aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wan')
-rw-r--r--drivers/net/wan/hdlc.c7
-rw-r--r--drivers/net/wan/lapbether.c3
-rw-r--r--drivers/net/wan/syncppp.c6
3 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c
index 65ad2e24caf0..3b57350eacca 100644
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
@@ -36,6 +36,7 @@
36#include <linux/rtnetlink.h> 36#include <linux/rtnetlink.h>
37#include <linux/notifier.h> 37#include <linux/notifier.h>
38#include <linux/hdlc.h> 38#include <linux/hdlc.h>
39#include <net/net_namespace.h>
39 40
40 41
41static const char* version = "HDLC support module revision 1.21"; 42static const char* version = "HDLC support module revision 1.21";
@@ -66,6 +67,12 @@ static int hdlc_rcv(struct sk_buff *skb, struct net_device *dev,
66 struct packet_type *p, struct net_device *orig_dev) 67 struct packet_type *p, struct net_device *orig_dev)
67{ 68{
68 struct hdlc_device_desc *desc = dev_to_desc(dev); 69 struct hdlc_device_desc *desc = dev_to_desc(dev);
70
71 if (dev->nd_net != &init_net) {
72 kfree_skb(skb);
73 return 0;
74 }
75
69 if (desc->netif_rx) 76 if (desc->netif_rx)
70 return desc->netif_rx(skb); 77 return desc->netif_rx(skb);
71 78
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 6c302e9dbca2..ca8b3c3cb931 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -91,6 +91,9 @@ static int lapbeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
91 int len, err; 91 int len, err;
92 struct lapbethdev *lapbeth; 92 struct lapbethdev *lapbeth;
93 93
94 if (dev->nd_net != &init_net)
95 goto drop;
96
94 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) 97 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
95 return NET_RX_DROP; 98 return NET_RX_DROP;
96 99
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index 67fc67cfd452..5c71af6ea3a5 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -51,6 +51,7 @@
51#include <linux/spinlock.h> 51#include <linux/spinlock.h>
52#include <linux/rcupdate.h> 52#include <linux/rcupdate.h>
53 53
54#include <net/net_namespace.h>
54#include <net/syncppp.h> 55#include <net/syncppp.h>
55 56
56#include <asm/byteorder.h> 57#include <asm/byteorder.h>
@@ -1445,6 +1446,11 @@ static void sppp_print_bytes (u_char *p, u16 len)
1445 1446
1446static int sppp_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *p, struct net_device *orig_dev) 1447static int sppp_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *p, struct net_device *orig_dev)
1447{ 1448{
1449 if (dev->nd_net != &init_net) {
1450 kfree_skb(skb);
1451 return 0;
1452 }
1453
1448 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) 1454 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
1449 return NET_RX_DROP; 1455 return NET_RX_DROP;
1450 sppp_input(dev,skb); 1456 sppp_input(dev,skb);