xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gve: Use size_add() in call to struct_size()

Browse Source 
[ Upstream commit d692873cbe861a870cdc9cbfb120eefd113c3dfd ]

If, for any reason, `tx_stats_num + rx_stats_num` wraps around, the
protection that struct_size() adds against potential integer overflows
is defeated. Fix this by hardening call to struct_size() with size_add().

Fixes: 691f4077d5 ("gve: Replace zero-length array with flexible-array member")
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Gustavo A. R. Silva
2023-09-15 12:17:49 -06:00
committed by Greg Kroah-Hartman
parent 2b46db3bb7
commit f927d44696
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/google/gve/gve_main.c
View File

@@ -128,7 +128,7 @@ static int gve_alloc_stats_report(struct gve_priv *priv)
rx_stats_num = (GVE_RX_STATS_REPORT_NUM + NIC_RX_STATS_REPORT_NUM) * rx_stats_num = (GVE_RX_STATS_REPORT_NUM + NIC_RX_STATS_REPORT_NUM) *
priv->rx_cfg.num_queues; priv->rx_cfg.num_queues;
priv->stats_report_len = struct_size(priv->stats_report, stats, priv->stats_report_len = struct_size(priv->stats_report, stats,
tx_stats_num + rx_stats_num); size_add(tx_stats_num, rx_stats_num));
priv->stats_report = priv->stats_report =
dma_alloc_coherent(&priv->pdev->dev, priv->stats_report_len, dma_alloc_coherent(&priv->pdev->dev, priv->stats_report_len,
&priv->stats_report_bus, GFP_KERNEL); &priv->stats_report_bus, GFP_KERNEL);