d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CID 1204394: Use strncpy(3) instead of strcpy(3). Note that it's

Browse Source 
ok to not have the name and type strings terminated.
This commit is contained in:
Marcel Moolenaar 2014-05-21 17:38:56 +00:00
parent 645c72194e
commit adc991ea42
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=266513
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/mkimg/apm.c
View File

@ -86,8 +86,8 @@ apm_write(lba_t imgsz, void *bootcode __unused)
be32enc(&ent->ent_pmblkcnt, nparts + 1);
be32enc(&ent->ent_start, 1);
be32enc(&ent->ent_size, nparts + 1);
strcpy(ent->ent_type, APM_ENT_TYPE_SELF);
strcpy(ent->ent_name, "Apple");
strncpy(ent->ent_type, APM_ENT_TYPE_SELF, sizeof(ent->ent_type));
strncpy(ent->ent_name, "Apple", sizeof(ent->ent_name));
STAILQ_FOREACH(part, &partlist, link) {
ent = (void *)(buf + (part->index + 2) * secsz);
@ -95,9 +95,11 @@ apm_write(lba_t imgsz, void *bootcode __unused)
be32enc(&ent->ent_pmblkcnt, nparts + 1);
be32enc(&ent->ent_start, part->block);
be32enc(&ent->ent_size, part->size);
strcpy(ent->ent_type, ALIAS_TYPE2PTR(part->type));
strncpy(ent->ent_type, ALIAS_TYPE2PTR(part->type),
sizeof(ent->ent_type));
if (part->label != NULL)
strcpy(ent->ent_name, part->label);
strncpy(ent->ent_name, part->label,
sizeof(ent->ent_name));
}
error = image_write(0, buf, nparts + 2);