diff options
| author |  Pali Rohár <pali@kernel.org>
| 2020-07-27 15:38:34 +0200 |
|---|---|---|
| committer |  Ulf Hansson <ulf.hansson@linaro.org>
| 2020-09-07 09:11:28 +0200 |
| commit | 8ebe2607965d3e2dc02029e8c7dd35fbe508ffd0 (patch) | |
| tree | fc7fb139d344cbf1daf86c434f38b2179d23688d | |
| parent | mmc: sdhci-esdhc-imx: Reset before sending tuning command for manual tuning (diff) | |
| download | linux-8ebe2607965d3e2dc02029e8c7dd35fbe508ffd0.tar.gz linux-8ebe2607965d3e2dc02029e8c7dd35fbe508ffd0.tar.bz2 linux-8ebe2607965d3e2dc02029e8c7dd35fbe508ffd0.zip | |
mmc: sdio: Check for CISTPL_VERS_1 buffer size
Before parsing CISTPL_VERS_1 structure check that its size is at least two
bytes to prevent buffer overflow.
Signed-off-by: Pali Rohár <pali@kernel.org>
Link: https://lore.kernel.org/r/20200727133837.19086-2-pali@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
| -rw-r--r-- | drivers/mmc/core/sdio_cis.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c index e0655278c5c3..3efaa9534a77 100644 --- a/drivers/mmc/core/sdio_cis.c +++ b/drivers/mmc/core/sdio_cis.c @@ -26,6 +26,9 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func, unsigned i, nr_strings; char **buffer, *string; + if (size < 2) + return 0; + /* Find all null-terminated (including zero length) strings in the TPLLV1_INFO field. Trailing garbage is ignored. */ buf += 2; |