From: Sebastian Schmidt <yath@yath.de>
Date: Fri, 14 Nov 2014 18:51:45 +0000 (-0800)
Subject: syslog: Provide stub check_syslog_permissions
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=069fb0b63722f8c9f8b4bbce236793626c89af33;p=deliverable%2Flinux.git

syslog: Provide stub check_syslog_permissions

When building without CONFIG_PRINTK, we need to provide a stub
check_syslog_permissions. As there is no way to turn on the
dmesg_restrict sysctl without CONFIG_PRINTK, return success.

Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Sebastian Schmidt <yath@yath.de>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/include/linux/syslog.h b/include/linux/syslog.h
index 9def5297dbb7..4b7b875a7ce1 100644
--- a/include/linux/syslog.h
+++ b/include/linux/syslog.h
@@ -48,6 +48,14 @@
 #define SYSLOG_FROM_PROC             1
 
 int do_syslog(int type, char __user *buf, int count, bool from_file);
+
+#ifdef CONFIG_PRINTK
 int check_syslog_permissions(int type, bool from_file);
+#else
+static inline int check_syslog_permissions(int type, bool from_file)
+{
+	return 0;
+}
+#endif
 
 #endif /* _LINUX_SYSLOG_H */