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

Commit e473fcb4 authored by Mathias Krause's avatar Mathias Krause Committed by Steffen Klassert
Browse files

xfrm: constify mark argument of xfrm_find_acq() 



The mark argument is read only, so constify it. Also make dummy_mark in
af_key const -- only used as dummy argument for this very function.

Signed-off-by: default avatarMathias Krause <minipli@googlemail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 5ca5461c

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -1548,7 +1548,7 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net, u32 mark, u8, int dir, u32 
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, struct xfrm_mark *mark,

struct xfrm_state *xfrm_find_acq(struct net *net, const struct xfrm_mark *mark,

				 u8 mode, u32 reqid, u8 proto,

				 const xfrm_address_t *daddr,

				 const xfrm_address_t *saddr, int create,

net/key/af_key.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct netns_pfkey { 
static DEFINE_MUTEX(pfkey_mutex);



#define DUMMY_MARK 0

static struct xfrm_mark dummy_mark = {0, 0};

static const struct xfrm_mark dummy_mark = {0, 0};

struct pfkey_sock {

	/* struct sock must be the first member of struct pfkey_sock */

	struct sock	sk;

net/xfrm/xfrm_state.c

+7 −5
Original line number Diff line number Diff line
@@ -990,11 +990,13 @@ 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, struct xfrm_mark *m,

static struct xfrm_state *__find_acq_core(struct net *net,

					  const struct xfrm_mark *m,

					  unsigned short family, u8 mode,

					  u32 reqid, u8 proto,

					  const xfrm_address_t *daddr,

					  const xfrm_address_t *saddr, int create)

					  const xfrm_address_t *saddr,

					  int create)

{

	unsigned int h = xfrm_dst_hash(net, daddr, saddr, reqid, family);

	struct xfrm_state *x;
@@ -1399,9 +1401,9 @@ xfrm_state_lookup_byaddr(struct net *net, u32 mark, 
EXPORT_SYMBOL(xfrm_state_lookup_byaddr);



struct xfrm_state *

xfrm_find_acq(struct net *net, struct xfrm_mark *mark, u8 mode, u32 reqid, u8 proto,

	      const xfrm_address_t *daddr, const xfrm_address_t *saddr,

	      int create, unsigned short family)

xfrm_find_acq(struct net *net, const struct xfrm_mark *mark, u8 mode, u32 reqid,

	      u8 proto, const xfrm_address_t *daddr,

	      const xfrm_address_t *saddr, int create, unsigned short family)

{

	struct xfrm_state *x;