mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-02 23:44:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "KW fix: replaced sprintf with snprintf"

Browse source
This commit is contained in:
Linux Build Service Account 2018-03-22 00:03:13 -07:00 • committed by Gerrit - the friendly Code Review server
commit a660845646
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
board/qca/arm/common/cmd_bootqca.c
View file

@ -365,13 +365,16 @@ int config_select(unsigned int addr, char *rcmd, int rcmd_size)
return -1;
}
sprintf((char *)dtb_config_name, "%s", config);
snprintf((char *)dtb_config_name,
sizeof(dtb_config_name), "%s", config);
ipq_smem_get_socinfo_version((uint32_t *)&soc_version);
if(SOCINFO_VERSION_MAJOR(soc_version) >= 2) {
sprintf(dtb_config_name + strlen("config@"), "v%d.0-%s",
SOCINFO_VERSION_MAJOR(soc_version),
config + strlen("config@"));
snprintf(dtb_config_name + strlen("config@"),
sizeof(dtb_config_name) - strlen("config@"),
"v%d.0-%s",
SOCINFO_VERSION_MAJOR(soc_version),
config + strlen("config@"));
}
}
@ -417,7 +420,8 @@ static int do_boot_signedimg(cmd_tbl_t *cmdtp, int flag, int argc, char *const a
if (debug) {
printf("Using nand device %d\n", CONFIG_SPI_FLASH_INFO_IDX);
}
sprintf(runcmd, "nand device %d", CONFIG_SPI_FLASH_INFO_IDX);
snprintf(runcmd, sizeof(runcmd),
"nand device %d", CONFIG_SPI_FLASH_INFO_IDX);
run_command(runcmd, 0);
} else if (sfi->flash_type == SMEM_BOOT_NAND_FLASH) {

4
board/qca/arm/ipq807x/ipq807x.c
View file

@ -540,7 +540,7 @@ void board_pci_init(int id)
int node, gpio_node;
char name[16];
sprintf(name, "pci%d", id);
snprintf(name, sizeof(name), "pci%d", id);
node = fdt_path_offset(gd->fdt_blob, name);
if (node < 0) {
printf("Could not find PCI in device tree\n");
@ -562,7 +562,7 @@ void board_pci_deinit()
struct fdt_resource pci_phy;
for (i = 0; i < PCI_MAX_DEVICES; i++) {
sprintf(name, "pci%d", i);
snprintf(name, sizeof(name), "pci%d", i);
node = fdt_path_offset(gd->fdt_blob, name);
if (node < 0) {
printf("Could not find PCI in device tree\n");