Skip to content

Commit

Permalink
netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
Browse files Browse the repository at this point in the history
Commit 4dee62b ("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>
  • Loading branch information
Jarno Rajahalme authored and Pablo Neira Ayuso committed Feb 26, 2017
1 parent 7fb668a commit 4b86c45
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/netfilter/nf_conntrack_expect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 4b86c45

Please sign in to comment.