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/packet | |
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/packet')
-rw-r--r-- | net/packet/af_packet.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 766b5faaed21..cae1ee4f2ad6 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
@@ -252,6 +252,9 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, struct | |||
252 | struct sock *sk; | 252 | struct sock *sk; |
253 | struct sockaddr_pkt *spkt; | 253 | struct sockaddr_pkt *spkt; |
254 | 254 | ||
255 | if (dev->nd_net != &init_net) | ||
256 | goto out; | ||
257 | |||
255 | /* | 258 | /* |
256 | * When we registered the protocol we saved the socket in the data | 259 | * When we registered the protocol we saved the socket in the data |
257 | * field for just this event. | 260 | * field for just this event. |
@@ -452,6 +455,9 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet | |||
452 | int skb_len = skb->len; | 455 | int skb_len = skb->len; |
453 | unsigned int snaplen, res; | 456 | unsigned int snaplen, res; |
454 | 457 | ||
458 | if (dev->nd_net != &init_net) | ||
459 | goto drop; | ||
460 | |||
455 | if (skb->pkt_type == PACKET_LOOPBACK) | 461 | if (skb->pkt_type == PACKET_LOOPBACK) |
456 | goto drop; | 462 | goto drop; |
457 | 463 | ||
@@ -568,6 +574,9 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe | |||
568 | struct sk_buff *copy_skb = NULL; | 574 | struct sk_buff *copy_skb = NULL; |
569 | struct timeval tv; | 575 | struct timeval tv; |
570 | 576 | ||
577 | if (dev->nd_net != &init_net) | ||
578 | goto drop; | ||
579 | |||
571 | if (skb->pkt_type == PACKET_LOOPBACK) | 580 | if (skb->pkt_type == PACKET_LOOPBACK) |
572 | goto drop; | 581 | goto drop; |
573 | 582 | ||