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 F06FCC433EF for ; Mon, 28 Feb 2022 18:55:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237455AbiB1Sz5 (ORCPT ); Mon, 28 Feb 2022 13:55:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237162AbiB1Szz (ORCPT ); Mon, 28 Feb 2022 13:55:55 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9586753E17 for ; Mon, 28 Feb 2022 10:55:16 -0800 (PST) Received: from [192.168.1.214] (dynamic-089-014-115-047.89.14.pool.telefonica.de [89.14.115.47]) by linux.microsoft.com (Postfix) with ESMTPSA id 6EB3520B7178; Mon, 28 Feb 2022 10:55:15 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 6EB3520B7178 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1646074516; bh=RVpdegT9lbS9nKfxZLtfcMcQMkYvjrdWMV2sq9u0hgk=; h=From:Subject:To:Cc:Date:From; b=amNykjXglVpPuheIK9WvqILZT3fIOfBvcglvIIcqah/fyP3HCbFkQHh+TtQ1il19d 9cHbW2OlDSn4Ot4VM4UENMsc+ZOti8Y3/IwxcCsUZMQ/qf5wDhi6q1OOuzZYR44Hhq V9M4CHkDxtFdXuSTr4Mh63BOIPaQgdxGM0GgsmuE= From: =?UTF-8?B?S2FpIEzDvGtl?= Subject: [PATCH 1/2] Revert "xfrm: interface with if_id 0 should return error" To: netdev@vger.kernel.org, Steffen Klassert , Eyal Birger Cc: Kai Lueke Message-ID: <1d7d2213-48cb-d46f-789c-cf3004a4fd0b@linux.microsoft.com> Date: Mon, 28 Feb 2022 19:55:08 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit 8dce43919566f06e865f7e8949f5c10d8c2493f5 because it breaks userspace (e.g., Cilium is affected because it used id 0 for the dummy state https://github.com/cilium/cilium/pull/18789). Signed-off-by: Kai Lueke ---  net/xfrm/xfrm_interface.c | 14 ++------------  1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index 57448fc519fc..41de46b5ffa9 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -637,16 +637,11 @@ static int xfrmi_newlink(struct net *src_net, struct net_device *dev,              struct netlink_ext_ack *extack)  {      struct net *net = dev_net(dev); -    struct xfrm_if_parms p = {}; +    struct xfrm_if_parms p;      struct xfrm_if *xi;      int err;        xfrmi_netlink_parms(data, &p); -    if (!p.if_id) { -        NL_SET_ERR_MSG(extack, "if_id must be non zero"); -        return -EINVAL; -    } -      xi = xfrmi_locate(net, &p);      if (xi)          return -EEXIST; @@ -671,12 +666,7 @@ static int xfrmi_changelink(struct net_device *dev, struct nlattr *tb[],  {      struct xfrm_if *xi = netdev_priv(dev);      struct net *net = xi->net; -    struct xfrm_if_parms p = {}; - -    if (!p.if_id) { -        NL_SET_ERR_MSG(extack, "if_id must be non zero"); -        return -EINVAL; -    } +    struct xfrm_if_parms p;        xfrmi_netlink_parms(data, &p);      xi = xfrmi_locate(net, &p); -- 2.35.1