Unverified Commit a52fc90c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8579 net: qlogic: qlcnic: Fix a NULL pointer dereference in qlcnic_83xx_add_rings() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Yejian <zhengyejian1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/QDL7FLPTG4VL7CUPJQDIYXUWVHWA4SDI/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9S240 
 
Link:https://gitee.com/openeuler/kernel/pulls/8579

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 2e920fea 84bee699

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c

+8 −2
Original line number Diff line number Diff line
@@ -1079,8 +1079,14 @@ static int qlcnic_83xx_add_rings(struct qlcnic_adapter *adapter) 
	sds_mbx_size = sizeof(struct qlcnic_sds_mbx);

	context_id = recv_ctx->context_id;

	num_sds = adapter->drv_sds_rings - QLCNIC_MAX_SDS_RINGS;

	ahw->hw_ops->alloc_mbx_args(&cmd, adapter,

	err = ahw->hw_ops->alloc_mbx_args(&cmd, adapter,

					QLCNIC_CMD_ADD_RCV_RINGS);

	if (err) {

		dev_err(&adapter->pdev->dev,

			"Failed to alloc mbx args %d\n", err);

		return err;

	}



	cmd.req.arg[1] = 0 | (num_sds << 8) | (context_id << 16);



	/* set up status rings, mbx 2-81 */