Patch "netfilter: nf_conntrack: Support expectations in different zones" has been added to the 3.10-stable tree

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

netfilter: nf_conntrack: Support expectations in different zones

to the 3.10-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_conntrack-support-expectations-in-different-zones.patch
and it can be found in the queue-3.10 subdirectory.

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

From: Joe Stringer <[email protected]>
Date: Tue, 21 Jul 2015 21:37:31 -0700
Subject: netfilter: nf_conntrack: Support expectations in different zones

From: Joe Stringer <[email protected]>

commit 4b31814d20cbe5cd4ccf18089751e77a04afe4f2 upstream.

When zones were originally introduced, the expectation functions were all extended to perform lookup using the zone. However, insertion was not modified to check the zone. This means that two expectations which are intended to apply for different connections that have the same tuple but exist in different zones cannot both be tracked.

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

@@ -202,7 +202,8 @@ static inline int expect_clash(const str
 			a->mask.src.u3.all[count] & b->mask.src.u3.all[count];
 	}
 
-	return nf_ct_tuple_mask_cmp(&a->tuple, &b->tuple, &intersect_mask);
+	return nf_ct_tuple_mask_cmp(&a->tuple, &b->tuple, &intersect_mask) &&
+	       nf_ct_zone(a->master) == nf_ct_zone(b->master);
 }
 
 static inline int expect_matches(const struct nf_conntrack_expect *a,

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

queue-3.10/netfilter-nf_conntrack-support-expectations-in-different-zones.patch