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

!10712 CVE-2024-41079 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yuntao Liu <liuyuntao12@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SN3QAC6S7SYDIQ5UEVBG466E5OFYBADH/ 
CVE-2024-41079

Daniel Wagner (1):
  [Backport] nvmet: always initialize cqe.result


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IAGEMT 
 
Link:https://gitee.com/openeuler/kernel/pulls/10712

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 82d93124 6ce9dccf

drivers/nvme/target/core.c

+1 −0
Original line number Diff line number Diff line
@@ -908,6 +908,7 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq, 
	req->metadata_sg_cnt = 0;

	req->transfer_len = 0;

	req->metadata_len = 0;

	req->cqe->result.u64 = 0;

	req->cqe->status = 0;

	req->cqe->sq_head = 0;

	req->ns = NULL;

drivers/nvme/target/fabrics-cmd.c

+0 −6
Original line number Diff line number Diff line
@@ -170,9 +170,6 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req) 
	if (status)

		goto out;



	/* zero out initial completion result, assign values as needed */

	req->cqe->result.u32 = 0;



	if (c->recfmt != 0) {

		pr_warn("invalid connect version (%d).\n",

			le16_to_cpu(c->recfmt));
@@ -242,9 +239,6 @@ static void nvmet_execute_io_connect(struct nvmet_req *req) 
	if (status)

		goto out;



	/* zero out initial completion result, assign values as needed */

	req->cqe->result.u32 = 0;



	if (c->recfmt != 0) {

		pr_warn("invalid connect version (%d).\n",

			le16_to_cpu(c->recfmt));