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 2CC02183CD2; Wed, 25 Sep 2024 11:38: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=1727264296; cv=none; b=bCV4Cdhj1xG2/ysEU1UnnzTo7lpIR/nRZ/6W/jrhPYFHE0ByV4vIdGgFGsIYityD8bGHNQM1MxykwPp+H++5gWyY60CFcw7CdJM0kxu5Q5X9mT7GKbT+MQkn+1PRGzfJzD6LglDt6wE1MQB9F+c8iYNwrM1h4qDebLPbh4BmqZI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727264296; c=relaxed/simple; bh=yH36a8k35/aZy1UjhKV7SrI4bspgyi3+ORHp/5gofHs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZbE3ujr8du952rYGBiQ6NW+Bkl3dYyvYPodM8a/s+c+6trc/0mPaoON+oT91foYXLIFbi6d+v0I3DOrwMjR66URftuPs7in0snpbKcb4WcVvdfdozVAE/UTzL96ENWXEfSGIr8lacXzbtFCRAfRUuVlxg9ALAeW8algbzqHKKz8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RXN1lfxd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RXN1lfxd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6232EC4CEC3; Wed, 25 Sep 2024 11:38:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727264295; bh=yH36a8k35/aZy1UjhKV7SrI4bspgyi3+ORHp/5gofHs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RXN1lfxdt6sQP2Zbwf/7qmyV09BdjkO64Ie0mq4KWux6f6Wj6VeWceXOLBMfuWMl8 IfdE5bAhN9AqJa/tikz+SnrSiCEGt97THYnlLwa5Z+O/sIS03j+Yr0T+Q79pm/AmW+ dVsgrfSn3eEc/etMfYmc+pfEXR9xiiWaiECQvcAhhn7dr5xXh+VY8unXhGUPAnczj5 ml16v1iQOeqkmHd7+v90HhCobhbS95j1jQyUgfK98nhTURTT06o5jVxGj9XN02hCG/ vpvlOiEC6FUzZScwp6RPcTojkIiszvSt8OScVHgjVyqj+TgGcYemunK+BGyICpqUEY R871DU+nMxHiw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Simon Horman , Marcin Wojtas , Jakub Kicinski , Sasha Levin , linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.11 044/244] net: mvpp2: Increase size of queue_name buffer Date: Wed, 25 Sep 2024 07:24:25 -0400 Message-ID: <20240925113641.1297102-44-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925113641.1297102-1-sashal@kernel.org> References: <20240925113641.1297102-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.11 Content-Transfer-Encoding: 8bit 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 e809f91c08fb9..9e02e4367bec8 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h @@ -1088,7 +1088,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