summaryrefslogtreecommitdiffstats
path: root/testing/linux-grsec/0002-xfrm-SA-lookups-signature-with-mark.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/linux-grsec/0002-xfrm-SA-lookups-signature-with-mark.patch')
-rw-r--r--testing/linux-grsec/0002-xfrm-SA-lookups-signature-with-mark.patch621
1 files changed, 621 insertions, 0 deletions
diff --git a/testing/linux-grsec/0002-xfrm-SA-lookups-signature-with-mark.patch b/testing/linux-grsec/0002-xfrm-SA-lookups-signature-with-mark.patch
new file mode 100644
index 00000000..72bc5c14
--- /dev/null
+++ b/testing/linux-grsec/0002-xfrm-SA-lookups-signature-with-mark.patch
@@ -0,0 +1,621 @@
+From bd3d7132b9ac62a093610cf0b9360356e4898f13 Mon Sep 17 00:00:00 2001
+From: Jamal Hadi Salim <hadi@cyberus.ca>
+Date: Mon, 22 Feb 2010 16:20:22 -0800
+Subject: [PATCH 2/7] xfrm: SA lookups signature with mark
+
+pass mark to all SA lookups to prepare them for when we add code
+to have them search.
+
+Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ include/net/xfrm.h | 23 +++++++++++++-----
+ net/core/pktgen.c | 3 +-
+ net/ipv4/ah4.c | 2 +-
+ net/ipv4/esp4.c | 2 +-
+ net/ipv4/ipcomp.c | 6 +++-
+ net/ipv6/ah6.c | 2 +-
+ net/ipv6/esp6.c | 2 +-
+ net/ipv6/ipcomp6.c | 6 +++-
+ net/ipv6/xfrm6_input.c | 2 +-
+ net/key/af_key.c | 14 ++++++-----
+ net/xfrm/xfrm_input.c | 2 +-
+ net/xfrm/xfrm_state.c | 58 ++++++++++++++++++++++++++++-------------------
+ net/xfrm/xfrm_user.c | 17 ++++++++-----
+ 13 files changed, 84 insertions(+), 55 deletions(-)
+
+diff --git a/include/net/xfrm.h b/include/net/xfrm.h
+index ba8d34f..0f3c0f4 100644
+--- a/include/net/xfrm.h
++++ b/include/net/xfrm.h
+@@ -1325,7 +1325,7 @@ extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t
+ struct flowi *fl, struct xfrm_tmpl *tmpl,
+ struct xfrm_policy *pol, int *err,
+ unsigned short family);
+-extern struct xfrm_state * xfrm_stateonly_find(struct net *net,
++extern struct xfrm_state *xfrm_stateonly_find(struct net *net, u32 mark,
+ xfrm_address_t *daddr,
+ xfrm_address_t *saddr,
+ unsigned short family,
+@@ -1334,8 +1334,14 @@ extern int xfrm_state_check_expire(struct xfrm_state *x);
+ extern void xfrm_state_insert(struct xfrm_state *x);
+ extern int xfrm_state_add(struct xfrm_state *x);
+ extern int xfrm_state_update(struct xfrm_state *x);
+-extern struct xfrm_state *xfrm_state_lookup(struct net *net, xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family);
+-extern struct xfrm_state *xfrm_state_lookup_byaddr(struct net *net, xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto, unsigned short family);
++extern struct xfrm_state *xfrm_state_lookup(struct net *net, u32 mark,
++ xfrm_address_t *daddr, __be32 spi,
++ u8 proto, unsigned short family);
++extern struct xfrm_state *xfrm_state_lookup_byaddr(struct net *net, u32 mark,
++ xfrm_address_t *daddr,
++ xfrm_address_t *saddr,
++ u8 proto,
++ unsigned short family);
+ #ifdef CONFIG_XFRM_SUB_POLICY
+ extern int xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src,
+ int n, unsigned short family);
+@@ -1372,7 +1378,8 @@ struct xfrmk_spdinfo {
+ u32 spdhmcnt;
+ };
+
+-extern struct xfrm_state *xfrm_find_acq_byseq(struct net *net, u32 seq);
++extern struct xfrm_state *xfrm_find_acq_byseq(struct net *net, u32 mark,
++ u32 seq);
+ extern int xfrm_state_delete(struct xfrm_state *x);
+ extern int xfrm_state_flush(struct net *net, u8 proto, struct xfrm_audit *audit_info);
+ extern void xfrm_sad_getinfo(struct xfrmk_sadinfo *si);
+@@ -1457,9 +1464,11 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net, u8, int dir, u32 id, int d
+ int xfrm_policy_flush(struct net *net, u8 type, struct xfrm_audit *audit_info);
+ u32 xfrm_get_acqseq(void);
+ extern int xfrm_alloc_spi(struct xfrm_state *x, u32 minspi, u32 maxspi);
+-struct xfrm_state * xfrm_find_acq(struct net *net, u8 mode, u32 reqid, u8 proto,
+- xfrm_address_t *daddr, xfrm_address_t *saddr,
+- int create, unsigned short family);
++struct xfrm_state *xfrm_find_acq(struct net *net, struct xfrm_mark *mark,
++ u8 mode, u32 reqid, u8 proto,
++ xfrm_address_t *daddr,
++ xfrm_address_t *saddr, int create,
++ unsigned short family);
+ extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
+ extern int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *xdst,
+ struct flowi *fl, int family, int strict);
+diff --git a/net/core/pktgen.c b/net/core/pktgen.c
+index 6e79e96..6b811e1 100644
+--- a/net/core/pktgen.c
++++ b/net/core/pktgen.c
+@@ -2189,12 +2189,13 @@ static inline int f_pick(struct pktgen_dev *pkt_dev)
+ /* If there was already an IPSEC SA, we keep it as is, else
+ * we go look for it ...
+ */
++#define DUMMY_MARK 0
+ static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)
+ {
+ struct xfrm_state *x = pkt_dev->flows[flow].x;
+ if (!x) {
+ /*slow path: we dont already have xfrm_state*/
+- x = xfrm_stateonly_find(&init_net,
++ x = xfrm_stateonly_find(&init_net, DUMMY_MARK,
+ (xfrm_address_t *)&pkt_dev->cur_daddr,
+ (xfrm_address_t *)&pkt_dev->cur_saddr,
+ AF_INET,
+diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
+index 5c66270..b4f1d57 100644
+--- a/net/ipv4/ah4.c
++++ b/net/ipv4/ah4.c
+@@ -210,7 +210,7 @@ static void ah4_err(struct sk_buff *skb, u32 info)
+ icmp_hdr(skb)->code != ICMP_FRAG_NEEDED)
+ return;
+
+- x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET);
++ x = xfrm_state_lookup(net, skb->mark, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET);
+ if (!x)
+ return;
+ printk(KERN_DEBUG "pmtu discovery on SA AH/%08x/%08x\n",
+diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
+index 12f7287..dad2c8f 100644
+--- a/net/ipv4/esp4.c
++++ b/net/ipv4/esp4.c
+@@ -422,7 +422,7 @@ static void esp4_err(struct sk_buff *skb, u32 info)
+ icmp_hdr(skb)->code != ICMP_FRAG_NEEDED)
+ return;
+
+- x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET);
++ x = xfrm_state_lookup(net, skb->mark, (xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET);
+ if (!x)
+ return;
+ NETDEBUG(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%08x\n",
+diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
+index 38fbf04..28e8000 100644
+--- a/net/ipv4/ipcomp.c
++++ b/net/ipv4/ipcomp.c
+@@ -35,7 +35,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info)
+ return;
+
+ spi = htonl(ntohs(ipch->cpi));
+- x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr,
++ x = xfrm_state_lookup(&init_net, skb->mark, (xfrm_address_t *)&iph->daddr,
+ spi, IPPROTO_COMP, AF_INET);
+ if (!x)
+ return;
+@@ -61,6 +61,7 @@ static struct xfrm_state *ipcomp_tunnel_create(struct xfrm_state *x)
+ t->props.mode = x->props.mode;
+ t->props.saddr.a4 = x->props.saddr.a4;
+ t->props.flags = x->props.flags;
++ memcpy(&t->mark, &x->mark, sizeof(t->mark));
+
+ if (xfrm_init_state(t))
+ goto error;
+@@ -84,8 +85,9 @@ static int ipcomp_tunnel_attach(struct xfrm_state *x)
+ {
+ int err = 0;
+ struct xfrm_state *t;
++ u32 mark = x->mark.v & x->mark.m;
+
+- t = xfrm_state_lookup(&init_net, (xfrm_address_t *)&x->id.daddr.a4,
++ t = xfrm_state_lookup(&init_net, mark, (xfrm_address_t *)&x->id.daddr.a4,
+ x->props.saddr.a4, IPPROTO_IPIP, AF_INET);
+ if (!t) {
+ t = ipcomp_tunnel_create(x);
+diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
+index c1589e2..2ab5b2f 100644
+--- a/net/ipv6/ah6.c
++++ b/net/ipv6/ah6.c
+@@ -416,7 +416,7 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
+ type != ICMPV6_PKT_TOOBIG)
+ return;
+
+- x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET6);
++ x = xfrm_state_lookup(net, skb->mark, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET6);
+ if (!x)
+ return;
+
+diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
+index af597c7..de0a856 100644
+--- a/net/ipv6/esp6.c
++++ b/net/ipv6/esp6.c
+@@ -365,7 +365,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
+ type != ICMPV6_PKT_TOOBIG)
+ return;
+
+- x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET6);
++ x = xfrm_state_lookup(net, skb->mark, (xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET6);
+ if (!x)
+ return;
+ printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%pI6\n",
+diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
+index 2f2a5ca..d74bb3d 100644
+--- a/net/ipv6/ipcomp6.c
++++ b/net/ipv6/ipcomp6.c
+@@ -63,7 +63,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
+ return;
+
+ spi = htonl(ntohs(ipcomph->cpi));
+- x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, spi, IPPROTO_COMP, AF_INET6);
++ x = xfrm_state_lookup(&init_net, skb->mark, (xfrm_address_t *)&iph->daddr, spi, IPPROTO_COMP, AF_INET6);
+ if (!x)
+ return;
+
+@@ -90,6 +90,7 @@ static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x)
+ t->props.family = AF_INET6;
+ t->props.mode = x->props.mode;
+ memcpy(t->props.saddr.a6, x->props.saddr.a6, sizeof(struct in6_addr));
++ memcpy(&t->mark, &x->mark, sizeof(t->mark));
+
+ if (xfrm_init_state(t))
+ goto error;
+@@ -111,10 +112,11 @@ static int ipcomp6_tunnel_attach(struct xfrm_state *x)
+ int err = 0;
+ struct xfrm_state *t = NULL;
+ __be32 spi;
++ u32 mark = x->mark.m & x->mark.v;
+
+ spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&x->props.saddr);
+ if (spi)
+- t = xfrm_state_lookup(&init_net, (xfrm_address_t *)&x->id.daddr,
++ t = xfrm_state_lookup(&init_net, mark, (xfrm_address_t *)&x->id.daddr,
+ spi, IPPROTO_IPV6, AF_INET6);
+ if (!t) {
+ t = ipcomp6_tunnel_create(x);
+diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
+index 9084582..2bc98ed 100644
+--- a/net/ipv6/xfrm6_input.c
++++ b/net/ipv6/xfrm6_input.c
+@@ -101,7 +101,7 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
+ break;
+ }
+
+- x = xfrm_state_lookup_byaddr(net, dst, src, proto, AF_INET6);
++ x = xfrm_state_lookup_byaddr(net, skb->mark, dst, src, proto, AF_INET6);
+ if (!x)
+ continue;
+
+diff --git a/net/key/af_key.c b/net/key/af_key.c
+index 4e98193..bcb9ecf 100644
+--- a/net/key/af_key.c
++++ b/net/key/af_key.c
+@@ -45,6 +45,8 @@ static DECLARE_WAIT_QUEUE_HEAD(pfkey_table_wait);
+ static DEFINE_RWLOCK(pfkey_table_lock);
+ static atomic_t pfkey_table_users = ATOMIC_INIT(0);
+
++#define DUMMY_MARK 0
++static struct xfrm_mark dummy_mark = {0, 0};
+ struct pfkey_sock {
+ /* struct sock must be the first member of struct pfkey_sock */
+ struct sock sk;
+@@ -690,7 +692,7 @@ static struct xfrm_state *pfkey_xfrm_state_lookup(struct net *net, struct sadb_
+ if (!xaddr)
+ return NULL;
+
+- return xfrm_state_lookup(net, xaddr, sa->sadb_sa_spi, proto, family);
++ return xfrm_state_lookup(net, DUMMY_MARK, xaddr, sa->sadb_sa_spi, proto, family);
+ }
+
+ #define PFKEY_ALIGN8(a) (1 + (((a) - 1) | (8 - 1)))
+@@ -1358,7 +1360,7 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
+ }
+
+ if (hdr->sadb_msg_seq) {
+- x = xfrm_find_acq_byseq(net, hdr->sadb_msg_seq);
++ x = xfrm_find_acq_byseq(net, DUMMY_MARK, hdr->sadb_msg_seq);
+ if (x && xfrm_addr_cmp(&x->id.daddr, xdaddr, family)) {
+ xfrm_state_put(x);
+ x = NULL;
+@@ -1366,7 +1368,7 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
+ }
+
+ if (!x)
+- x = xfrm_find_acq(net, mode, reqid, proto, xdaddr, xsaddr, 1, family);
++ x = xfrm_find_acq(net, &dummy_mark, mode, reqid, proto, xdaddr, xsaddr, 1, family);
+
+ if (x == NULL)
+ return -ENOENT;
+@@ -1415,7 +1417,7 @@ static int pfkey_acquire(struct sock *sk, struct sk_buff *skb, struct sadb_msg *
+ if (hdr->sadb_msg_seq == 0 || hdr->sadb_msg_errno == 0)
+ return 0;
+
+- x = xfrm_find_acq_byseq(net, hdr->sadb_msg_seq);
++ x = xfrm_find_acq_byseq(net, DUMMY_MARK, hdr->sadb_msg_seq);
+ if (x == NULL)
+ return 0;
+
+@@ -2592,8 +2594,8 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
+ return -EINVAL;
+
+ delete = (hdr->sadb_msg_type == SADB_X_SPDDELETE2);
+- xp = xfrm_policy_byid(net, XFRM_POLICY_TYPE_MAIN, dir,
+- pol->sadb_x_policy_id, delete, &err);
++ xp = xfrm_policy_byid(net, XFRM_POLICY_TYPE_MAIN,
++ dir, pol->sadb_x_policy_id, delete, &err);
+ if (xp == NULL)
+ return -ENOENT;
+
+diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
+index e0009c1..45f1c98 100644
+--- a/net/xfrm/xfrm_input.c
++++ b/net/xfrm/xfrm_input.c
+@@ -152,7 +152,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
+ goto drop;
+ }
+
+- x = xfrm_state_lookup(net, daddr, spi, nexthdr, family);
++ x = xfrm_state_lookup(net, skb->mark, daddr, spi, nexthdr, family);
+ if (x == NULL) {
+ XFRM_INC_STATS(net, LINUX_MIB_XFRMINNOSTATES);
+ xfrm_audit_state_notfound(skb, family, spi, seq);
+diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
+index f2f7c63..ff7d83e 100644
+--- a/net/xfrm/xfrm_state.c
++++ b/net/xfrm/xfrm_state.c
+@@ -659,7 +659,7 @@ xfrm_init_tempsel(struct xfrm_state *x, struct flowi *fl,
+ return 0;
+ }
+
+-static struct xfrm_state *__xfrm_state_lookup(struct net *net, xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family)
++static struct xfrm_state *__xfrm_state_lookup(struct net *net, u32 mark, xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family)
+ {
+ unsigned int h = xfrm_spi_hash(net, daddr, spi, proto, family);
+ struct xfrm_state *x;
+@@ -679,7 +679,7 @@ static struct xfrm_state *__xfrm_state_lookup(struct net *net, xfrm_address_t *d
+ return NULL;
+ }
+
+-static struct xfrm_state *__xfrm_state_lookup_byaddr(struct net *net, xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto, unsigned short family)
++static struct xfrm_state *__xfrm_state_lookup_byaddr(struct net *net, u32 mark, xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto, unsigned short family)
+ {
+ unsigned int h = xfrm_src_hash(net, daddr, saddr, family);
+ struct xfrm_state *x;
+@@ -703,12 +703,14 @@ static inline struct xfrm_state *
+ __xfrm_state_locate(struct xfrm_state *x, int use_spi, int family)
+ {
+ struct net *net = xs_net(x);
++ u32 mark = x->mark.v & x->mark.m;
+
+ if (use_spi)
+- return __xfrm_state_lookup(net, &x->id.daddr, x->id.spi,
+- x->id.proto, family);
++ return __xfrm_state_lookup(net, mark, &x->id.daddr,
++ x->id.spi, x->id.proto, family);
+ else
+- return __xfrm_state_lookup_byaddr(net, &x->id.daddr,
++ return __xfrm_state_lookup_byaddr(net, mark,
++ &x->id.daddr,
+ &x->props.saddr,
+ x->id.proto, family);
+ }
+@@ -773,6 +775,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
+ int acquire_in_progress = 0;
+ int error = 0;
+ struct xfrm_state *best = NULL;
++ u32 mark = pol->mark.v & pol->mark.m;
+
+ to_put = NULL;
+
+@@ -809,7 +812,7 @@ found:
+ x = best;
+ if (!x && !error && !acquire_in_progress) {
+ if (tmpl->id.spi &&
+- (x0 = __xfrm_state_lookup(net, daddr, tmpl->id.spi,
++ (x0 = __xfrm_state_lookup(net, mark, daddr, tmpl->id.spi,
+ tmpl->id.proto, family)) != NULL) {
+ to_put = x0;
+ error = -EEXIST;
+@@ -823,6 +826,7 @@ found:
+ /* Initialize temporary selector matching only
+ * to current session. */
+ xfrm_init_tempsel(x, fl, tmpl, daddr, saddr, family);
++ memcpy(&x->mark, &pol->mark, sizeof(x->mark));
+
+ error = security_xfrm_state_alloc_acquire(x, pol->security, fl->secid);
+ if (error) {
+@@ -866,7 +870,7 @@ out:
+ }
+
+ struct xfrm_state *
+-xfrm_stateonly_find(struct net *net,
++xfrm_stateonly_find(struct net *net, u32 mark,
+ xfrm_address_t *daddr, xfrm_address_t *saddr,
+ unsigned short family, u8 mode, u8 proto, u32 reqid)
+ {
+@@ -962,7 +966,7 @@ void xfrm_state_insert(struct xfrm_state *x)
+ EXPORT_SYMBOL(xfrm_state_insert);
+
+ /* xfrm_state_lock is held */
+-static struct xfrm_state *__find_acq_core(struct net *net, unsigned short family, u8 mode, u32 reqid, u8 proto, xfrm_address_t *daddr, xfrm_address_t *saddr, int create)
++static struct xfrm_state *__find_acq_core(struct net *net, struct xfrm_mark *m, unsigned short family, u8 mode, u32 reqid, u8 proto, xfrm_address_t *daddr, xfrm_address_t *saddr, int create)
+ {
+ unsigned int h = xfrm_dst_hash(net, daddr, saddr, reqid, family);
+ struct hlist_node *entry;
+@@ -1017,6 +1021,8 @@ static struct xfrm_state *__find_acq_core(struct net *net, unsigned short family
+ x->props.family = family;
+ x->props.mode = mode;
+ x->props.reqid = reqid;
++ x->mark.v = m->v;
++ x->mark.m = m->m;
+ x->lft.hard_add_expires_seconds = net->xfrm.sysctl_acq_expires;
+ xfrm_state_hold(x);
+ x->timer.expires = jiffies + net->xfrm.sysctl_acq_expires*HZ;
+@@ -1034,7 +1040,7 @@ static struct xfrm_state *__find_acq_core(struct net *net, unsigned short family
+ return x;
+ }
+
+-static struct xfrm_state *__xfrm_find_acq_byseq(struct net *net, u32 seq);
++static struct xfrm_state *__xfrm_find_acq_byseq(struct net *net, u32 mark, u32 seq);
+
+ int xfrm_state_add(struct xfrm_state *x)
+ {
+@@ -1042,6 +1048,7 @@ int xfrm_state_add(struct xfrm_state *x)
+ struct xfrm_state *x1, *to_put;
+ int family;
+ int err;
++ u32 mark = x->mark.v & x->mark.m;
+ int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY);
+
+ family = x->props.family;
+@@ -1059,7 +1066,7 @@ int xfrm_state_add(struct xfrm_state *x)
+ }
+
+ if (use_spi && x->km.seq) {
+- x1 = __xfrm_find_acq_byseq(net, x->km.seq);
++ x1 = __xfrm_find_acq_byseq(net, mark, x->km.seq);
+ if (x1 && ((x1->id.proto != x->id.proto) ||
+ xfrm_addr_cmp(&x1->id.daddr, &x->id.daddr, family))) {
+ to_put = x1;
+@@ -1068,8 +1075,8 @@ int xfrm_state_add(struct xfrm_state *x)
+ }
+
+ if (use_spi && !x1)
+- x1 = __find_acq_core(net, family, x->props.mode, x->props.reqid,
+- x->id.proto,
++ x1 = __find_acq_core(net, &x->mark, family, x->props.mode,
++ x->props.reqid, x->id.proto,
+ &x->id.daddr, &x->props.saddr, 0);
+
+ __xfrm_state_bump_genids(x);
+@@ -1143,6 +1150,8 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, int *errp)
+ goto error;
+ }
+
++ memcpy(&x->mark, &orig->mark, sizeof(x->mark));
++
+ err = xfrm_init_state(x);
+ if (err)
+ goto error;
+@@ -1340,41 +1349,41 @@ int xfrm_state_check_expire(struct xfrm_state *x)
+ EXPORT_SYMBOL(xfrm_state_check_expire);
+
+ struct xfrm_state *
+-xfrm_state_lookup(struct net *net, xfrm_address_t *daddr, __be32 spi, u8 proto,
+- unsigned short family)
++xfrm_state_lookup(struct net *net, u32 mark, xfrm_address_t *daddr, __be32 spi,
++ u8 proto, unsigned short family)
+ {
+ struct xfrm_state *x;
+
+ spin_lock_bh(&xfrm_state_lock);
+- x = __xfrm_state_lookup(net, daddr, spi, proto, family);
++ x = __xfrm_state_lookup(net, mark, daddr, spi, proto, family);
+ spin_unlock_bh(&xfrm_state_lock);
+ return x;
+ }
+ EXPORT_SYMBOL(xfrm_state_lookup);
+
+ struct xfrm_state *
+-xfrm_state_lookup_byaddr(struct net *net,
++xfrm_state_lookup_byaddr(struct net *net, u32 mark,
+ xfrm_address_t *daddr, xfrm_address_t *saddr,
+ u8 proto, unsigned short family)
+ {
+ struct xfrm_state *x;
+
+ spin_lock_bh(&xfrm_state_lock);
+- x = __xfrm_state_lookup_byaddr(net, daddr, saddr, proto, family);
++ x = __xfrm_state_lookup_byaddr(net, mark, daddr, saddr, proto, family);
+ spin_unlock_bh(&xfrm_state_lock);
+ return x;
+ }
+ EXPORT_SYMBOL(xfrm_state_lookup_byaddr);
+
+ struct xfrm_state *
+-xfrm_find_acq(struct net *net, u8 mode, u32 reqid, u8 proto,
++xfrm_find_acq(struct net *net, struct xfrm_mark *mark, u8 mode, u32 reqid, u8 proto,
+ xfrm_address_t *daddr, xfrm_address_t *saddr,
+ int create, unsigned short family)
+ {
+ struct xfrm_state *x;
+
+ spin_lock_bh(&xfrm_state_lock);
+- x = __find_acq_core(net, family, mode, reqid, proto, daddr, saddr, create);
++ x = __find_acq_core(net, mark, family, mode, reqid, proto, daddr, saddr, create);
+ spin_unlock_bh(&xfrm_state_lock);
+
+ return x;
+@@ -1421,7 +1430,7 @@ EXPORT_SYMBOL(xfrm_state_sort);
+
+ /* Silly enough, but I'm lazy to build resolution list */
+
+-static struct xfrm_state *__xfrm_find_acq_byseq(struct net *net, u32 seq)
++static struct xfrm_state *__xfrm_find_acq_byseq(struct net *net, u32 mark, u32 seq)
+ {
+ int i;
+
+@@ -1440,12 +1449,12 @@ static struct xfrm_state *__xfrm_find_acq_byseq(struct net *net, u32 seq)
+ return NULL;
+ }
+
+-struct xfrm_state *xfrm_find_acq_byseq(struct net *net, u32 seq)
++struct xfrm_state *xfrm_find_acq_byseq(struct net *net, u32 mark, u32 seq)
+ {
+ struct xfrm_state *x;
+
+ spin_lock_bh(&xfrm_state_lock);
+- x = __xfrm_find_acq_byseq(net, seq);
++ x = __xfrm_find_acq_byseq(net, mark, seq);
+ spin_unlock_bh(&xfrm_state_lock);
+ return x;
+ }
+@@ -1472,6 +1481,7 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high)
+ int err = -ENOENT;
+ __be32 minspi = htonl(low);
+ __be32 maxspi = htonl(high);
++ u32 mark = x->mark.v & x->mark.m;
+
+ spin_lock_bh(&x->lock);
+ if (x->km.state == XFRM_STATE_DEAD)
+@@ -1484,7 +1494,7 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high)
+ err = -ENOENT;
+
+ if (minspi == maxspi) {
+- x0 = xfrm_state_lookup(net, &x->id.daddr, minspi, x->id.proto, x->props.family);
++ x0 = xfrm_state_lookup(net, mark, &x->id.daddr, minspi, x->id.proto, x->props.family);
+ if (x0) {
+ xfrm_state_put(x0);
+ goto unlock;
+@@ -1494,7 +1504,7 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high)
+ u32 spi = 0;
+ for (h=0; h<high-low+1; h++) {
+ spi = low + net_random()%(high-low+1);
+- x0 = xfrm_state_lookup(net, &x->id.daddr, htonl(spi), x->id.proto, x->props.family);
++ x0 = xfrm_state_lookup(net, mark, &x->id.daddr, htonl(spi), x->id.proto, x->props.family);
+ if (x0 == NULL) {
+ x->id.spi = htonl(spi);
+ break;
+diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
+index b95a2d6..dec2e0d 100644
+--- a/net/xfrm/xfrm_user.c
++++ b/net/xfrm/xfrm_user.c
+@@ -31,6 +31,9 @@
+ #include <linux/in6.h>
+ #endif
+
++#define DUMMY_MARK 0
++static struct xfrm_mark dummy_mark = {0, 0};
++
+ static inline int aead_len(struct xfrm_algo_aead *alg)
+ {
+ return sizeof(*alg) + ((alg->alg_key_len + 7) / 8);
+@@ -443,7 +446,7 @@ static struct xfrm_state *xfrm_user_state_lookup(struct net *net,
+
+ if (xfrm_id_proto_match(p->proto, IPSEC_PROTO_ANY)) {
+ err = -ESRCH;
+- x = xfrm_state_lookup(net, &p->daddr, p->spi, p->proto, p->family);
++ x = xfrm_state_lookup(net, DUMMY_MARK, &p->daddr, p->spi, p->proto, p->family);
+ } else {
+ xfrm_address_t *saddr = NULL;
+
+@@ -454,7 +457,7 @@ static struct xfrm_state *xfrm_user_state_lookup(struct net *net,
+ }
+
+ err = -ESRCH;
+- x = xfrm_state_lookup_byaddr(net, &p->daddr, saddr,
++ x = xfrm_state_lookup_byaddr(net, DUMMY_MARK, &p->daddr, saddr,
+ p->proto, p->family);
+ }
+
+@@ -846,7 +849,7 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh,
+
+ x = NULL;
+ if (p->info.seq) {
+- x = xfrm_find_acq_byseq(net, p->info.seq);
++ x = xfrm_find_acq_byseq(net, DUMMY_MARK, p->info.seq);
+ if (x && xfrm_addr_cmp(&x->id.daddr, daddr, family)) {
+ xfrm_state_put(x);
+ x = NULL;
+@@ -854,7 +857,7 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh,
+ }
+
+ if (!x)
+- x = xfrm_find_acq(net, p->info.mode, p->info.reqid,
++ x = xfrm_find_acq(net, &dummy_mark, p->info.mode, p->info.reqid,
+ p->info.id.proto, daddr,
+ &p->info.saddr, 1,
+ family);
+@@ -1483,7 +1486,7 @@ static int xfrm_get_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
+ if (r_skb == NULL)
+ return -ENOMEM;
+
+- x = xfrm_state_lookup(net, &id->daddr, id->spi, id->proto, id->family);
++ x = xfrm_state_lookup(net, DUMMY_MARK, &id->daddr, id->spi, id->proto, id->family);
+ if (x == NULL) {
+ kfree_skb(r_skb);
+ return -ESRCH;
+@@ -1525,7 +1528,7 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
+ if (!(nlh->nlmsg_flags&NLM_F_REPLACE))
+ return err;
+
+- x = xfrm_state_lookup(net, &p->sa_id.daddr, p->sa_id.spi, p->sa_id.proto, p->sa_id.family);
++ x = xfrm_state_lookup(net, DUMMY_MARK, &p->sa_id.daddr, p->sa_id.spi, p->sa_id.proto, p->sa_id.family);
+ if (x == NULL)
+ return -ESRCH;
+
+@@ -1648,7 +1651,7 @@ static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
+ struct xfrm_user_expire *ue = nlmsg_data(nlh);
+ struct xfrm_usersa_info *p = &ue->state;
+
+- x = xfrm_state_lookup(net, &p->id.daddr, p->id.spi, p->id.proto, p->family);
++ x = xfrm_state_lookup(net, DUMMY_MARK, &p->id.daddr, p->id.spi, p->id.proto, p->family);
+
+ err = -ENOENT;
+ if (x == NULL)
+--
+1.6.3.3
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 13:54:51 +0000