From nobody Thu Sep 10 02:32:11 2026 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 4hgMC01h3Bz6rsXd for ; Thu, 10 Sep 2026 02:32:12 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hgMBz5lfWz3Ktr for ; Thu, 10 Sep 2026 02:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007531; 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=RlC7d02LGU6KvWcgtVSQKELmoVGhdfPCANyhmHA1Tjg=; b=cnqdHGeIB8cEkfm/MeDMPKxkxE5z+WiD5kDMHjjE7e6Bm4k6hOfxxxCiCVharpIBMsD5KA zmoGnexzveyHrFPEhqEIS5mD2Gt6npNhTaZ/2V+WVTkt84jepAeNJsPThkh6Q+qf0T8wPc hDdPTlFMnnkkIaeKt29IeXs7DUmtMh7ME2d2Sy1XUyLUnWRbbwA1QdvTjEjHJvW+0hvpyd 0AK7bFDxDcUJsti7V+LX/DGgGDx+whNfh+1GaHmfaXSFpHNiIvUdyM0mXifXmjWfkUYl/s z/o4BlxBTXUg2XVk0/2WYpIKaSP+q1t59b/Ve+u5wIIm9L62vbw8tv9pv5GOiQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789007531; b=vwR02vDeqO9t6LxlLxhdzeqvarl8rp8+XKfq51OqNbuuekfJR1MwuiNfkHuSMWPCvwDW2t AFvJ4EWT+p9euSzQeD7OWKjcWVGUP3ho8xrd8yIMnXplQehgWuB6UAr3wbagPW+0DY0TZs Y8f8+31BUgCvxFPbEHBEISCLsLABDSJG9Weev98srDRANIYauuniQF6a/2EwbC2l2K6niT tdugmbIdT4mMjeJquSlPh9+VEgKa0HHZXBFJGa2zF9PNG/UfV1CqpUAD//b3/FNb5L+FCn 3UvHjohaJGrSU+aSweNQ1HOczBpKH9P2but0SvZKm+MkCikOI9jB6ltFZZofuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007531; 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=RlC7d02LGU6KvWcgtVSQKELmoVGhdfPCANyhmHA1Tjg=; b=WSZUWMJTTcS5morTri9eM7KnjY+dp+G4/Jf74UPK96UQB9m0g6JCzN66CWKYjvU6HTj8EP 28ByLpm5F9aym/Q4QWq9Zi7+r6AJe+ejKx21oKDTrtvU5gO4m5ijZo4yQc4iXlgpU2YS2b ig0lGbVo7gztaKydronj9WQmyoQkmnNmsSW/NMFk9KSOL2L8xkoAkSDioXOlv4zNKSUSaH /PFHFxZjPhRuc+JFtWtvTCFuyyWbxIjqSFyjlFIgoDrSIs1xJRtJD2BvOaOo58cZ9wJRpF 320YwZ4a5qEoaEFQv+yrb1oa0/3oO40RrLBHwQPjZleDUOveNfKs59E4A+EZjQ== 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 4hgMBz4pBPz1NCB for ; Thu, 10 Sep 2026 02:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f5d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 02:32:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Chris Suter From: Xin LI Subject: git: 741eb8ae72c0 - stable/14 - MFC: fsck_msdosfs: fix memory leaks in checkfilesys() 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 List-Id: 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 741eb8ae72c0eb7f51d06229a51291742aab2a7c Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 02:32:11 +0000 Message-Id: <6aa216ab.1f5d9.5b583de2@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=741eb8ae72c0eb7f51d06229a51291742aab2a7c commit 741eb8ae72c0eb7f51d06229a51291742aab2a7c Author: Chris Suter AuthorDate: 2026-08-04 05:58:25 +0000 Commit: Xin LI CommitDate: 2026-09-10 02:31:06 +0000 MFC: fsck_msdosfs: fix memory leaks in checkfilesys() (cherry picked from commit 6d49b0c0e7b8b77d8043593356e712307e894743) --- sbin/fsck_msdosfs/check.c | 5 ++++- sbin/fsck_msdosfs/ext.h | 1 + sbin/fsck_msdosfs/fat.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c index f672a2ac515c..e6c8ba24520f 100644 --- a/sbin/fsck_msdosfs/check.c +++ b/sbin/fsck_msdosfs/check.c @@ -181,7 +181,10 @@ checkfilesys(const char *fname) out: if (finish_dosdirsection) finishDosDirSection(); - free(fat); + if (fat) { + releasefat(fat); + free(fat); + } close(dosfs); if (mod & (FSFATMOD|FSDIRMOD)) diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h index d0f4dd6279f7..80ad684e9622 100644 --- a/sbin/fsck_msdosfs/ext.h +++ b/sbin/fsck_msdosfs/ext.h @@ -109,6 +109,7 @@ bool fat_is_valid_cl(struct fat_descriptor *, cl_t); * descriptor of it. */ int readfat(int, struct bootblock *, struct fat_descriptor **); +void releasefat(struct fat_descriptor *); /* * Write back FAT entries diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index 5ead0b1bf783..bd8171043cc1 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -783,7 +783,7 @@ err: return 0; } -static void +void releasefat(struct fat_descriptor *fat) { if (fat->is_mmapped) {