summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJarno Rajahalme <jarno@ovn.org>2017-02-23 17:08:54 -0800
committerPablo Neira Ayuso <pablo@netfilter.org>2017-02-26 17:06:59 +0100
commit4b86c459c7bee3acaf92f0e2b4c6ac803eaa1a58 (patch)
tree92a327731dd37dada3a753fae2807320329700ab /net
parent7fb668ac7b498f7e8ba2de373fe8a8648bd39a4c (diff)
downloadlinux-4b86c459c7bee3acaf92f0e2b4c6ac803eaa1a58.tar.bz2
netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
Commit 4dee62b1b9b4 ("netfilter: nf_ct_expect: nf_ct_expect_insert() returns void") inadvertently changed the successful return value of nf_ct_expect_related_report() from 0 to 1 due to __nf_ct_expect_check() returning 1 on success. Prevent this regression in the future by changing the return value of __nf_ct_expect_check() to 0 on success. Signed-off-by: Jarno Rajahalme <jarno@ovn.org> Acked-by: Joe Stringer <joe@ovn.org> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_expect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index d6ace69d57dc..4b2e1fb28bb4 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -410,7 +410,7 @@ static inline int __nf_ct_expect_check(struct nf_conntrack_expect *expect)
struct net *net = nf_ct_exp_net(expect);
struct hlist_node *next;
unsigned int h;
- int ret = 1;
+ int ret = 0;
if (!master_help) {
ret = -ESHUTDOWN;
@@ -460,7 +460,7 @@ int nf_ct_expect_related_report(struct nf_conntrack_expect *expect,
spin_lock_bh(&nf_conntrack_expect_lock);
ret = __nf_ct_expect_check(expect);
- if (ret <= 0)
+ if (ret < 0)
goto out;
nf_ct_expect_insert(expect);