From nobody Mon Dec 15 14:16:13 2025 X-Original-To: dev-commits-src-branches@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 4dVMYV1yNzz6KmLj for ; Mon, 15 Dec 2025 14:16:14 +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 4dVMYT5kGTz3M3m for ; Mon, 15 Dec 2025 14:16:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808173; 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=nGD7Siq8ayLcM/4bzo+d6wrba7KWqz3BNgr1Xcj1KlU=; b=A5MAbyIjzmG1dokQTCqc6NUCoR0x2G1hEFp9X9+oJVMQ9hpnspNkh90rbIpsT88hwW29Hs mfUWSbeRQLjEFmzZ1GWk+om+vYSTeM8n0KaHT/sEYs+nKUmW7Za1r8UgZiXlierkrqGOd9 aDe+E6+9fYmc9Q1R8W3B2ND7BlQpx7uy1rTxoy+CDhx5WeSmTHFWl0br66A6O694duIOxm WFKSSoWmoW1F1Yu7LHHagJiTkBDjwSSEKxUH790oXgNHKWtgHuJeDDMfQGpynsS30MahAF I+5b6CL3W9jJg7Gq5jqq8E+sy9+jKvWwpGc8+2xLxAagRj/uuL5fveY3V+2KJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808173; 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=nGD7Siq8ayLcM/4bzo+d6wrba7KWqz3BNgr1Xcj1KlU=; b=B5x/2vpyC0gVLrTBqmOTY+gCFd1gQc8OIG2ILlb2co/eo47fHDvfcO158KwKtdGXK5xJiW FyRQ7Qn7WDVIoX5TeWReYZ6fu+sLgSfZFjWnlICpNUesc+kihqQfSWrfsF5gAzzNQ+51La Ek55FmcN62DF8v/pLKtzQVU7KMB7NWI2B9tzYT/F46/Z2XkYI8sD/if5ad1nd3I4NnfuGD Q5F0WlRYX6T5HHL9rGpKp3nF3X7YG7JBKIumU/3s48tftzRgoTz4KgF33xCgQyjGlXL2Lx MJCm9jraKXjRAZBUO0C+eKaVq2gb9uwRG60SAxubaTvRtx2YbXbe5SM7PAlZLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765808173; a=rsa-sha256; cv=none; b=Ew0/KG07js2LGhwgaEP2rG9DkKQq/wf7KNYGiVAhblcaJt3Qc3PjslSlH+k/fNc5Y82oqW UtRix3k7tePkrRYRmUC0YbjfLd2E6z3I0lVyUKoJCcSUCgsVOjTfm0H/8p9OIoSlDXDCVv JGE1UNzRXrkAu/Ae6TnnuPPRD/o8Bwui30fPW8C8LKXv5uaFhibdZ5OdjEhpSbUoUqGR/2 J6BQzzXJcjNcteTh1Hx17dW8WxMi7KWV36M/tE7cCXOPVz4WPs29bUQBt7isjw/qay3ZbX NiC09gjZT7pCC1v0WCzqAPgG5g+Q9RCUiW5PJIagx9ZgKSO4c/Lw098VteJLUA== 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 4dVMYT5FZWz7Wf for ; Mon, 15 Dec 2025 14:16:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35a0e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 14:16:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6162c06963ab - stable/15 - libkern: Avoid a one-byte OOB access in strndup() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 6162c06963abe3b56e7c26112052f541b4246bf7 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 14:16:13 +0000 Message-Id: <6940182d.35a0e.27377003@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6162c06963abe3b56e7c26112052f541b4246bf7 commit 6162c06963abe3b56e7c26112052f541b4246bf7 Author: Mark Johnston AuthorDate: 2025-12-08 14:08:22 +0000 Commit: Mark Johnston CommitDate: 2025-12-15 14:09:37 +0000 libkern: Avoid a one-byte OOB access in strndup() If the length of the string is maxlen, we would end up copying maxlen+1 bytes, which violates the contract of the function. The result is the same since that extra byte is overwritten. Reported by: Kevin Day Reviewed by: imp, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54093 (cherry picked from commit 73586fcea630c2c4fb83e966920c039aee8a5fc9) --- sys/libkern/strndup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/libkern/strndup.c b/sys/libkern/strndup.c index 75b33339e1c7..1fbcfd28cae4 100644 --- a/sys/libkern/strndup.c +++ b/sys/libkern/strndup.c @@ -40,9 +40,9 @@ strndup(const char *string, size_t maxlen, struct malloc_type *type) size_t len; char *copy; - len = strnlen(string, maxlen) + 1; - copy = malloc(len, type, M_WAITOK); + len = strnlen(string, maxlen); + copy = malloc(len + 1, type, M_WAITOK); memcpy(copy, string, len); - copy[len - 1] = '\0'; + copy[len] = '\0'; return (copy); }