]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ssb: sdio: Don't overwrite const buffer if block_write fails
authorMichael Buesch <m@bues.ch>
Sat, 15 May 2021 19:02:52 +0000 (21:02 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:22:31 +0000 (16:22 +0200)
commit 47ec636f7a25aa2549e198c48ecb6b1c25d05456 upstream.

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
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210515210252.318be2ba@wiggum
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/ssb/sdio.c

index 2278e43614bd13c3c0c34afaa81f9a20f944f586..5e10514ef80c17a58fc405466e8aa02582d6e244 100644 (file)
@@ -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;