Skip to content

Commit

Permalink
netfilter: nf_ct_expect: nf_ct_expect_related_report(): Return zero o…
Browse files Browse the repository at this point in the history
…n success.

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, which caused openvswitch
conntrack integration fail in FTP test cases.

Fix this by always returning zero on the success code path.

Fixes: 4dee62b ("netfilter: nf_ct_expect: nf_ct_expect_insert() returns void")
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 25, 2017
1 parent f216827 commit 7fb668a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/netfilter/nf_conntrack_expect.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ int nf_ct_expect_related_report(struct nf_conntrack_expect *expect,

spin_unlock_bh(&nf_conntrack_expect_lock);
nf_ct_expect_event_report(IPEXP_NEW, expect, portid, report);
return ret;
return 0;
out:
spin_unlock_bh(&nf_conntrack_expect_lock);
return ret;
Expand Down

0 comments on commit 7fb668a

Please sign in to comment.