Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bridge: Fix double free and memory leak around br_allowed_ingress

Browse source 
br_allowed_ingress() has two problems.

1. If br_allowed_ingress() is called by br_handle_frame_finish() and
vlan_untag() in br_allowed_ingress() fails, skb will be freed by both
vlan_untag() and br_handle_frame_finish().

2. If br_allowed_ingress() is called by br_dev_xmit() and
br_allowed_ingress() fails, the skb will not be freed.

Fix these two problems by freeing the skb in br_allowed_ingress()
if it fails.

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Toshiaki Makita 2014-04-09 17:00:30 +09:00 • committed by David S. Miller
parent db29868653
commit eb7076182d
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/bridge/br_input.c
View file

@ -73,7 +73,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
goto drop; goto drop;
if (!br_allowed_ingress(p->br, nbp_get_vlan_info(p), skb, &vid)) if (!br_allowed_ingress(p->br, nbp_get_vlan_info(p), skb, &vid))
goto drop; goto out;
/* insert into forwarding database after filtering to avoid spoofing */ /* insert into forwarding database after filtering to avoid spoofing */
br = p->br; br = p->br;

7
net/bridge/br_vlan.c
View file

@ -170,7 +170,7 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
* rejected. * rejected.
*/ */
if (!v) if (!v)
return false; goto drop;
/* If vlan tx offload is disabled on bridge device and frame was /* If vlan tx offload is disabled on bridge device and frame was
* sent from vlan device on the bridge device, it does not have * sent from vlan device on the bridge device, it does not have
@ -193,7 +193,7 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
* vlan untagged or priority-tagged traffic belongs to. * vlan untagged or priority-tagged traffic belongs to.
*/ */
if (pvid == VLAN_N_VID) if (pvid == VLAN_N_VID)
return false; goto drop;
/* PVID is set on this port. Any untagged or priority-tagged /* PVID is set on this port. Any untagged or priority-tagged
* ingress frame is considered to belong to this vlan. * ingress frame is considered to belong to this vlan.
@ -216,7 +216,8 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
/* Frame had a valid vlan tag. See if vlan is allowed */ /* Frame had a valid vlan tag. See if vlan is allowed */
if (test_bit(*vid, v->vlan_bitmap)) if (test_bit(*vid, v->vlan_bitmap))
return true; return true;
drop:
kfree_skb(skb);
return false; return false;
} }