packages/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!281 Automatically generate code patches with openeuler !113

Browse Source 
From: @kuhnchen18
Reviewed-by: @imxcc
Signed-off-by: @imxcc
This commit is contained in:
openeuler-ci-bot 2021-05-19 17:11:00 +08:00 committed by Gitee
commit 37ac08e1e0
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qemu.spec
View File

@ -1,6 +1,6 @@
Name: qemu Name: qemu
Version: 4.1.0 Version: 4.1.0
Release: 43 Release: 44
Epoch: 2 Epoch: 2
Summary: QEMU is a generic and open source machine emulator and virtualizer Summary: QEMU is a generic and open source machine emulator and virtualizer
License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 License: GPLv2 and BSD and MIT and CC-BY-SA-4.0
@ -286,6 +286,7 @@ Patch0273: migration-fix-memory-leak-in-qmp_migrate_set_paramet.patch
Patch0274: migration-tls-fix-inverted-semantics-in-multifd_chan.patch Patch0274: migration-tls-fix-inverted-semantics-in-multifd_chan.patch
Patch0275: migration-tls-add-error-handling-in-multifd_tls_hand.patch Patch0275: migration-tls-add-error-handling-in-multifd_tls_hand.patch
Patch0276: arm-cpu-Fixed-function-undefined-error-at-compile-ti.patch Patch0276: arm-cpu-Fixed-function-undefined-error-at-compile-ti.patch
Patch0277: scsi-mptsas-dequeue-request-object-in-case-of-an-err.patch
BuildRequires: flex BuildRequires: flex
BuildRequires: bison BuildRequires: bison
@ -670,6 +671,9 @@ getent passwd qemu >/dev/null || \
%endif %endif
%changelog %changelog
* Wed May 19 2021 Chen Qun <kuhn.chenqun@huawei.com>
- scsi: mptsas: dequeue request object in case of an error
* Tue May 11 2021 Chen Qun <kuhn.chenqun@huawei.com> * Tue May 11 2021 Chen Qun <kuhn.chenqun@huawei.com>
- arm/cpu: Fixed function undefined error at compile time under arm - arm/cpu: Fixed function undefined error at compile time under arm

41
scsi-mptsas-dequeue-request-object-in-case-of-an-err.patch Normal file
View File

@ -0,0 +1,41 @@
From 27b68c47d739a3c4e5ece95ab002ee852103e11f 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