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

Commit b8b8063e authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Patrick McHardy
Browse files

netfilter: netns nat: fix ipt_MASQUERADE in netns 



First, allow entry in notifier hook.
Second, start conntrack cleanup in netns to which netdevice belongs.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 0e6e75af

net/ipv4/netfilter/ipt_MASQUERADE.c

+2 −4
Original line number Diff line number Diff line
@@ -119,9 +119,7 @@ static int masq_device_event(struct notifier_block *this, 
			     void *ptr)

{

	const struct net_device *dev = ptr;



	if (!net_eq(dev_net(dev), &init_net))

		return NOTIFY_DONE;

	struct net *net = dev_net(dev);



	if (event == NETDEV_DOWN) {

		/* Device was downed.  Search entire table for
@@ -129,7 +127,7 @@ static int masq_device_event(struct notifier_block *this, 
		   and forget them. */

		NF_CT_ASSERT(dev->ifindex != 0);



		nf_ct_iterate_cleanup(&init_net, device_cmp,

		nf_ct_iterate_cleanup(net, device_cmp,

				      (void *)(long)dev->ifindex);

	}