Commit 40cfb706 authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_nat: remove obsolete code from nf_nat_icmp_reply_translation() 



The inner tuple that is extracted from the packet is unused. The code also
doesn't have any useful side-effects like verifying the packet does contain
enough data to extract the inner tuple since conntrack already does the
same, so remove it.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent d70308f7

net/ipv4/netfilter/nf_nat_core.c

+1 −13
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <net/netfilter/nf_nat_helper.h>

#include <net/netfilter/nf_conntrack_helper.h>

#include <net/netfilter/nf_conntrack_l3proto.h>

#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack_zones.h>



static DEFINE_SPINLOCK(nf_nat_lock);
@@ -414,8 +413,7 @@ int nf_nat_icmp_reply_translation(struct nf_conn *ct, 
		struct icmphdr icmp;

		struct iphdr ip;

	} *inside;

	const struct nf_conntrack_l4proto *l4proto;

	struct nf_conntrack_tuple inner, target;

	struct nf_conntrack_tuple target;

	int hdrlen = ip_hdrlen(skb);

	enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);

	unsigned long statusbit;
@@ -463,16 +461,6 @@ int nf_nat_icmp_reply_translation(struct nf_conn *ct, 
		 "dir %s\n", skb, manip,

		 dir == IP_CT_DIR_ORIGINAL ? "ORIG" : "REPLY");



	/* rcu_read_lock()ed by nf_hook_slow */

	l4proto = __nf_ct_l4proto_find(PF_INET, inside->ip.protocol);



	if (!nf_ct_get_tuple(skb, hdrlen + sizeof(struct icmphdr),

			     (hdrlen +

			      sizeof(struct icmphdr) + inside->ip.ihl * 4),

			     (u_int16_t)AF_INET, inside->ip.protocol,

			     &inner, l3proto, l4proto))

		return 0;



	/* Change inner back to look like incoming packet.  We do the

	   opposite manip on this hook to normal, because it might not

	   pass all hooks (locally-generated ICMP).  Consider incoming

CRA Git | Maintained and supported by SUSTech CRA and CCSE