From: Peter Maydell Date: Mon, 22 Mar 2021 18:50:25 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/philmd/tags/sdmmc-20210322' into staging X-Git-Tag: v6.0.0-rc0~9 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5ca634afcf83215a9a54ca6e66032325b5ffb5f6;p=users%2Fdwmw2%2Fqemu.git Merge remote-tracking branch 'remotes/philmd/tags/sdmmc-20210322' into staging 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) # gpg: Signature made Mon 22 Mar 2021 17:13:43 GMT # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) " [full] # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * remotes/philmd/tags/sdmmc-20210322: hw/sd: sdhci: Reset the data pointer of s->fifo_buffer[] when a different block size is programmed hw/sd: sdhci: Limit block size only when SDHC_BLKSIZE register is writable hw/sd: sdhci: Correctly set the controller status for ADMA hw/sd: sdhci: Don't write to SDHC_SYSAD register when transfer is in progress hw/sd: sdhci: Don't transfer any data when command time out hw/sd: sd: Actually perform the erase operation hw/sd: sd: Fix build error when DEBUG_SD is on Signed-off-by: Peter Maydell --- 5ca634afcf83215a9a54ca6e66032325b5ffb5f6