aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk.c20
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 }
435out: 429out:
436 return error; 430 return error;
431warn:
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
439SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) 439SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)