summaryrefslogtreecommitdiffstats
path: root/security/smack
diff options
context:
space:
mode:
authorKees Cook <kees.cook@canonical.com>2010-02-03 15:36:43 -0800
committerJames Morris <jmorris@namei.org>2010-02-04 14:20:12 +1100
commit002345925e6c45861f60db6f4fc6236713fd8847 (patch)
treed7849eafe1755116597166bbebf43e2bee86cb76 /security/smack
parent0719aaf5ead7555b7b7a4a080ebf2826a871384e (diff)
downloadlinux-002345925e6c45861f60db6f4fc6236713fd8847.tar.gz
linux-002345925e6c45861f60db6f4fc6236713fd8847.tar.bz2
linux-002345925e6c45861f60db6f4fc6236713fd8847.zip
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/smack')
-rw-r--r--security/smack/smack_lsm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 529c9ca65878..a5721b373f53 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -157,12 +157,12 @@ static int smack_ptrace_traceme(struct task_struct *ptp)
*
* Returns 0 on success, error code otherwise.
*/
-static int smack_syslog(int type)
+static int smack_syslog(int type, bool from_file)
{
int rc;
char *sp = current_security();
- rc = cap_syslog(type);
+ rc = cap_syslog(type, from_file);
if (rc != 0)
return rc;