[PULL 0/7] SD/MMC patches for 2021-03-21

Philippe Mathieu-Daudé posted 7 patches 3 years ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210322171610.4183696-1-f4bug@amsat.org
hw/sd/sd.c    | 23 +++++++++++++---------
hw/sd/sdhci.c | 53 ++++++++++++++++++++++++++++++++++-----------------
2 files changed, 50 insertions(+), 26 deletions(-)
[PULL 0/7] SD/MMC patches for 2021-03-21
Posted by Philippe Mathieu-Daudé 3 years ago
The following changes since commit b184750926812cb78ac0caf4c4b2b13683b5bde3:

  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2021-03-22 11:24:55 +0000)

are available in the Git repository at:

  https://github.com/philmd/qemu.git tags/sdmmc-20210322

for you to fetch changes up to cffb446e8fd19a14e1634c7a3a8b07be3f01d5c9:

  hw/sd: sdhci: Reset the data pointer of s->fifo_buffer[] when a different block size is programmed (2021-03-22 16:56:22 +0100)

----------------------------------------------------------------
SD/MMC patches queue

- Fix build error when DEBUG_SD is on
- Perform SD ERASE operation
- SDHCI ADMA heap buffer overflow
  (CVE-2020-17380, CVE-2020-25085, CVE-2021-3409)
----------------------------------------------------------------

Bin Meng (7):
  hw/sd: sd: Fix build error when DEBUG_SD is on
  hw/sd: sd: Actually perform the erase operation
  hw/sd: sdhci: Don't transfer any data when command time out
  hw/sd: sdhci: Don't write to SDHC_SYSAD register when transfer is in
    progress
  hw/sd: sdhci: Correctly set the controller status for ADMA
  hw/sd: sdhci: Limit block size only when SDHC_BLKSIZE register is
    writable
  hw/sd: sdhci: Reset the data pointer of s->fifo_buffer[] when a
    different block size is programmed

 hw/sd/sd.c    | 23 +++++++++++++---------
 hw/sd/sdhci.c | 53 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 50 insertions(+), 26 deletions(-)

-- 
2.26.2

Re: [PULL 0/7] SD/MMC patches for 2021-03-21
Posted by Peter Maydell 3 years ago
On Mon, 22 Mar 2021 at 17:23, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> The following changes since commit b184750926812cb78ac0caf4c4b2b13683b5bde3:
>
>   Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2021-03-22 11:24:55 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/philmd/qemu.git tags/sdmmc-20210322
>
> for you to fetch changes up to cffb446e8fd19a14e1634c7a3a8b07be3f01d5c9:
>
>   hw/sd: sdhci: Reset the data pointer of s->fifo_buffer[] when a different block size is programmed (2021-03-22 16:56:22 +0100)
>
> ----------------------------------------------------------------
> SD/MMC patches queue
>
> - Fix build error when DEBUG_SD is on
> - Perform SD ERASE operation
> - SDHCI ADMA heap buffer overflow
>   (CVE-2020-17380, CVE-2020-25085, CVE-2021-3409)


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.

-- PMM