summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-01-14 16:13:58 +0300
committerHeiko Carstens <heiko.carstens@de.ibm.com>2009-01-14 16:15:16 +0300
commitf627a741d24f12955fa2d9f8831c3b12860635bd (patch)
tree2b96ea5be1df1978fd08544929c2ab3d4fbad8ba
parentc9da9f2129d6a421c32e334a83770a9e67f7feac (diff)
downloadlinux-f627a741d24f12955fa2d9f8831c3b12860635bd.tar.xz
[CVE-2009-0029] Make sys_syslog a conditional system call
Remove the -ENOSYS implementation for !CONFIG_PRINTK and use the cond_syscall infrastructure instead. Acked-by: Kyle McMartin <kyle@redhat.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
-rw-r--r--kernel/printk.c5
-rw-r--r--kernel/sys_ni.c1
2 files changed, 1 insertions, 5 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index 7015733793e8..e48cf33783fc 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -742,11 +742,6 @@ EXPORT_SYMBOL(vprintk);
#else
-asmlinkage long sys_syslog(int type, char __user *buf, int len)
-{
- return -ENOSYS;
-}
-
static void call_console_drivers(unsigned start, unsigned end)
{
}
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index e14a23281707..27dad2967387 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -131,6 +131,7 @@ cond_syscall(sys_io_destroy);
cond_syscall(sys_io_submit);
cond_syscall(sys_io_cancel);
cond_syscall(sys_io_getevents);
+cond_syscall(sys_syslog);
/* arch-specific weak syscall entries */
cond_syscall(sys_pciconfig_read);