summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-09-07 19:58:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-09-07 19:58:56 -0700
commit21d236bf2bde518844b5675ec4980f4b2fd13e1a (patch)
tree0a0f93f452f96becaa5779b76e85db4e0d31f2eb /kernel
parent8dc5b3a6cb2fc5d4f751bda56a378589202a118b (diff)
parentc71b02e4d207cbcf097f9746d5f7967b22905e70 (diff)
downloadlinux-21d236bf2bde518844b5675ec4980f4b2fd13e1a.tar.bz2
Merge tag 'pstore-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore update from Kees Cook: "Make pstore permissions more versatile by removing CAP_SYSLOG requirement and defining more restrictive root directory DAC permissions default (0750, which can be adjust after boot unlike the CAP_SYSLOG check). Suggested by Nick Kralevich" * tag 'pstore-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: Revert "pstore: Honor dmesg_restrict sysctl on dmesg dumps" pstore: Make default pstorefs root dir perms 0750
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index fc47863f629c..97bda7b0655b 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -649,7 +649,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
@@ -677,7 +677,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)
{