Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0542b69e authored by dpward's avatar dpward Committed by David S. Miller
Browse files

net: Make flow cache namespace-aware 



flow_cache_lookup will return a cached object (or null pointer) that the
resolver (i.e. xfrm_policy_lookup) previously found for another namespace
using the same key/family/dir.  Instead, make the namespace part of what
identifies entries in the cache.

As before, flow_entry_valid will return 0 for entries where the namespace
has been deleted, and they will be removed from the cache the next time
flow_cache_gc_task is run.

Reported-by: default avatarAndrew Dickinson <whydna@whydna.net>
Signed-off-by: default avatarDavid Ward <david.ward@ll.mit.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 02009afc

net/core/flow.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ struct flow_cache_entry { 
		struct hlist_node	hlist;

		struct hlist_node	hlist;

		struct list_head	gc_list;

		struct list_head	gc_list;

	} u;

	} u;

	struct net			*net;

	u16				family;

	u16				family;

	u8				dir;

	u8				dir;

	u32				genid;

	u32				genid;
@@ -232,7 +233,8 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, 




	hash = flow_hash_code(fc, fcp, key);

	hash = flow_hash_code(fc, fcp, key);

	hlist_for_each_entry(tfle, entry, &fcp->hash_table[hash], u.hlist) {

	hlist_for_each_entry(tfle, entry, &fcp->hash_table[hash], u.hlist) {

		if (tfle->family == family &&

		if (tfle->net == net &&

		    tfle->family == family &&

		    tfle->dir == dir &&

		    tfle->dir == dir &&

		    flow_key_compare(key, &tfle->key) == 0) {

		    flow_key_compare(key, &tfle->key) == 0) {

			fle = tfle;

			fle = tfle;
@@ -246,6 +248,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, 




		fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC);

		fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC);

		if (fle) {

		if (fle) {

			fle->net = net;

			fle->family = family;

			fle->family = family;

			fle->dir = dir;

			fle->dir = dir;

			memcpy(&fle->key, key, sizeof(*key));

			memcpy(&fle->key, key, sizeof(*key));