| From b7b517b182ddc52845a7e95ac5bf471f1fd2a1b2 Mon Sep 17 00:00:00 2001 |
| From: Aya Levin <ayal@mellanox.com> |
| Date: Thu, 15 Nov 2018 18:05:15 +0200 |
| Subject: net/mlx4: Fix UBSAN warning of signed integer overflow |
| |
| [ Upstream commit a463146e67c848cbab5ce706d6528281b7cded08 ] |
| |
| UBSAN: Undefined behavior in |
| drivers/net/ethernet/mellanox/mlx4/resource_tracker.c:626:29 |
| signed integer overflow: 1802201963 + 1802201963 cannot be represented |
| in type 'int' |
| |
| The union of res_reserved and res_port_rsvd[MLX4_MAX_PORTS] monitors |
| granting of reserved resources. The grant operation is calculated and |
| protected, thus both members of the union cannot be negative. Changed |
| type of res_reserved and of res_port_rsvd[MLX4_MAX_PORTS] from signed |
| int to unsigned int, allowing large value. |
| |
| Fixes: 5a0d0a6161ae ("mlx4: Structures and init/teardown for VF resource quotas") |
| Signed-off-by: Aya Levin <ayal@mellanox.com> |
| Signed-off-by: Tariq Toukan <tariqt@mellanox.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx4/mlx4.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h |
| index de10dbb2e6ed..4f63915f14be 100644 |
| --- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h |
| +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h |
| @@ -516,8 +516,8 @@ struct slave_list { |
| struct resource_allocator { |
| spinlock_t alloc_lock; /* protect quotas */ |
| union { |
| - int res_reserved; |
| - int res_port_rsvd[MLX4_MAX_PORTS]; |
| + unsigned int res_reserved; |
| + unsigned int res_port_rsvd[MLX4_MAX_PORTS]; |
| }; |
| union { |
| int res_free; |
| -- |
| 2.19.1 |
| |
