From nobody Wed Nov 04 17:29:04 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 4jKXVT1x41z6yYdt for ; Wed, 04 Nov 2026 17:29:05 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jKXVS6JsPz4xhw for ; Wed, 04 Nov 2026 17:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793813344; 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=zyCbLqWFiECacqVlML4RmkgWDYYee3OIU5dOfOJJfB8=; b=uWE8Bxy84bIGMrXp3GFX1+J8Klue5u0HW4KEpEuIEaw3zXVEymuUoOZkpWrfYw1nA6ToIZ vdBgzcMPQmg9VOlLiyBqB7Jw2Ovk5oXnRrd51m4LUiiEI+13x3ra1HIEUWTkieb9RdEjGG sAat11HWkLYL8Zkuvpf6SvNd/8b9o7kELcUqup9yYw/DNJHgwHJ9syVo07HysFDP2r9AZ1 u+vSNO+VJrIueMudqY0ib1B/GOimEXwyioy1klMVhlMtf+rtK/BxTzNhI9xOW33cQxZpKj v3+Hr88CVAh8kB1gHHcUFxQ+ILpqAvXnzef+hk4GwthovSygUP1OaZqpWlsVIg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793813344; b=sRcKZP1J2bPHgPfQiCJh57QML6sge72QvEbo/q8/+DRY0ZMXAumMihvjgEv2u3ifBZf3yE xLVd9tJt2pNSvAOqpcoO2rORVQhsZ3atkRmGyoyVhFVrt8Tx641Pu2K9XRaeqzqUrozTg4 yd+YehwNYf9MeocZvaKsd1UCepidRPNM3osxtTJlZooN8dq/9wX+sTNyY88P5K/ehR5+xK G5rVNxSDFQ9yYLZvO5U+L/+4VmBR+1vrqfoXYMh5lBuUbTpPG/9V4Ma6flpw6XhDT/BEAW TdmRcGgmXIEABiNq6pCYE0dQ6aUbbEdVN/VSM/XIa1CFrHJT5MYBS8F9kUk+Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793813344; 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=zyCbLqWFiECacqVlML4RmkgWDYYee3OIU5dOfOJJfB8=; b=j28OqRLqz9mzC/kUeL/GjwX0sC9K3i5ZpvE1eFKtlDM2WKD7Fnom057nsQ7Okv6RS2SeX4 2dNzxWuy91fxJj7/Daqa1PfwCJ3nrRh58BuT5Baa9MHs0XPXsdwUTCEiMAdtC3WnWouSBQ /d9VFqbjDnWlStn7kPRN507JXUZLM6Dnst6euC4YrjywiHJk1dQNz7VTU8Rzl3r2nDQPwX axr1G874NZLjv6s/oF6+M8BjTfIhSq2rcvZqhTkzEmA53adSbyGnFT4C03eYmglXOGwYwE cQJCKseGS0tsJQF0zn+3/Hi8/ffRTSxV72MmQ1lE1b0oxmAA//d5aNPyyIbRiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jKXVS5Lbrz1Bd6 for ; Wed, 04 Nov 2026 17:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26f83 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 17:29:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Yura Tkachenko From: Igor Ostapenko Subject: git: 2b4877576d03 - stable/14 - jailmeta: reject empty keys in metadata lookups List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2b4877576d032cf0a46655d3b4154ac318675312 Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 17:29:04 +0000 Message-Id: <6aeb6b60.26f83.3bd36a78@gitrepo.freebsd.org> The branch stable/14 has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=2b4877576d032cf0a46655d3b4154ac318675312 commit 2b4877576d032cf0a46655d3b4154ac318675312 Author: Yura Tkachenko AuthorDate: 2026-10-30 20:20:24 +0000 Commit: Igor Ostapenko CommitDate: 2026-11-04 03:48:16 +0000 jailmeta: reject empty keys in metadata lookups Reject empty keys in metadata lookups with EINVAL to prevent an infinite loop while holding allprison_lock and pr_mtx. Add tests for empty-key reads and writes with empty and populated meta/env buffers, trailing newlines, and empty final values. Reviewed by: igoro, jamie MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D61025 (cherry picked from commit d1a465f02b14c9eed8a87c31092bb9251dc053c1) --- sys/kern/kern_jailmeta.c | 4 ++++ tests/sys/kern/jailmeta.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/sys/kern/kern_jailmeta.c b/sys/kern/kern_jailmeta.c index 91bb7155820d..83d773ca6caa 100644 --- a/sys/kern/kern_jailmeta.c +++ b/sys/kern/kern_jailmeta.c @@ -436,6 +436,10 @@ jm_osd_method_get(void *obj, void *data, const struct meta *meta) p = osd; key = opt->name + strlen(meta->name) + 1; keylen = strlen(key); + if (keylen < 1) { + error = EINVAL; + break; + } while ((p = strstr(p, key)) != NULL) { if ((p == osd || *(p - 1) == '\n') && p[keylen] == '=') { diff --git a/tests/sys/kern/jailmeta.sh b/tests/sys/kern/jailmeta.sh index 9a63f958231f..2d46abe0d07e 100644 --- a/tests/sys/kern/jailmeta.sh +++ b/tests/sys/kern/jailmeta.sh @@ -397,12 +397,28 @@ keyvalue_generic() atf_check -sexit:0 -oinline:'""\n' jls -jj $meta + # Reject empty keys even when the metadata buffer is empty. + atf_check -s exit:1 -o empty -e match:'Invalid argument' \ + jls -jj "${meta}." + atf_check -s exit:1 -o empty -e match:'Invalid argument' \ + jail -m name=j "${meta}.=value" + atf_check -s exit:0 -o inline:'""\n' jls -jj "$meta" + # Note: each sub-case depends on the results of the previous ones # Should be able to extract a key added manually atf_check -sexit:0 jail -m name=j $meta="a=1" atf_check -sexit:0 -oinline:'a=1\n' jls -jj $meta atf_check -sexit:0 -oinline:'1\n' jls -jj $meta.a + + # Reject empty keys with populated metadata; failed writes preserve it. + atf_check -s exit:1 -o empty -e match:'Invalid argument' \ + jls -jj "${meta}." + atf_check -s exit:1 -o empty -e match:'Invalid argument' \ + jail -m name=j "${meta}.=value" + atf_check -s exit:0 -o inline:'a=1\n' jls -jj "$meta" + atf_check -s exit:0 -o inline:'1\n' jls -jj "${meta}.a" + atf_check -sexit:0 jail -m name=j $meta="$(printf 'a=2\nb=3')" atf_check -sexit:0 -oinline:'a=2\nb=3\n' jls -jj $meta atf_check -sexit:0 -oinline:'2\n' jls -jj $meta.a @@ -492,6 +508,18 @@ keyvalue_generic() # Should respectively support "jls -s" for a missing key atf_check -sexit:0 -oinline:''$meta'.missing\n' jls -jj -s $meta.missing + + # Preserve the trailing newline despite command substitution. + local value + value=$(printf 'a=1\nb=2\n.') + value=${value%.} + atf_check -s exit:0 jail -m name=j "${meta}=$value" + atf_check -s exit:0 -o inline:'1\n' jls -jj "${meta}.a" + atf_check -s exit:0 -o inline:'2\n' jls -jj "${meta}.b" + + # An empty value on the final line needs only its terminating NUL. + atf_check -s exit:0 jail -m name=j "${meta}=a=" + atf_check -s exit:0 -o inline:'""\n' jls -jj "${meta}.a" } keyvalue_body() {