summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-08-10 13:36:35 -0700
committerMichael Bestas <mkbestas@lineageos.org>2020-01-27 20:39:02 +0200
commit7d41636897e1e39a2025efe2cb0d8a6ac15c28a5 (patch)
tree8d99b240cdc8cd08d3e9b619e0d86201aa738ee2 /include/linux
parent3edf0a32f5825b8b71edb6a8953eedb6400d271c (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 'include/linux')
-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 */