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/tipc | |
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/tipc')
-rw-r--r-- | net/tipc/eth_media.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c index 711ca4b1f051..d2ed23704189 100644 --- a/net/tipc/eth_media.c +++ b/net/tipc/eth_media.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <net/tipc/tipc_bearer.h> | 38 | #include <net/tipc/tipc_bearer.h> |
39 | #include <net/tipc/tipc_msg.h> | 39 | #include <net/tipc/tipc_msg.h> |
40 | #include <linux/netdevice.h> | 40 | #include <linux/netdevice.h> |
41 | #include <net/net_namespace.h> | ||
41 | 42 | ||
42 | #define MAX_ETH_BEARERS 2 | 43 | #define MAX_ETH_BEARERS 2 |
43 | #define ETH_LINK_PRIORITY TIPC_DEF_LINK_PRI | 44 | #define ETH_LINK_PRIORITY TIPC_DEF_LINK_PRI |
@@ -100,6 +101,11 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev, | |||
100 | struct eth_bearer *eb_ptr = (struct eth_bearer *)pt->af_packet_priv; | 101 | struct eth_bearer *eb_ptr = (struct eth_bearer *)pt->af_packet_priv; |
101 | u32 size; | 102 | u32 size; |
102 | 103 | ||
104 | if (dev->nd_net != &init_net) { | ||
105 | kfree_skb(buf); | ||
106 | return 0; | ||
107 | } | ||
108 | |||
103 | if (likely(eb_ptr->bearer)) { | 109 | if (likely(eb_ptr->bearer)) { |
104 | if (likely(buf->pkt_type <= PACKET_BROADCAST)) { | 110 | if (likely(buf->pkt_type <= PACKET_BROADCAST)) { |
105 | size = msg_size((struct tipc_msg *)buf->data); | 111 | size = msg_size((struct tipc_msg *)buf->data); |