All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3] tools/libs/stat: fix broken build
@ 2020-09-12 13:08 Juergen Gross
  2020-09-14  9:34 ` Wei Liu
  2020-09-14 10:58 ` Bertrand Marquis
  0 siblings, 2 replies; 14+ messages in thread
From: Juergen Gross @ 2020-09-12 13:08 UTC (permalink / raw)
  To: xen-devel; +Cc: Juergen Gross, Ian Jackson, Wei Liu

Making getBridge() static triggered a build error with some gcc versions:

error: 'strncpy' output may be truncated copying 15 bytes from a string of
length 255 [-Werror=stringop-truncation]

Fix that by using a buffer with 256 bytes instead.

Fixes: 6d0ec053907794 ("tools: split libxenstat into new tools/libs/stat directory")
Signed-off-by: Juergen Gross <jgross@suse.com>
---
 tools/libs/stat/xenstat_linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libs/stat/xenstat_linux.c b/tools/libs/stat/xenstat_linux.c
index 793263f2b6..d2ee6fda64 100644
--- a/tools/libs/stat/xenstat_linux.c
+++ b/tools/libs/stat/xenstat_linux.c
@@ -78,7 +78,7 @@ 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 - 1);
+					strncpy(result, de->d_name, resultLen);
 					result[resultLen - 1] = 0;
 				}
 		}
@@ -264,7 +264,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[16] = { 0 }, devNoBridge[17] = { 0 };
+	char line[512] = { 0 }, iface[16] = { 0 }, devBridge[256] = { 0 }, devNoBridge[257] = { 0 };
 	unsigned long long rxBytes, rxPackets, rxErrs, rxDrops, txBytes, txPackets, txErrs, txDrops;
 
 	struct priv_data *priv = get_priv_data(node->handle);
-- 
2.26.2



^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2020-10-02 14:08 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-12 13:08 [PATCH v3] tools/libs/stat: fix broken build Juergen Gross
2020-09-14  9:34 ` Wei Liu
2020-09-14 10:58 ` Bertrand Marquis
2020-10-01 16:38   ` Bertrand Marquis
2020-10-02  4:50     ` Jürgen Groß
2020-10-02  6:20       ` Jan Beulich
2020-10-02  6:51         ` Jürgen Groß
2020-10-02  6:59           ` Jan Beulich
2020-10-02  7:25             ` Jürgen Groß
2020-10-02 10:12               ` Bertrand Marquis
2020-10-02 10:44                 ` Jürgen Groß
2020-10-02 11:03                   ` Bertrand Marquis
2020-10-02 14:07                     ` Bertrand Marquis
2020-10-02 11:05       ` Andrew Cooper

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.