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

!15762 scsi: ufs: core: bsg: Fix crash when arpmb command fails 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiangwei Li <liwei728@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/WR6ZXLQQBHP6VCBMWNWP7Z4DKYVTPPNL/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBWVSZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/15762

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents f5dce47f d8191b7f

drivers/ufs/core/ufs_bsg.c

+4 −2
Original line number Diff line number Diff line
@@ -194,10 +194,12 @@ static int ufs_bsg_request(struct bsg_job *job) 
	ufshcd_rpm_put_sync(hba);

	kfree(buff);

	bsg_reply->result = ret;

	job->reply_len = !rpmb ? sizeof(struct ufs_bsg_reply) : sizeof(struct ufs_rpmb_reply);

	/* complete the job here only if no error */

	if (ret == 0)

	if (ret == 0) {

		job->reply_len = rpmb ? sizeof(struct ufs_rpmb_reply) :

					sizeof(struct ufs_bsg_reply);

		bsg_job_done(job, ret, bsg_reply->reply_payload_rcv_len);

	}



	return ret;

}