From nobody Wed Jul 16 15:08:39 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 4bhzw81564z61cXN; Wed, 16 Jul 2025 15:08:40 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bhzw725Lbz4G57; Wed, 16 Jul 2025 15:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752678519; 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=JeP3gvkvleI6jj2VgVzl0kGTrLMbECFzE7u06pGtvps=; b=o8hEdlvblMISHhYScYSpK1YfcEyyqOF38bZ7c1E+lgbgU2hgMfWu+ka8aSWjvQ8NtFcBbD VSl+rJVwVGoowfiY9Wo0OK863v9NwI9EHLjyc5g8BYoAF7kluWJl67TO5YSs8RUccKHg+M qRLumDwTE7GI2JjLPwLzsAGPsIdlZJcgMX4w58t/BOzGL7ryImBeNakrmPLzkqJFKY7UbH n3cx036XLNOeTkMnUDoO2wEYi0p5fpQykNZ4PVam4HHxilQivB8GO0scj07xSZV9pSRRnt jR/xkymwsRtqnXMcjXTOfn0ml1kZBH60HEKm6oFbLjaMNU0nE+pWqAcnZTBlTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752678519; 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=JeP3gvkvleI6jj2VgVzl0kGTrLMbECFzE7u06pGtvps=; b=pNHi1L94Vg4wC/RNnS8z50Cvv+xL5Hvk7iS1pidMkshx5QCf+pI5+RYizayOLqoV0nDZmz 5dtPE2rrUjb2zGNm8PycpqZLi9OOU8vQ7FFvVhcUQxaulz0oCLDqF/4STWYz1WzpHd3JeP 3ikRMGCk6EE39ccPp+5EYMBZKJ8sA2RvbsG2W1VsWyiMUfprPZt3yT9baid6t6qOUJbIay krHNcgodUHvgPECjBnh9voTcfPqDwzEv0ug0yDtQafSacpf9oZVMCfZeao8sSbTAxoMOz0 C8gERIwG885bGhqBaAhmwP3Q2Uqs39griB740eTfSj1RGs3CWJie0bDfsEl/uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752678519; a=rsa-sha256; cv=none; b=xMA0LB2RiLYyNXtU7kPTOQnSJsQArDe+75kQeO8mmbHj7Pjp/bBOXaRMFJXIfHutm0wEy/ P6vN0Pa570pCFIhKKV0zuaKPgHSNdLGOVtEkCeKC91sMoArrOOcghr5UI+9RdssJzSXEI/ TGSBvLP7fkBIcQkB1gKaEt3SpvvDoj5rcISf1BuHDCk0DUbAlOUyUu86WPxj+u7/AaPkey W4+XvjxIIXCMDzhn/5EB8tsehfLU/qpY7ZNIOO6xbRSqoAsxfN5zUMkMweZCqIyg/Hq4dY qi+sZP1u8vjPhfJtBzqrpUq2+3QYi43VjNn+Y/W3IoPfDCSHdc88uGlHL85RSw== 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 4bhzw71FZFz90; Wed, 16 Jul 2025 15:08:39 +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 56GF8dHu008094; Wed, 16 Jul 2025 15:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56GF8d6Z008091; Wed, 16 Jul 2025 15:08:39 GMT (envelope-from git) Date: Wed, 16 Jul 2025 15:08:39 GMT Message-Id: <202507161508.56GF8d6Z008091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 06077dc327ea - main - makefs: Fix undefined behaviour in ffs.c 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: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06077dc327eae05026dde958c7a275b8b5bae3b9 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=06077dc327eae05026dde958c7a275b8b5bae3b9 commit 06077dc327eae05026dde958c7a275b8b5bae3b9 Author: Bojan Novković AuthorDate: 2025-06-25 09:45:06 +0000 Commit: Bojan Novković CommitDate: 2025-07-16 15:06:11 +0000 makefs: Fix undefined behaviour in ffs.c Fix a UBSAN-reported error in `ffs_make_dirbuf` where a zero offset gets applied to a NULL pointer. Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51037 Reviewed by: emaste, mckusick --- usr.sbin/makefs/ffs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 4efcd20ad91a..c0fcadf11fba 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -1056,7 +1056,7 @@ ffs_make_dirbuf(dirbuf_t *dbuf, const char *name, fsnode *node, int needswap) reclen = DIRSIZ_SWAP(0, &de, needswap); de.d_reclen = ufs_rw16(reclen, needswap); - dp = (struct direct *)(dbuf->buf + dbuf->cur); + dp = dbuf->buf == NULL ? NULL : (struct direct *)(dbuf->buf + dbuf->cur); llen = 0; if (dp != NULL) llen = DIRSIZ_SWAP(0, dp, needswap);