summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2023-10-12 11:16:16 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-14 22:45:42 +0100
commit29f2ecdd6c2c168f7c17a2035b7927d9171c4bb8 (patch)
tree2e1a841cc17e1c5ccb1c6b1cf83cf0b7bccb339f /meta/recipes-devtools/qemu
parentc5369d6a6d536ff81fe02bda6f211a9699dedda5 (diff)
downloadpoky-29f2ecdd6c2c168f7c17a2035b7927d9171c4bb8.tar.gz
qemu: drop unreferenced patch
OE Commit a7176c3b2a7e2041b9be5dabb6b0f1e62f235f76 removed the reference to this patch but did not remove the patch (From OE-Core rev: eeb7063ea70b861269aa820d19e6804b7841149e) Signed-off-by: Jon Mason <jdmason@kudzu.us> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu')
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-CVE-2023-40360-hw-nvme-fix-null-pointer-access-in-di.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0001-CVE-2023-40360-hw-nvme-fix-null-pointer-access-in-di.patch b/meta/recipes-devtools/qemu/qemu/0001-CVE-2023-40360-hw-nvme-fix-null-pointer-access-in-di.patch
deleted file mode 100644
index 731b0281f4..0000000000
--- a/meta/recipes-devtools/qemu/qemu/0001-CVE-2023-40360-hw-nvme-fix-null-pointer-access-in-di.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 83dd3da9fac872fac9739b9dcb96232c93675824 Mon Sep 17 00:00:00 2001
2From: Klaus Jensen <k.jensen@samsung.com>
3Date: Tue, 8 Aug 2023 17:16:13 +0200
4Subject: [PATCH] CVE-2023-40360 hw/nvme: fix null pointer access in directive
5 receive
6
7nvme_directive_receive() does not check if an endurance group has been
8configured (set) prior to testing if flexible data placement is enabled
9or not.
10
11Fix this.
12
13CVE: CVE-2023-40360
14Upstream-Status: Backport [https://gitlab.com/birkelund/qemu/-/commit/6c8f8456cb0b239812dee5211881426496da7b98]
15Cc: qemu-stable@nongnu.org
16Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1815
17Fixes: 73064edfb864 ("hw/nvme: flexible data placement emulation")
18Reviewed-by: Jesper Wendel Devantier <j.devantier@samsung.com>
19Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
20---
21 hw/nvme/ctrl.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
25index 2097fb131..36a2846c3 100644
26--- a/hw/nvme/ctrl.c
27+++ b/hw/nvme/ctrl.c
28@@ -6862,7 +6862,7 @@ static uint16_t nvme_directive_receive(NvmeCtrl *n, NvmeRequest *req)
29 case NVME_DIRECTIVE_IDENTIFY:
30 switch (doper) {
31 case NVME_DIRECTIVE_RETURN_PARAMS:
32- if (ns->endgrp->fdp.enabled) {
33+ if (ns->endgrp && ns->endgrp->fdp.enabled) {
34 id.supported |= 1 << NVME_DIRECTIVE_DATA_PLACEMENT;
35 id.enabled |= 1 << NVME_DIRECTIVE_DATA_PLACEMENT;
36 id.persistent |= 1 << NVME_DIRECTIVE_DATA_PLACEMENT;
37--
382.42.0
39