From nobody Wed Oct 15 20:20:10 2025 X-Original-To: dev-commits-src-main@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 4cn2Wb1Q6Qz6Cwn9; Wed, 15 Oct 2025 20:20:11 +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 4cn2Wb0vBDz3FRZ; Wed, 15 Oct 2025 20:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760559611; 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=nX6UzVu/J3NIUBW3JEPWaoLfPtqtrpp+NmLX4mXZVnQ=; b=b2h57WUiG8xgQYFOHkPH9QVCMNY4Uk92n56l5SS25jNi4wTy2A0IghCaPa2V483i5uYTs+ qULC6yaxaCdCLFWqgWcx0+h64WVbLBP1wax+rciMh/CCk2WevBxBxSeF/QITl0QirdgeWm VFQH8K1wMMnRLxh14ShaRy0iUTt7WYoF4E9GbxlAB5U/1+OBWDUbDDvnOgWMY/SLRxFlrH mYuhwLxd2UwtWrNutPoYoQxKw9fIuZEuy7gtKj/cc3YXWs/iXHSiG8T6IeBjyYVBipTtC/ csoC9qAyfLvRuv3ecUKxSWzYLzMCxjp6g/uY7e+DnN/l7vL1q/vT53xDJPmXdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760559611; 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=nX6UzVu/J3NIUBW3JEPWaoLfPtqtrpp+NmLX4mXZVnQ=; b=cjYfae2qD/GQL/vTMCei7h9iwNgeNRzzKW7dtH7lhFeIePNcRV34vKCNaptHcGa2Ju+K3G GBNJXJ2c7dDsnm6C52mI5VGr15rbeq0aQ+gJ2mZs87ZNCciyF54rBlmE1uyB5FyTwCwWw4 +H9bEmOpItnqoCLYE1miYX5w4DLFDkS6n0NiMZ1UBb07W24+iSO2+4DEdUqAkaXEVC8dyh 7EPJq4JiCGCeEoFjiAdu2sGkWwA/YFgQTdr63SNyc54OtRhhRVbQnrRU2j1eNd1AHhNQQ4 7SbNezf9CYvsJM1OCD4MisuytI3E7oYaenXkPzl4XCPK45bgziJ/mRHOAA+8tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760559611; a=rsa-sha256; cv=none; b=G/oE5+OK4iYEBZ4LiZis4KcOSyrBOJcrf/r5XPVPIs4+6gsnpgMyLo+MAue+Oju7yYFf05 kWE3/redXamDQVdBJ0J27sDzNrdpAiEZWTq46RROD77qVVGK8ULizy4INXCQ7sQM3LLIxW +3Rz4PpXxyxbpbkz+iigU+F4u96hpd3KAV0WMJPorG/p/7IT3C+KfnZbKXytOBG+svkIxU Vp2lBG5hovfmr87F/XzuneSO22/IzvjeUiCtqMXb0uctUvmmM5S/ANNUvbjGhAB3HkAlrh AejOMY6FvQV2VEKC1SvrNLX9mrGkruVBj8b5p60Z7jTa6nzCmSDdgkj1vdvcag== 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 4cn2Wb0KYdztV9; Wed, 15 Oct 2025 20:20:11 +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 59FKKAJI031952; Wed, 15 Oct 2025 20:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59FKKAsH031948; Wed, 15 Oct 2025 20:20:10 GMT (envelope-from git) Date: Wed, 15 Oct 2025 20:20:10 GMT Message-Id: <202510152020.59FKKAsH031948@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 937693fc9e4f - main - libnv: Fix a length check in nvpair_unpack_string_array() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 937693fc9e4ff4045cc674a14902f0d53e84ec98 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=937693fc9e4ff4045cc674a14902f0d53e84ec98 commit 937693fc9e4ff4045cc674a14902f0d53e84ec98 Author: Mark Johnston AuthorDate: 2025-10-15 20:15:08 +0000 Commit: Mark Johnston CommitDate: 2025-10-15 20:15:08 +0000 libnv: Fix a length check in nvpair_unpack_string_array() A string array is represented by a set of nul-terminated strings concatenated together. For each string, we check to see if there's a nul terminator at the end, taking care to avoid going past the end of the buffer. However, the code fails to handle the possibility that size == 0 at the end of an iteration, leading to underflow. Fix the length check. Reported by: Ilja van Sprundel Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53069 --- sys/contrib/libnv/bsd_nvpair.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c index c73bc2189121..b884dd260b84 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -985,13 +985,13 @@ nvpair_unpack_string_array(bool isbe __unused, nvpair_t *nvp, size = nvp->nvp_datasize; tmp = (const char *)ptr; for (ii = 0; ii < nvp->nvp_nitems; ii++) { - len = strnlen(tmp, size - 1) + 1; - size -= len; - if (tmp[len - 1] != '\0') { + if (size <= 0) { ERRNO_SET(EINVAL); return (NULL); } - if (size < 0) { + len = strnlen(tmp, size - 1) + 1; + size -= len; + if (tmp[len - 1] != '\0') { ERRNO_SET(EINVAL); return (NULL); }