Commit 2294be0f authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

net: use skb_sec_path helper in more places 



skb_sec_path gains 'const' qualifier to avoid
xt_policy.c: 'skb_sec_path' discards 'const' qualifier from pointer target type

same reasoning as previous conversions: Won't need to touch these
spots anymore when skb->sp is removed.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7af8f4ca

include/linux/skbuff.h

+1 −1
Original line number Diff line number Diff line
@@ -4124,7 +4124,7 @@ static inline bool skb_get_dst_pending_confirm(const struct sk_buff *skb) 
	return skb->dst_pending_confirm != 0;

}



static inline struct sec_path *skb_sec_path(struct sk_buff *skb)

static inline struct sec_path *skb_sec_path(const struct sk_buff *skb)

{

#ifdef CONFIG_XFRM

	return skb->sp;

include/net/xfrm.h

+4 −2
Original line number Diff line number Diff line
@@ -1896,14 +1896,16 @@ static inline void xfrm_states_delete(struct xfrm_state **states, int n) 
#ifdef CONFIG_XFRM

static inline struct xfrm_state *xfrm_input_state(struct sk_buff *skb)

{

	return skb->sp->xvec[skb->sp->len - 1];

	struct sec_path *sp = skb_sec_path(skb);



	return sp->xvec[sp->len - 1];

}

#endif



static inline struct xfrm_offload *xfrm_offload(struct sk_buff *skb)

{

#ifdef CONFIG_XFRM

	struct sec_path *sp = skb->sp;

	struct sec_path *sp = skb_sec_path(skb);



	if (!sp || !sp->olen || sp->len != sp->olen)

		return NULL;

net/ipv4/esp4.c

+6 −3
Original line number Diff line number Diff line
@@ -125,10 +125,13 @@ static void esp_output_done(struct crypto_async_request *base, int err) 
	void *tmp;

	struct xfrm_state *x;



	if (xo && (xo->flags & XFRM_DEV_RESUME))

		x = skb->sp->xvec[skb->sp->len - 1];

	else

	if (xo && (xo->flags & XFRM_DEV_RESUME)) {

		struct sec_path *sp = skb_sec_path(skb);



		x = sp->xvec[sp->len - 1];

	} else {

		x = skb_dst(skb)->xfrm;

	}



	tmp = ESP_SKB_CB(skb)->tmp;

	esp_ssg_unref(x, tmp);

net/ipv4/esp4_offload.c

+3 −1
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb, 
	struct crypto_aead *aead;

	netdev_features_t esp_features = features;

	struct xfrm_offload *xo = xfrm_offload(skb);

	struct sec_path *sp;



	if (!xo)

		return ERR_PTR(-EINVAL);
@@ -122,7 +123,8 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb, 
	if (!(skb_shinfo(skb)->gso_type & SKB_GSO_ESP))

		return ERR_PTR(-EINVAL);



	x = skb->sp->xvec[skb->sp->len - 1];

	sp = skb_sec_path(skb);

	x = sp->xvec[sp->len - 1];

	aead = x->data;

	esph = ip_esp_hdr(skb);

net/ipv6/esp6.c

+6 −3
Original line number Diff line number Diff line
@@ -145,10 +145,13 @@ static void esp_output_done(struct crypto_async_request *base, int err) 
	void *tmp;

	struct xfrm_state *x;



	if (xo && (xo->flags & XFRM_DEV_RESUME))

		x = skb->sp->xvec[skb->sp->len - 1];

	else

	if (xo && (xo->flags & XFRM_DEV_RESUME)) {

		struct sec_path *sp = skb_sec_path(skb);



		x = sp->xvec[sp->len - 1];

	} else {

		x = skb_dst(skb)->xfrm;

	}



	tmp = ESP_SKB_CB(skb)->tmp;

	esp_ssg_unref(x, tmp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE