diff options
| author | Kees Cook <keescook@chromium.org> | 2017-08-10 13:36:35 -0700 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-01-27 20:39:02 +0200 |
| commit | 7d41636897e1e39a2025efe2cb0d8a6ac15c28a5 (patch) | |
| tree | 8d99b240cdc8cd08d3e9b619e0d86201aa738ee2 | |
| parent | 3edf0a32f5825b8b71edb6a8953eedb6400d271c (diff) | |
FROMLIST: Revert "pstore: Honor dmesg_restrict sysctl on dmesg dumps"
This reverts commit 68c4a4f8abc60c9440ede9cd123d48b78325f7a3, with
various conflict clean-ups.
With the default root directory mode set to 0750 now, the capability
check was redundant.
Bug: 64503253
Change-Id: Ia361706f70eb691ebb8f7a41359ceb91c8495910
Suggested-by: Nick Kralevich <nnk@google.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Siqi Lin <siqilin@google.com>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
(am from https://patchwork.kernel.org/patch/9894575/)
| -rw-r--r-- | fs/pstore/inode.c | 22 | ||||
| -rw-r--r-- | include/linux/syslog.h | 9 | ||||
| -rw-r--r-- | kernel/printk/printk.c | 3 |
3 files changed, 1 insertions, 33 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index 75bf5e7d5d84..7a380208b006 100644 --- 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 <linux/vmalloc.h> #include "internal.h" @@ -122,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) { @@ -152,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; @@ -192,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, diff --git a/include/linux/syslog.h b/include/linux/syslog.h index c3a7f0cc3a27..e1c3632f4e81 100644 --- a/include/linux/syslog.h +++ b/include/linux/syslog.h @@ -49,13 +49,4 @@ int do_syslog(int type, char __user *buf, int count, int source); -#ifdef CONFIG_PRINTK -int check_syslog_permissions(int type, int source); -#else -static inline int check_syslog_permissions(int type, int source) -{ - return 0; -} -#endif - #endif /* _LINUX_SYSLOG_H */ diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index fd63b4d06139..4bbafc2a4822 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -497,7 +497,7 @@ static int syslog_action_restricted(int type) type != SYSLOG_ACTION_SIZE_BUFFER; } -int check_syslog_permissions(int type, int source) +static int check_syslog_permissions(int type, int source) { /* * If this is from /proc/kmsg and we've already opened it, then we've @@ -525,7 +525,6 @@ int check_syslog_permissions(int type, int source) ok: return security_syslog(type); } -EXPORT_SYMBOL_GPL(check_syslog_permissions); static void append_char(char **pp, char *e, char c) { |