diff options
| author | Andy Grover <agrover@groveronline.com> | 2003-03-19 00:09:51 -0800 |
|---|---|---|
| committer | Andy Grover <agrover@groveronline.com> | 2003-03-19 00:09:51 -0800 |
| commit | b39e199b453be169dfd1adec9686978057c1dc0f (patch) | |
| tree | dd7162a8e62d003159d6250069194b48a72b76d0 /kernel/printk.c | |
| parent | 99d5dfb972d15c955e274d3f67e3862ce8004311 (diff) | |
| parent | d99c48c60bc52561b3125dd1f85db7a77b7031ca (diff) | |
Merge groveronline.com:/root/bk/linux-2.5
into groveronline.com:/root/bk/linux-acpi
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 9f2eb4b45669..853ac68708ae 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -28,6 +28,7 @@ #include <linux/config.h> #include <linux/delay.h> #include <linux/smp.h> +#include <linux/security.h> #include <asm/uaccess.h> @@ -161,6 +162,10 @@ int do_syslog(int type, char * buf, int len) char c; int error = 0; + error = security_syslog(type); + if (error) + return error; + switch (type) { case 0: /* Close log */ break; @@ -273,8 +278,6 @@ out: asmlinkage long sys_syslog(int type, char * buf, int len) { - if ((type != 3) && !capable(CAP_SYS_ADMIN)) - return -EPERM; return do_syslog(type, buf, len); } |