From: Steve Grubb This is a reworking of Tim's patch that has been updated to match the inode and ipc patches since its similar. Signed-off-by: Steve Grubb Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- include/linux/netlink.h | 1 + include/linux/selinux.h | 16 ++++++++++++++++ kernel/audit.c | 22 +++++++++++++++++++--- net/netlink/af_netlink.c | 2 ++ security/selinux/exports.c | 11 +++++++++++ 5 files changed, 49 insertions(+), 3 deletions(-) diff -puN include/linux/netlink.h~audit-reworked-patch-for-labels-on-user-space-messages include/linux/netlink.h --- devel/include/linux/netlink.h~audit-reworked-patch-for-labels-on-user-space-messages 2006-04-17 21:40:46.000000000 -0700 +++ devel-akpm/include/linux/netlink.h 2006-04-17 21:40:46.000000000 -0700 @@ -143,6 +143,7 @@ struct netlink_skb_parms __u32 dst_group; kernel_cap_t eff_cap; __u32 loginuid; /* Login (audit) uid */ + __u32 sid; /* SELinux security id */ }; #define NETLINK_CB(skb) (*(struct netlink_skb_parms*)&((skb)->cb)) diff -puN include/linux/selinux.h~audit-reworked-patch-for-labels-on-user-space-messages include/linux/selinux.h --- devel/include/linux/selinux.h~audit-reworked-patch-for-labels-on-user-space-messages 2006-04-17 21:40:46.000000000 -0700 +++ devel-akpm/include/linux/selinux.h 2006-04-17 21:40:46.000000000 -0700 @@ -5,6 +5,7 @@ * * Copyright (C) 2005 Red Hat, Inc., James Morris * Copyright (C) 2006 Trusted Computer Solutions, Inc. + * Copyright (C) 2006 IBM Corporation, Timothy R. Chavez * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -108,6 +109,16 @@ void selinux_get_inode_sid(const struct */ void selinux_get_ipc_sid(const struct kern_ipc_perm *ipcp, u32 *sid); +/** + * selinux_get_task_sid - return the SID of task + * @tsk: the task whose SID will be returned + * @sid: pointer to security context ID to be filled in. + * + * Returns nothing + */ +void selinux_get_task_sid(struct task_struct *tsk, u32 *sid); + + #else static inline int selinux_audit_rule_init(u32 field, u32 op, @@ -156,6 +167,11 @@ static inline void selinux_get_ipc_sid(c *sid = 0; } +static inline void selinux_get_task_sid(struct task_struct *tsk, u32 *sid) +{ + *sid = 0; +} + #endif /* CONFIG_SECURITY_SELINUX */ #endif /* _LINUX_SELINUX_H */ diff -puN kernel/audit.c~audit-reworked-patch-for-labels-on-user-space-messages kernel/audit.c --- devel/kernel/audit.c~audit-reworked-patch-for-labels-on-user-space-messages 2006-04-17 21:40:46.000000000 -0700 +++ devel-akpm/kernel/audit.c 2006-04-17 21:40:46.000000000 -0700 @@ -390,7 +390,7 @@ static int audit_netlink_ok(kernel_cap_t static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) { - u32 uid, pid, seq; + u32 uid, pid, seq, sid; void *data; struct audit_status *status_get, status_set; int err; @@ -416,6 +416,7 @@ static int audit_receive_msg(struct sk_b pid = NETLINK_CREDS(skb)->pid; uid = NETLINK_CREDS(skb)->uid; loginuid = NETLINK_CB(skb).loginuid; + sid = NETLINK_CB(skb).sid; seq = nlh->nlmsg_seq; data = NLMSG_DATA(nlh); @@ -468,8 +469,23 @@ static int audit_receive_msg(struct sk_b ab = audit_log_start(NULL, GFP_KERNEL, msg_type); if (ab) { audit_log_format(ab, - "user pid=%d uid=%u auid=%u msg='%.1024s'", - pid, uid, loginuid, (char *)data); + "user pid=%d uid=%u auid=%u", + pid, uid, loginuid); + if (sid) { + char *ctx = NULL; + u32 len; + if (selinux_ctxid_to_string( + sid, &ctx, &len)) { + audit_log_format(ab, + " subj=%u", sid); + /* Maybe call audit_panic? */ + } else + audit_log_format(ab, + " subj=%s", ctx); + kfree(ctx); + } + audit_log_format(ab, " msg='%.1024s'", + (char *)data); audit_set_pid(ab, pid); audit_log_end(ab); } diff -puN net/netlink/af_netlink.c~audit-reworked-patch-for-labels-on-user-space-messages net/netlink/af_netlink.c --- devel/net/netlink/af_netlink.c~audit-reworked-patch-for-labels-on-user-space-messages 2006-04-17 21:40:46.000000000 -0700 +++ devel-akpm/net/netlink/af_netlink.c 2006-04-17 21:40:46.000000000 -0700 @@ -56,6 +56,7 @@ #include #include #include +#include #include #include @@ -1157,6 +1158,7 @@ static int netlink_sendmsg(struct kiocb NETLINK_CB(skb).dst_pid = dst_pid; NETLINK_CB(skb).dst_group = dst_group; NETLINK_CB(skb).loginuid = audit_get_loginuid(current->audit_context); + selinux_get_task_sid(current, &(NETLINK_CB(skb).sid)); memcpy(NETLINK_CREDS(skb), &siocb->scm->creds, sizeof(struct ucred)); /* What can I do? Netlink is asynchronous, so that diff -puN security/selinux/exports.c~audit-reworked-patch-for-labels-on-user-space-messages security/selinux/exports.c --- devel/security/selinux/exports.c~audit-reworked-patch-for-labels-on-user-space-messages 2006-04-17 21:40:46.000000000 -0700 +++ devel-akpm/security/selinux/exports.c 2006-04-17 21:40:46.000000000 -0700 @@ -5,6 +5,7 @@ * * Copyright (C) 2005 Red Hat, Inc., James Morris * Copyright (C) 2006 Trusted Computer Solutions, Inc. + * Copyright (C) 2006 IBM Corporation, Timothy R. Chavez * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -61,3 +62,13 @@ void selinux_get_ipc_sid(const struct ke *sid = 0; } +void selinux_get_task_sid(struct task_struct *tsk, u32 *sid) +{ + if (selinux_enabled) { + struct task_security_struct *tsec = tsk->security; + *sid = tsec->sid; + return; + } + *sid = 0; +} + _