diff options
| author | Kees Cook <kees.cook@canonical.com> | 2010-02-03 15:36:43 -0800 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-02-04 14:20:12 +1100 |
| commit | 002345925e6c45861f60db6f4fc6236713fd8847 (patch) | |
| tree | d7849eafe1755116597166bbebf43e2bee86cb76 /security/selinux | |
| parent | 0719aaf5ead7555b7b7a4a080ebf2826a871384e (diff) | |
| download | kernel_samsung_aries-002345925e6c45861f60db6f4fc6236713fd8847.zip kernel_samsung_aries-002345925e6c45861f60db6f4fc6236713fd8847.tar.gz kernel_samsung_aries-002345925e6c45861f60db6f4fc6236713fd8847.tar.bz2 | |
syslog: distinguish between /proc/kmsg and syscalls
This allows the LSM to distinguish between syslog functions originating
from /proc/kmsg access and direct syscalls. By default, the commoncaps
will now no longer require CAP_SYS_ADMIN to read an opened /proc/kmsg
file descriptor. For example the kernel syslog reader can now drop
privileges after opening /proc/kmsg, instead of staying privileged with
CAP_SYS_ADMIN. MAC systems that implement security_syslog have unchanged
behavior.
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Acked-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/hooks.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 9a2ee84..a4862a0 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -76,6 +76,7 @@ #include <linux/selinux.h> #include <linux/mutex.h> #include <linux/posix-timers.h> +#include <linux/syslog.h> #include "avc.h" #include "objsec.h" @@ -2049,11 +2050,11 @@ static int selinux_quota_on(struct dentry *dentry) return dentry_has_perm(cred, NULL, dentry, FILE__QUOTAON); } -static int selinux_syslog(int type) +static int selinux_syslog(int type, bool from_file) { int rc; - rc = cap_syslog(type); + rc = cap_syslog(type, from_file); if (rc) return rc; |