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 A9B3813FD94; Thu, 11 Apr 2024 10:24:59 +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=1712831099; cv=none; b=q5Uj26m0XvgaA3pLnQ4Nl6APNE7uDhJuOI/vjoGCaOHfyvRcpOmfcRceP1hDY/x3lkJJyfH5WFsNdLfEptjiYfGme+ILkI3sRGSxwR7Z+7Ug7Fod8i/Jf4H334tS8D7EWr6YgrtOiFHPOXUkfi9BSN+DDe92oLwyyoSEFVJVYMw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712831099; c=relaxed/simple; bh=oobHuPv10dyhN5LFltTwYNHkoVdxWmI1NLPjuqVqMog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HuGn7lWF8VfttbFO0z1LpukS0xXwdqUjkkjwsUs3MPu0I2UFdJh+MRsH+4PqA5EvMtA6/DzeZUge6gEClHNKuDPXtGzhiwlfMm/rvzuoKxpHm8pHVetNRGkvO2qcZZ9rGdu/i6ZLELKLykaH/13RzwewySwxKo052iKKa1au1rw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Rakyy8cU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Rakyy8cU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E79BC433C7; Thu, 11 Apr 2024 10:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712831099; bh=oobHuPv10dyhN5LFltTwYNHkoVdxWmI1NLPjuqVqMog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rakyy8cUTr8Oq1tkWJvoecvge4i0fYD3O9fgKGwoXIN3p3RE5o7BXYcpSbp1NE2I0 cVQaaC52UqRYVcRHQQ019FF9fdFVAmYZKjPMkiECVHPRJTHCq5m7D7zo2dIqPx2vHf B9OhP4pe0KQnlHGEqROo/Bz5NNq6zHDUlM3stb5M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Henrie , Jan Kara , Sasha Levin Subject: [PATCH 5.4 188/215] isofs: handle CDs with bad root inode but good Joliet root directory Date: Thu, 11 Apr 2024 11:56:37 +0200 Message-ID: <20240411095430.516183268@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411095424.875421572@linuxfoundation.org> References: <20240411095424.875421572@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ 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 74e487d63c62c..95c08f3c4b35e 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -912,8 +912,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