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

Commit a07ef951 authored by Piotr Sawicki's avatar Piotr Sawicki Committed by Casey Schaufler
Browse files

Smack: Check UDP-Lite and DCCP protocols during IPv6 handling 



The smack_socket_sock_rcv_skb() function is checking smack labels
only for UDP and TCP frames carried in IPv6 packets. From now on,
it is able also to handle UDP-Lite and DCCP protocols.

Signed-off-by: default avatarPiotr Sawicki <p.sawicki2@partner.samsung.com>
Signed-off-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
parent 129a9989

security/smack/smack_lsm.c

+3 −1
Original line number Diff line number Diff line
@@ -3895,6 +3895,7 @@ static int smk_skb_to_addr_ipv6(struct sk_buff *skb, struct sockaddr_in6 *sip) 
			sip->sin6_port = th->source;

		break;

	case IPPROTO_UDP:

	case IPPROTO_UDPLITE:

		uh = skb_header_pointer(skb, offset, sizeof(_udph), &_udph);

		if (uh != NULL)

			sip->sin6_port = uh->source;
@@ -3985,7 +3986,8 @@ static int smack_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb) 
#if IS_ENABLED(CONFIG_IPV6)

	case PF_INET6:

		proto = smk_skb_to_addr_ipv6(skb, &sadd);

		if (proto != IPPROTO_UDP && proto != IPPROTO_TCP)

		if (proto != IPPROTO_UDP && proto != IPPROTO_UDPLITE &&

		    proto != IPPROTO_TCP && proto != IPPROTO_DCCP)

			break;

#ifdef SMACK_IPV6_SECMARK_LABELING

		if (skb && skb->secmark != 0)