From nobody Thu Sep 10 02:32:38 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 4hgMCW18W1z6rsdS for ; Thu, 10 Sep 2026 02:32:39 +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 4hgMCV3fFsz3Lwl for ; Thu, 10 Sep 2026 02:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007558; 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=Y693I3ZD99N+Cp/3EcJab1Y7oa++9Uv4zpmE+dABfMU=; b=LHQTlkxjr9QTjspbbIrfv55CUmkYEzuwVFawv/T1p4JlYbTKuYjOBdsMrSsbj8+sQJEGSv mNsgA8snT9gVBpu0E0soAVBlp8JwmwJY/+gASSqFMnD8KrjsAe16RIBAVoZL94wIC41iaO rnIEyYBnSTwhPE5tw232zhKP/H6vGx9sbEMa4JVugXr0VLZbbEIEsQ1IhEvIPy24FCPpHR RC7RUsOrdsOx2n3IwV6nqgG4UHbn+pAlAo4QA1jxb7BNegbOxyfOFCmmB3mV98QaAjjFCt skT8mFNaSVrMSCi22wSsxIx4+cUWyZFTcqbjX7ZllXXmMAV3bQs2aM3HZTP5NA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789007558; b=rQbRGAglYunrbaP3YDLAuyxCcARb74nAmXElH4RNwnMnhWYMwUVrIa9BFFNbre9px86BFu 8SqIPW7OMXCQmUede3iwRExm+/ynx29id8q9vP+vGIuk/Df8hYh6LG9W8u6+U3unVx2C5q ldWP6dwAbERQsSM+gcD40YhGQLm73aYPiusc5+Vo7gNgkql4QFFC7QgFHsAbwpYdSPu2Xq 6E3iLlVYfBlJqARPf4lDg6aoQrWu1Xadxz9OzJOiHl5bkrVZrnb6of4vJxPl+NoV3Us25T TzEhRz8G9HzejhPZ0cF+j/VmKlu4A3XuKasJybTz0xdeM762U3wFqpVjNYBObA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007558; 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=Y693I3ZD99N+Cp/3EcJab1Y7oa++9Uv4zpmE+dABfMU=; b=UL1iLl+7qhQAnoO8+d3Ow2yHKLYLt5lWg5vw1k3leoKIaSgehItU57EIrfZrGACqtr3ahf 9Vui11IFXybY88xx3AuDCEqsr197mFV/sfo6ic/SyqqlFekBJ0EeorwLMgLSg7TXQunZTi AyPCUEDwPOiaauIlbyvsypGj+nIskS7z1kM77bVdLtayfOWyjhSJFUrNzk/1rA5bXgRL+a 3N6Vc0fIZ0bKB/3JDz304sVR2lRp0BajYG47FxcbljgMHXDY24TflIz/0olQDgHo6dp3+T 5e1o8Hc9sgTJ1BFRKwx4QLX4ZSVMCxu0lXVsA0kZg01BcKgPOf4INFTcaqh84A== 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 4hgMCV2kXgz1Mgg for ; Thu, 10 Sep 2026 02:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fda6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 02:32:38 +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: c2e12db3db01 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: c2e12db3db01e214304b9e43d3c79dde06c3b06e Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 02:32:38 +0000 Message-Id: <6aa216c6.1fda6.6c8c0750@gitrepo.freebsd.org> The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=c2e12db3db01e214304b9e43d3c79dde06c3b06e commit c2e12db3db01e214304b9e43d3c79dde06c3b06e Author: Chris Suter AuthorDate: 2026-08-04 05:58:25 +0000 Commit: Xin LI CommitDate: 2026-09-10 02:27:20 +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) {