Patch "netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value." has been added to the 3.18-stable tree

This is a note to let you know that I've just added the patch titled

netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
netfilter-nf_ct_expect-change-__nf_ct_expect_check-return-value.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Jarno Rajahalme <[email protected]>
Date: Thu, 23 Feb 2017 17:08:54 -0800
Subject: netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.

From: Jarno Rajahalme <[email protected]>

[ 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.

---
 net/netfilter/nf_conntrack_expect.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

@@ -392,7 +392,7 @@ static inline int __nf_ct_expect_check(s
 	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;

@@ -442,7 +442,7 @@ int nf_ct_expect_related_report(struct n
 
 	spin_lock_bh(&nf_conntrack_expect_lock);
 	ret = __nf_ct_expect_check(expect);
-	if (ret <= 0)
+	if (ret < 0)
 		goto out;
 
 	ret = nf_ct_expect_insert(expect);

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/netfilter-nf_ct_expect-change-__nf_ct_expect_check-return-value.patch