Messages in this thread Patch in this message | | | Subject | [PATCH] Fix dmesg_restrict build failure with CONFIG_EMBEDDED=y and CONFIG_PRINTK=n | From | Joe Perches <> | Date | Sat, 13 Nov 2010 09:26:16 -0800 |
| |
dmesg_restrict is guarded by #ifdef CONFIG_PRINTK in kernel.h Its uses need to be guarded as well.
Signed-off-by: Joe Perches <joe@perches.com> --- kernel/sysctl.c | 2 +- security/commoncap.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index b65bf63..5abfa15 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -702,7 +702,6 @@ static struct ctl_table kern_table[] = { .extra1 = &zero, .extra2 = &ten_thousand, }, -#endif { .procname = "dmesg_restrict", .data = &dmesg_restrict, @@ -712,6 +711,7 @@ static struct ctl_table kern_table[] = { .extra1 = &zero, .extra2 = &one, }, +#endif { .procname = "ngroups_max", .data = &ngroups_max, diff --git a/security/commoncap.c b/security/commoncap.c index 04b80f9..29f2368 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -895,8 +895,10 @@ int cap_syslog(int type, bool from_file) { if (type != SYSLOG_ACTION_OPEN && from_file) return 0; +#ifdef CONFIG_PRINTK if (dmesg_restrict && !capable(CAP_SYS_ADMIN)) return -EPERM; +#endif if ((type != SYSLOG_ACTION_READ_ALL && type != SYSLOG_ACTION_SIZE_BUFFER) && !capable(CAP_SYS_ADMIN)) return -EPERM;
| |