Skip to content

Commit e22c6ea

Browse files
GustavoARSilvadavem330
authored andcommitted
mlxsw: Use size_mul() in call to struct_size()
If, for any reason, the open-coded arithmetic causes a wraparound, the protection that `struct_size()` adds against potential integer overflows is defeated. Fix this by hardening call to `struct_size()` with `size_mul()`. Fixes: 2285ec8 ("mlxsw: spectrum_acl_bloom_filter: use struct_size() in kzalloc()") Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Ido Schimmel <idosch@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 74fa1a8 commit e22c6ea

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ mlxsw_sp_acl_bf_init(struct mlxsw_sp *mlxsw_sp, unsigned int num_erp_banks)
496496
* is 2^ACL_MAX_BF_LOG
497497
*/
498498
bf_bank_size = 1 << MLXSW_CORE_RES_GET(mlxsw_sp->core, ACL_MAX_BF_LOG);
499-
bf = kzalloc(struct_size(bf, refcnt, bf_bank_size * num_erp_banks),
499+
bf = kzalloc(struct_size(bf, refcnt, size_mul(bf_bank_size, num_erp_banks)),
500500
GFP_KERNEL);
501501
if (!bf)
502502
return ERR_PTR(-ENOMEM);

0 commit comments

Comments
 (0)