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

Commit 75c26314 authored Aug 31, 2017 by Florian Westphal Committed by Pablo Neira Ayuso Sep 08, 2017

netfilter: nf_nat: don't bug when mapping already exists



It seems preferrable to limp along if we have a conflicting mapping,
its certainly better than a BUG().

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 68913a01

net/netfilter/nf_nat_core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -416,7 +416,9 @@ nf_nat_setup_info(struct nf_conn *ct,

		WARN_ON(maniptype != NF_NAT_MANIP_SRC &&
		maniptype != NF_NAT_MANIP_DST);
		BUG_ON(nf_nat_initialized(ct, maniptype));

		if (WARN_ON(nf_nat_initialized(ct, maniptype)))
		return NF_DROP;

		/* What we've got will look like inverse of reply. Normally
		* this is what is in the conntrack, except for prior