lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: OMAP3: mmc-twl4030 fix name buffer length, v2

Browse Source 
Add 1 to buffer length for null terminator and use snprintf.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Adrian Hunter
2009-03-23 18:23:46 -07:00
committed by Tony Lindgren
parent b9d766c767
commit 8466032d86
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-omap2/mmc-twl4030.c
View File

@@ -59,7 +59,7 @@ static struct twl_mmc_controller {
struct omap_mmc_platform_data *mmc; struct omap_mmc_platform_data *mmc;
u8 twl_vmmc_dev_grp; u8 twl_vmmc_dev_grp;
u8 twl_mmc_dedicated; u8 twl_mmc_dedicated;
char name[HSMMC_NAME_LEN]; char name[HSMMC_NAME_LEN + 1];
} hsmmc[] = { } hsmmc[] = {
{ {
.twl_vmmc_dev_grp = VMMC1_DEV_GRP, .twl_vmmc_dev_grp = VMMC1_DEV_GRP,
@@ -349,7 +349,8 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
return; return;
} }
sprintf(twl->name, "mmc%islot%i", c->mmc, 1); snprintf(twl->name, ARRAY_SIZE(twl->name), "mmc%islot%i",
c->mmc, 1);
mmc->slots[0].name = twl->name; mmc->slots[0].name = twl->name;
mmc->nr_slots = 1; mmc->nr_slots = 1;
mmc->slots[0].ocr_mask = MMC_VDD_165_195 | mmc->slots[0].ocr_mask = MMC_VDD_165_195 |