From 89949abd6f6198223823a42e291d8e73f13e20dc Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Mon, 17 May 2021 14:24:49 +0800 Subject: [PATCH 1/3] scsi: mptsas: dequeue request object in case of an error Fix CVE-2021-3392 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 Signed-off-by: Prasad J Pandit Signed-off-by: Jiajie Li --- ...eue-request-object-in-case-of-an-err.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 scsi-mptsas-dequeue-request-object-in-case-of-an-err.patch diff --git a/scsi-mptsas-dequeue-request-object-in-case-of-an-err.patch b/scsi-mptsas-dequeue-request-object-in-case-of-an-err.patch new file mode 100644 index 00000000..e8a96852 --- /dev/null +++ b/scsi-mptsas-dequeue-request-object-in-case-of-an-err.patch @@ -0,0 +1,41 @@ +From 23cfacd3cd6329d31c29083071d65dc2fab8042a Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit +Date: Mon, 17 May 2021 14:24:49 +0800 +Subject: [PATCH] scsi: mptsas: dequeue request object in case of an error + +Fix CVE-2021-3392 + +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 +Signed-off-by: Prasad J Pandit + +Signed-off-by: Jiajie Li +--- + 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 3f94d5ab55..4d23f045d7 100644 +--- a/hw/scsi/mptsas.c ++++ b/hw/scsi/mptsas.c +@@ -259,8 +259,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.27.0 + -- Gitee From 800619037e657d83b396fe804348bcfab789ff60 Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Wed, 19 May 2021 11:27:08 +0800 Subject: [PATCH 2/3] spec: Update patch and changelog with !112 fix CVE-2021-3392 #I3E5MB !112 scsi: mptsas: dequeue request object in case of an error Signed-off-by: Chen Qun --- qemu.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qemu.spec b/qemu.spec index 22667bde..92ae5570 100644 --- a/qemu.spec +++ b/qemu.spec @@ -266,6 +266,7 @@ Patch0253: rtl8139-switch-to-use-qemu_receive_packet-for-loopba.patch Patch0254: pcnet-switch-to-use-qemu_receive_packet-for-loopback.patch Patch0255: cadence_gem-switch-to-use-qemu_receive_packet-for-lo.patch Patch0256: lan9118-switch-to-use-qemu_receive_packet-for-loopba.patch +Patch0257: scsi-mptsas-dequeue-request-object-in-case-of-an-err.patch BuildRequires: flex BuildRequires: bison @@ -650,6 +651,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Wed May 19 2021 Chen Qun +- scsi: mptsas: dequeue request object in case of an error + * Fri May 14 2021 Chen Qun - net: introduce qemu_receive_packet() - e1000: switch to use qemu_receive_packet() for loopback -- Gitee From 6e770a37d13795a1e43d28620e51d49829ee507b Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Wed, 19 May 2021 11:27:12 +0800 Subject: [PATCH 3/3] spec: Update release version with !112 increase release verison by one Signed-off-by: Chen Qun --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 92ae5570..40efca6e 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 42 +Release: 43 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 -- Gitee