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 CCE8A4D7D26; Wed, 30 Sep 2026 16:23:41 +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=1790785425; cv=none; b=q/oRAm6B1aS4QUWbIvgvOnS28IXEErHCZXnXCUpU4OhRgRkTdSheeqdU6XA8AFZBYeN6MAx4z8WT1NIvB7x0WatJqSWaS2rygDqwNtvirqn6OG9nHKnuc+zDhMa0nmarv0kIvbbwYSmUDx9L9hXgXdTMPLUZjRVbNcPg1m7zXyM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790785425; c=relaxed/simple; bh=C79am0IkUIDV68T6UxY8vYQ04iyebTO94lfgY18D/Ho=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rRdwO+1esxPGzqBJZuupB9OCwni095XvbJh1LA5+hRbMAngO74vgwf0kEk+pbQ3ON6+uFTcseicd2kJ14cFTaWsKGZc/6NCkureseY9+MiPYZBqK2slKZP5m6FsgVElfLjawQSgxvq8c0O/XRG8PmS7s9lLYWy3GfNZkwgGrXpU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uEW8odw3; 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="uEW8odw3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B939E1F00898; Wed, 30 Sep 2026 16:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790785421; bh=Xd1ch+UcBTh1u1URLyrK5F8pwFvxZ5LHdDoaaueM4J4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uEW8odw31GJk3vwVeVEOjGB1ZBpcU62dJBQxO3zHUoU+IBYSyEbkgBhZ+DBkw1vAy /+rDkkG20y6U5TFVbbmhu5JvuynWqpB99pziF9btMW42Y8pnHxl5J+tkeap4u7xjdP yPFg/neC5ZTvR0rJhKP1z34dxgq7Mz7d1cE/5MIk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ali Ahmet Memis , Jan Kara , "Christian Brauner (Amutable)" Subject: [PATCH 6.1 504/982] ufs: validate cylinder group metadata before caching it Date: Wed, 30 Sep 2026 17:20:40 +0200 Message-ID: <20260930152427.605218231@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@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: Ali Ahmet Memis commit c9d263be26806d388129fab8c6904bed197fc6af upstream. ufs_read_cylinder() copies the cylinder group index and the rotor positions straight from the on-disk group and caches them without any check: ucpi->c_cgx = fs32_to_cpu(sb, ucg->cg_cgx); ucpi->c_rotor = fs32_to_cpu(sb, ucg->cg_rotor); ucpi->c_frotor = fs32_to_cpu(sb, ucg->cg_frotor); ucpi->c_irotor = fs32_to_cpu(sb, ucg->cg_irotor); They are then used as indices during allocation and free: - c_cgx indexes the cylinder summary array as UFS_SB(sb)->fs_cs(ucpi->c_cgx), so a value past s_ncg writes a 32 bit count outside the s_csp allocation. - c_frotor becomes a bitmap scan start, start = c_frotor >> 3, and then length = ((s_fpg + 7) >> 3) - start. A start beyond the block bitmap wraps the unsigned length to a huge value, so ubh_scanc() walks far past the cylinder group buffers. c_irotor drives the inode bitmap the same way. A crafted image can set any of these freely, turning an ordinary allocation into an out of bounds access. Reject a cylinder group whose recorded index does not match the group being read, or whose rotors fall outside the group, before the metadata is cached. Valid filesystems keep cg_cgx equal to the group number and the rotors within the group, so only malformed images are rejected. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Signed-off-by: Ali Ahmet Memis Link: https://patch.msgid.link/20260801071306.59484-3-ali@iusegentoo.com Reviewed-by: Jan Kara Signed-off-by: Christian Brauner (Amutable) Signed-off-by: Greg Kroah-Hartman --- fs/ufs/cylinder.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/fs/ufs/cylinder.c +++ b/fs/ufs/cylinder.c @@ -66,6 +66,16 @@ static void ufs_read_cylinder (struct su ucpi->c_clustersumoff = fs32_to_cpu(sb, ucg->cg_u.cg_44.cg_clustersumoff); ucpi->c_clusteroff = fs32_to_cpu(sb, ucg->cg_u.cg_44.cg_clusteroff); ucpi->c_nclusterblks = fs32_to_cpu(sb, ucg->cg_u.cg_44.cg_nclusterblks); + + /* these on-disk values become array and bitmap indices */ + if (ucpi->c_cgx != cgno || + ucpi->c_rotor >= uspi->s_fpg || + ucpi->c_frotor >= uspi->s_fpg || + ucpi->c_irotor >= uspi->s_ipg) { + ufs_error(sb, __func__, + "inconsistent metadata in cylinder group %u\n", cgno); + goto failed; + } UFSD("EXIT\n"); return;