diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-09-17 14:53:39 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:49:08 -0400 |
commit | e730c15519d09ea528b4d2f1103681fa5937c0e6 (patch) | |
tree | c117294523f4d004fb1d740610b6403e5744cdfc /net/bridge | |
parent | 6d34b1c27a72d5d1c73c567b2f6b1fde316e0eae (diff) |
[NET]: Make packet reception network namespace safe
This patch modifies every packet receive function
registered with dev_add_pack() to drop packets if they
are not from the initial network namespace.
This should ensure that the various network stacks do
not receive packets in a anything but the initial network
namespace until the code has been converted and is ready
for them.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_stp_bpdu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c index 14f0c888eec..0edbd2a1c3f 100644 --- a/net/bridge/br_stp_bpdu.c +++ b/net/bridge/br_stp_bpdu.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/netfilter_bridge.h> | 17 | #include <linux/netfilter_bridge.h> |
18 | #include <linux/etherdevice.h> | 18 | #include <linux/etherdevice.h> |
19 | #include <linux/llc.h> | 19 | #include <linux/llc.h> |
20 | #include <net/net_namespace.h> | ||
20 | #include <net/llc.h> | 21 | #include <net/llc.h> |
21 | #include <net/llc_pdu.h> | 22 | #include <net/llc_pdu.h> |
22 | #include <asm/unaligned.h> | 23 | #include <asm/unaligned.h> |
@@ -141,6 +142,9 @@ int br_stp_rcv(struct sk_buff *skb, struct net_device *dev, | |||
141 | struct net_bridge *br; | 142 | struct net_bridge *br; |
142 | const unsigned char *buf; | 143 | const unsigned char *buf; |
143 | 144 | ||
145 | if (dev->nd_net != &init_net) | ||
146 | goto err; | ||
147 | |||
144 | if (!p) | 148 | if (!p) |
145 | goto err; | 149 | goto err; |
146 | 150 | ||