From: David Laight <[email protected]> The length of nullname is known (and used for the kmalloc) so use memcpy() instead of strcpy() to copy it into place.
Use strscpy() and the length it returns to copy over the names. Signed-off-by: David Laight <[email protected]> --- This is one of a group of patches that remove potentially unbounded strcpy() calls. They are mostly replaced by strscpy() or, when strlen() has just been called, with memcpy() (usually including the '\0'). Calls with copy string literals into arrays are left unchanged. They are safe and easily detected as such. The changes were made by getting the compiler to detect the calls and then fixing the code by hand. Note that all the changes are only compile tested. Some Makefiles were changed to allow files to contain strcpy(). As well as 'difficult to fix' files, this included 'show' functions as they really need to use sysfs_emit() or seq_printf(). All the patches are being sent individually to avoid very long cc lists. Apologies for the terse commit messages and likely unexpected tags. (There are about 100 patches in total.) drivers/mtd/parsers/redboot.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/parsers/redboot.c b/drivers/mtd/parsers/redboot.c index bf162c44eafe..e1e280b5fa40 100644 --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c @@ -249,7 +249,7 @@ static int parse_redboot_partitions(struct mtd_info *master, nullname = (char *)&parts[nrparts]; #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED if (nulllen > 0) - strcpy(nullname, nullstring); + memcpy(nullname, nullstring, nulllen); #endif names = nullname + nulllen; @@ -264,11 +264,13 @@ static int parse_redboot_partitions(struct mtd_info *master, } #endif for ( ; i < nrparts; i++) { + int len; parts[i].size = fl->img->size; parts[i].offset = fl->img->flash_base; parts[i].name = names; - strcpy(names, fl->img->name); + len = strscpy(names, fl->img->name, namelen); + BUG_ON(len < 0); #ifdef CONFIG_MTD_REDBOOT_PARTS_READONLY if (!strcmp(names, "RedBoot") || !strcmp(names, "RedBoot config") || @@ -276,7 +278,8 @@ static int parse_redboot_partitions(struct mtd_info *master, parts[i].mask_flags = MTD_WRITEABLE; } #endif - names += strlen(names) + 1; + names += len + 1; + namelen -= len + 1; #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED if (fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) { -- 2.39.5
