| Message ID | 1487719522-42844-1-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, which caused openvswitch > conntrack integration fail in FTP test cases. I can't tell at a glance given all the netlink callback stuff but I suspect this broke expectation insertion from netlink too. > Fix this by always returning zero on the success code path. > > Fixes: 4dee62b1 ("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>
On Tue, Feb 21, 2017 at 03:25:21PM -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, which caused openvswitch > conntrack integration fail in FTP test cases. > > Fix this by always returning zero on the success code path. Please, Cc netfilter-devel for your netfilter patches. I can pick these patches via nf.git tree. Thank you.
Hello! On 2/22/2017 2:25 AM, Jarno Rajahalme wrote: > Commit 4dee62b1 ("netfilter: nf_ct_expect: nf_ct_expect_insert() Need at least 12 hex digits. > 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: 4dee62b1 ("netfilter: nf_ct_expect: nf_ct_expect_insert() returns void") > Signed-off-by: Jarno Rajahalme <jarno@ovn.org> [...] MBR, Sergei
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c index e19a697..d6ace69 100644 --- a/net/netfilter/nf_conntrack_expect.c +++ b/net/netfilter/nf_conntrack_expect.c @@ -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;
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, which caused openvswitch conntrack integration fail in FTP test cases. Fix this by always returning zero on the success code path. Fixes: 4dee62b1 ("netfilter: nf_ct_expect: nf_ct_expect_insert() returns void") Signed-off-by: Jarno Rajahalme <jarno@ovn.org> --- net/netfilter/nf_conntrack_expect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)