Skip to content

Commit 4a6f18f

Browse files
keeskuba-moo
authored andcommitted
net/mlx4_core: Avoid impossible mlx4_db_alloc() order value
GCC can see that the value range for "order" is capped, but this leads it to consider that it might be negative, leading to a false positive warning (with GCC 15 with -Warray-bounds -fdiagnostics-details): ../drivers/net/ethernet/mellanox/mlx4/alloc.c:691:47: error: array subscript -1 is below array bounds of 'long unsigned int *[2]' [-Werror=array-bounds=] 691 | i = find_first_bit(pgdir->bits[o], MLX4_DB_PER_PAGE >> o); | ~~~~~~~~~~~^~~ 'mlx4_alloc_db_from_pgdir': events 1-2 691 | i = find_first_bit(pgdir->bits[o], MLX4_DB_PER_PAGE >> o); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | | | (2) out of array bounds here | (1) when the condition is evaluated to true In file included from ../drivers/net/ethernet/mellanox/mlx4/mlx4.h:53, from ../drivers/net/ethernet/mellanox/mlx4/alloc.c:42: ../include/linux/mlx4/device.h:664:33: note: while referencing 'bits' 664 | unsigned long *bits[2]; | ^~~~ Switch the argument to unsigned int, which removes the compiler needing to consider negative values. Signed-off-by: Kees Cook <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 0025fa4 commit 4a6f18f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/net/ethernet/mellanox/mlx4/alloc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -660,9 +660,9 @@ static struct mlx4_db_pgdir *mlx4_alloc_db_pgdir(struct device *dma_device)
660660
}
661661

662662
static int mlx4_alloc_db_from_pgdir(struct mlx4_db_pgdir *pgdir,
663-
struct mlx4_db *db, int order)
663+
struct mlx4_db *db, unsigned int order)
664664
{
665-
int o;
665+
unsigned int o;
666666
int i;
667667

668668
for (o = order; o <= 1; ++o) {
@@ -690,7 +690,7 @@ static int mlx4_alloc_db_from_pgdir(struct mlx4_db_pgdir *pgdir,
690690
return 0;
691691
}
692692

693-
int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, int order)
693+
int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, unsigned int order)
694694
{
695695
struct mlx4_priv *priv = mlx4_priv(dev);
696696
struct mlx4_db_pgdir *pgdir;

include/linux/mlx4/device.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,7 @@ int mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
11351135
int mlx4_buf_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
11361136
struct mlx4_buf *buf);
11371137

1138-
int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, int order);
1138+
int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, unsigned int order);
11391139
void mlx4_db_free(struct mlx4_dev *dev, struct mlx4_db *db);
11401140

11411141
int mlx4_alloc_hwq_res(struct mlx4_dev *dev, struct mlx4_hwq_resources *wqres,

0 commit comments

Comments
 (0)