diff options
Diffstat (limited to 'main/linux-grsec/0010-xfrm-Remove-xfrm_state_genid.patch')
| -rw-r--r-- | main/linux-grsec/0010-xfrm-Remove-xfrm_state_genid.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/main/linux-grsec/0010-xfrm-Remove-xfrm_state_genid.patch b/main/linux-grsec/0010-xfrm-Remove-xfrm_state_genid.patch deleted file mode 100644 index 8cfffd739..000000000 --- a/main/linux-grsec/0010-xfrm-Remove-xfrm_state_genid.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f2c59932757a06851bb740dc757ce2ba1961fc08 Mon Sep 17 00:00:00 2001 -From: Herbert Xu <herbert@gondor.apana.org.au> -Date: Wed, 31 Mar 2010 01:19:49 +0000 -Subject: [PATCH 10/18] xfrm: Remove xfrm_state_genid -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The xfrm state genid only needs to be matched against the copy -saved in xfrm_dst. So we don't need a global genid at all. In -fact, we don't even need to initialise it. - -Based on observation by Timo Teräs. - -Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> -Signed-off-by: David S. Miller <davem@davemloft.net> -(cherry picked from commit 34996cb91dd72f0b0456d8fd3fef4aaee62232f2) ---- - net/xfrm/xfrm_state.c | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c -index f2f7c63..8ee733f 100644 ---- a/net/xfrm/xfrm_state.c -+++ b/net/xfrm/xfrm_state.c -@@ -34,7 +34,6 @@ - static DEFINE_SPINLOCK(xfrm_state_lock); - - static unsigned int xfrm_state_hashmax __read_mostly = 1 * 1024 * 1024; --static unsigned int xfrm_state_genid; - - static struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned int family); - static void xfrm_state_put_afinfo(struct xfrm_state_afinfo *afinfo); -@@ -903,8 +902,6 @@ static void __xfrm_state_insert(struct xfrm_state *x) - struct net *net = xs_net(x); - unsigned int h; - -- x->genid = ++xfrm_state_genid; -- - list_add(&x->km.all, &net->xfrm.state_all); - - h = xfrm_dst_hash(net, &x->id.daddr, &x->props.saddr, -@@ -948,7 +945,7 @@ static void __xfrm_state_bump_genids(struct xfrm_state *xnew) - x->props.reqid == reqid && - !xfrm_addr_cmp(&x->id.daddr, &xnew->id.daddr, family) && - !xfrm_addr_cmp(&x->props.saddr, &xnew->props.saddr, family)) -- x->genid = xfrm_state_genid; -+ x->genid++; - } - } - --- -1.7.0.2 - |