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

Commit 90059d0c authored by Richard Haines's avatar Richard Haines Committed by Greg Kroah-Hartman
Browse files

netlabel: If PF_INET6, check sk_buff ip header version 



[ Upstream commit 213d7f94775322ba44e0bbb55ec6946e9de88cea ]

When resolving a fallback label, check the sk_buff version as it
is possible (e.g. SCTP) to have family = PF_INET6 while
receiving ip_hdr(skb)->version = 4.

Signed-off-by: default avatarRichard Haines <richard_c_haines@btinternet.com>
Acked-by: default avatarPaul Moore <paul@paul-moore.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba0c7ae1

net/netlabel/netlabel_unlabeled.c

+10 −0
Original line number Diff line number Diff line
@@ -1472,6 +1472,16 @@ int netlbl_unlabel_getattr(const struct sk_buff *skb, 
		iface = rcu_dereference(netlbl_unlhsh_def);

	if (iface == NULL || !iface->valid)

		goto unlabel_getattr_nolabel;



#if IS_ENABLED(CONFIG_IPV6)

	/* When resolving a fallback label, check the sk_buff version as

	 * it is possible (e.g. SCTP) to have family = PF_INET6 while

	 * receiving ip_hdr(skb)->version = 4.

	 */

	if (family == PF_INET6 && ip_hdr(skb)->version == 4)

		family = PF_INET;

#endif /* IPv6 */



	switch (family) {

	case PF_INET: {

		struct iphdr *hdr4;