From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Daley Subject: [PATCH 2/2] xenstat: don't leak memory in getBridge Date: Sun, 4 May 2014 20:31:47 +1200 Message-ID: <1399192307-6426-2-git-send-email-mattd@bugfuzz.com> References: <1399192307-6426-1-git-send-email-mattd@bugfuzz.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1399192307-6426-1-git-send-email-mattd@bugfuzz.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: xen-devel@lists.xen.org, Matthew Daley , Ian Jackson , Ian Campbell , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org getBridge's method of returning a result was a little confused: allocating a result buffer but never using it. Simplify by instead allowing a result buffer to be passed in and modifying the single usage to match. Signed-off-by: Matthew Daley --- tools/xenstat/libxenstat/src/xenstat_linux.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/xenstat/libxenstat/src/xenstat_linux.c b/tools/xenstat/libxenstat/src/xenstat_linux.c index 931b24e..24335e1 100644 --- a/tools/xenstat/libxenstat/src/xenstat_linux.c +++ b/tools/xenstat/libxenstat/src/xenstat_linux.c @@ -64,14 +64,12 @@ static const char PROCNETDEV_HEADER[] = /* We need to get the name of the bridge interface for use with bonding interfaces */ /* Use excludeName parameter to avoid adding bridges we don't care about, eg. virbr0 */ -char *getBridge(char *excludeName) +void getBridge(char *excludeName, char *result, size_t resultLen) { struct dirent *de; DIR *d; - char tmp[256] = { 0 }, *bridge; - - bridge = (char *)malloc(16 * sizeof(char)); + char tmp[256] = { 0 }; d = opendir("/sys/class/net"); while ((de = readdir(d)) != NULL) { @@ -79,14 +77,14 @@ char *getBridge(char *excludeName) && (strstr(de->d_name, excludeName) == NULL)) { sprintf(tmp, "/sys/class/net/%s/bridge", de->d_name); - if (access(tmp, F_OK) == 0) - bridge = de->d_name; + if (access(tmp, F_OK) == 0) { + strncpy(result, de->d_name, resultLen - 1); + result[resultLen - 1] = 0; + } } } closedir(d); - - return bridge; } /* parseNetLine provides regular expression based parsing for lines from /proc/net/dev, all the */ @@ -279,7 +277,7 @@ int xenstat_collect_networks(xenstat_node * node) SEEK_SET); /* We get the bridge devices for use with bonding interface to get bonding interface stats */ - snprintf(devBridge, 16, "%s", getBridge("vir")); + getBridge("vir", devBridge, sizeof(devBridge)); snprintf(devNoBridge, 16, "p%s", devBridge); while (fgets(line, 512, priv->procnetdev)) { -- 1.9.2