Revert "pstore: Honor dmesg_restrict sysctl on dmesg dumps"

[linux.git] / fs / pstore / inode.c

diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index fefd22611cf60b1c25b7842b63da5957876a444f..d814723fb27dcdfc80168bf97a5c10ab20fcc0c2 100644 (file)
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -36,7 +36,6 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/uaccess.h>
-#include <linux/syslog.h>
 
 #include "internal.h"
 
@@ -132,18 +131,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->record->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)
 {
@@ -163,10 +150,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->record->type == PSTORE_TYPE_FTRACE)
                sops = &pstore_ftrace_seq_ops;
 
@@ -204,11 +187,6 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry)
 {
        struct pstore_private *p = d_inode(dentry)->i_private;
        struct pstore_record *record = p->record;
-       int err;
-
-       err = pstore_check_syslog_permissions(p);
-       if (err)
-               return err;
 
        if (!record->psi->erase)
                return -EPERM;
@@ -471,7 +449,7 @@ static int pstore_fill_super(struct super_block *sb, void *data, int silent)
 
        inode = pstore_get_inode(sb);
        if (inode) {
-               inode->i_mode = S_IFDIR | 0755;
+               inode->i_mode = S_IFDIR | 0750;
                inode->i_op = &pstore_dir_inode_operations;
                inode->i_fop = &simple_dir_operations;
                inc_nlink(inode);