Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7c34970 authored by Steve Grubb's avatar Steve Grubb Committed by Al Viro
Browse files

[PATCH] Reworked patch for labels on user space messages 



The below patch should be applied after the inode and ipc sid patches.
This patch is a reworking of Tim's patch that has been updated to match
the inode and ipc patches since its similar.

[updated:
>  Stephen Smalley also wanted to change a variable from isec to tsec in the
>  user sid patch.                                                              ]

Signed-off-by: default avatarSteve Grubb <sgrubb@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9c7aa6aa

include/linux/netlink.h

+1 −0
Original line number Diff line number Diff line
@@ -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))

include/linux/selinux.h

+16 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 *

 * Copyright (C) 2005 Red Hat, Inc., James Morris <jmorris@redhat.com>

 * Copyright (C) 2006 Trusted Computer Solutions, Inc. <dgoeddel@trustedcs.com>

 * Copyright (C) 2006 IBM Corporation, Timothy R. Chavez <tinytim@us.ibm.com>

 *

 * 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 inode *inode, u32 *sid); 
 */

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(const struct kern_ipc_perm *ipcp, u32 *si 
	*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 */

kernel/audit.c

+19 −3
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int audit_netlink_ok(kernel_cap_t eff_cap, u16 msg_type) 


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_buff *skb, struct nlmsghdr *nlh) 
	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_buff *skb, struct nlmsghdr *nlh) 
			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);

			}

net/netlink/af_netlink.c

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include <linux/mm.h>

#include <linux/types.h>

#include <linux/audit.h>

#include <linux/selinux.h>



#include <net/sock.h>

#include <net/scm.h>
@@ -1157,6 +1158,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock, 
	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

security/selinux/exports.c

+11 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 *

 * Copyright (C) 2005 Red Hat, Inc., James Morris <jmorris@redhat.com>

 * Copyright (C) 2006 Trusted Computer Solutions, Inc. <dgoeddel@trustedcs.com>

 * Copyright (C) 2006 IBM Corporation, Timothy R. Chavez <tinytim@us.ibm.com>

 *

 * 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 kern_ipc_perm *ipcp, u32 *sid) 
	*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;

}