| -rw-r--r-- | fs/pstore/inode.c | 21 | ||||
| -rw-r--r-- | include/linux/syslog.h | 9 | ||||
| -rw-r--r-- | kernel/printk/printk.c | 3 |
3 files changed, 1 insertions, 32 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index 1781dc5..3774856 100644 --- a/fs/pstore/inode.c +++ b/fs/pstore/inode.c @@ -121,18 +121,6 @@ static const struct seq_operations pstore_ftrace_seq_ops = { .show = pstore_ftrace_seq_show, }; -static int pstore_check_syslog_permissions(struct pstore_private *ps) -{ - switch (ps->type) { - case PSTORE_TYPE_DMESG: - case PSTORE_TYPE_CONSOLE: - return check_syslog_permissions(SYSLOG_ACTION_READ_ALL, - SYSLOG_FROM_READER); - default: - return 0; - } -} - static ssize_t pstore_file_read(struct file *file, char __user *userbuf, size_t count, loff_t *ppos) { @@ -151,10 +139,6 @@ static int pstore_file_open(struct inode *inode, struct file *file) int err; const struct seq_operations *sops = NULL; - err = pstore_check_syslog_permissions(ps); - if (err) - return err; - if (ps->type == PSTORE_TYPE_FTRACE) sops = &pstore_ftrace_seq_ops; @@ -191,11 +175,6 @@ static const struct file_operations pstore_file_operations = { static int pstore_unlink(struct inode *dir, struct dentry *dentry) { struct pstore_private *p = d_inode(dentry)->i_private; - int err; - - err = pstore_check_syslog_permissions(p); - if (err) - return err; if (p->psi->erase) p->psi->erase(p->type, p->id, p->count, |