diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-07 19:58:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-07 19:58:56 -0700 |
| commit | 21d236bf2bde518844b5675ec4980f4b2fd13e1a (patch) | |
| tree | 0a0f93f452f96becaa5779b76e85db4e0d31f2eb /include | |
| parent | Merge tag '4.14-smb3-xattr-enable' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | Revert "pstore: Honor dmesg_restrict sysctl on dmesg dumps" (diff) | |
| download | linux-21d236bf2bde518844b5675ec4980f4b2fd13e1a.tar.gz linux-21d236bf2bde518844b5675ec4980f4b2fd13e1a.zip | |
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.h | 9 |
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 */ |