From nobody Mon Dec 15 14:14:05 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 4dVMW65qlTz6KmLD for ; Mon, 15 Dec 2025 14:14:10 +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 4dVMW63N3yz3LbK for ; Mon, 15 Dec 2025 14:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808050; 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=T75lTHMwrOU2GWO16QWQ5UCPWbFYiGgvd4UTYBZ7w28=; b=Sya4f2ePgl0KTu1PbwIYhcryEM7EcZiDWI4R2wJKAi8GAeXJ5WnP7thT61yHKebv4gmP+s ffc1U5X8phuM2VUiLrcf2iGBiAd9NZqC+b/MjWUW1+6Uh4vewmHzzznci4bNfJhoZBTHQV RuSeWd+FR1rdWeSv2PkO5QoVzLm7BjGuDIb12LfMNcbgLGkgkEQVqrmjZo3MOMFITU9alM uXfb4dDT/Y4giZhnoL0ZPLFwpqYtFe+88iDtr6Nmdfuq6pfvUUSFSUA2EDY3FANVQGyiWH sjjiGMB8rFZDrYWbSGimk0a0KIZCpXohVciIKkOSdpexsB47UQxySa2LK8raiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808050; 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=T75lTHMwrOU2GWO16QWQ5UCPWbFYiGgvd4UTYBZ7w28=; b=uGVpzgMcJXXAomtYAkc75WWLDaljrjRcF8nKxYq9KizOl9u8TGTf+PMY/7dLd5LpkfXnJY I7vR/6gZOXqoErwm/ZiVis453k2R1xvUT5EfuWbJIDvR+rCrl6hsgli1Byl1p6nDRHh298 YnsH5Cd5xMnMaSrtPkBrOQUpeN+lImbDMoWeSwwvvY2RzE8lio0TY1a5fhChUbyJdZcUKp LjCs+y4KFEeiNy5+CE1/SNsMpzw58/ntgkqkHwXwlAdr6wCF81oTxPaJQ+mJrxxt/zy13L rzeaUbrelFLoSAkOpRduT/nwZ8OhDz4L+hpzvF9ivAI7+48AQw2qyM8WabkJ3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765808050; a=rsa-sha256; cv=none; b=ptkcPxv/qazSlG2hVoKzS6WDxOF6k8TklQVTyZoZJw41Th0/k7opBhmyEzla//V6y+ME83 uMlKNW7qGOSLFrPOIBQFC+itpUtgc0K4+f1OSIXO2xAY/2Nv7ZyQmkXlDq4jzaYkuw6BZ8 Iq2UyzIUL3FbFlPj2xIcpcznwhh4vvUBFj19AfbJsHclV6Dd2xWKg9E3NYrhHLoU8wXacl uy/UZ2ANZXMlAfo42RU7HZcU2ShExBRFxRc4k1NW7Y/CgkwqqSJWFy5vlhrYLjzFbzxgkM YOQD/OVbb8usI0dt1Cg9CvpuaZaBCsSPMLm9+KCUes6tCBh9WF4DjXxQzb1Whw== 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 4dVMW62lQ0z7Wd for ; Mon, 15 Dec 2025 14:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35172 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 14:14:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f6ad204da856 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: f6ad204da856e722b4995f929a09c96ccc38d537 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 14:14:05 +0000 Message-Id: <694017ad.35172.319c6355@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f6ad204da856e722b4995f929a09c96ccc38d537 commit f6ad204da856e722b4995f929a09c96ccc38d537 Author: Mark Johnston AuthorDate: 2025-12-08 14:08:22 +0000 Commit: Mark Johnston CommitDate: 2025-12-15 14:12:39 +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 9065153d7232..eb4bd88fa42b 100644 --- a/sys/libkern/strndup.c +++ b/sys/libkern/strndup.c @@ -41,9 +41,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); }