@@ -31,6 +31,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2022-35414.patch \
file://CVE-2021-3507_1.patch \
file://CVE-2021-3507_2.patch \
+ file://CVE-2022-0216_1.patch \
+ file://CVE-2022-0216_2.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
new file mode 100644
@@ -0,0 +1,42 @@
+From f37ac8619a39498edd225c4a0b3039b28814833d Mon Sep 17 00:00:00 2001
+From: Mauro Matteo Cascella <mcascell@redhat.com>
+Date: Tue, 5 Jul 2022 22:05:43 +0200
+Subject: [PATCH 1/2] scsi/lsi53c895a: fix use-after-free in lsi_do_msgout
+ (CVE-2022-0216)
+
+Set current_req->req to NULL to prevent reusing a free'd buffer in case of
+repeated SCSI cancel requests. Thanks to Thomas Huth for suggesting the patch.
+
+Fixes: CVE-2022-0216
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/972
+Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
+Message-Id: <20220705200543.2366809-1-mcascell@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+
+Upstream-Status: Backport [6c8fa961da5e60f574bb52fd3ad44b1e9e8ad4b8]
+CVE: CVE-2022-0216
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/scsi/lsi53c895a.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
+index c8773f73f..99ea42d49 100644
+--- a/hw/scsi/lsi53c895a.c
++++ b/hw/scsi/lsi53c895a.c
+@@ -1028,8 +1028,9 @@ static void lsi_do_msgout(LSIState *s)
+ case 0x0d:
+ /* The ABORT TAG message clears the current I/O process only. */
+ trace_lsi_do_msgout_abort(current_tag);
+- if (current_req) {
++ if (current_req && current_req->req) {
+ scsi_req_cancel(current_req->req);
++ current_req->req = NULL;
+ }
+ lsi_disconnect(s);
+ break;
+--
+2.33.0
+
new file mode 100644
@@ -0,0 +1,146 @@
+From 5451bf6db85ce3da1238e9154d051ebccec8f171 Mon Sep 17 00:00:00 2001
+From: Mauro Matteo Cascella <mcascell@redhat.com>
+Date: Mon, 11 Jul 2022 14:33:16 +0200
+Subject: [PATCH 2/2] scsi/lsi53c895a: really fix use-after-free in
+ lsi_do_msgout (CVE-2022-0216)
+
+Set current_req to NULL, not current_req->req, to prevent reusing a free'd
+buffer in case of repeated SCSI cancel requests. Also apply the fix to
+CLEAR QUEUE and BUS DEVICE RESET messages as well, since they also cancel
+the request.
+
+Thanks to Alexander Bulekov for providing a reproducer.
+
+Fixes: CVE-2022-0216
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/972
+Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
+Tested-by: Alexander Bulekov <alxndr@bu.edu>
+Message-Id: <20220711123316.421279-1-mcascell@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+
+Upstream-Status: Backport [4367a20cc442c56b05611b4224de9a61908f9eac]
+CVE: CVE-2022-0216
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/scsi/lsi53c895a.c | 3 +-
+ tests/qtest/fuzz-lsi53c895a-test.c | 76 ++++++++++++++++++++++++++++++
+ 2 files changed, 78 insertions(+), 1 deletion(-)
+
+diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
+index 99ea42d49..ad5f5e5f3 100644
+--- a/hw/scsi/lsi53c895a.c
++++ b/hw/scsi/lsi53c895a.c
+@@ -1030,7 +1030,7 @@ static void lsi_do_msgout(LSIState *s)
+ trace_lsi_do_msgout_abort(current_tag);
+ if (current_req && current_req->req) {
+ scsi_req_cancel(current_req->req);
+- current_req->req = NULL;
++ current_req = NULL;
+ }
+ lsi_disconnect(s);
+ break;
+@@ -1056,6 +1056,7 @@ static void lsi_do_msgout(LSIState *s)
+ /* clear the current I/O process */
+ if (s->current) {
+ scsi_req_cancel(s->current->req);
++ current_req = NULL;
+ }
+
+ /* As the current implemented devices scsi_disk and scsi_generic
+diff --git a/tests/qtest/fuzz-lsi53c895a-test.c b/tests/qtest/fuzz-lsi53c895a-test.c
+index ba5d46897..c1af0ab1c 100644
+--- a/tests/qtest/fuzz-lsi53c895a-test.c
++++ b/tests/qtest/fuzz-lsi53c895a-test.c
+@@ -8,6 +8,79 @@
+ #include "qemu/osdep.h"
+ #include "libqos/libqtest.h"
+
++/*
++ * This used to trigger a UAF in lsi_do_msgout()
++ * https://gitlab.com/qemu-project/qemu/-/issues/972
++ */
++static void test_lsi_do_msgout_cancel_req(void)
++{
++ QTestState *s;
++
++ if (sizeof(void *) == 4) {
++ g_test_skip("memory size too big for 32-bit build");
++ return;
++ }
++
++ s = qtest_init("-M q35 -m 4G -display none -nodefaults "
++ "-device lsi53c895a,id=scsi "
++ "-device scsi-hd,drive=disk0 "
++ "-drive file=null-co://,id=disk0,if=none,format=raw");
++
++ qtest_outl(s, 0xcf8, 0x80000810);
++ qtest_outl(s, 0xcf8, 0xc000);
++ qtest_outl(s, 0xcf8, 0x80000810);
++ qtest_outw(s, 0xcfc, 0x7);
++ qtest_outl(s, 0xcf8, 0x80000810);
++ qtest_outl(s, 0xcfc, 0xc000);
++ qtest_outl(s, 0xcf8, 0x80000804);
++ qtest_outw(s, 0xcfc, 0x05);
++ qtest_writeb(s, 0x69736c10, 0x08);
++ qtest_writeb(s, 0x69736c13, 0x58);
++ qtest_writeb(s, 0x69736c1a, 0x01);
++ qtest_writeb(s, 0x69736c1b, 0x06);
++ qtest_writeb(s, 0x69736c22, 0x01);
++ qtest_writeb(s, 0x69736c23, 0x07);
++ qtest_writeb(s, 0x69736c2b, 0x02);
++ qtest_writeb(s, 0x69736c48, 0x08);
++ qtest_writeb(s, 0x69736c4b, 0x58);
++ qtest_writeb(s, 0x69736c52, 0x04);
++ qtest_writeb(s, 0x69736c53, 0x06);
++ qtest_writeb(s, 0x69736c5b, 0x02);
++ qtest_outl(s, 0xc02d, 0x697300);
++ qtest_writeb(s, 0x5a554662, 0x01);
++ qtest_writeb(s, 0x5a554663, 0x07);
++ qtest_writeb(s, 0x5a55466a, 0x10);
++ qtest_writeb(s, 0x5a55466b, 0x22);
++ qtest_writeb(s, 0x5a55466c, 0x5a);
++ qtest_writeb(s, 0x5a55466d, 0x5a);
++ qtest_writeb(s, 0x5a55466e, 0x34);
++ qtest_writeb(s, 0x5a55466f, 0x5a);
++ qtest_writeb(s, 0x5a345a5a, 0x77);
++ qtest_writeb(s, 0x5a345a5b, 0x55);
++ qtest_writeb(s, 0x5a345a5c, 0x51);
++ qtest_writeb(s, 0x5a345a5d, 0x27);
++ qtest_writeb(s, 0x27515577, 0x41);
++ qtest_outl(s, 0xc02d, 0x5a5500);
++ qtest_writeb(s, 0x364001d0, 0x08);
++ qtest_writeb(s, 0x364001d3, 0x58);
++ qtest_writeb(s, 0x364001da, 0x01);
++ qtest_writeb(s, 0x364001db, 0x26);
++ qtest_writeb(s, 0x364001dc, 0x0d);
++ qtest_writeb(s, 0x364001dd, 0xae);
++ qtest_writeb(s, 0x364001de, 0x41);
++ qtest_writeb(s, 0x364001df, 0x5a);
++ qtest_writeb(s, 0x5a41ae0d, 0xf8);
++ qtest_writeb(s, 0x5a41ae0e, 0x36);
++ qtest_writeb(s, 0x5a41ae0f, 0xd7);
++ qtest_writeb(s, 0x5a41ae10, 0x36);
++ qtest_writeb(s, 0x36d736f8, 0x0c);
++ qtest_writeb(s, 0x36d736f9, 0x80);
++ qtest_writeb(s, 0x36d736fa, 0x0d);
++ qtest_outl(s, 0xc02d, 0x364000);
++
++ qtest_quit(s);
++}
++
+ /*
+ * This used to trigger the assert in lsi_do_dma()
+ * https://bugs.launchpad.net/qemu/+bug/697510
+@@ -48,5 +121,8 @@ int main(int argc, char **argv)
+ test_lsi_do_dma_empty_queue);
+ }
+
++ qtest_add_func("fuzz/lsi53c895a/lsi_do_msgout_cancel_req",
++ test_lsi_do_msgout_cancel_req);
++
+ return g_test_run();
+ }
+--
+2.33.0
+
Backport required patches to fix CVE-2022-0216. Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> --- meta/recipes-devtools/qemu/qemu.inc | 2 + .../qemu/qemu/CVE-2022-0216_1.patch | 42 +++++ .../qemu/qemu/CVE-2022-0216_2.patch | 146 ++++++++++++++++++ 3 files changed, 190 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-0216_1.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-0216_2.patch