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 77CCC145B13; Thu, 11 Apr 2024 10:27:20 +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=1712831240; cv=none; b=mEeRLdaHZxfTo07xCuxre37TNx5EtUSpEbxFqyoiVvKOwjHIy1CcEatYPbqUELjDZxtqcm2sqByVSotyoE1recYb8qq3kn5iperdVMX3vRh7PBAKzretq99nu0jUjvjH0JrHpsNdzqXVMPz5SoynAXzb+MEoWXTGVePqI7E+D0U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712831240; c=relaxed/simple; bh=GHUrM2JkJip0e5DVGvZvSVQawvAUqQr1kQiVRJbRPtc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aLLibmcE1Lp/bP9ttFOi5JBFKiDSnEK72R8kT9ziJOhkP/eUSXUCilPrcGglhH+h4vvM1nmZdNOkuGoojY0eMPQb+4oyxvk9cEdiGHaOJyIGKIH7mWiFVLsaPHR4+0zQKImKyZ7ZcS5o71vl6dVNkWU9tCYZjLeRPfBb7QhiZws= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0f8mglgT; 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="0f8mglgT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2E1DC433F1; Thu, 11 Apr 2024 10:27:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712831240; bh=GHUrM2JkJip0e5DVGvZvSVQawvAUqQr1kQiVRJbRPtc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0f8mglgT5NjYImN+aqOzkfFYeHM/kywFTS5hFYghmkNZjMH59MhyuA6RsJaft0yDD iQFGEbx5nF8ktTozjJTq2KotMdeFU+JPzLOibJh3xmMYmX1NOVqS66QNVGTnQc6roU WuRgt2CtQqtnxJKH6b6Spmbs9+ToJwAMC1wdfXXU= 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 6.6 054/114] isofs: handle CDs with bad root inode but good Joliet root directory Date: Thu, 11 Apr 2024 11:56:21 +0200 Message-ID: <20240411095418.515712419@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411095416.853744210@linuxfoundation.org> References: <20240411095416.853744210@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 6.6-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 2ee21286ac8f0..54075fe3de9b1 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