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

Commit 75e22910 authored by Paul Moore's avatar Paul Moore Committed by James Morris
Browse files

NetLabel: Add IP address family information to the netlbl_skbuff_getattr() function 



In order to do any sort of IP header inspection of incoming packets we need to
know which address family, AF_INET/AF_INET6/etc., it belongs to and since the
sk_buff structure does not store this information we need to pass along the
address family separate from the packet itself.

Signed-off-by: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 16efd454

include/net/netlabel.h

+2 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ int netlbl_sock_setattr(struct sock *sk, 
int netlbl_sock_getattr(struct sock *sk,

			struct netlbl_lsm_secattr *secattr);

int netlbl_skbuff_getattr(const struct sk_buff *skb,

			  u16 family,

			  struct netlbl_lsm_secattr *secattr);

void netlbl_skbuff_err(struct sk_buff *skb, int error);
@@ -415,6 +416,7 @@ static inline int netlbl_sock_getattr(struct sock *sk, 
	return -ENOSYS;

}

static inline int netlbl_skbuff_getattr(const struct sk_buff *skb,

					u16 family,

					struct netlbl_lsm_secattr *secattr)

{

	return -ENOSYS;

net/netlabel/netlabel_kapi.c

+2 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ int netlbl_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr) 
/**

 * netlbl_skbuff_getattr - Determine the security attributes of a packet

 * @skb: the packet

 * @family: protocol family

 * @secattr: the security attributes

 *

 * Description:
@@ -342,6 +343,7 @@ int netlbl_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr) 
 *

 */

int netlbl_skbuff_getattr(const struct sk_buff *skb,

			  u16 family,

			  struct netlbl_lsm_secattr *secattr)

{

	if (CIPSO_V4_OPTEXIST(skb) &&

security/selinux/hooks.c

+22 −11
Original line number Diff line number Diff line
@@ -3429,6 +3429,7 @@ static int selinux_parse_skb(struct sk_buff *skb, struct avc_audit_data *ad, 
/**

 * selinux_skb_extlbl_sid - Determine the external label of a packet

 * @skb: the packet

 * @family: protocol family

 * @sid: the packet's SID

 *

 * Description:
@@ -3441,13 +3442,16 @@ static int selinux_parse_skb(struct sk_buff *skb, struct avc_audit_data *ad, 
 * selinux_netlbl_skbuff_getsid().

 *

 */

static void selinux_skb_extlbl_sid(struct sk_buff *skb, u32 *sid)

static void selinux_skb_extlbl_sid(struct sk_buff *skb,

				   u16 family,

				   u32 *sid)

{

	u32 xfrm_sid;

	u32 nlbl_sid;



	selinux_skb_xfrm_sid(skb, &xfrm_sid);

	if (selinux_netlbl_skbuff_getsid(skb,

					 family,

					 (xfrm_sid == SECSID_NULL ?

					  SECINITSID_NETMSG : xfrm_sid),

					 &nlbl_sid) != 0)
@@ -3940,7 +3944,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb) 
	if (err)

		goto out;



	err = selinux_netlbl_sock_rcv_skb(sksec, skb, &ad);

	err = selinux_netlbl_sock_rcv_skb(sksec, skb, family, &ad);

	if (err)

		goto out;
@@ -3996,18 +4000,25 @@ out: 
static int selinux_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, u32 *secid)

{

	u32 peer_secid = SECSID_NULL;

	int err = 0;

	u16 family;



	if (sock)

		family = sock->sk->sk_family;

	else if (skb && skb->sk)

		family = skb->sk->sk_family;

	else

		goto out;



	if (sock && sock->sk->sk_family == PF_UNIX)

	if (sock && family == PF_UNIX)

		selinux_get_inode_sid(SOCK_INODE(sock), &peer_secid);

	else if (skb)

		selinux_skb_extlbl_sid(skb, &peer_secid);

		selinux_skb_extlbl_sid(skb, family, &peer_secid);



	if (peer_secid == SECSID_NULL)

		err = -EINVAL;

out:

	*secid = peer_secid;



	return err;

	if (peer_secid == SECSID_NULL)

		return -EINVAL;

	return 0;

}



static int selinux_sk_alloc_security(struct sock *sk, int family, gfp_t priority)
@@ -4062,7 +4073,7 @@ static int selinux_inet_conn_request(struct sock *sk, struct sk_buff *skb, 
	u32 newsid;

	u32 peersid;



	selinux_skb_extlbl_sid(skb, &peersid);

	selinux_skb_extlbl_sid(skb, sk->sk_family, &peersid);

	if (peersid == SECSID_NULL) {

		req->secid = sksec->sid;

		req->peer_secid = SECSID_NULL;
@@ -4100,7 +4111,7 @@ static void selinux_inet_conn_established(struct sock *sk, 
{

	struct sk_security_struct *sksec = sk->sk_security;



	selinux_skb_extlbl_sid(skb, &sksec->peer_sid);

	selinux_skb_extlbl_sid(skb, sk->sk_family, &sksec->peer_sid);

}



static void selinux_req_classify_flow(const struct request_sock *req,

security/selinux/include/netlabel.h

+7 −1
Original line number Diff line number Diff line
@@ -46,13 +46,17 @@ void selinux_netlbl_sk_security_init(struct sk_security_struct *ssec, 
void selinux_netlbl_sk_security_clone(struct sk_security_struct *ssec,

				      struct sk_security_struct *newssec);



int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u32 base_sid, u32 *sid);

int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,

				 u16 family,

				 u32 base_sid,

				 u32 *sid);



void selinux_netlbl_sock_graft(struct sock *sk, struct socket *sock);

int selinux_netlbl_socket_post_create(struct socket *sock);

int selinux_netlbl_inode_permission(struct inode *inode, int mask);

int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,

				struct sk_buff *skb,

				u16 family,

				struct avc_audit_data *ad);

int selinux_netlbl_socket_setsockopt(struct socket *sock,

				     int level,
@@ -83,6 +87,7 @@ static inline void selinux_netlbl_sk_security_clone( 
}



static inline int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,

					       u16 family,

					       u32 base_sid,

					       u32 *sid)

{
@@ -106,6 +111,7 @@ static inline int selinux_netlbl_inode_permission(struct inode *inode, 
}

static inline int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,

					      struct sk_buff *skb,

					      u16 family,

					      struct avc_audit_data *ad)

{

	return 0;

security/selinux/netlabel.c

+9 −3
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ void selinux_netlbl_sk_security_clone(struct sk_security_struct *ssec, 
/**

 * selinux_netlbl_skbuff_getsid - Get the sid of a packet using NetLabel

 * @skb: the packet

 * @family: protocol family

 * @base_sid: the SELinux SID to use as a context for MLS only attributes

 * @sid: the SID

 *
@@ -153,7 +154,10 @@ void selinux_netlbl_sk_security_clone(struct sk_security_struct *ssec, 
 * assign to the packet.  Returns zero on success, negative values on failure.

 *

 */

int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u32 base_sid, u32 *sid)

int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,

				 u16 family,

				 u32 base_sid,

				 u32 *sid)

{

	int rc;

	struct netlbl_lsm_secattr secattr;
@@ -164,7 +168,7 @@ int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u32 base_sid, u32 *sid) 
	}



	netlbl_secattr_init(&secattr);

	rc = netlbl_skbuff_getattr(skb, &secattr);

	rc = netlbl_skbuff_getattr(skb, family, &secattr);

	if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE) {

		rc = security_netlbl_secattr_to_sid(&secattr, base_sid, sid);

		if (rc == 0 &&
@@ -292,6 +296,7 @@ int selinux_netlbl_inode_permission(struct inode *inode, int mask) 
 * selinux_netlbl_sock_rcv_skb - Do an inbound access check using NetLabel

 * @sksec: the sock's sk_security_struct

 * @skb: the packet

 * @family: protocol family

 * @ad: the audit data

 *

 * Description:
@@ -302,6 +307,7 @@ int selinux_netlbl_inode_permission(struct inode *inode, int mask) 
 */

int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,

				struct sk_buff *skb,

				u16 family,

				struct avc_audit_data *ad)

{

	int rc;
@@ -313,7 +319,7 @@ int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec, 
		return 0;



	netlbl_secattr_init(&secattr);

	rc = netlbl_skbuff_getattr(skb, &secattr);

	rc = netlbl_skbuff_getattr(skb, family, &secattr);

	if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE) {

		rc = security_netlbl_secattr_to_sid(&secattr,

						    SECINITSID_NETMSG,