From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-block@nongnu.org
Subject: [PATCH v7 00/17] hw/sd/sdcard: Fix CVE-2020-13253 & cleanups
Date: Tue, 30 Jun 2020 15:38:54 +0200 [thread overview]
Message-ID: <20200630133912.9428-1-f4bug@amsat.org> (raw)
Patches 5 & 6 fix CVE-2020-13253.
The rest are (accumulated) cleanups.
Since v6: Handle -ENOMEDIUM error
Since v5: Fix incorrect use of sd_addr_to_wpnum() in sd_reset()
Missing review:
[PATCH 01/15] MAINTAINERS: Cc qemu-block mailing list
[PATCH 03/15] hw/sd/sdcard: Move some definitions to use them
[PATCH 04/15] hw/sd/sdcard: Use the HWBLOCK_SIZE definition
[PATCH 05/15] hw/sd/sdcard: Do not switch to ReceivingData if
[PATCH 07/15] hw/sd/sdcard: Move sd->size initialization
[PATCH 08/15] hw/sd/sdcard: Call sd_addr_to_wpnum where used, consider zero size
[PATCH 09/15] hw/sd/sdcard: Special case the -ENOMEDIUM error
[PATCH 10/15] hw/sd/sdcard: Check address is in range
[PATCH 14/15] hw/sd/sdcard: Make iolen unsigned
[PATCH 15/15] hw/sd/sdcard: Correctly display the command name in trace
$ git backport-diff -u v6
$ git backport-diff -u sd_cve_2020_13253-v6 -r origin/master..
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/17:[----] [--] 'MAINTAINERS: Cc qemu-block mailing list'
002/17:[----] [--] 'hw/sd/sdcard: Update coding style to make checkpatch.pl happy'
003/17:[----] [--] 'hw/sd/sdcard: Move some definitions to use them earlier'
004/17:[----] [--] 'hw/sd/sdcard: Use the HWBLOCK_SIZE definition'
005/17:[----] [--] 'hw/sd/sdcard: Do not switch to ReceivingData if address is invalid'
006/17:[----] [--] 'hw/sd/sdcard: Restrict Class 6 commands to SCSD cards'
007/17:[down] 'hw/sd/sdcard: Move sd->size initialization'
008/17:[down] 'hw/sd/sdcard: Call sd_addr_to_wpnum where it is used, consider zero size'
009/17:[down] 'hw/sd/sdcard: Special case the -ENOMEDIUM error'
010/17:[0004] [FC] 'hw/sd/sdcard: Check address is in range'
011/17:[----] [--] 'hw/sd/sdcard: Update the SDState documentation'
012/17:[----] [--] 'hw/sd/sdcard: Simplify cmd_valid_while_locked()'
013/17:[----] [--] 'hw/sd/sdcard: Constify sd_crc*()'s message argument'
014/17:[----] [--] 'hw/sd/sdcard: Make iolen unsigned'
015/17:[----] [--] 'hw/sd/sdcard: Correctly display the command name in trace events'
016/17:[----] [--] 'hw/sd/sdcard: Display offset in read/write_data() trace events'
017/17:[----] [--] 'hw/sd/sdcard: Simplify realize() a bit'
Philippe Mathieu-Daudé (17):
MAINTAINERS: Cc qemu-block mailing list
hw/sd/sdcard: Update coding style to make checkpatch.pl happy
hw/sd/sdcard: Move some definitions to use them earlier
hw/sd/sdcard: Use the HWBLOCK_SIZE definition
hw/sd/sdcard: Do not switch to ReceivingData if address is invalid
hw/sd/sdcard: Restrict Class 6 commands to SCSD cards
hw/sd/sdcard: Move sd->size initialization
hw/sd/sdcard: Call sd_addr_to_wpnum where it is used, consider zero
size
hw/sd/sdcard: Special case the -ENOMEDIUM error
hw/sd/sdcard: Check address is in range
hw/sd/sdcard: Update the SDState documentation
hw/sd/sdcard: Simplify cmd_valid_while_locked()
hw/sd/sdcard: Constify sd_crc*()'s message argument
hw/sd/sdcard: Make iolen unsigned
hw/sd/sdcard: Correctly display the command name in trace events
hw/sd/sdcard: Display offset in read/write_data() trace events
hw/sd/sdcard: Simplify realize() a bit
hw/sd/sd.c | 189 +++++++++++++++++++++++++++++----------------
MAINTAINERS | 1 +
hw/sd/trace-events | 4 +-
3 files changed, 124 insertions(+), 70 deletions(-)
--
2.21.3
next reply other threads:[~2020-06-30 13:40 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 13:38 Philippe Mathieu-Daudé [this message]
2020-06-30 13:38 ` [PATCH v7 01/17] MAINTAINERS: Cc qemu-block mailing list Philippe Mathieu-Daudé
2020-07-03 13:29 ` Peter Maydell
2020-06-30 13:38 ` [PATCH v7 02/17] hw/sd/sdcard: Update coding style to make checkpatch.pl happy Philippe Mathieu-Daudé
2020-07-06 16:24 ` Alistair Francis
2020-06-30 13:38 ` [PATCH v7 03/17] hw/sd/sdcard: Move some definitions to use them earlier Philippe Mathieu-Daudé
2020-07-03 13:08 ` Peter Maydell
2020-06-30 13:38 ` [PATCH v7 04/17] hw/sd/sdcard: Use the HWBLOCK_SIZE definition Philippe Mathieu-Daudé
2020-07-03 13:11 ` Peter Maydell
2020-06-30 13:38 ` [PATCH v7 05/17] hw/sd/sdcard: Do not switch to ReceivingData if address is invalid Philippe Mathieu-Daudé
2020-07-03 13:12 ` Peter Maydell
2020-07-06 16:26 ` Alistair Francis
2020-07-07 8:30 ` Philippe Mathieu-Daudé
2020-07-07 10:24 ` Philippe Mathieu-Daudé
2020-07-07 10:34 ` Philippe Mathieu-Daudé
2020-06-30 13:39 ` [PATCH v7 06/17] hw/sd/sdcard: Restrict Class 6 commands to SCSD cards Philippe Mathieu-Daudé
2020-07-06 16:27 ` Alistair Francis
2020-06-30 13:39 ` [PATCH v7 07/17] hw/sd/sdcard: Move sd->size initialization Philippe Mathieu-Daudé
2020-07-03 13:13 ` Peter Maydell
2020-06-30 13:39 ` [PATCH v7 08/17] hw/sd/sdcard: Call sd_addr_to_wpnum where it is used, consider zero size Philippe Mathieu-Daudé
2020-07-03 13:15 ` Peter Maydell
2020-06-30 13:39 ` [PATCH v7 09/17] hw/sd/sdcard: Special case the -ENOMEDIUM error Philippe Mathieu-Daudé
2020-07-03 13:23 ` Peter Maydell
2020-07-03 15:16 ` Philippe Mathieu-Daudé
2020-07-03 23:42 ` Philippe Mathieu-Daudé
2020-07-04 22:10 ` Philippe Mathieu-Daudé
2020-07-04 22:18 ` Philippe Mathieu-Daudé
2020-07-04 22:26 ` Philippe Mathieu-Daudé
2020-07-05 17:33 ` Philippe Mathieu-Daudé
2020-07-06 5:52 ` Markus Armbruster
2020-07-06 9:15 ` Peter Maydell
2020-06-30 13:39 ` [PATCH v7 10/17] hw/sd/sdcard: Check address is in range Philippe Mathieu-Daudé
2020-07-03 13:23 ` Peter Maydell
2020-06-30 13:39 ` [PATCH v7 11/17] hw/sd/sdcard: Update the SDState documentation Philippe Mathieu-Daudé
2020-07-06 16:28 ` Alistair Francis
2020-06-30 13:39 ` [PATCH v7 12/17] hw/sd/sdcard: Simplify cmd_valid_while_locked() Philippe Mathieu-Daudé
2020-07-06 16:30 ` Alistair Francis
2020-06-30 13:39 ` [PATCH v7 13/17] hw/sd/sdcard: Constify sd_crc*()'s message argument Philippe Mathieu-Daudé
2020-07-03 13:24 ` Peter Maydell
2020-06-30 13:39 ` [PATCH v7 14/17] hw/sd/sdcard: Make iolen unsigned Philippe Mathieu-Daudé
2020-07-03 13:25 ` Peter Maydell
2020-07-06 16:32 ` Alistair Francis
2020-06-30 13:39 ` [PATCH v7 15/17] hw/sd/sdcard: Correctly display the command name in trace events Philippe Mathieu-Daudé
2020-07-03 13:28 ` Peter Maydell
2020-07-03 15:09 ` Philippe Mathieu-Daudé
2020-06-30 13:39 ` [PATCH v7 16/17] hw/sd/sdcard: Display offset in read/write_data() " Philippe Mathieu-Daudé
2020-07-06 16:33 ` Alistair Francis
2020-06-30 13:39 ` [PATCH v7 17/17] hw/sd/sdcard: Simplify realize() a bit Philippe Mathieu-Daudé
2020-07-06 16:34 ` Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200630133912.9428-1-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).