diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-01 18:24:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-01 18:24:12 -0700 |
| commit | 2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb (patch) | |
| tree | 38d1c178777b62dec9eacea10a93d78dcaa7d24d /net/bridge/br_input.c | |
| parent | 4bf1b54f9df7ced4869f7dfd0bdf5eb22aa98447 (diff) | |
| parent | 248234ca029710fbad6423c48f98c2a6ea9582fb (diff) | |
| download | linux-2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb.tar.gz linux-2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb.tar.bz2 linux-2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb.zip | |
Merge branch 'bridge_vlan_cleanups_fixes'
Nikolay Aleksandrov says:
====================
bridge: vlan: cleanups & fixes
This is the first follow-up set, patch 01 reduces the default rhashtable
size and the number of locks that can be allocated. Patch 02 and 04 fix
possible null pointer dereferences due to the new ordering and
initialization on port add/del, and patch 03 moves the "pvid" member in
the net_bridge_vlan_group struct in order to simplify code (similar to how
it was with the older struct). Patch 05 fixes adding a vlan on a port which
is pvid and doesn't have a global context yet.
Please review carefully, I think this is the first use of rhashtable's
"locks_mul" member in the tree and I'd like to make sure it's correct.
Another thing that needs special attention is the nbp_vlan_flush() move
after the rx_handler unregister.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_input.c')
| -rw-r--r-- | net/bridge/br_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index e27d0dfd2ee9..f5c5a4500e2f 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -140,7 +140,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb if (!p || p->state == BR_STATE_DISABLED) goto drop; - if (!nbp_allowed_ingress(p, skb, &vid)) + if (!br_allowed_ingress(p->br, nbp_vlan_group(p), skb, &vid)) goto out; /* insert into forwarding database after filtering to avoid spoofing */ |