From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2119019BB2 for ; Mon, 31 Jul 2023 17:12:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55807C433C8; Mon, 31 Jul 2023 17:12:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690823522; bh=BLrmPpdR4m+SM761OvA9jo6yXuOO0YGcJ3ce9wlZ/cc=; h=From:To:Cc:Subject:Date:From; b=Ry2dA3FRtJCxO42kwWtDlRJ0v5LAfWYq5Iw4c2xRGwFs3mA4CBeQjifcWEyLRb74M P6gximCZiGhfr9v6Ru2em2ag+Kg59Iw3OlSOoiRDQxuujHOLTQcqFqpUkMDX+aAyJM eSe+0A9lsTE9tlJfbWYlFn1mCzfpghJuZ4rjHcgfGeAcNr78LrCpV5xjahLRspZH5a bH45CcCVK13aAur3hfe/y9/GUUh1E2ssZn0kK2/OpD5dHzHsWn4jg9fRbgkOpVXH83 LUS5PlVyBXpv5pVBzkil8Z0rFgEhlpDiv4U17jVIYXbQ2c4h+qGFwtysePFtU87JXO lRD+BZTICbQNw== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, Jakub Kicinski , Stephen Hemminger , leon@kernel.org Subject: [PATCH net-next v2] net: make sure we never create ifindex = 0 Date: Mon, 31 Jul 2023 10:11:58 -0700 Message-ID: <20230731171159.988962-1-kuba@kernel.org> X-Mailer: git-send-email 2.41.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Instead of allocating from 1 use proper xa_init flag, to protect ourselves from IDs wrapping back to 0. Fixes: 759ab1edb56c ("net: store netdevs in an xarray") Reported-by: Stephen Hemminger Link: https://lore.kernel.org/all/20230728162350.2a6d4979@hermes.local/ Signed-off-by: Jakub Kicinski --- CC: leon@kernel.org --- net/core/dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index b58674774a57..10e5a036c706 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -11271,8 +11271,7 @@ static int __net_init netdev_init(struct net *net) if (net->dev_index_head == NULL) goto err_idx; - net->ifindex = 1; - xa_init_flags(&net->dev_by_index, XA_FLAGS_ALLOC); + xa_init_flags(&net->dev_by_index, XA_FLAGS_ALLOC1); RAW_INIT_NOTIFIER_HEAD(&net->netdev_chain); -- 2.41.0