Revert "qemu: fix CVE-2021-3392"

This reverts commit 5e8e08df8b.

This is an incomplete fix.

(From OE-Core rev: 2e7494cd388c5d03a95d8a54d6231e7fe7fd46ef)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Anuj Mittal
2021-05-05 10:37:43 +08:00
committed by Richard Purdie
parent 0a0c83d083
commit db4d9619aa
2 changed files with 0 additions and 46 deletions

View File

@@ -54,7 +54,6 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2021-3416_9.patch \
file://CVE-2021-3416_10.patch \
file://CVE-2021-20257.patch \
file://CVE-2021-3392.patch \
file://CVE-2020-27821.patch \
file://CVE-2021-20263.patch \
"

View File

@@ -1,45 +0,0 @@
From 3431b01b43584de5f710c40605fe3251f81c0e11 Mon Sep 17 00:00:00 2001
From: Minjae Kim <flowergom@gmail.com>
Date: Tue, 27 Apr 2021 02:09:49 +0000
Subject: [PATCH] scsi: mptsas: dequeue request object in case of an error
(CVE-2021-3392)
From: Prasad J Pandit <pjp@fedoraproject.org>
While processing SCSI i/o requests in mptsas_process_scsi_io_request(),
the Megaraid emulator appends new MPTSASRequest object 'req' to
the 's->pending' queue. In case of an error, this same object gets
dequeued in mptsas_free_request() only if SCSIRequest object
'req->sreq' is initialised. This may lead to a use-after-free issue.
Unconditionally dequeue 'req' object from 's->pending' to avoid it.
Fixes: CVE-2021-3392
Buglink: https://bugs.launchpad.net/qemu/+bug/1914236
Reported-by: Cheolwoo Myung <cwmyung@snu.ac.kr>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Upstream-Status: Acepted
[https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg00488.html]
CVE: CVE-2021-3392
Signed-off-by: Minjae Kim <flowergom@gmail.com>
---
hw/scsi/mptsas.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
index f86616544..adff5b0bf 100644
--- a/hw/scsi/mptsas.c
+++ b/hw/scsi/mptsas.c
@@ -257,8 +257,8 @@ static void mptsas_free_request(MPTSASRequest *req)
req->sreq->hba_private = NULL;
scsi_req_unref(req->sreq);
req->sreq = NULL;
- QTAILQ_REMOVE(&s->pending, req, next);
}
+ QTAILQ_REMOVE(&s->pending, req, next);
qemu_sglist_destroy(&req->qsg);
g_free(req);
}
--
2.17.1