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 smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5BE64E7BDBB for ; Mon, 16 Feb 2026 13:19:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0166240ADF; Mon, 16 Feb 2026 13:19:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id PQGaH0DhwRT9; Mon, 16 Feb 2026 13:19:18 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2B7AA4055C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1771247958; bh=yyPZMNCvgEIFVbA5qts4ygVgEEATSl41ahGxqk/oMuw=; h=Date:From:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=YubEhEvm67eSke6tD/OPLl/hLp/vPVZfsg+pYdL+OjjlHFA2XSCbQaPCIhzxqaUnx BLRhKBON3CjpqysC8vdOkUKhFlF8+vPrYtHMlkaJX9n6kc26Et6R/yq2YZXCqUGHbu J2XR4tzjqPYuqIAv9//Dgb9zaTdA04h+h4HwZ6rlK8yX9vQ0HgxoK+HEBR2C+9MvtT 7xoOlE4fUR9QhTU99vh2FD0q4M//5+H9jKW1/jgiyQXgQynxlT4F9CCT4ViLS7zmNn 0dH8CtiLWIew2bhHynVNQzfYn12KWoShDDFQ1mAfa4SpTBEwGe/v666AXfhxy+z4Iv WG33DpqpVM+rg== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id 2B7AA4055C; Mon, 16 Feb 2026 13:19:18 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists1.osuosl.org (Postfix) with ESMTP id 3CB3C35B for ; Mon, 16 Feb 2026 13:19:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1E9E260B5D for ; Mon, 16 Feb 2026 13:19:17 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id YT6-Kk0qEgJg for ; Mon, 16 Feb 2026 13:19:16 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=172.105.4.254; helo=tor.source.kernel.org; envelope-from=horms@kernel.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 56AC560B5C DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 56AC560B5C Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by smtp3.osuosl.org (Postfix) with ESMTPS id 56AC560B5C for ; Mon, 16 Feb 2026 13:19:16 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 2F52B600C4; Mon, 16 Feb 2026 13:19:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0704EC116C6; Mon, 16 Feb 2026 13:19:11 +0000 (UTC) Date: Mon, 16 Feb 2026 13:19:09 +0000 From: Simon Horman To: Kohei Enju Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jedrzej Jagielski , Mateusz Palczewski , Witold Fijalkowski , Przemyslaw Patynowski , kohei.enju@gmail.com Message-ID: References: <20260214191502.267670-1-kohei@enjuk.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260214191502.267670-1-kohei@enjuk.jp> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771247954; bh=L+SuQDcvBCHqR3x9W5Om/Gh8l0QgbINjVgOff6HAL+8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BTiHqB0rP48PVxvQLTUYs9bSqEf1NSYD2bs+/j6lInOtin3m/NKf+Sruuc55l0vWW 7JwMX+oAkhgNTyXgXgz70WTTK7gczZc08TIlDSKHNSxAOfTfBqhOkOHZ9WzEcZovrK M4vLVtTZqK3EDibwvl9UUIh/cp2HNe4NwapXFe84t0eY1wDCO+k3do/WpjC/dQHBM0 dt+nNNqC5Gj4HA+DDIfxZiEKuPdhxLUF6wK+2qXP4j4SYaLImHvJyar8ZUjYQ5B/X2 MLXzY2MmGvpjNJ5jZvASwVRFeF6vm41TP4bfbXsO3M2pDPu9yHfMSzVl/xXafbezTX F/uUjVs6IHjPA== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=BTiHqB0r Subject: Re: [Intel-wired-lan] [PATCH v1 iwl-net] iavf: fix out-of-bounds writes in iavf_get_ethtool_stats() X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" On Sat, Feb 14, 2026 at 07:14:25PM +0000, Kohei Enju wrote: > iavf incorrectly uses real_num_tx_queues for ETH_SS_STATS. Since the > value could change in runtime, we should use num_tx_queues instead. > > Moreover iavf_get_ethtool_stats() uses num_active_queues while > iavf_get_sset_count() and iavf_get_stat_strings() use > real_num_tx_queues, which triggers out-of-bounds writes when we do > "ethtool -L" and "ethtool -S" simultaneously [1]. > > For example when we change channels from 1 to 8, Thread 3 could be > scheduled before Thread 2, and out-of-bounds writes could be triggered > in Thread 3: > > Thread 1 (ethtool -L) Thread 2 (work) Thread 3 (ethtool -S) > iavf_set_channels() > ... > iavf_alloc_queues() > -> num_active_queues = 8 > iavf_schedule_finish_config() > iavf_get_sset_count() > real_num_tx_queues: 1 > -> buffer for 1 queue > iavf_get_ethtool_stats() > num_active_queues: 8 > -> out-of-bounds! > iavf_finish_config() > -> real_num_tx_queues = 8 ... > Fixes: 64430f70ba6f ("iavf: Fix displaying queue statistics shown by ethtool") > Signed-off-by: Kohei Enju ... > @@ -345,19 +344,19 @@ static void iavf_get_ethtool_stats(struct net_device *netdev, > iavf_add_ethtool_stats(&data, adapter, iavf_gstrings_stats); > > rcu_read_lock(); > - /* As num_active_queues describe both tx and rx queues, we can use > - * it to iterate over rings' stats. > + /* Use num_tx_queues to report stats for the maximum number of queues. > + * Queues beyond num_active_queues will report zero. > */ > - for (i = 0; i < adapter->num_active_queues; i++) { > - struct iavf_ring *ring; > + for (i = 0; i < netdev->num_tx_queues; i++) { > + struct iavf_ring *tx_ring = NULL, *rx_ring = NULL; > > - /* Tx rings stats */ > - ring = &adapter->tx_rings[i]; > - iavf_add_queue_stats(&data, ring); > + if (i < adapter->num_active_queues) { Hi Enju-san, If I understand things correctly, in the scenario described in the patch description, num_active_queues will be 8 here. Won't that result in an overflow? > + tx_ring = &adapter->tx_rings[i]; > + rx_ring = &adapter->rx_rings[i]; > + } > > - /* Rx rings stats */ > - ring = &adapter->rx_rings[i]; > - iavf_add_queue_stats(&data, ring); > + iavf_add_queue_stats(&data, tx_ring); > + iavf_add_queue_stats(&data, rx_ring); > } > rcu_read_unlock(); > } ...