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

Commit 2b7a79ba authored by FX Le Bail's avatar FX Le Bail Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_nat_snmp_basic: fix duplicates in if/else branches 



The solution was found by Patrick in 2.4 kernel sources.

Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: default avatarFrancois-Xavier Le Bail <fx.lebail@yahoo.com>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 06efbd6d

net/ipv4/netfilter/nf_nat_snmp_basic.c

+2 −2
Original line number Diff line number Diff line
@@ -1198,8 +1198,8 @@ static int snmp_translate(struct nf_conn *ct, 
		map.to = NOCT1(&ct->tuplehash[!dir].tuple.dst.u3.ip);

	} else {

		/* DNAT replies */

		map.from = NOCT1(&ct->tuplehash[dir].tuple.src.u3.ip);

		map.to = NOCT1(&ct->tuplehash[!dir].tuple.dst.u3.ip);

		map.from = NOCT1(&ct->tuplehash[!dir].tuple.src.u3.ip);

		map.to = NOCT1(&ct->tuplehash[dir].tuple.dst.u3.ip);

	}



	if (map.from == map.to)