mmc: sdio_cis: use strscpy() instead of strcpy() in cistpl_vers_1()
PATCH 1/1 mmc: sdio_cis: use strscpy() instead of strcpy() in cistpl_vers_1()
cistpl_vers_1() copies each NUL-terminated string out of the raw CIS TPLLV1_INFO data into a single kzalloc()'d blob shared by all of the strings, using strcpy() with no bound. The strings are already known to be well-formed within size bytes by the counting loop above, so this isn't currently exploitable, but strcpy()'s lack of any bound is still worth removing on general principle.
Track the end of the allocated string storage and use strscpy() with the remaining space as an explicit, always-safe bound instead.
No functional change.
--- drivers/mmc/core/sdio_cis.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mmc/core/sdio_cis.c +3 -2
@@ -27,7 +27,7 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func, {u8 major_rev, minor_rev;unsigned i, nr_strings; -char **buffer, *string; +char **buffer, *string, *string_end;if (size <2 )return 0 ;
@@ -57,10 +57,11 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,return -ENOMEM ; string = (char *)(buffer + nr_strings); + string_end = string + size;for (i =0 ; i < nr_strings; i++) { buffer[i] = string; -strcpy (string, buf); +strscpy (string, buf, string_end - string); string +=strlen (string) +1 ; buf +=strlen (buf) +1 ; }
Quoted 8 lines · Hrushiraj Gandhi
cistpl_vers_1()copies each NUL-terminated string out of the raw CISTPLLV1_INFOdata into a single kzalloc()'d blob shared by all of the strings, usingstrcpy()with no bound. The strings are already known to be well-formed withinsizebytes by the counting loop above, so this isn't currently exploitable, but strcpy()'s lack of any bound is still worth removing on general principle.
Quoted 6 lines
Track the end of the allocated string storage and use
strscpy()with the remaining space as an explicit, always-safe bound instead.No functional change.
Signed-off-by Hrushiraj Gandhi <[email protected]>
This doesn't apply on my next branch, please rebase and submit a new version.
Kind regards
Uffe
Quoted 30 lines
--- drivers/mmc/core/sdio_cis.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/mmc/core/sdio_cis.c +3
-2@@ -27,7 +27,7 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func, {u8 major_rev, minor_rev;unsigned i, nr_strings; -char **buffer, *string; +char **buffer, *string, *string_end;if (size <2 )return 0 ;@@ -57,10 +57,11 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,return -ENOMEM ; string = (char *)(buffer + nr_strings); + string_end = string + size;for (i =0 ; i < nr_strings; i++) { buffer[i] = string; -strcpy (string, buf); +strscpy (string, buf, string_end - string); string +=strlen (string) +1 ; buf +=strlen (buf) +1 ; }