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 7363BC77B78 for ; Thu, 4 May 2023 19:52:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231458AbjEDTwx (ORCPT ); Thu, 4 May 2023 15:52:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231588AbjEDTvh (ORCPT ); Thu, 4 May 2023 15:51: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 BBAE811B66; Thu, 4 May 2023 12:47:05 -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 96CA0637D0; Thu, 4 May 2023 19:47:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E995C433D2; Thu, 4 May 2023 19:46:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683229621; bh=cc8i3+a6mA29PywXsWaG+BHDZOfZiUF1UJgCk351FIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gv6xS4+ZYXiCus2MzI+zwj4Il26PzLWkW6OrnvOz/kPug39GdMA97Q70qXv9QAL3E h1NKVrLIoJHS2ivBBHsJbkbtGdxdVLwEEDruB/fkdFyGAGCtu0UAvC19HUdMuxifZR nDohw5T2gA3Ps8TbXoVDxWLwQeTIVLirTg/iSK3qbdL93wJiPxhOkgMiHLc34GnCI7 0KHADG0ZTb5yqGRUThlSzMs7uaJ49ws2JaNdyO1wRdeGZfMGOYnbqs/Gr+sFhli2AY EV+bpZGPhlCWRqCMSpJp7mCFfYNoxZ1P3lrlsFJxPeKVDSqj6OynMPMIuwrbkZoUGy cYLH2J1v50KXA== 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 6.1 12/49] net: Catch invalid index in XPS mapping Date: Thu, 4 May 2023 15:45:49 -0400 Message-Id: <20230504194626.3807438-12-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230504194626.3807438-1-sashal@kernel.org> References: <20230504194626.3807438-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 a25b8741b1599..7b4576206be2f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2549,6 +2549,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