2021-05-16 09:03:35

by Michael Büsch

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

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 <[email protected]>
Cc: [email protected]

---


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


Attachments:
(No filename) (849.00 B)
OpenPGP digital signature

2021-06-15 10:13:03

by Kalle Valo

[permalink] [raw]
Subject: Re: ssb: sdio: Don't overwrite const buffer if block_write fails

Michael Büsch <[email protected]> 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 <[email protected]>
> Cc: [email protected]

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/[email protected]/

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