From: Vasily Averin <vvs@odin.com>
To: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>,
Josh Boyer <jwboyer@redhat.com>, Eric Paris <eparis@redhat.com>
Subject: [PATCH] kernel/printk/printk.c: check_syslog_permissions() cleanup
Date: Sun, 10 May 2015 09:35:53 +0300 [thread overview]
Message-ID: <554EFC49.2020800@odin.com> (raw)
Fixes: 637241a900cb ("kmsg: honor dmesg_restrict sysctl on /dev/kmsg")
Final version of patch 637241a900cb ("kmsg: honor dmesg_restrict sysctl
on /dev/kmsg") lost few hooks. As result security_syslog() is not checked
inside check_syslog_permissions() if dmesg_restrict is set,
or it can be called twice in do_syslog().
Signed-off-by: Vasily Averin <vvs@openvz.org>
---
kernel/printk/printk.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index c099b08..bff0169 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -484,11 +484,11 @@ int check_syslog_permissions(int type, bool from_file)
* already done the capabilities checks at open time.
*/
if (from_file && type != SYSLOG_ACTION_OPEN)
- return 0;
+ goto ok;
if (syslog_action_restricted(type)) {
if (capable(CAP_SYSLOG))
- return 0;
+ goto ok;
/*
* For historical reasons, accept CAP_SYS_ADMIN too, with
* a warning.
@@ -498,10 +498,11 @@ int check_syslog_permissions(int type, bool from_file)
"CAP_SYS_ADMIN but no CAP_SYSLOG "
"(deprecated).\n",
current->comm, task_pid_nr(current));
- return 0;
+ goto ok;
}
return -EPERM;
}
+ok:
return security_syslog(type);
}
@@ -1263,10 +1264,6 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
if (error)
goto out;
- error = security_syslog(type);
- if (error)
- return error;
-
switch (type) {
case SYSLOG_ACTION_CLOSE: /* Close log */
break;
--
1.9.1
next reply other threads:[~2015-05-10 6:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-10 6:35 Vasily Averin [this message]
2015-05-14 22:01 ` [PATCH] kernel/printk/printk.c: check_syslog_permissions() cleanup Andrew Morton
2015-05-15 7:41 ` Vasily Averin
2015-05-15 9:22 ` Vasily Averin
2015-05-24 16:09 ` Vasily Averin
2015-05-24 16:18 ` [PATCH v2] security_syslog() should be called once only Vasily Averin
2015-05-27 23:43 ` Andrew Morton
2015-05-30 13:51 ` Vasily Averin
2015-06-01 21:23 ` Andrew Morton
2015-06-02 7:57 ` Vasily Averin
2015-05-30 13:51 ` [PATCH] check_syslog_permissions() cleanup Vasily Averin
2015-06-04 17:00 ` [PATCH v2] security_syslog() should be called once only Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=554EFC49.2020800@odin.com \
--to=vvs@odin.com \
--cc=akpm@linux-foundation.org \
--cc=eparis@redhat.com \
--cc=jwboyer@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).