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 4137EC7EE29 for ; Thu, 4 May 2023 19:45:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230339AbjEDTpg (ORCPT ); Thu, 4 May 2023 15:45:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230322AbjEDTov (ORCPT ); Thu, 4 May 2023 15:44:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D64AB900D; Thu, 4 May 2023 12:43:49 -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 27EA66371B; Thu, 4 May 2023 19:42:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3EC7C433B0; Thu, 4 May 2023 19:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683229357; bh=vKK2eCpyB6uJ5aOf6LN5RwkQuxnFUtTZC2kmn+oUDEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WFdn/dqbu/6HC/0E3VkbVCBbmcQ9VWiZzC/UW1U/gKojfp47+Fi/nKiv73PaCcqau v9wSAuYSmL+bI9nJAwaewrCXfuQDb1DhjodAjUB8AhMyQs9fOrDF0poKfgLNYfQKrU QALd5I3rhitL0WRyHtfnRqzGv9OSeRavq02vJcK4Mi1P4VwJW/0tfmFSeuO8/DHK14 7FjA9e7jXBDMBGNDGncrvg/iKEXEPANbOVrGdyLIfsOj+X54lQ0Q75ju/3oIQrZ/31 xrlu6ZtCmbIC9qmVl/8CfYoXaY5dcyX6m1BYEWni5TILARVKr7bkzNsCb+mThJe/2z gR1fiydXPVEQA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nick Child , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.3 18/59] netdev: Enforce index cap in netdev_get_tx_queue Date: Thu, 4 May 2023 15:41:01 -0400 Message-Id: <20230504194142.3805425-18-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230504194142.3805425-1-sashal@kernel.org> References: <20230504194142.3805425-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: stable@vger.kernel.org From: Nick Child [ Upstream commit 1cc6571f562774f1d928dc8b3cff50829b86e970 ] When requesting a TX queue at a given index, warn on out-of-bounds referencing if the index is greater than the allocated number of queues. Specifically, since this function is used heavily in the networking stack use DEBUG_NET_WARN_ON_ONCE to avoid executing a new branch on every packet. Signed-off-by: Nick Child Link: https://lore.kernel.org/r/20230321150725.127229-2-nnac123@linux.ibm.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- include/linux/netdevice.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index c35f04f636f15..7db9f960221d3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2463,6 +2463,7 @@ static inline struct netdev_queue *netdev_get_tx_queue(const struct net_device *dev, unsigned int index) { + DEBUG_NET_WARN_ON_ONCE(index >= dev->num_tx_queues); return &dev->_tx[index]; } -- 2.39.2