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