aboutsummaryrefslogtreecommitdiffstats
path: root/security/security.c
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/security.c
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/security.c')
-rw-r--r--security/security.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c
index 440afe5eb54c..971092c06f31 100644
--- a/security/security.c
+++ b/security/security.c
@@ -203,9 +203,9 @@ int security_quota_on(struct dentry *dentry)
203 return security_ops->quota_on(dentry); 203 return security_ops->quota_on(dentry);
204} 204}
205 205
206int security_syslog(int type) 206int security_syslog(int type, bool from_file)
207{ 207{
208 return security_ops->syslog(type); 208 return security_ops->syslog(type, from_file);
209} 209}
210 210
211int security_settime(struct timespec *ts, struct timezone *tz) 211int security_settime(struct timespec *ts, struct timezone *tz)