[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130424151151.GA16783@elgon.mountain>
Date: Wed, 24 Apr 2013 18:11:51 +0300
From: Dan Carpenter <dan.carpenter@...cle.com>
To: Pablo Neira Ayuso <pablo@...filter.org>
Cc: Patrick McHardy <kaber@...sh.net>,
"David S. Miller" <davem@...emloft.net>,
netfilter-devel@...r.kernel.org, netfilter@...r.kernel.org,
coreteam@...filter.org, netdev@...r.kernel.org,
kernel-janitors@...r.kernel.org
Subject: [patch -next] netfilter: nf_nat: missing condition in
nf_xfrm_me_harder()
This if statement was accidentally dropped in a merge commit so now it
returns unconditionally.
Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com>
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index 2e469ca..d4c9a31 100644
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -90,6 +90,7 @@ int nf_xfrm_me_harder(struct sk_buff *skb, unsigned int family)
int err;
err = xfrm_decode_session(skb, &fl, family);
+ if (err)
return err;
dst = skb_dst(skb);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists