bridge: Fix double free and memory leak around br_allowed_ingress
authorToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Wed, 9 Apr 2014 08:00:30 +0000 (17:00 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 May 2014 20:20:33 +0000 (13:20 -0700)
commitd526f28383673eb871ea383fce884d867cdd6bb9
treec8d2bb412071f7cf51878acdcdcd47b72897ab73
parentcfe1592425717a19757afa497e1f2299352322a2
bridge: Fix double free and memory leak around br_allowed_ingress

[ Upstream commit eb7076182d1ae4bc4641534134ed707100d76acc ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/bridge/br_input.c
net/bridge/br_vlan.c