summaryrefslogtreecommitdiffstats
path: root/include
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 /include
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 'include')
-rw-r--r--include/linux/syslog.h9
1 files changed, 0 insertions, 9 deletions
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 */