Commit 1020ce31 authored Jun 06, 2017 by Nikolay Aleksandrov Committed by David S. Miller Jun 06, 2017

net: bridge: fix a null pointer dereference in br_afspec



We might call br_afspec() with p == NULL which is a valid use case if
the action is on the bridge device itself, but the bridge tunnel code
dereferences the p pointer without checking, so check if p is null
first.

Reported-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Fixes: efa5356b ("bridge: per vlan dst_metadata netlink support")
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 79514ef6

net/bridge/br_netlink.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -595,7 +595,7 @@ static int br_afspec(struct net_bridge *br,
		err = 0;
		switch (nla_type(attr)) {
		case IFLA_BRIDGE_VLAN_TUNNEL_INFO:
		if (!(p->flags & BR_VLAN_TUNNEL))
		if (!p \|\| !(p->flags & BR_VLAN_TUNNEL))
		return -EINVAL;
		err = br_parse_vlan_tunnel_info(attr, &tinfo_curr);
		if (err)