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

Commit 6b94bab0 authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by David S. Miller
Browse files

net/mlx4_core: Fix potential corruption in counters database 



The error flow in procedure handle_existing_counter() is wrong.

The procedure should exit after encountering the error, not continue
as if everything is OK.

Fixes: 68230242 ('net/mlx4_core: Add port attribute when tracking counters')
Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31c128b6

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

+6 −4
Original line number Original line Diff line number Diff line
@@ -915,11 +915,13 @@ static int handle_existing_counter(struct mlx4_dev *dev, u8 slave, int port, 




	spin_lock_irq(mlx4_tlock(dev));

	spin_lock_irq(mlx4_tlock(dev));

	r = find_res(dev, counter_index, RES_COUNTER);

	r = find_res(dev, counter_index, RES_COUNTER);

	if (!r || r->owner != slave)

	if (!r || r->owner != slave) {

		ret = -EINVAL;

		ret = -EINVAL;

	} else {

		counter = container_of(r, struct res_counter, com);

		counter = container_of(r, struct res_counter, com);

		if (!counter->port)

		if (!counter->port)

			counter->port = port;

			counter->port = port;

	}





	spin_unlock_irq(mlx4_tlock(dev));

	spin_unlock_irq(mlx4_tlock(dev));

	return ret;

	return ret;