* [patch -next] netfilter: nf_nat: missing condition in nf_xfrm_me_harder()
@ 2013-04-24 15:11 Dan Carpenter
2013-04-24 23:59 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2013-04-24 15:11 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: Patrick McHardy, David S. Miller, netfilter-devel, netfilter,
coreteam, netdev, kernel-janitors
This if statement was accidentally dropped in a merge commit so now it
returns unconditionally.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch -next] netfilter: nf_nat: missing condition in nf_xfrm_me_harder()
2013-04-24 15:11 [patch -next] netfilter: nf_nat: missing condition in nf_xfrm_me_harder() Dan Carpenter
@ 2013-04-24 23:59 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2013-04-24 23:59 UTC (permalink / raw)
To: Dan Carpenter
Cc: Patrick McHardy, David S. Miller, netfilter-devel, netfilter,
coreteam, netdev, kernel-janitors
On Wed, Apr 24, 2013 at 06:11:51PM +0300, Dan Carpenter wrote:
> This if statement was accidentally dropped in a merge commit so now it
> returns unconditionally.
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-24 23:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-24 15:11 [patch -next] netfilter: nf_nat: missing condition in nf_xfrm_me_harder() Dan Carpenter
2013-04-24 23:59 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).