tools/libs/stat: use memcpy instead of strncpy in getBridge
PATCH v3 1/2 tools/libs/stat: use memcpy instead of strncpy in getBridge
Use memcpy in getBridge to prevent gcc warnings about truncated strings. We know that we might truncate it, so the gcc warning here is wrong.
Revert previous change changing buffer sizes as bigger buffers are not needed.
---
Changes in v3:
Do a memset 0 on destination buffer and use MIN between string length and resultLen - 1.
Changes in v2:
Use MIN between string length of de->d_name and resultLen to copy only the minimum size required and prevent crossing to from an unallocated space.
--- tools/libs/stat/xenstat_linux.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
tools/libs/stat/xenstat_linux.c +10 -3
@@ -29,6 +29,7 @@#include <string.h> #include <unistd.h> #include <regex.h> +#include <xen-tools/libs.h> #include "xenstat_priv.h"
@@ -78,8 +79,14 @@ static void getBridge(char *excludeName, char *result, size_t resultLen)sprintf (tmp,"/sys/class/net/%s/bridge" , de->d_name);if (access (tmp,F_OK ) ==0 ) { -strncpy (result, de->d_name, resultLen); - result[resultLen -1 ] =0 ; +/* +* Do not use strncpy to prevent compiler warning with +* gcc >= 10.0 +* If de->d_name is longer then resultLen we truncate it +*/ +memset (result,0 , resultLen); +memcpy (result, de->d_name,MIN (strnlen (de->d_name, +NAME_MAX ),resultLen -1 )); } } }
@@ -264,7 +271,7 @@ int xenstat_collect_networks(xenstat_node * node) {/* Helper variables for parseNetDevLine() function defined above */ int i; -char line[512 ] = {0 }, iface[16 ] = {0 }, devBridge[256 ] = {0 }, devNoBridge[257 ] = {0 }; +char line[512 ] = {0 }, iface[16 ] = {0 }, devBridge[16 ] = {0 }, devNoBridge[17 ] = {0 };unsigned long long rxBytes, rxPackets, rxErrs, rxDrops, txBytes, txPackets, txErrs, txDrops;struct priv_data *priv =get_priv_data (node->handle);
Signature · 1 line
2.17.1
PATCH v3 2/2 tool/libs/light: Fix libxenlight gcc warning
Fix gcc10 compilation warning about uninitialized variable by setting it to 0.
---
Changes in v3: Rebase
--- tools/libs/light/libxl_mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/libs/light/libxl_mem.c +1 -1
@@ -562,7 +562,7 @@ out:int libxl_get_free_memory_0x040700 (libxl_ctx *ctx,uint32_t *memkb) { -uint64_t my_memkb; +uint64_t my_memkb =0 ;int rc; rc =libxl_get_free_memory (ctx, &my_memkb);
Signature · 1 line
2.17.1
Wei Liu
AppliedRe: [PATCH v3 2/2] tool/libs/light: Fix libxenlight gcc warning
Quoted 4 lines · Bertrand Marquis
Fix gcc10 compilation warning about uninitialized variable by setting it to 0.
Signed-off-by Bertrand Marquis <[email protected]>
Applied.
Hi,
Could this be reviewed so that gcc10 issues are fixed ?
Thanks
Bertrand
Quoted 63 lines · Bertrand Marquis
Use memcpy in getBridge to prevent gcc warnings about truncated strings. We know that we might truncate it, so the gcc warning here is wrong.
Revert previous change changing buffer sizes as bigger buffers are not needed.Signed-off-by Bertrand Marquis <[email protected]>---
Changes in v3:
Do a memset 0 on destination buffer and use MIN between string length and resultLen - 1.
Changes in v2:
Use MIN between string length ofde->d_nameand resultLen to copy only the minimum size required and prevent crossing to from an unallocated space.
---tools/libs/stat/xenstat_linux.c| 13 ++++++++++---1 file changed, 10 insertions(+), 3 deletions(-)tools/libs/stat/xenstat_linux.c +10
-3@@ -29,6 +29,7 @@#include <string.h> #include <unistd.h> #include <regex.h> +#include <xen-tools/libs.h> #include "xenstat_priv.h" @@ -78,8 +79,14 @@ static void getBridge(char *excludeName, char *result, size_t resultLen)sprintf (tmp,"/sys/class/net/%s/bridge" , de->d_name);if (access (tmp,F_OK ) ==0 ) { -strncpy (result, de->d_name, resultLen); - result[resultLen -1 ] =0 ; +/* +* Do not use strncpy to prevent compiler warning with +* gcc >= 10.0 +* If de->d_name is longer then resultLen we truncate it +*/ +memset (result,0 , resultLen); +memcpy (result, de->d_name,MIN (strnlen (de->d_name, +NAME_MAX ),resultLen -1 )); } } }@@ -264,7 +271,7 @@ int xenstat_collect_networks(xenstat_node * node) {/* Helper variables for parseNetDevLine() function defined above */ int i; -char line[512 ] = {0 }, iface[16 ] = {0 }, devBridge[256 ] = {0 }, devNoBridge[257 ] = {0 }; +char line[512 ] = {0 }, iface[16 ] = {0 }, devBridge[16 ] = {0 }, devNoBridge[17 ] = {0 };unsigned long long rxBytes, rxPackets, rxErrs, rxDrops, txBytes, txPackets, txErrs, txDrops;struct priv_data *priv =get_priv_data (node->handle);Signature · 1 line
2.17.1
Wei Liu
Acked-byQuoted 3 lines · Bertrand Marquis
Hi,
Could this be reviewed so that gcc10 issues are fixed ?
I think Juergen's comments have been addressed.
Quoted 12 lines · Wei Liu
Quoted 3 lines · Bertrand Marquis
Hi,
Could this be reviewed so that gcc10 issues are fixed ?
I think Juergen's comments have been addressed.
Acked-by Wei Liu <[email protected]>
Thanks :-)