Commit 741f9a10 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Steffen Klassert
Browse files

xfrm: add extack to __xfrm_init_state 



Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 2b916826

include/net/xfrm.h

+2 −1
Original line number Diff line number Diff line
@@ -1582,7 +1582,8 @@ void xfrm_spd_getinfo(struct net *net, struct xfrmk_spdinfo *si); 
u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq);

int xfrm_init_replay(struct xfrm_state *x);

u32 xfrm_state_mtu(struct xfrm_state *x, int mtu);

int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload);

int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload,

		      struct netlink_ext_ack *extack);

int xfrm_init_state(struct xfrm_state *x);

int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type);

int xfrm_input_resume(struct sk_buff *skb, int nexthdr);

net/xfrm/xfrm_state.c

+19 −7
Original line number Diff line number Diff line
@@ -2610,7 +2610,8 @@ u32 xfrm_state_mtu(struct xfrm_state *x, int mtu) 
}

EXPORT_SYMBOL_GPL(xfrm_state_mtu);



int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)

int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload,

		      struct netlink_ext_ack *extack)

{

	const struct xfrm_mode *inner_mode;

	const struct xfrm_mode *outer_mode;
@@ -2625,12 +2626,16 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload) 


	if (x->sel.family != AF_UNSPEC) {

		inner_mode = xfrm_get_mode(x->props.mode, x->sel.family);

		if (inner_mode == NULL)

		if (inner_mode == NULL) {

			NL_SET_ERR_MSG(extack, "Requested mode not found");

			goto error;

		}



		if (!(inner_mode->flags & XFRM_MODE_FLAG_TUNNEL) &&

		    family != x->sel.family)

		    family != x->sel.family) {

			NL_SET_ERR_MSG(extack, "Only tunnel modes can accommodate a change of family");

			goto error;

		}



		x->inner_mode = *inner_mode;

	} else {
@@ -2638,11 +2643,15 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload) 
		int iafamily = AF_INET;



		inner_mode = xfrm_get_mode(x->props.mode, x->props.family);

		if (inner_mode == NULL)

		if (inner_mode == NULL) {

			NL_SET_ERR_MSG(extack, "Requested mode not found");

			goto error;

		}



		if (!(inner_mode->flags & XFRM_MODE_FLAG_TUNNEL))

		if (!(inner_mode->flags & XFRM_MODE_FLAG_TUNNEL)) {

			NL_SET_ERR_MSG(extack, "Only tunnel modes can accommodate an AF_UNSPEC selector");

			goto error;

		}



		x->inner_mode = *inner_mode;
@@ -2657,8 +2666,10 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload) 
	}



	x->type = xfrm_get_type(x->id.proto, family);

	if (x->type == NULL)

	if (x->type == NULL) {

		NL_SET_ERR_MSG(extack, "Requested type not found");

		goto error;

	}



	x->type_offload = xfrm_get_type_offload(x->id.proto, family, offload);
@@ -2668,6 +2679,7 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload) 


	outer_mode = xfrm_get_mode(x->props.mode, family);

	if (!outer_mode) {

		NL_SET_ERR_MSG(extack, "Requested mode not found");

		err = -EPROTONOSUPPORT;

		goto error;

	}
@@ -2689,7 +2701,7 @@ int xfrm_init_state(struct xfrm_state *x) 
{

	int err;



	err = __xfrm_init_state(x, true, false);

	err = __xfrm_init_state(x, true, false, NULL);

	if (!err)

		x->km.state = XFRM_STATE_VALID;

net/xfrm/xfrm_user.c

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ static struct xfrm_state *xfrm_state_construct(struct net *net, 
	if (attrs[XFRMA_IF_ID])

		x->if_id = nla_get_u32(attrs[XFRMA_IF_ID]);



	err = __xfrm_init_state(x, false, attrs[XFRMA_OFFLOAD_DEV]);

	err = __xfrm_init_state(x, false, attrs[XFRMA_OFFLOAD_DEV], extack);

	if (err)

		goto error;