From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76155C433F5 for ; Wed, 16 Mar 2022 14:15:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356425AbiCPOQO (ORCPT ); Wed, 16 Mar 2022 10:16:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356410AbiCPOP6 (ORCPT ); Wed, 16 Mar 2022 10:15:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42FC928E0F; Wed, 16 Mar 2022 07:14:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D00B161315; Wed, 16 Mar 2022 14:14:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECE7CC340E9; Wed, 16 Mar 2022 14:14:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647440083; bh=nrBBUPAwJqphjit+c5kxlRZSSr9HJbGJfOqFgMWvRhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ikgPNR9PvlvQVxl150wgqDJYcFYW7QrAF1JkIi12MDDrjYs5w+oEfwMJgnofejkGX pQ3silUqvaCKzyOggiZqwr4yyYaklzjw2qim/pregpDxoELhZbgN4jYs7akLMkd5C4 U7sE0+z7ryBLO2x8x6P4A6WLpZ0liDcH5D18KifROSTFZm1wdKsqAkCznvLOdVEdCH NcF4V//+KbaPlCcKawYklRZwzR9a4+TatR7htXOY4XxM1Eaf1I4rQSP+PQA9hh7L6P 8G6PjoRD9SFk7mD8meRKnKZ0s0VfIHn5l4i6HB6L/RloYGzHnm8JRZMehU/4o633Go Nw/q8ipG2upEA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kai Lueke , Steffen Klassert , Sasha Levin , davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.16 08/13] Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0" Date: Wed, 16 Mar 2022 10:13:49 -0400 Message-Id: <20220316141354.247750-8-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220316141354.247750-1-sashal@kernel.org> References: <20220316141354.247750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kai Lueke [ Upstream commit a3d9001b4e287fc043e5539d03d71a32ab114bcb ] 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: Kai Lueke Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- net/xfrm/xfrm_user.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index c60441be883a..17f0623c4508 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -629,13 +629,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) @@ -1431,13 +1426,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); @@ -1750,13 +1740,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: -- 2.34.1