Commit 10c78f58 authored Jul 02, 2016 by Sven Eckelmann Committed by Simon Wunderlich Jul 05, 2016

batman-adv: Avoid nullptr dereference in bla after vlan_insert_tag



vlan_insert_tag can return NULL on errors. The bridge loop avoidance code
therefore has to check the return value of vlan_insert_tag for NULL before
it can safely operate on this pointer.

Fixes: 23721387 ("batman-adv: add basic bridge loop avoidance code")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>

parent 5b4d10f5

net/batman-adv/bridge_loop_avoidance.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -418,9 +418,12 @@ static void batadv_bla_send_claim(struct batadv_priv bat_priv, u8 mac,
		break;
		}

		if (vid & BATADV_VLAN_HAS_TAG)
		if (vid & BATADV_VLAN_HAS_TAG) {
		skb = vlan_insert_tag(skb, htons(ETH_P_8021Q),
		vid & VLAN_VID_MASK);
		if (!skb)
		goto out;
		}

		skb_reset_mac_header(skb);
		skb->protocol = eth_type_trans(skb, soft_iface);