summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_input.c
diff options
context:
space:
mode:
authorToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>2014-04-09 17:00:30 +0900
committerDavid S. Miller <davem@davemloft.net>2014-04-11 15:12:47 -0400
commiteb7076182d1ae4bc4641534134ed707100d76acc (patch)
treea4beecd9fe24c72173ecfa9adf7d125a8dd19ef0 /net/bridge/br_input.c
parentdb29868653394937037d71dc3545768302dda643 (diff)
downloadlinux-eb7076182d1ae4bc4641534134ed707100d76acc.tar.gz
linux-eb7076182d1ae4bc4641534134ed707100d76acc.tar.bz2
linux-eb7076182d1ae4bc4641534134ed707100d76acc.zip
bridge: Fix double free and memory leak around br_allowed_ingress
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>
Diffstat (limited to 'net/bridge/br_input.c')
-rw-r--r--net/bridge/br_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index d0cca3c65f01..7985deaff52f 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -73,7 +73,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
goto drop;
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 */
br = p->br;