From nobody Tue Sep 30 15:23:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cbhfY1Sl2z69F2Y; Tue, 30 Sep 2025 15:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cbhfX4kv2z3M7m; Tue, 30 Sep 2025 15:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759245828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3DzNv71Z60wxuziZr0IGHN3Nkjkf0SsdcWJJFsf5VI=; b=rQLXFN/r9axC5oMWItU+gTDlKbloQJpW9RixdmRVBCqYhVAbJCDkfskOxBYRg23FBgnBw5 n58EOugCY8XndJsxd8k4APKvBIDopgakVW1CHkiYiapqWZUHcc/4H0ZA3qCWiXW5uJrOjx FIKHVVwlnN6mkMupRwGPQAVP84IfS39N2xx1OUzdCg+Yg/QNjYxNGplMeWPoMKhMRzJJ3u pAqKFXig5Uz/EOKxPQ5n6ygw6hbjgm/HPTMZjkpY5429ORS4MgPftSn7sKPESQSf+VxgIY nY8uFBWWI3ALefCrp+KWstEoek2HIyaOdbYEaZivtk+XuHpVWnqw01sAvMuZSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759245828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3DzNv71Z60wxuziZr0IGHN3Nkjkf0SsdcWJJFsf5VI=; b=F9gL7tlGLpnv7+tM2ejEw1OK7w1KcaSPxEJsyDrEcXSnq7ogzX/9c8bPtm2kEQluxBNZI9 X3MmEfe+nF1f+iDbhZv7mBHCUrxgbdXuJ5he4V92g4j31Pii5S2nQcoFKbnSc0snX+VWoO xYf3RpJHGTrXmOgUoASP3kM4qFKphTKfERDCpW3q96C6ycbMYpbQX3SPyY5WvEVIUBW4rY qP+hiTxO9XrzvPA9ExN8beyd+VXQZZybbMgqnMqdIiz793u86lGWkfpuiNbWBF63Wf+G/J fRSbLvDuxtBjmeMmb1RLeSIq6IffXNj3qMIvgswy6dwL9XnyJDSqLuOWapnZdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759245828; a=rsa-sha256; cv=none; b=E3nbx+WNFJNH4vhuwtqQmIZUsg4OwTHheh23AoCQ4aihcCbCg2YOwvrQU3+fmqAepX5gGO myltn8n1MYOswHeNDQhFaa1dnpkwuAG/vi24FcLs3Dl0PgWDTfGzmGmGplZM6VJngVPOoS bmvLpvkWG+a+NCq3GrLGIMWB6xrI8Ew/ym7dR5LgxTVV6hrsB4jAsbuxnB31pFs31I73PS qcM0xcVcTH2hVl1J6+uhyzNsD9yZZYVgaTVh8HGIk++mQCSEHIxjjLFhRU1hM2Ok1GvuFt SD4P/BZrOfdcY3rtHB/dwcU1Jh5+F8JcGbvK6a5XciXu+Zi7LnG/16wX+9ec+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cbhfX3P8Kzj8y; Tue, 30 Sep 2025 15:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58UFNm5t046010; Tue, 30 Sep 2025 15:23:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UFNmtQ046007; Tue, 30 Sep 2025 15:23:48 GMT (envelope-from git) Date: Tue, 30 Sep 2025 15:23:48 GMT Message-Id: <202509301523.58UFNmtQ046007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: cffe51ff98c0 - stable/15 - libnv: Fix handling of nvlist_dump() and nvlist_send() for child nvlists List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cffe51ff98c0e7b6d7c344bef39bf07513066e70 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cffe51ff98c0e7b6d7c344bef39bf07513066e70 commit cffe51ff98c0e7b6d7c344bef39bf07513066e70 Author: Mark Johnston AuthorDate: 2025-09-10 14:33:35 +0000 Commit: Mark Johnston CommitDate: 2025-09-30 09:43:08 +0000 libnv: Fix handling of nvlist_dump() and nvlist_send() for child nvlists Suppose an nvlist nvl belongs to a parent nvlist or nvlist array. In this case, nvl contains a pointer to its container. This trips up nvlist_send(nvl) and nvlist_dump(nvl), which intuitively should only operate on nvl and its nvpairs. In particular, both of these functions will traverse to nvl's parent and start sending/dumping the parent's nvpairs, which results in assertion failures or nonsensical output, respectively. Reviewed by: oshogbo MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D52360 (cherry picked from commit 0b68e3ce6e0e437fa480b25a0ef706ee08562257) --- sys/contrib/libnv/nvlist.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c index 41edc72322c3..73226ee51a78 100644 --- a/sys/contrib/libnv/nvlist.c +++ b/sys/contrib/libnv/nvlist.c @@ -478,7 +478,7 @@ nvlist_dump_error_check(const nvlist_t *nvl, int fd, int level) void nvlist_dump(const nvlist_t *nvl, int fd) { - const nvlist_t *tmpnvl; + const nvlist_t *tmpnvl, *top; nvpair_t *nvp, *tmpnvp; void *cookie; int level; @@ -487,6 +487,7 @@ nvlist_dump(const nvlist_t *nvl, int fd) if (nvlist_dump_error_check(nvl, fd, level)) return; + top = nvl; nvp = nvlist_first_nvpair(nvl); while (nvp != NULL) { dprintf(fd, "%*s%s (%s):", level * 4, "", nvpair_name(nvp), @@ -645,6 +646,8 @@ nvlist_dump(const nvlist_t *nvl, int fd) while ((nvp = nvlist_next_nvpair(nvl, nvp)) == NULL) { do { + if (nvl == top) + return; cookie = NULL; if (nvlist_in_array(nvl)) dprintf(fd, "%*s,\n", level * 4, ""); @@ -847,7 +850,7 @@ nvlist_xpack(const nvlist_t *nvl, int64_t *fdidxp, size_t *sizep) { unsigned char *buf, *ptr; size_t left, size; - const nvlist_t *tmpnvl; + const nvlist_t *tmpnvl, *top; nvpair_t *nvp, *tmpnvp; void *cookie; @@ -868,6 +871,7 @@ nvlist_xpack(const nvlist_t *nvl, int64_t *fdidxp, size_t *sizep) ptr = nvlist_pack_header(nvl, ptr, &left); + top = nvl; nvp = nvlist_first_nvpair(nvl); while (nvp != NULL) { NVPAIR_ASSERT(nvp); @@ -958,6 +962,8 @@ nvlist_xpack(const nvlist_t *nvl, int64_t *fdidxp, size_t *sizep) goto fail; while ((nvp = nvlist_next_nvpair(nvl, nvp)) == NULL) { do { + if (nvl == top) + goto out; cookie = NULL; if (nvlist_in_array(nvl)) { ptr = nvpair_pack_nvlist_array_next(ptr,