From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03F3532B11D; Sat, 30 May 2026 17:01:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160498; cv=none; b=N6F/JSaH+9zStAp4g8ya4SD7Jh5qgu8ewtBD4Dg57a9w8VUxgapIKMLz7VMm93Al5fCDp6a4UHauSIjRQXKM9BABlFq35JOVFgyJvdVFFBuvz2BOwC7Bu4OJyaux/Dx9HlYeFYkDHUm+ezcI6M47/tPnpf+HCcjuMaHyCrUacXo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160498; c=relaxed/simple; bh=wc3LV2/zIfv2k35MKtksXYBjQq1OLHgxBeW25ki+QOA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pzChWmrCBqUzJ1fuqkywzE9ngQyZjQ5FCP7dzPaJF77ZFGZfau4zLCZQ8p5wf/IxepEOTUjBgzPnZ2GzSD7z0bBOkOVIU+fHCPlrNrGcr612jU8Y2xXE0cJOwYTqX9rUVZAVk+AQxIeIV28riJ+WBJ8XUzoqsFA1Mid/9qcSN9Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OdX0y0oq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OdX0y0oq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05D361F00893; Sat, 30 May 2026 17:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780160497; bh=Zo2HKM6gEWd2gNQ66JQavLeBW6qsEw70JbEJuqqPkRA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OdX0y0oqvv0YEmS05/qVcFzaOnuKZrT1Nt5TZsBG9woVsiN6AVUktxVIC3aQmY3Ee MgdJgtIY8chuTpDf1j6A1mtAo3qePOcDdkDle9t1sjXxlVrVD7qxJ+J6jcR61qEiCy spDFz5u5kWOImTTVGyyEjzDnOcoD/KwF4eGoSbh8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michael Bommarito , Jan Kara Subject: [PATCH 6.1 355/969] isofs: validate block number from NFS file handle in isofs_export_iget Date: Sat, 30 May 2026 17:57:59 +0200 Message-ID: <20260530160310.147633735@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael Bommarito commit 24376458138387fb251e782e624c7776e9826796 upstream. isofs_fh_to_dentry() and isofs_fh_to_parent() pass an attacker- controlled block number (ifid->block or ifid->parent_block) from the NFS file handle to isofs_export_iget(), which only rejects block == 0 before calling isofs_iget() and ultimately sb_bread(). A crafted file handle with fh_len sufficient to pass the check added by commit 0405d4b63d08 ("isofs: Prevent the use of too small fid") can still drive the server to read any in-range block on the backing device as if it were an iso_directory_record. That earlier fix was assigned CVE-2025-37780. sb_bread() on an out-of-range block returns NULL cleanly via the EIO path, so there is no memory-safety violation. For in-range reads of adjacent-partition data on the same block device, the unrelated bytes end up in iso_inode_info fields that reach the NFS client as dentry metadata. The deployment surface (isofs exported over NFS from loop-mounted images) is narrow and requires an authenticated NFS peer, but the malformed-file-handle class is reportable as hardening next to the existing CVE-2025-37780 fix. Reject block >= ISOFS_SB(sb)->s_nzones in isofs_export_iget() so the check covers both isofs_fh_to_dentry() and isofs_fh_to_parent() call sites with a single line. Fixes: 0405d4b63d08 ("isofs: Prevent the use of too small fid") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Michael Bommarito Link: https://patch.msgid.link/20260419212155.2169382-3-michael.bommarito@gmail.com Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman --- fs/isofs/export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/isofs/export.c +++ b/fs/isofs/export.c @@ -24,7 +24,7 @@ isofs_export_iget(struct super_block *sb { struct inode *inode; - if (block == 0) + if (block == 0 || block >= ISOFS_SB(sb)->s_nzones) return ERR_PTR(-ESTALE); inode = isofs_iget(sb, block, offset); if (IS_ERR(inode))