diff options
author | Serge E. Hallyn <serge@hallyn.com> | 2010-12-08 10:19:01 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-12-08 17:48:48 -0500 |
commit | 38ef4c2e437d11b5922723504b62824e96761459 (patch) | |
tree | ccec1f38348af3c2776fc5bc0b589e14504f4b33 /kernel | |
parent | 5c6d1125f8dbd1bfef39e38fbc2837003be78a59 (diff) |
syslog: check cap_syslog when dmesg_restrict
Eric Paris pointed out that it doesn't make sense to require
both CAP_SYS_ADMIN and CAP_SYSLOG for certain syslog actions.
So require CAP_SYSLOG, not CAP_SYS_ADMIN, when dmesg_restrict
is set.
(I'm also consolidating the now common error path)
Signed-off-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Acked-by: Eric Paris <eparis@redhat.com>
Acked-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/printk.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 0712380737b3..0cecba059666 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -279,18 +279,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file) | |||
279 | * at open time. | 279 | * at open time. |
280 | */ | 280 | */ |
281 | if (type == SYSLOG_ACTION_OPEN || !from_file) { | 281 | if (type == SYSLOG_ACTION_OPEN || !from_file) { |
282 | if (dmesg_restrict && !capable(CAP_SYS_ADMIN)) | 282 | if (dmesg_restrict && !capable(CAP_SYSLOG)) |
283 | return -EPERM; | 283 | goto warn; /* switch to return -EPERM after 2.6.39 */ |
284 | if ((type != SYSLOG_ACTION_READ_ALL && | 284 | if ((type != SYSLOG_ACTION_READ_ALL && |
285 | type != SYSLOG_ACTION_SIZE_BUFFER) && | 285 | type != SYSLOG_ACTION_SIZE_BUFFER) && |
286 | !capable(CAP_SYSLOG)) { | 286 | !capable(CAP_SYSLOG)) |
287 | /* remove after 2.6.38 */ | 287 | goto warn; /* switch to return -EPERM after 2.6.39 */ |
288 | if (capable(CAP_SYS_ADMIN)) | ||
289 | WARN_ONCE(1, "Attempt to access syslog with " | ||
290 | "CAP_SYS_ADMIN but no CAP_SYSLOG " | ||
291 | "(deprecated and denied).\n"); | ||
292 | return -EPERM; | ||
293 | } | ||
294 | } | 288 | } |
295 | 289 | ||
296 | error = security_syslog(type); | 290 | error = security_syslog(type); |
@@ -434,6 +428,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file) | |||
434 | } | 428 | } |
435 | out: | 429 | out: |
436 | return error; | 430 | return error; |
431 | warn: | ||
432 | /* remove after 2.6.39 */ | ||
433 | if (capable(CAP_SYS_ADMIN)) | ||
434 | WARN_ONCE(1, "Attempt to access syslog with CAP_SYS_ADMIN " | ||
435 | "but no CAP_SYSLOG (deprecated and denied).\n"); | ||
436 | return -EPERM; | ||
437 | } | 437 | } |
438 | 438 | ||
439 | SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) | 439 | SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) |