From owner-svn-src-all@freebsd.org Thu Sep 21 10:16:45 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9060FE22265;
Thu, 21 Sep 2017 10:16:45 +0000 (UTC)
(envelope-from oshogbo@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 mx1.freebsd.org (Postfix) with ESMTPS id 5F73A72D00;
Thu, 21 Sep 2017 10:16:45 +0000 (UTC)
(envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8LAGi7Q073070;
Thu, 21 Sep 2017 10:16:44 GMT (envelope-from oshogbo@FreeBSD.org)
Received: (from oshogbo@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8LAGig1073069;
Thu, 21 Sep 2017 10:16:44 GMT (envelope-from oshogbo@FreeBSD.org)
Message-Id: <201709211016.v8LAGig1073069@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to
oshogbo@FreeBSD.org using -f
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Date: Thu, 21 Sep 2017 10:16:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r323858 - head/sys/contrib/libnv
X-SVN-Group: head
X-SVN-Commit-Author: oshogbo
X-SVN-Commit-Paths: head/sys/contrib/libnv
X-SVN-Commit-Revision: 323858
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Sep 2017 10:16:45 -0000
Author: oshogbo
Date: Thu Sep 21 10:16:44 2017
New Revision: 323858
URL: https://svnweb.freebsd.org/changeset/base/323858
Log:
IMHO it is possible that failure will be treated as success because we don't
initialize nvp on every loop iteration and the code under 'fail'(!) label
detects success by checking of nvp != NULL.
Submitted by: pjd@
MFC after: 1 month
Sponsored by: Wheel Systems
Modified:
head/sys/contrib/libnv/nvpair.c
Modified: head/sys/contrib/libnv/nvpair.c
==============================================================================
--- head/sys/contrib/libnv/nvpair.c Thu Sep 21 10:16:25 2017 (r323857)
+++ head/sys/contrib/libnv/nvpair.c Thu Sep 21 10:16:44 2017 (r323858)
@@ -1690,11 +1690,10 @@ nvpair_move_number_array(const char *name, uint64_t *v
nvpair_t *
nvpair_move_nvlist_array(const char *name, nvlist_t **value, size_t nitems)
{
+ nvpair_t *parent;
unsigned int ii;
- nvpair_t *nvp;
int flags;
- nvp = NULL;
if (value == NULL || nitems == 0) {
ERRNO_SET(EINVAL);
return (NULL);
@@ -1707,6 +1706,8 @@ nvpair_move_nvlist_array(const char *name, nvlist_t **
goto fail;
}
if (ii > 0) {
+ nvpair_t *nvp;
+
nvp = nvpair_allocv(" ", NV_TYPE_NVLIST,
(uint64_t)(uintptr_t)value[ii], 0, 0);
if (nvp == NULL)
@@ -1717,25 +1718,27 @@ nvpair_move_nvlist_array(const char *name, nvlist_t **
flags = nvlist_flags(value[nitems - 1]) | NV_FLAG_IN_ARRAY;
nvlist_set_flags(value[nitems - 1], flags);
- nvp = nvpair_allocv(name, NV_TYPE_NVLIST_ARRAY,
+ parent = nvpair_allocv(name, NV_TYPE_NVLIST_ARRAY,
(uint64_t)(uintptr_t)value, 0, nitems);
+ if (parent == NULL)
+ goto fail;
+
+ for (ii = 0; ii < nitems; ii++)
+ nvlist_set_parent(value[ii], parent);
+
+ return (parent);
fail:
- if (nvp == NULL) {
- ERRNO_SAVE();
- for (ii = 0; ii < nitems; ii++) {
- if (value[ii] != NULL &&
- nvlist_get_pararr(value[ii], NULL) != NULL) {
- nvlist_destroy(value[ii]);
- }
+ ERRNO_SAVE();
+ for (ii = 0; ii < nitems; ii++) {
+ if (value[ii] != NULL &&
+ nvlist_get_pararr(value[ii], NULL) != NULL) {
+ nvlist_destroy(value[ii]);
}
- nv_free(value);
- ERRNO_RESTORE();
- } else {
- for (ii = 0; ii < nitems; ii++)
- nvlist_set_parent(value[ii], nvp);
}
+ nv_free(value);
+ ERRNO_RESTORE();
- return (nvp);
+ return (NULL);
}
#ifndef _KERNEL