diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2021-3409_4.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2021-3409_4.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_4.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_4.patch deleted file mode 100644 index d5be99759d..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_4.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | From b672bcaf5522294a4d8de3e88e0932d55585ee3b Mon Sep 17 00:00:00 2001 | ||
2 | From: Bin Meng <bmeng.cn@gmail.com> | ||
3 | Date: Wed, 3 Mar 2021 20:26:37 +0800 | ||
4 | Subject: [PATCH 4/6] hw/sd: sdhci: Correctly set the controller status for | ||
5 | ADMA | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | When an ADMA transfer is started, the codes forget to set the | ||
11 | controller status to indicate a transfer is in progress. | ||
12 | |||
13 | With this fix, the following 2 reproducers: | ||
14 | |||
15 | https://paste.debian.net/plain/1185136 | ||
16 | https://paste.debian.net/plain/1185141 | ||
17 | |||
18 | cannot be reproduced with the following QEMU command line: | ||
19 | |||
20 | $ qemu-system-x86_64 -nographic -machine accel=qtest -m 512M \ | ||
21 | -nodefaults -device sdhci-pci,sd-spec-version=3 \ | ||
22 | -drive if=sd,index=0,file=null-co://,format=raw,id=mydrive \ | ||
23 | -device sd-card,drive=mydrive -qtest stdio | ||
24 | |||
25 | Cc: qemu-stable@nongnu.org | ||
26 | Fixes: CVE-2020-17380 | ||
27 | Fixes: CVE-2020-25085 | ||
28 | Fixes: CVE-2021-3409 | ||
29 | Fixes: d7dfca0807a0 ("hw/sdhci: introduce standard SD host controller") | ||
30 | Reported-by: Alexander Bulekov <alxndr@bu.edu> | ||
31 | Reported-by: Cornelius Aschermann (Ruhr-Universität Bochum) | ||
32 | Reported-by: Sergej Schumilo (Ruhr-Universität Bochum) | ||
33 | Reported-by: Simon Wörner (Ruhr-Universität Bochum) | ||
34 | Buglink: https://bugs.launchpad.net/qemu/+bug/1892960 | ||
35 | Buglink: https://bugs.launchpad.net/qemu/+bug/1909418 | ||
36 | Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1928146 | ||
37 | Tested-by: Alexander Bulekov <alxndr@bu.edu> | ||
38 | Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> | ||
39 | Signed-off-by: Bin Meng <bmeng.cn@gmail.com> | ||
40 | Message-Id: <20210303122639.20004-4-bmeng.cn@gmail.com> | ||
41 | Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> | ||
42 | |||
43 | Upstream-Status: Backport [bc6f28995ff88f5d82c38afcfd65406f0ae375aa] | ||
44 | CVE: CVE-2021-3409 | ||
45 | |||
46 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | ||
47 | --- | ||
48 | hw/sd/sdhci.c | 3 +++ | ||
49 | 1 file changed, 3 insertions(+) | ||
50 | |||
51 | diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c | ||
52 | index d8a46f307..7de03c6dd 100644 | ||
53 | --- a/hw/sd/sdhci.c | ||
54 | +++ b/hw/sd/sdhci.c | ||
55 | @@ -768,7 +768,9 @@ static void sdhci_do_adma(SDHCIState *s) | ||
56 | |||
57 | switch (dscr.attr & SDHC_ADMA_ATTR_ACT_MASK) { | ||
58 | case SDHC_ADMA_ATTR_ACT_TRAN: /* data transfer */ | ||
59 | + s->prnsts |= SDHC_DATA_INHIBIT | SDHC_DAT_LINE_ACTIVE; | ||
60 | if (s->trnmod & SDHC_TRNS_READ) { | ||
61 | + s->prnsts |= SDHC_DOING_READ; | ||
62 | while (length) { | ||
63 | if (s->data_count == 0) { | ||
64 | sdbus_read_data(&s->sdbus, s->fifo_buffer, block_size); | ||
65 | @@ -796,6 +798,7 @@ static void sdhci_do_adma(SDHCIState *s) | ||
66 | } | ||
67 | } | ||
68 | } else { | ||
69 | + s->prnsts |= SDHC_DOING_WRITE; | ||
70 | while (length) { | ||
71 | begin = s->data_count; | ||
72 | if ((length + begin) < block_size) { | ||
73 | -- | ||
74 | 2.29.2 | ||
75 | |||