From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 977B623658B; Fri, 29 Mar 2024 12:46:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716385; cv=none; b=rs2obixyqsA2LVcuUedZ0n/xgVQS/fc+u3svwta7XbxI+8NXS1+C0K4mhDspwL3pHvuB2v32wMI2W7tmloLXwpbw27QyeIFyXxjn9MzxlsWdnPkG35FYc8GHMIpZeJr6Yv63N8S3IbDQBRDvnf+LQzZmQ8D7GIZsGrm5e5mMYOA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716385; c=relaxed/simple; bh=X+bTYyVLoxeWuZfwjWgmZvLj4dT4ohDe+Hb8ohJxybA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rEhDJmnYAdNgvpSgUz9n1wibI8RaZQIi9k6MC2lqorXmSIIRI3o6VNkLe8gAuKVJ+X/T80QNuUEmmTgJm5x56y5vSfjbS5PCGB0dhZcffTh1xIfHTBVN9ORD1VSpHDZOavSX0JNRTGhDFfGKeQxVX9jIAEZKiHlnEusxSgu0hsY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Osijzzs5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Osijzzs5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B69AEC433C7; Fri, 29 Mar 2024 12:46:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711716385; bh=X+bTYyVLoxeWuZfwjWgmZvLj4dT4ohDe+Hb8ohJxybA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Osijzzs5K33RClrOuYA3c2CBk74e1UiUKm7DVegypB+VGY5/LAmQtZT/XwzPsslSE XSbSqouqbyK53kC0AL8OZo0QaFMnBIrdUtCUCQpyA6mbx64geFX85Vwhr+Z4MZ0e10 rtTGqkJhdI6ZLTqjNA88Y8G2gk1fCa0L+iqvBlZWc3zBCgfgBMW0dAUnmqKlg5RT1f dDkJS4BiKc32pruXqs76x55LC/rQ2kjv+KQu+h/4e7AeS3FE5V3HclM8M1qC214F3g xIidZZtX7xdjUEizjthceBNd6I4uNOjSxyEv5IhJopBTA4vBd9RSyNOrrfk+v0D8LP itEaFi7L8ELaQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Henrie , Jan Kara , Sasha Levin , linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 12/52] isofs: handle CDs with bad root inode but good Joliet root directory Date: Fri, 29 Mar 2024 08:45:06 -0400 Message-ID: <20240329124605.3091273-12-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329124605.3091273-1-sashal@kernel.org> References: <20240329124605.3091273-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.83 Content-Transfer-Encoding: 8bit From: Alex Henrie [ Upstream commit 4243bf80c79211a8ca2795401add9c4a3b1d37ca ] I have a CD copy of the original Tom Clancy's Ghost Recon game from 2001. The disc mounts without error on Windows, but on Linux mounting fails with the message "isofs_fill_super: get root inode failed". The error originates in isofs_read_inode, which returns -EIO because de_len is 0. The superblock on this disc appears to be intentionally corrupt as a form of copy protection. When the root inode is unusable, instead of giving up immediately, try to continue with the Joliet file table. This fixes the Ghost Recon CD and probably other copy-protected CDs too. Signed-off-by: Alex Henrie Signed-off-by: Jan Kara Message-Id: <20240208022134.451490-1-alexhenrie24@gmail.com> Signed-off-by: Sasha Levin --- fs/isofs/inode.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index df9d70588b600..8a6c7fdc1d5fc 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -908,8 +908,22 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) * we then decide whether to use the Joliet descriptor. */ inode = isofs_iget(s, sbi->s_firstdatazone, 0); - if (IS_ERR(inode)) - goto out_no_root; + + /* + * Fix for broken CDs with a corrupt root inode but a correct Joliet + * root directory. + */ + if (IS_ERR(inode)) { + if (joliet_level && sbi->s_firstdatazone != first_data_zone) { + printk(KERN_NOTICE + "ISOFS: root inode is unusable. " + "Disabling Rock Ridge and switching to Joliet."); + sbi->s_rock = 0; + inode = NULL; + } else { + goto out_no_root; + } + } /* * Fix for broken CDs with Rock Ridge and empty ISO root directory but -- 2.43.0