Skip to content

Commit 5c65ed5

Browse files
Jarno Rajahalmegregkh
authored andcommitted
netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
[ Upstream commit 4b86c459c7bee3acaf92f0e2b4c6ac803eaa1a58 ] 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> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 743a3ce commit 5c65ed5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/netfilter/nf_conntrack_expect.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ static inline int __nf_ct_expect_check(struct nf_conntrack_expect *expect)
395395
struct net *net = nf_ct_exp_net(expect);
396396
struct hlist_node *next;
397397
unsigned int h;
398-
int ret = 1;
398+
int ret = 0;
399399

400400
if (!master_help) {
401401
ret = -ESHUTDOWN;
@@ -445,7 +445,7 @@ int nf_ct_expect_related_report(struct nf_conntrack_expect *expect,
445445

446446
spin_lock_bh(&nf_conntrack_expect_lock);
447447
ret = __nf_ct_expect_check(expect);
448-
if (ret <= 0)
448+
if (ret < 0)
449449
goto out;
450450

451451
ret = nf_ct_expect_insert(expect);

0 commit comments

Comments
 (0)