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

Commit 8ca2e93b authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

xfrm: SP lookups signature with mark 



pass mark to all SP lookups to prepare them for when we add code
to have them search.

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d6acfa7

include/net/xfrm.h

+3 −2
Original line number Diff line number Diff line
@@ -1450,11 +1450,12 @@ extern int xfrm_policy_walk(struct net *net, struct xfrm_policy_walk *walk, 
	int (*func)(struct xfrm_policy *, int, int, void*), void *);

extern void xfrm_policy_walk_done(struct xfrm_policy_walk *walk);

int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl);

struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u8 type, int dir,

struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u32 mark,

					  u8 type, int dir,

					  struct xfrm_selector *sel,

					  struct xfrm_sec_ctx *ctx, int delete,

					  int *err);

struct xfrm_policy *xfrm_policy_byid(struct net *net, u8, int dir, u32 id, int delete, int *err);

struct xfrm_policy *xfrm_policy_byid(struct net *net, u32 mark, u8, int dir, u32 id, int delete, int *err);

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);

net/key/af_key.c

+2 −2
Original line number Diff line number Diff line
@@ -2326,7 +2326,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg 
			return err;

	}



	xp = xfrm_policy_bysel_ctx(net, XFRM_POLICY_TYPE_MAIN,

	xp = xfrm_policy_bysel_ctx(net, DUMMY_MARK, XFRM_POLICY_TYPE_MAIN,

				   pol->sadb_x_policy_dir - 1, &sel, pol_ctx,

				   1, &err);

	security_xfrm_policy_free(pol_ctx);
@@ -2574,7 +2574,7 @@ 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,

	xp = xfrm_policy_byid(net, DUMMY_MARK, XFRM_POLICY_TYPE_MAIN,

			      dir, pol->sadb_x_policy_id, delete, &err);

	if (xp == NULL)

		return -ENOENT;

net/xfrm/xfrm_policy.c

+4 −4
Original line number Diff line number Diff line
@@ -635,8 +635,8 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) 
}

EXPORT_SYMBOL(xfrm_policy_insert);



struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u8 type, int dir,

					  struct xfrm_selector *sel,

struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u32 mark, u8 type,

					  int dir, struct xfrm_selector *sel,

					  struct xfrm_sec_ctx *ctx, int delete,

					  int *err)

{
@@ -676,8 +676,8 @@ struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u8 type, int dir, 
}

EXPORT_SYMBOL(xfrm_policy_bysel_ctx);



struct xfrm_policy *xfrm_policy_byid(struct net *net, u8 type, int dir, u32 id,

				     int delete, int *err)

struct xfrm_policy *xfrm_policy_byid(struct net *net, u32 mark, u8 type,

				     int dir, u32 id, int delete, int *err)

{

	struct xfrm_policy *pol, *ret;

	struct hlist_head *chain;

net/xfrm/xfrm_user.c

+5 −5
Original line number Diff line number Diff line
@@ -1457,7 +1457,7 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh, 
		return err;



	if (p->index)

		xp = xfrm_policy_byid(net, type, p->dir, p->index, delete, &err);

		xp = xfrm_policy_byid(net, DUMMY_MARK, type, p->dir, p->index, delete, &err);

	else {

		struct nlattr *rt = attrs[XFRMA_SEC_CTX];

		struct xfrm_sec_ctx *ctx;
@@ -1474,8 +1474,8 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh, 
			if (err)

				return err;

		}

		xp = xfrm_policy_bysel_ctx(net, type, p->dir, &p->sel, ctx,

					   delete, &err);

		xp = xfrm_policy_bysel_ctx(net, DUMMY_MARK, type, p->dir,

					   &p->sel, ctx, delete, &err);

		security_xfrm_policy_free(ctx);

	}

	if (xp == NULL)
@@ -1712,7 +1712,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, 
		return err;



	if (p->index)

		xp = xfrm_policy_byid(net, type, p->dir, p->index, 0, &err);

		xp = xfrm_policy_byid(net, DUMMY_MARK, type, p->dir, p->index, 0, &err);

	else {

		struct nlattr *rt = attrs[XFRMA_SEC_CTX];

		struct xfrm_sec_ctx *ctx;
@@ -1729,7 +1729,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, 
			if (err)

				return err;

		}

		xp = xfrm_policy_bysel_ctx(net, type, p->dir, &p->sel, ctx, 0, &err);

		xp = xfrm_policy_bysel_ctx(net, DUMMY_MARK, type, p->dir, &p->sel, ctx, 0, &err);

		security_xfrm_policy_free(ctx);

	}

	if (xp == NULL)