Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e730c155 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

[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: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d34b1c2

drivers/block/aoe/aoenet.c

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/blkdev.h>

#include <linux/netdevice.h>

#include <linux/moduleparam.h>

#include <net/net_namespace.h>

#include <asm/unaligned.h>

#include "aoe.h"
@@ -114,6 +115,9 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, 
	struct aoe_hdr *h;

	u32 n;



	if (ifp->nd_net != &init_net)

		goto exit;



	skb = skb_share_check(skb, GFP_ATOMIC);

	if (skb == NULL)

		return 0;

drivers/net/bonding/bond_3ad.c

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/ethtool.h>

#include <linux/if_bonding.h>

#include <linux/pkt_sched.h>

#include <net/net_namespace.h>

#include "bonding.h"

#include "bond_3ad.h"
@@ -2448,6 +2449,9 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac 
	struct slave *slave = NULL;

	int ret = NET_RX_DROP;



	if (dev->nd_net != &init_net)

		goto out;



	if (!(dev->flags & IFF_MASTER))

		goto out;

drivers/net/bonding/bond_alb.c

+3 −0
Original line number Diff line number Diff line
@@ -345,6 +345,9 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct 
	struct arp_pkt *arp = (struct arp_pkt *)skb->data;

	int res = NET_RX_DROP;



	if (bond_dev->nd_net != &init_net)

		goto out;



	if (!(bond_dev->flags & IFF_MASTER))

		goto out;

drivers/net/bonding/bond_main.c

+3 −0
Original line number Diff line number Diff line
@@ -2458,6 +2458,9 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack 
	unsigned char *arp_ptr;

	u32 sip, tip;



	if (dev->nd_net != &init_net)

		goto out;



	if (!(dev->priv_flags & IFF_BONDING) || !(dev->flags & IFF_MASTER))

		goto out;

drivers/net/hamradio/bpqether.c

+3 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty 
	struct ethhdr *eth;

	struct bpqdev *bpq;



	if (dev->nd_net != &init_net)

		goto drop;



	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)

		return NET_RX_DROP;