From nobody Wed Apr 29 14:48:53 2026 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 4g5Ktx346mz6bkfp for ; Wed, 29 Apr 2026 14:48:57 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5Ktt5Kjlz4K2b for ; Wed, 29 Apr 2026 14:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777474134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQsGMN1ps9Xv4cmc02GH0Av/aT4HDC5uWAGr6ESoteU=; b=s+gDOiidsc46dpUH3HJ758FhaOuQvCAks/xpAbqtm2j05DP/fNRe0mqJi18RPbsDmrfRaI iJPICAHQBGhNxtujUCDHzL2RVPjgQM46tXHVUTlEAZVpSUDIz3oYwHXs4wY/CQPJyxAD4A 9Km2vogLvVSzsjjwlrfCnH4Nj6QAEopQTlvkP2raWV+fNRnXpnHFDMVMqTc20vpAp+xwze ZpI/V0m2stsY9N1xaz63Lem1d9nm0DR1JslR3vt86nYotXBuqYriEyRZjDvu0NpkJa5FXu DDIfVGOCxQb8P5PAmv/Q98zupc6YUOZvJrdx8FdBfhiohEVex+t8VqGpFE5FxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777474134; a=rsa-sha256; cv=none; b=buMkoEB4KTdWQ8Mlcy2rvBWVBhtaoiTW87ETShJCDhRTXaUjUfZvzJtWCBpmnpa9oUvDNg bJP4ieiPv1bi5xE9NoZcIhm4hf33lnBIAhynj8VaIByTdlAy5mcs71YaT2n099dsEXI4UT XzWODGMUUwzDS+mat+ZabSIGKRiE32f8k6dD1UMuPi2pEjxOHEAshaUKqDmmFcHv7y0+j2 oagDVQzYHS4MPe2pdH9ros8En2vqrtn6cGAhWMEft0uQv78Xf5+HGAymmlbdjrh6v2z3MU T5bbvzdLZA7InMoO/MVQ2NKBirhgpBT6tqex14eczZtaMaWOcXl3InAYNcVC1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777474134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQsGMN1ps9Xv4cmc02GH0Av/aT4HDC5uWAGr6ESoteU=; b=rBcQBkfCgGVGtwBCe8HDJ8Ebc7oBMBDoLhPy53128llikMpGM+MfgDV/zynInPasi2at4N 5Luc9NHN5CG25TAbrTCCoI5IfOzHCzuCN2jeJwMsHs9XPk8GtTcGJdabBbLtiDrz20LB3u Xwh3dsnqfiHEomAtHr00Gnee5YvQjOQ1ZKXbw04jrqFHGccs9y3aq4s5M0mS042zBWRkVN Ab3683v7AcaLwDS/ODYgvEiiFIWZVZzJAMNKzu7pq3uM3cxoVPoevo5mCyyegRI59eLge9 JxP6DHg+dJq+aiTYC9sCj/4jty59QipMlVMPU7c7ZIVQ5ThfI3HYiZx5NuwvHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5Ktt2fqpzlWn for ; Wed, 29 Apr 2026 14:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c677 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 14:48:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mariusz Zaborski From: Mark Johnston Subject: git: 680e97f45b0f - stable/14 - libnv: add test to verify null termination of string in array 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/14 X-Git-Reftype: branch X-Git-Commit: 680e97f45b0ff827291a96f24c0d8edf5f7dc0c6 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 14:48:53 +0000 Message-Id: <69f21a55.3c677.4ae7d933@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=680e97f45b0ff827291a96f24c0d8edf5f7dc0c6 commit 680e97f45b0ff827291a96f24c0d8edf5f7dc0c6 Author: Mariusz Zaborski AuthorDate: 2024-08-29 13:44:03 +0000 Commit: Mark Johnston CommitDate: 2026-04-29 14:45:04 +0000 libnv: add test to verify null termination of string in array Differential Revision: https://reviews.freebsd.org/D46138 (cherry picked from commit 2981431e044fae3bc87e6fa891b8230b484dc84b) --- lib/libnv/tests/nv_array_tests.cc | 58 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/lib/libnv/tests/nv_array_tests.cc b/lib/libnv/tests/nv_array_tests.cc index f5c448598b22..d3f23e323719 100644 --- a/lib/libnv/tests/nv_array_tests.cc +++ b/lib/libnv/tests/nv_array_tests.cc @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2015 Mariusz Zaborski - * All rights reserved. + * Copyright (c) 2015-2024 Mariusz Zaborski * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,6 +27,7 @@ #include #include #include +#include #include #include @@ -1162,6 +1162,58 @@ ATF_TEST_CASE_BODY(nvlist_nvlist_array__pack) free(packed); } + +ATF_TEST_CASE_WITHOUT_HEAD(nvlist_string_array_nonull__pack); +ATF_TEST_CASE_BODY(nvlist_string_array_nonull__pack) +{ + nvlist_t *testnvl, *unpacked; + const char *somestr[3] = { "a", "b", "XXX" }; + uint8_t *packed, *twopages, *dataptr, *secondpage; + size_t packed_size, page_size; + bool found; + + page_size = sysconf(_SC_PAGESIZE); + testnvl = nvlist_create(0); + ATF_REQUIRE(testnvl != NULL); + ATF_REQUIRE_EQ(nvlist_error(testnvl), 0); + nvlist_add_string_array(testnvl, "nvl/string", somestr, + nitems(somestr)); + ATF_REQUIRE_EQ(nvlist_error(testnvl), 0); + + packed = (uint8_t *)nvlist_pack(testnvl, &packed_size); + ATF_REQUIRE(packed != NULL); + + twopages = (uint8_t *)mmap(NULL, page_size * 2, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + ATF_REQUIRE(twopages != MAP_FAILED); + dataptr = &twopages[page_size - packed_size]; + secondpage = &twopages[page_size]; + + memset(twopages, 'A', page_size * 2); + + mprotect(secondpage, page_size, PROT_NONE); + memcpy(dataptr, packed, packed_size); + + found = false; + for (size_t i = 0; i < packed_size - 3; i++) { + if (dataptr[i] == 'X' && dataptr[i + 1] == 'X' && + dataptr[i + 2] == 'X' && dataptr[i + 3] == '\0') { + dataptr[i + 3] = 'X'; + found = true; + break; + } + } + ATF_REQUIRE(found == true); + + unpacked = nvlist_unpack(dataptr, packed_size, 0); + ATF_REQUIRE(unpacked == NULL); + + nvlist_destroy(testnvl); + free(packed); + munmap(twopages, page_size * 2); +} + + ATF_INIT_TEST_CASES(tp) { @@ -1191,5 +1243,7 @@ ATF_INIT_TEST_CASES(tp) ATF_ADD_TEST_CASE(tp, nvlist_descriptor_array__pack) ATF_ADD_TEST_CASE(tp, nvlist_string_array__pack) ATF_ADD_TEST_CASE(tp, nvlist_nvlist_array__pack) + + ATF_ADD_TEST_CASE(tp, nvlist_string_array_nonull__pack) }