projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0ac4f49
)
mmc: sdio: Check for CISTPL_VERS_1 buffer size
author
Pali Rohár
<pali@kernel.org>
Mon, 27 Jul 2020 13:38:34 +0000
(15:38 +0200)
committer
Ulf Hansson
<ulf.hansson@linaro.org>
Mon, 7 Sep 2020 07:11:28 +0000
(09:11 +0200)
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>
drivers/mmc/core/sdio_cis.c
patch
|
blob
|
history
diff --git
a/drivers/mmc/core/sdio_cis.c
b/drivers/mmc/core/sdio_cis.c
index
e065527
..
3efaa95
100644
(file)
--- 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;