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

Commit 57352ef4 authored by Amir Vadai's avatar Amir Vadai Committed by David S. Miller
Browse files

net/mlx4_core: Fix memory access error in mlx4_QUERY_DEV_CAP_wrapper() 



Fix a regression introduced by [1]. outbox was accessed instead of
outbox->buf. Typo was copy-pasted to [2] and [3].

[1] - cc1ade94 mlx4_core: Disable memory windows for virtual functions
[2] - 4de65803 mlx4_core: Add support for steerable IB UD QPs
[3] - 7ffdf726 net/mlx4_core: Add basic support for TCP/IP offloads under
      tunneling

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5bd4e4c1

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -859,7 +859,7 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave, 
	MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_CQ_TS_SUPPORT_OFFSET);

	MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_CQ_TS_SUPPORT_OFFSET);





	/* For guests, disable vxlan tunneling */

	/* For guests, disable vxlan tunneling */

	MLX4_GET(field, outbox, QUERY_DEV_CAP_VXLAN);

	MLX4_GET(field, outbox->buf, QUERY_DEV_CAP_VXLAN);

	field &= 0xf7;

	field &= 0xf7;

	MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_VXLAN);

	MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_VXLAN);
@@ -869,7 +869,7 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave, 
	MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_BF_OFFSET);

	MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_BF_OFFSET);





	/* For guests, disable mw type 2 */

	/* For guests, disable mw type 2 */

	MLX4_GET(bmme_flags, outbox, QUERY_DEV_CAP_BMME_FLAGS_OFFSET);

	MLX4_GET(bmme_flags, outbox->buf, QUERY_DEV_CAP_BMME_FLAGS_OFFSET);

	bmme_flags &= ~MLX4_BMME_FLAG_TYPE_2_WIN;

	bmme_flags &= ~MLX4_BMME_FLAG_TYPE_2_WIN;

	MLX4_PUT(outbox->buf, bmme_flags, QUERY_DEV_CAP_BMME_FLAGS_OFFSET);

	MLX4_PUT(outbox->buf, bmme_flags, QUERY_DEV_CAP_BMME_FLAGS_OFFSET);
@@ -883,7 +883,7 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave, 
	}

	}





	/* turn off ipoib managed steering for guests */

	/* turn off ipoib managed steering for guests */

	MLX4_GET(field, outbox, QUERY_DEV_CAP_FLOW_STEERING_IPOIB_OFFSET);

	MLX4_GET(field, outbox->buf, QUERY_DEV_CAP_FLOW_STEERING_IPOIB_OFFSET);

	field &= ~0x80;

	field &= ~0x80;

	MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_FLOW_STEERING_IPOIB_OFFSET);

	MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_FLOW_STEERING_IPOIB_OFFSET);