From nobody Mon Nov 09 17:54:03 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 4jNcq00lsMz70CHR for ; Mon, 09 Nov 2026 17:54:04 +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 4jNcpz74Qdz3LhC for ; Mon, 09 Nov 2026 17:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794246844; 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=qgujPNtRXH68aPXXn+YPhaTj/pCEkU/NP86WcxM2QO8=; b=PZ1xf/Xt6HbK7KNle52viA9M317Dr9yKj5MgFnCgj9YQuvuK0CzmBZ5VWti6sEypjffr/T 3nBtuX5ByNvr0hSbjfG4xcqDb2B5bPk9S290ixpvBQhIQDQ383WOoQirTAzrADQXy+frUx i+kytyVcyALXEpt6bHLf+XyjRMTl7wTh1h1mRRaEBxLR2scGAcqQJOdrsXeWqvAUknxfKO 6NKoyyWVRghYHOzbJCJxBtusf76+xq21Y+dTj48YzeOAOemaUTBuQbMI573zrmsb8/q3PY ZAVxOip/9h7h7asf5y7DI71vnazGUdElyJgeBDSK4GFabbL7oaSILFi3EHMC2g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794246844; b=AB42KVAN7I5ze2Xqh45eAQeS6IF6bqmsmnBVb/FeVUlgW47ganbB8ADWGmQ7dtlX1JSExu vHF/jpL34l6bo8D6bCZh4bPKAdOIZMfMUczOG3pgMQwK5WAezq7YpWC1jhhu7Ir67McPhb eu0L6hsetcGZs9SVsrJ+fyryJF7zOga/rHoB6/asd3neP1WCw/XxA4sZmOI6pEpX/xWxgE +Obh3N+2CYgf2lqfu0rjodUS7DXlmVQZkCB6KEoKVT6d0kOeBr8k6sUPCG2rscXQwwYstv elR7uuqxSpUpK+kCOpGDsmwUZOw98dYqeSJDj5WUV1xoHpOugP+Iy4wgwoJbXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794246844; 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=qgujPNtRXH68aPXXn+YPhaTj/pCEkU/NP86WcxM2QO8=; b=sZjfkMKn2rEWDIbbrb5yWcm7kYwYnAwfYz03OaBXcGkBM2KUvDqTfJKIfKXUOlcUvgTSEt z97Agdq1ou/eOX5Uc+MQlfEX7KVvuUBpBRRFOceasBB5CeOUZtziAzUC47N2k7vrMixU1b EwgwMmkHlmiJXo+NjD7Y1ND2Y1KVhOFlxGfF39EjOFcL3YBhrmEhoQ/osSRVIaf6Tc3UUk ssba9pGSl6uOfbdRXXL5Q1mRwUGVQ7b9lIeUyMhsLWgCtXoViXyv1CRKMbeMblUHLzgLhm UDhaAMmrBnHe7K9/y14UyQ6yjy/GmQUhmOX2ZeqBRSCSSi8OmVa+c5i1Mr+aDg== 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 4jNcpz6RtKzrW7 for ; Mon, 09 Nov 2026 17:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 75fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 17:54:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: cbd7e7fa5327 - main - stand: ufs directory corruption sanity checks 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: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbd7e7fa5327fe91d5a6649b92f8f2e2fb383e87 Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 17:54:03 +0000 Message-Id: <6af208bb.75fc.4aba3e5b@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=cbd7e7fa5327fe91d5a6649b92f8f2e2fb383e87 commit cbd7e7fa5327fe91d5a6649b92f8f2e2fb383e87 Author: Ryan Libby AuthorDate: 2026-11-09 17:15:54 +0000 Commit: Ryan Libby CommitDate: 2026-11-09 17:15:54 +0000 stand: ufs directory corruption sanity checks Add sanity checks for corrupt UFS directory blocks. Don't allow bad data to cause buffer overflows or infinite loops. Reviewed by: dab, imp (previous version) Differential Revision: https://reviews.freebsd.org/D59378 --- stand/libsa/ufs.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index 868e8d47dbbd..67d414b217c9 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -78,7 +78,6 @@ #include #include #include "stand.h" -#include "string.h" static int ufs_open(const char *path, struct open_file *f); static int ufs_write(struct open_file *f, const void *buf, size_t size, @@ -444,8 +443,9 @@ buf_read_file(struct open_file *f, char **buf_p, size_t *size_p) } /* - * Search a directory for a name and return its - * i_number. + * Search a directory for a name and return its i_number. + * Light corruption sanity checks avoid buffer overruns and infinite + * loops, but we avoid being very strict. */ static int search_directory(char *name, struct open_file *f, ino_t *inumber_p) @@ -469,6 +469,8 @@ search_directory(char *name, struct open_file *f, ino_t *inumber_p) dp = (struct direct *)buf; edp = (struct direct *)(buf + buf_size); while (dp < edp) { + if ((uintptr_t)&dp->d_name > (uintptr_t)edp) + return (EIO); if (dp->d_ino == (ino_t)0) goto next; #if BYTE_ORDER == LITTLE_ENDIAN @@ -477,13 +479,17 @@ search_directory(char *name, struct open_file *f, ino_t *inumber_p) else #endif namlen = dp->d_namlen; + if ((uintptr_t)&dp->d_name[namlen] > (uintptr_t)edp) + goto next; if (namlen == length && - !strcmp(name, dp->d_name)) { + bcmp(dp->d_name, name, length) == 0) { /* found entry */ *inumber_p = dp->d_ino; return (0); } next: + if (dp->d_reclen == 0) + return (EIO); dp = (struct direct *)((char *)dp + dp->d_reclen); } fp->f_seekp += buf_size;