Commit 7fb668ac authored Feb 23, 2017 by Jarno Rajahalme Committed by Pablo Neira Ayuso Feb 25, 2017

netfilter: nf_ct_expect: nf_ct_expect_related_report(): Return zero on success.



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>
Acked-by: Joe Stringer <joe@ovn.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent f2168273

net/netfilter/nf_conntrack_expect.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -467,7 +467,7 @@ int nf_ct_expect_related_report(struct nf_conntrack_expect *expect,

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