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 B18D7C7EE22 for ; Thu, 4 May 2023 19:57:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231235AbjEDT5o (ORCPT ); Thu, 4 May 2023 15:57:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232270AbjEDTzh (ORCPT ); Thu, 4 May 2023 15:55:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32D4E11DB2; Thu, 4 May 2023 12:48:59 -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 D31E0637F8; Thu, 4 May 2023 19:48:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D68CDC4339E; Thu, 4 May 2023 19:48:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683229730; bh=ap9ES+0J9zF9fx9c4TX8dKCjJ0YlaLD8/Kl/HGurlRk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CNsOgYe7ybTEr/Uosx539mc+VC0p8loKZcNt/8swnsuzqEVyniwmVievmRjRoIzZ/ GDV8fibSsCc3dGtKEjZOF7L3Bgogg4u4rVXW4PxqzGDWkzIbkwSSA+bSNgshUoEWLu UZQUsZ8pmRdJQCs8yyB5PbzhZY/sAXnu/jp/kcwvtTAbb5rE585pggVe0cW9z7tSG0 NQUC//kgVrAUBpY1KAAdat+SEunhpZS7tvHiYknEzRSBSlR09ebHu5RzL4jxGzOw4R Kh9VbJWD4Sy/2DiMOZq+b767tgHCnr0Ft3ht4fOLo0m5hix8NOM/he73mKyiiEXpkF ccT3ls2gtzy4g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nick Child , Piotr Raczynski , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, kuniyu@amazon.com, liuhangbin@gmail.com, jiri@resnulli.us, andy.ren@getcruise.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 09/30] net: Catch invalid index in XPS mapping Date: Thu, 4 May 2023 15:48:02 -0400 Message-Id: <20230504194824.3808028-9-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230504194824.3808028-1-sashal@kernel.org> References: <20230504194824.3808028-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: Nick Child [ Upstream commit 5dd0dfd55baec0742ba8f5625a0dd064aca7db16 ] When setting the XPS value of a TX queue, warn the user once if the index of the queue is greater than the number of allocated TX queues. Previously, this scenario went uncaught. In the best case, it resulted in unnecessary allocations. In the worst case, it resulted in out-of-bounds memory references through calls to `netdev_get_tx_queue( dev, index)`. Therefore, it is important to inform the user but not worth returning an error and risk downing the netdevice. Signed-off-by: Nick Child Reviewed-by: Piotr Raczynski Link: https://lore.kernel.org/r/20230321150725.127229-1-nnac123@linux.ibm.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/dev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/core/dev.c b/net/core/dev.c index 7fc8ae7f3cd5b..5c1cd25e851c7 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2574,6 +2574,8 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask, struct xps_map *map, *new_map; unsigned int nr_ids; + WARN_ON_ONCE(index >= dev->num_tx_queues); + if (dev->num_tc) { /* Do not allow XPS on subordinate device directly */ num_tc = dev->num_tc; -- 2.39.2