summaryrefslogtreecommitdiffstats
path: root/net/netlabel
diff options
context:
space:
mode:
authorRichard Haines <richard_c_haines@btinternet.com>2017-11-13 20:54:22 +0000
committerPaul Moore <paul@paul-moore.com>2018-02-14 14:01:41 -0500
commit213d7f94775322ba44e0bbb55ec6946e9de88cea (patch)
treedaac5442060f3e2f198ed341cebf344edfc0bdc6 /net/netlabel
parent7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff)
downloadlinux-stable-213d7f94775322ba44e0bbb55ec6946e9de88cea.tar.gz
linux-stable-213d7f94775322ba44e0bbb55ec6946e9de88cea.tar.bz2
linux-stable-213d7f94775322ba44e0bbb55ec6946e9de88cea.zip
netlabel: If PF_INET6, check sk_buff ip header version
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: Richard Haines <richard_c_haines@btinternet.com> Acked-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'net/netlabel')
-rw-r--r--net/netlabel/netlabel_unlabeled.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 22dc1b9d6362..c070dfc0190a 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -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;