From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 14 Jan 2009 13:13:58 +0000 (+0100)
Subject: [CVE-2009-0029] Make sys_syslog a conditional system call
X-Git-Tag: v2.6.29-rc2~77^2~38
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f627a741d24f12955fa2d9f8831c3b12860635bd;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/kernel/printk.c b/kernel/printk.c
index 7015733793e..e48cf33783f 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 e14a2328170..27dad296738 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);