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

Commit b95666a1 authored by Kai Lueke's avatar Kai Lueke Committed by Yan Yan
Browse files

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

This reverts commit 68ac0f3810e76a853b5f7b90601a05c3048b8b54 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>
Link: https://lore.kernel.org/netdev/20220309130839.3263912-3-steffen.klassert@secunet.com/
(cherry picked from commit a3d9001b4e287fc043e5539d03d71a32ab114bcb
 https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=a3d9001b4e287fc043e5539d03d71a32ab114bcb)
Bug: 221187056
Test: run_net_test.sh
Change-Id: Iccaf42f776cad9166f808c490bfce586f850554c
parent 81fbdf90

net/xfrm/xfrm_user.c

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


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

		if (!x->if_id) {

			err = -EINVAL;

			goto error;

		}

	}



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

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


	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 (!if_id) {

			err = -EINVAL;

			goto out_noput;

		}

	}



	if (p->info.seq) {

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


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

		if (!xp->if_id) {

			err = -EINVAL;

			goto error;

		}

	}



	return xp;

 error: