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 /kernel/printk/printk.c | |
| 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/)
Diffstat (limited to '')
| -rw-r--r-- | kernel/printk/printk.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) { |