raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

mmc: sdio: Check for CISTPL_VERS_1 buffer size

Browse Source 
[ Upstream commit 8ebe260796 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Pali Rohár
2020-07-27 15:38:34 +02:00
committed by Greg Kroah-Hartman
parent ec650318eb
commit fa0a1c79c0
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mmc/core/sdio_cis.c
View File

@@ -26,6 +26,9 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,
unsigned i, nr_strings; unsigned i, nr_strings;
char **buffer, *string; char **buffer, *string;
if (size < 2)
return 0;
/* Find all null-terminated (including zero length) strings in /* Find all null-terminated (including zero length) strings in
the TPLLV1_INFO field. Trailing garbage is ignored. */ the TPLLV1_INFO field. Trailing garbage is ignored. */
buf += 2; buf += 2;