| Message ID | 1487719522-42844-2-git-send-email-jarno@ovn.org |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On 21 February 2017 at 15:25, Jarno Rajahalme <jarno@ovn.org> wrote: > Commit 4dee62b1 ("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> > --- It seems like other functions in this file return 0 as successful condition, so from that perspective this seems more in line with existing code. Acked-by: Joe Stringer <joe@ovn.org>
On Tue, Feb 21, 2017 at 03:25:22PM -0800, Jarno Rajahalme wrote: > Commit 4dee62b1 ("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. Same thing, please Cc netfilter-devel. Thanks.
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c index d6ace69..4b2e1fb 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);
Commit 4dee62b1 ("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> --- net/netfilter/nf_conntrack_expect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)