aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux
diff options
context:
space:
mode:
authorKees Cook <kees.cook@canonical.com>2010-02-03 18:36:43 -0500
committerJames Morris <jmorris@namei.org>2010-02-03 22:20:12 -0500
commit002345925e6c45861f60db6f4fc6236713fd8847 (patch)
treed7849eafe1755116597166bbebf43e2bee86cb76 /security/selinux
parent0719aaf5ead7555b7b7a4a080ebf2826a871384e (diff)
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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 9a2ee845e9d..a4862a0730f 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -76,6 +76,7 @@
76#include <linux/selinux.h> 76#include <linux/selinux.h>
77#include <linux/mutex.h> 77#include <linux/mutex.h>
78#include <linux/posix-timers.h> 78#include <linux/posix-timers.h>
79#include <linux/syslog.h>
79 80
80#include "avc.h" 81#include "avc.h"
81#include "objsec.h" 82#include "objsec.h"
@@ -2049,11 +2050,11 @@ static int selinux_quota_on(struct dentry *dentry)
2049 return dentry_has_perm(cred, NULL, dentry, FILE__QUOTAON); 2050 return dentry_has_perm(cred, NULL, dentry, FILE__QUOTAON);
2050} 2051}
2051 2052
2052static int selinux_syslog(int type) 2053static int selinux_syslog(int type, bool from_file)
2053{ 2054{
2054 int rc; 2055 int rc;
2055 2056
2056 rc = cap_syslog(type); 2057 rc = cap_syslog(type, from_file);
2057 if (rc) 2058 if (rc)
2058 return rc; 2059 return rc;
2059 2060