From owner-svn-src-head@freebsd.org Wed Dec 5 13:28:18 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34FB71312BC4;
Wed, 5 Dec 2018 13:28:18 +0000 (UTC)
(envelope-from slavash@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id C151A6FB16;
Wed, 5 Dec 2018 13:28:17 +0000 (UTC)
(envelope-from slavash@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A28D614F14;
Wed, 5 Dec 2018 13:28:17 +0000 (UTC)
(envelope-from slavash@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB5DSHXI070685;
Wed, 5 Dec 2018 13:28:17 GMT (envelope-from slavash@FreeBSD.org)
Received: (from slavash@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB5DSHqm070684;
Wed, 5 Dec 2018 13:28:17 GMT (envelope-from slavash@FreeBSD.org)
Message-Id: <201812051328.wB5DSHqm070684@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: slavash set sender to
slavash@FreeBSD.org using -f
From: Slava Shwartsman <slavash@FreeBSD.org>
Date: Wed, 5 Dec 2018 13:28:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r341540 - head/contrib/ofed/libibverbs
X-SVN-Group: head
X-SVN-Commit-Author: slavash
X-SVN-Commit-Paths: head/contrib/ofed/libibverbs
X-SVN-Commit-Revision: 341540
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: C151A6FB16
X-Spamd-Result: default: False [-0.76 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-0.54)[-0.543,0];
NEURAL_HAM_LONG(-0.07)[-0.072,0];
NEURAL_HAM_SHORT(-0.15)[-0.149,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-Rspamd-Server: mx1.freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Dec 2018 13:28:18 -0000
Author: slavash
Date: Wed Dec 5 13:28:17 2018
New Revision: 341540
URL: https://svnweb.freebsd.org/changeset/base/341540
Log:
libibverbs: Fix memory leak in ibv_read_sysfs_file().
Testing packetdrill using valgrind resulted in finding a memory leak in
ibv_read_sysfs_file(). The attached patch fixes it.
Submitted by: tuexen@
Approved by: hselasky (mentor)
MFC after: 1 week
Sponsored by: Mellanox Technologies
Modified:
head/contrib/ofed/libibverbs/sysfs.c
Modified: head/contrib/ofed/libibverbs/sysfs.c
==============================================================================
--- head/contrib/ofed/libibverbs/sysfs.c Wed Dec 5 13:27:48 2018 (r341539)
+++ head/contrib/ofed/libibverbs/sysfs.c Wed Dec 5 13:28:17 2018 (r341540)
@@ -79,7 +79,7 @@ int ibv_read_sysfs_file(const char *dir, const char *f
char *buf, size_t size)
{
char *path, *s;
- int fd;
+ int ret;
size_t len;
if (asprintf(&path, "%s/%s", dir, file) < 0)
@@ -89,11 +89,12 @@ int ibv_read_sysfs_file(const char *dir, const char *f
if (*s == '/')
*s = '.';
- len = size;
- if (sysctlbyname(&path[1], buf, &len, NULL, 0) == -1)
- return -1;
-
+ len = size;
+ ret = sysctlbyname(&path[1], buf, &len, NULL, 0);
free(path);
+
+ if (ret == -1)
+ return -1;
if (len > 0 && buf[len - 1] == '\n')
buf[--len] = '\0';