diff options
| author |   Anuj Mittal <anuj.mittal@intel.com> | 2021-05-05 10:37:43 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-06 08:41:21 +0100 |
| commit | 2e7494cd388c5d03a95d8a54d6231e7fe7fd46ef (patch) | |
| tree | d1de8c648b15d26e2a3134fb31a98a67381d27b1 | |
| parent | 853eb9a9c4b02b7acfc72659eb20914f0f19e66b (diff) | |
| download | openembedded-core-contrib-2e7494cd388c5d03a95d8a54d6231e7fe7fd46ef.tar.gz | |
Revert "qemu: fix CVE-2021-3392"
This reverts commit 5e8e08df8b5d0040ad911d3c51f63e7fec1858b4.
This is an incomplete fix.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2021-3392.patch | 45 |
2 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 486f404668..810d8b7c8a 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -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 \ " diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3392.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3392.patch deleted file mode 100644 index 1c688827db..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2021-3392.patch +++ /dev/null @@ -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 - |