Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fffd6873 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Doug Ledford
Browse files

IB/mlx5: Fix the size parameter to find_first_bit 



The 2nd parameter of 'find_first_bit' is the number of bits to search.
In this case, we are passing 'sizeof(tmp)' which is likely to be 4 or 8
because 'tmp' is an 'unsigned long'.

It is likely that the number of bits of 'tmp' was expected here. So use
BITS_PER_LONG instead.

It has been spotted by the following coccinelle script:
@@
expression ret, x;

@@
*  ret = \(find_first_bit \| find_first_zero_bit\) (x, sizeof(...));

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarMajd Dibbiny <majd@mellanox.com>
Acked-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 61a28d2b

drivers/infiniband/hw/mlx5/mem.c

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr, int *count, int *shift, 


	addr = addr >> page_shift;

	tmp = (unsigned long)addr;

	m = find_first_bit(&tmp, sizeof(tmp));

	m = find_first_bit(&tmp, BITS_PER_LONG);

	skip = 1 << m;

	mask = skip - 1;

	i = 0;
@@ -81,7 +81,7 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr, int *count, int *shift, 
		for (k = 0; k < len; k++) {

			if (!(i & mask)) {

				tmp = (unsigned long)pfn;

				m = min_t(unsigned long, m, find_first_bit(&tmp, sizeof(tmp)));

				m = min_t(unsigned long, m, find_first_bit(&tmp, BITS_PER_LONG));

				skip = 1 << m;

				mask = skip - 1;

				base = pfn;
@@ -89,7 +89,7 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr, int *count, int *shift, 
			} else {

				if (base + p != pfn) {

					tmp = (unsigned long)p;

					m = find_first_bit(&tmp, sizeof(tmp));

					m = find_first_bit(&tmp, BITS_PER_LONG);

					skip = 1 << m;

					mask = skip - 1;

					base = pfn;