Skip to contentSkip to conversation

RDMA/hns: Uninitialized variable in modify_qp_init_to_rtr()

PATCH Applied Dan Carpenter 3 participants 3 messages May 29, 2020 – Jun 1, 2020

Subsystems (3)
Kernel janitors InfiniBand HiSilicon RoCE driver
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 RDMA/hns: Uninitialized variable in modify_qp_init_to_rtr()

The "dmac" variable is used before it is initialized.

Fixes 494c3b312255 ("RDMA/hns: Refactor the QP context filling process related to WQE buffer configure")
Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1 -1
index 6454ac4ad06f0..c597d7281629b 100644
@@ -4030,6 +4030,7 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,
 	port = (attr_mask & IB_QP_PORT) ? (attr->port_num - 1) : hr_qp->port;
 
 	smac = (u8 *)hr_dev->dev_addr[port];
+	dmac = (u8 *)attr->ah_attr.roce.dmac;
 	/* when dmac equals smac or loop_idc is 1, it should loopback */
 	if (ether_addr_equal_unaligned(dmac, smac) ||
 	    hr_dev->loop_idc = 0x1) {

@@ -4053,7 +4054,6 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,
 	roce_set_field(qpc_mask->byte_20_smac_sgid_idx,
 		       V2_QPC_BYTE_20_SGID_IDX_M, V2_QPC_BYTE_20_SGID_IDX_S, 0);
 
-	dmac = (u8 *)attr->ah_attr.roce.dmac;
 	memcpy(&(context->dmac), dmac, sizeof(u32));
 	roce_set_field(context->byte_52_udpspn_dmac, V2_QPC_BYTE_52_DMAC_M,
 		       V2_QPC_BYTE_52_DMAC_S, *((u16 *)(&dmac[4])));
Signature · 1 line
2.26.2
Applied
#2 lore raw
In reply to Dan Carpenter
Quoted 8 lines · Dan Carpenter

The "dmac" variable is used before it is initialized.

Fixes 494c3b312255 ("RDMA/hns: Refactor the QP context filling process related to WQE buffer configure")
Signed-off-by Dan Carpenter <[email protected]>
Reviewed-by Leon Romanovsky <[email protected]>
---
 drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to for-next, thanks

Jason