diff --git a/qemu.spec b/qemu.spec
index 6137b69725d7f5983286a5636e3b99c90d3a5e64..2841a0cf2697526e242292d1d26de651b6b3f19a 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,6 +1,6 @@
 Name: qemu
 Version: 4.1.0
-Release: 37
+Release: 38
 Epoch: 2
 Summary: QEMU is a generic and open source machine emulator and virtualizer
 License: GPLv2 and BSD and MIT and CC-BY
@@ -226,6 +226,7 @@ Patch0213: rtl8139-switch-to-use-qemu_receive_packet-for-loopba.patch
 Patch0214: pcnet-switch-to-use-qemu_receive_packet-for-loopback.patch
 Patch0215: cadence_gem-switch-to-use-qemu_receive_packet-for-lo.patch
 Patch0216: lan9118-switch-to-use-qemu_receive_packet-for-loopba.patch
+Patch0217: scsi-mptsas-dequeue-request-object-in-case-of-an-err.patch
 
 BuildRequires: flex
 BuildRequires: bison
@@ -571,6 +572,9 @@ getent passwd qemu >/dev/null || \
 %endif
 
 %changelog
+* Wed May 19 2021 Chen Qun <kuhn.chenqun@huawei.com>
+- scsi: mptsas: dequeue request object in case of an error
+
 * Fri May 14 2021 Chen Qun <kuhn.chenqun@huawei.com>
 - net: introduce qemu_receive_packet()
 - e1000: switch to use qemu_receive_packet() for loopback
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 0000000000000000000000000000000000000000..3b0ca2cbaccd5184bf506ef9e78ddf1f038bf3ed
--- /dev/null
+++ b/scsi-mptsas-dequeue-request-object-in-case-of-an-err.patch
@@ -0,0 +1,41 @@
+From 2db78c45ffa307241bf100cda049550b860f1735 Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+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 <cwmyung@snu.ac.kr>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+
+Signed-off-by: Jiajie Li <lijiajie11@huawei.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 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
+