app/proc-info: fix string copying to use strlcpy
PATCH 1/1 app/proc-info: fix string copying to use strlcpy
Replaced strncpy and strcpy with strlcpy. Also replaced snprintf with strlcpy where applicable. Using strlcpy is safe practice when copying strings, as it will include a null terminator.
Fixes 2deb6b5246d7 ("app/procinfo: add collectd format and host id")
Fixes 8a37f37fc243 ("app/procinfo: add --show-port")
Reported-by Reshma Pattan <[email protected]>
Signed-off-by Ciara Power <[email protected]>
--- app/proc-info/main.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
app/proc-info/main.c +19 -19
@@ -201,7 +201,7 @@ proc_info_preparse_args(int argc, char **argv)int err =gethostname (host_id,MAX_LONG_OPT_SZ -1 );if (err) -strcpy (host_id,"unknown" ); +strlcpy (host_id,"unknown" ,sizeof (host_id)); }return 0 ;
@@ -396,50 +396,50 @@ static void collectd_resolve_cnt_type(char *cnt_type, size_t cnt_type_len,if ((type_end !=NULL ) && (strncmp (cnt_name,"rx_" ,strlen ("rx_" )) ==0 )) {if (strncmp (type_end,"_errors" ,strlen ("_errors" )) ==0 ) -strncpy (cnt_type,"if_rx_errors" , cnt_type_len); +strlcpy (cnt_type,"if_rx_errors" , cnt_type_len);else if (strncmp (type_end,"_dropped" ,strlen ("_dropped" )) ==0 ) -strncpy (cnt_type,"if_rx_dropped" , cnt_type_len); +strlcpy (cnt_type,"if_rx_dropped" , cnt_type_len);else if (strncmp (type_end,"_bytes" ,strlen ("_bytes" )) ==0 ) -strncpy (cnt_type,"if_rx_octets" , cnt_type_len); +strlcpy (cnt_type,"if_rx_octets" , cnt_type_len);else if (strncmp (type_end,"_packets" ,strlen ("_packets" )) ==0 ) -strncpy (cnt_type,"if_rx_packets" , cnt_type_len); +strlcpy (cnt_type,"if_rx_packets" , cnt_type_len);else if (strncmp (type_end,"_placement" ,strlen ("_placement" )) ==0 ) -strncpy (cnt_type,"if_rx_errors" , cnt_type_len); +strlcpy (cnt_type,"if_rx_errors" , cnt_type_len);else if (strncmp (type_end,"_buff" ,strlen ("_buff" )) ==0 ) -strncpy (cnt_type,"if_rx_errors" , cnt_type_len); +strlcpy (cnt_type,"if_rx_errors" , cnt_type_len);else /* Does not fit obvious type: use a more generic one */ -strncpy (cnt_type,"derive" , cnt_type_len); +strlcpy (cnt_type,"derive" , cnt_type_len); }else if ((type_end !=NULL ) && (strncmp (cnt_name,"tx_" ,strlen ("tx_" ))) ==0 ) {if (strncmp (type_end,"_errors" ,strlen ("_errors" )) ==0 ) -strncpy (cnt_type,"if_tx_errors" , cnt_type_len); +strlcpy (cnt_type,"if_tx_errors" , cnt_type_len);else if (strncmp (type_end,"_dropped" ,strlen ("_dropped" )) ==0 ) -strncpy (cnt_type,"if_tx_dropped" , cnt_type_len); +strlcpy (cnt_type,"if_tx_dropped" , cnt_type_len);else if (strncmp (type_end,"_bytes" ,strlen ("_bytes" )) ==0 ) -strncpy (cnt_type,"if_tx_octets" , cnt_type_len); +strlcpy (cnt_type,"if_tx_octets" , cnt_type_len);else if (strncmp (type_end,"_packets" ,strlen ("_packets" )) ==0 ) -strncpy (cnt_type,"if_tx_packets" , cnt_type_len); +strlcpy (cnt_type,"if_tx_packets" , cnt_type_len);else /* Does not fit obvious type: use a more generic one */ -strncpy (cnt_type,"derive" , cnt_type_len); +strlcpy (cnt_type,"derive" , cnt_type_len); }else if ((type_end !=NULL ) && (strncmp (cnt_name,"flow_" ,strlen ("flow_" ))) ==0 ) {if (strncmp (type_end,"_filters" ,strlen ("_filters" )) ==0 ) -strncpy (cnt_type,"operations" , cnt_type_len); +strlcpy (cnt_type,"operations" , cnt_type_len);else if (strncmp (type_end,"_errors" ,strlen ("_errors" )) ==0 ) -strncpy (cnt_type,"errors" , cnt_type_len); +strlcpy (cnt_type,"errors" , cnt_type_len);else if (strncmp (type_end,"_filters" ,strlen ("_filters" )) ==0 ) -strncpy (cnt_type,"filter_result" , cnt_type_len); +strlcpy (cnt_type,"filter_result" , cnt_type_len); }else if ((type_end !=NULL ) && (strncmp (cnt_name,"mac_" ,strlen ("mac_" ))) ==0 ) {if (strncmp (type_end,"_errors" ,strlen ("_errors" )) ==0 ) -strncpy (cnt_type,"errors" , cnt_type_len); +strlcpy (cnt_type,"errors" , cnt_type_len); }else {/* Does not fit obvious type, or strrchr error: */ /* use a more generic type */ -strncpy (cnt_type,"derive" , cnt_type_len); +strlcpy (cnt_type,"derive" , cnt_type_len); } }
@@ -1321,7 +1321,7 @@ main(int argc, char **argv)if (ret)printf ("Error from rte_eal_cleanup(), %d\n" , ret); -snprintf (bdr_str,MAX_STRING_LEN ," " ); +strlcpy (bdr_str," " ,MAX_STRING_LEN );STATS_BDR_STR (50 , bdr_str);return 0 ;
Signature · 1 line
2.17.1
Quoted 9 lines · Ciara Power
Replaced strncpy and strcpy with strlcpy. Also replaced snprintf with strlcpy where applicable. Using strlcpy is safe practice when copying strings, as it will include a null terminator.
Quoted 5 lines
Fixes 2deb6b5246d7 ("app/procinfo: add collectd format and host id")Fixes 8a37f37fc243 ("app/procinfo: add --show-port")Reported-by Reshma Pattan <[email protected]>Signed-off-by Ciara Power <[email protected]>---
+1 for using strlcpy over strncpy
Acked-by Bruce Richardson <[email protected]>
David Marchand
AppliedQuoted 8 lines · Bruce Richardson
Quoted 6 lines · Ciara Power
Replaced strncpy and strcpy with strlcpy. Also replaced snprintf with strlcpy where applicable. Using strlcpy is safe practice when copying strings, as it will include a null terminator.
Quoted 8 lines
Quoted 7 lines
Fixes 2deb6b5246d7 ("app/procinfo: add collectd format and host id")Fixes 8a37f37fc243 ("app/procinfo: add --show-port")Reported-by Reshma Pattan <[email protected]>Signed-off-by Ciara Power <[email protected]>---
Acked-by Bruce Richardson <[email protected]>
Applied, thanks.
Signature · 1 line
David Marchand