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