]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: mmc_spi: drop buggy snprintf()
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tue, 8 Oct 2024 16:01:34 +0000 (18:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 09:59:31 +0000 (10:59 +0100)
[ Upstream commit 328bda09cc91b3d93bc64f4a4dadc44313dd8140 ]

GCC 13 complains about the truncated output of snprintf():

drivers/mmc/host/mmc_spi.c: In function ‘mmc_spi_response_get’:
drivers/mmc/host/mmc_spi.c:227:64: error: ‘snprintf’ output may be truncated before the last format character [-Werror=format-truncation=]
  227 |         snprintf(tag, sizeof(tag), "  ... CMD%d response SPI_%s",
      |                                                                ^
drivers/mmc/host/mmc_spi.c:227:9: note: ‘snprintf’ output between 26 and 43 bytes into a destination of size 32
  227 |         snprintf(tag, sizeof(tag), "  ... CMD%d response SPI_%s",
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  228 |                 cmd->opcode, maptype(cmd));

Drop it and fold the string it generates into the only place where it's
emitted - the dev_dbg() call at the end of the function.

Fixes: 15a0580ced08 ("mmc_spi host driver")
Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Link: https://lore.kernel.org/r/20241008160134.69934-1-brgl@bgdev.pl
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mmc/host/mmc_spi.c

index 24795454d106617e6614656b4a9d4fa4b85b095f..008a47842de0ae3c4db1131de4c02f9fcfd6adeb 100644 (file)
@@ -269,10 +269,6 @@ static int mmc_spi_response_get(struct mmc_spi_host *host,
        u8      leftover = 0;
        unsigned short rotator;
        int     i;
-       char    tag[32];
-
-       snprintf(tag, sizeof(tag), "  ... CMD%d response SPI_%s",
-               cmd->opcode, maptype(cmd));
 
        /* Except for data block reads, the whole response will already
         * be stored in the scratch buffer.  It's somewhere after the
@@ -422,8 +418,9 @@ checkstatus:
        }
 
        if (value < 0)
-               dev_dbg(&host->spi->dev, "%s: resp %04x %08x\n",
-                       tag, cmd->resp[0], cmd->resp[1]);
+               dev_dbg(&host->spi->dev,
+                       "  ... CMD%d response SPI_%s: resp %04x %08x\n",
+                       cmd->opcode, maptype(cmd), cmd->resp[0], cmd->resp[1]);
 
        /* disable chipselect on errors and some success cases */
        if (value >= 0 && cs_on)