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 CE3B41DF252; Wed, 6 Nov 2024 12:14:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730895255; cv=none; b=GwNU/TRGcL5AP+T5zVOzB0Ety6/D9Oyl5v520mDLC65iGdae0MazvKGnSMh9MTaej3LsobvhILmVvAL32zRLdQxHbvOcDk9lAvoiomXxOHrtNx/C1jgCnui6Vp+VoSsdI5FQX0VMQSFx/4fSKY8mtpCv5fVzDYFaLx832z5XE1M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730895255; c=relaxed/simple; bh=nlYQQ/XL20tmdxwBzo5mhUVO3/3AGKtqlpVdQbOfwxY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DiT6r8L9rAGq/Zoya+uvqyur0cPb8UqrbDjmLyY0vPfzd3c8HeFKRkcQu2USuvEf1hQ4JiixJxUAnahFB7xmX2tI2lwNyafVU6OKXTck2WRAQ0sAlmqNIYGFAzGsjTsZ0YBwNYleCAq8iNZqzhMLol8TevSl9KbmM2hn73ZmOlY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wh8zbkGo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wh8zbkGo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AAD2C4CED2; Wed, 6 Nov 2024 12:14:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730895255; bh=nlYQQ/XL20tmdxwBzo5mhUVO3/3AGKtqlpVdQbOfwxY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wh8zbkGoZb9qETwUoxZy6LTIOpHuWwlBpK+ywMcC5w+ZOoQ88JJKhsL53CDThAF45 hyD5vJI3ISOriLt6xcmYbVDV5lWbXjgqegs4wQyJnAz9g1/MXjph48tCPAcWq84lSP rVvHSoGkonnYicS/EczSGk24wE3qf+/2X2rJoZQM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Simon Horman , Marcin Wojtas , Jakub Kicinski , Sasha Levin Subject: [PATCH 4.19 156/350] net: mvpp2: Increase size of queue_name buffer Date: Wed, 6 Nov 2024 13:01:24 +0100 Message-ID: <20241106120324.772574232@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120320.865793091@linuxfoundation.org> References: <20241106120320.865793091@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Simon Horman [ Upstream commit 91d516d4de48532d967a77967834e00c8c53dfe6 ] Increase size of queue_name buffer from 30 to 31 to accommodate the largest string written to it. This avoids truncation in the possibly unlikely case where the string is name is the maximum size. Flagged by gcc-14: .../mvpp2_main.c: In function 'mvpp2_probe': .../mvpp2_main.c:7636:32: warning: 'snprintf' output may be truncated before the last format character [-Wformat-truncation=] 7636 | "stats-wq-%s%s", netdev_name(priv->port_list[0]->dev), | ^ .../mvpp2_main.c:7635:9: note: 'snprintf' output between 10 and 31 bytes into a destination of size 30 7635 | snprintf(priv->queue_name, sizeof(priv->queue_name), | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 7636 | "stats-wq-%s%s", netdev_name(priv->port_list[0]->dev), | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 7637 | priv->port_count > 1 ? "+" : ""); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Introduced by commit 118d6298f6f0 ("net: mvpp2: add ethtool GOP statistics"). I am not flagging this as a bug as I am not aware that it is one. Compile tested only. Signed-off-by: Simon Horman Reviewed-by: Marcin Wojtas Link: https://patch.msgid.link/20240806-mvpp2-namelen-v1-1-6dc773653f2f@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h index 23f60bc5d48f5..57fbfef336657 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h @@ -756,7 +756,7 @@ struct mvpp2 { unsigned int max_port_rxqs; /* Workqueue to gather hardware statistics */ - char queue_name[30]; + char queue_name[31]; struct workqueue_struct *stats_queue; /* Debugfs root entry */ -- 2.43.0