From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 10/10] netfilter: nf_nat: missing condition in nf_xfrm_me_harder()
Date: Thu, 25 Apr 2013 02:22:21 +0200 [thread overview]
Message-ID: <1366849341-10466-11-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1366849341-10466-1-git-send-email-pablo@netfilter.org>
From: Dan Carpenter <dan.carpenter@oracle.com>
This if statement was accidentally dropped in (aaa795a netfilter:
nat: propagate errors from xfrm_me_harder()) so now it returns
unconditionally.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_nat_core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index 346f871..cf1c731 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 < 0)
return err;
dst = skb_dst(skb);
--
1.7.10.4
next prev parent reply other threads:[~2013-04-25 0:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-25 0:22 [PATCH 00/10] netfilter fixes for net-next Pablo Neira Ayuso
2013-04-25 0:22 ` [PATCH 01/10] ipvs: properly dereference dest_dst in ip_vs_forget_dev Pablo Neira Ayuso
2013-04-25 0:22 ` [PATCH 02/10] ipvs: fix sparse warnings for ip_vs_conn listing Pablo Neira Ayuso
2013-04-25 0:22 ` [PATCH 03/10] ipvs: fix the remaining sparse warnings in ip_vs_ctl.c Pablo Neira Ayuso
2013-04-25 0:22 ` [PATCH 04/10] ipvs: fix sparse warnings in lblc and lblcr Pablo Neira Ayuso
2013-04-25 0:22 ` [PATCH 05/10] ipvs: fix sparse warnings for some parameters Pablo Neira Ayuso
2013-04-25 0:22 ` [PATCH 06/10] ipvs: Avoid shadowing net variable in ip_vs_leave() Pablo Neira Ayuso
2013-04-25 0:22 ` [PATCH 07/10] ipvs: Use min3() in ip_vs_dbg_callid() Pablo Neira Ayuso
2013-04-25 0:22 ` [PATCH 08/10] ipvs: off by one in set_sctp_state() Pablo Neira Ayuso
2013-04-25 0:22 ` [PATCH 09/10] ipvs: Use network byte order for sync message size Pablo Neira Ayuso
2013-04-25 0:22 ` Pablo Neira Ayuso [this message]
2013-04-25 4:54 ` [PATCH 00/10] netfilter fixes for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366849341-10466-11-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).