Commit a3d9001b authored by Kai Lueke's avatar Kai Lueke Committed by Steffen Klassert
Browse files

Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0" 

This reverts commit 68ac0f38 because ID
0 was meant to be used for configuring the policy/state without
matching for a specific interface (e.g., Cilium is affected, see
https://github.com/cilium/cilium/pull/18789 and
https://github.com/cilium/cilium/pull/19019

).

Signed-off-by: default avatarKai Lueke <kailueke@linux.microsoft.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 4ff2980b

net/xfrm/xfrm_user.c

+3 −18
Original line number Original line Diff line number Diff line
@@ -630,13 +630,8 @@ static struct xfrm_state *xfrm_state_construct(struct net *net, 




	xfrm_smark_init(attrs, &x->props.smark);

	xfrm_smark_init(attrs, &x->props.smark);





	if (attrs[XFRMA_IF_ID]) {

	if (attrs[XFRMA_IF_ID])

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

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

		if (!x->if_id) {

			err = -EINVAL;

			goto error;

		}

	}





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

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

	if (err)

	if (err)
@@ -1432,13 +1427,8 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh, 




	mark = xfrm_mark_get(attrs, &m);

	mark = xfrm_mark_get(attrs, &m);





	if (attrs[XFRMA_IF_ID]) {

	if (attrs[XFRMA_IF_ID])

		if_id = nla_get_u32(attrs[XFRMA_IF_ID]);

		if_id = nla_get_u32(attrs[XFRMA_IF_ID]);

		if (!if_id) {

			err = -EINVAL;

			goto out_noput;

		}

	}





	if (p->info.seq) {

	if (p->info.seq) {

		x = xfrm_find_acq_byseq(net, mark, p->info.seq);

		x = xfrm_find_acq_byseq(net, mark, p->info.seq);
@@ -1751,13 +1741,8 @@ static struct xfrm_policy *xfrm_policy_construct(struct net *net, struct xfrm_us 




	xfrm_mark_get(attrs, &xp->mark);

	xfrm_mark_get(attrs, &xp->mark);





	if (attrs[XFRMA_IF_ID]) {

	if (attrs[XFRMA_IF_ID])

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

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

		if (!xp->if_id) {

			err = -EINVAL;

			goto error;

		}

	}





	return xp;

	return xp;

 error:

 error: