colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toradex: tdx-cfg-block: use only snprintf

Browse Source 
Prevent memory issues that could appear with sprintf. Replace all
sprintf occurences with snprintf.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
This commit is contained in:
Philippe Schenker
2022-06-13 19:35:21 +02:00
committed by Tom Rini
parent e0392596e9
commit 39ff0624bc
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
board/toradex/common/tdx-common.c
View File

@@ -89,8 +89,10 @@ int show_board_info(void)
tdx_eth_addr.nic = htonl(tdx_serial << 8); tdx_eth_addr.nic = htonl(tdx_serial << 8);
checkboard(); checkboard();
} else { } else {
sprintf(tdx_serial_str, "%08u", tdx_serial); snprintf(tdx_serial_str, sizeof(tdx_serial_str),
sprintf(tdx_board_rev_str, "V%1d.%1d%c", "%08u", tdx_serial);
snprintf(tdx_board_rev_str, sizeof(tdx_board_rev_str),
"V%1d.%1d%c",
tdx_hw_tag.ver_major, tdx_hw_tag.ver_major,
tdx_hw_tag.ver_minor, tdx_hw_tag.ver_minor,
(char)tdx_hw_tag.ver_assembly + 'A'); (char)tdx_hw_tag.ver_assembly + 'A');
@@ -109,12 +111,13 @@ int show_board_info(void)
tdx_carrier_board_name = (char *) tdx_carrier_board_name = (char *)
toradex_carrier_boards[tdx_car_hw_tag.prodid]; toradex_carrier_boards[tdx_car_hw_tag.prodid];
sprintf(tdx_car_serial_str, "%08u", tdx_car_serial); snprintf(tdx_car_serial_str, sizeof(tdx_car_serial_str),
sprintf(tdx_car_rev_str, "V%1d.%1d%c", "%08u", tdx_car_serial);
snprintf(tdx_car_rev_str, sizeof(tdx_car_rev_str),
"V%1d.%1d%c",
tdx_car_hw_tag.ver_major, tdx_car_hw_tag.ver_major,
tdx_car_hw_tag.ver_minor, tdx_car_hw_tag.ver_minor,
(char)tdx_car_hw_tag.ver_assembly + (char)tdx_car_hw_tag.ver_assembly + 'A');
'A');
env_set("carrier_serial#", tdx_car_serial_str); env_set("carrier_serial#", tdx_car_serial_str);
printf("Carrier: Toradex %s %s, Serial# %s\n", printf("Carrier: Toradex %s %s, Serial# %s\n",
@@ -170,7 +173,7 @@ int ft_common_board_setup(void *blob, struct bd_info *bd)
if (tdx_hw_tag.ver_major) { if (tdx_hw_tag.ver_major) {
char prod_id[5]; char prod_id[5];
sprintf(prod_id, "%04u", tdx_hw_tag.prodid); snprintf(prod_id, sizeof(prod_id), "%04u", tdx_hw_tag.prodid);
fdt_setprop(blob, 0, "toradex,product-id", prod_id, 5); fdt_setprop(blob, 0, "toradex,product-id", prod_id, 5);
fdt_setprop(blob, 0, "toradex,board-rev", tdx_board_rev_str, fdt_setprop(blob, 0, "toradex,board-rev", tdx_board_rev_str,