[PATCH] drivers/ssb/sdio: Don't overwrite const buffer if block_write fails

[PATCH] drivers/ssb/sdio: Don't overwrite const buffer if block_write fails

[Michael Büsch]

[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]

It doesn't make sense to clobber the const driver-side buffer, if a
write-to-device attempt failed. All other SSB variants (PCI, PCMCIA and SoC)
also don't corrupt the buffer on any failure in block_write.
Therefore, remove this memset from the SDIO variant.

Signed-off-by: Michael Büsch <m@bues.ch>
Cc: stable@vger.kernel.org

---


This memset has been introduced by the original patch that added SDIO support to SSB:
24ea602e183ca
Better late than never.

This change is only build tested, because I don't own the hardware.
But to me this change looks reasonable.


diff --git a/drivers/ssb/sdio.c b/drivers/ssb/sdio.c
index 7fe0afb42234..66c5c2169704 100644
--- a/drivers/ssb/sdio.c
+++ b/drivers/ssb/sdio.c
@@ -411,7 +411,6 @@ static void ssb_sdio_block_write(struct ssb_device *dev, const void *buffer,
 	sdio_claim_host(bus->host_sdio);
 	if (unlikely(ssb_sdio_switch_core(bus, dev))) {
 		error = -EIO;
-		memset((void *)buffer, 0xff, count);
 		goto err_out;
 	}
 	offset |= bus->sdio_sbaddr & 0xffff;


-- 
Michael

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: ssb: sdio: Don't overwrite const buffer if block_write fails

[Kalle Valo]

Michael Büsch <m@bues.ch> wrote:

> It doesn't make sense to clobber the const driver-side buffer, if a
> write-to-device attempt failed. All other SSB variants (PCI, PCMCIA and SoC)
> also don't corrupt the buffer on any failure in block_write.
> Therefore, remove this memset from the SDIO variant.
> 
> Signed-off-by: Michael Büsch <m@bues.ch>
> Cc: stable@vger.kernel.org

Patch applied to wireless-drivers-next.git, thanks.

47ec636f7a25 ssb: sdio: Don't overwrite const buffer if block_write fails

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20210515210252.318be2ba@wiggum/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches