projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3856143
)
netfilter: nf_nat: missing condition in nf_xfrm_me_harder()
author
Dan Carpenter
<dan.carpenter@oracle.com>
Wed, 24 Apr 2013 05:11:51 +0000
(
05:11
+0000)
committer
Pablo Neira Ayuso
<pablo@netfilter.org>
Wed, 24 Apr 2013 23:58:16 +0000
(
01:58
+0200)
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
patch
|
blob
|
history
diff --git
a/net/netfilter/nf_nat_core.c
b/net/netfilter/nf_nat_core.c
index
346f871
..
cf1c731
100644
(file)
--- 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);