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 2A47E2D979C; Tue, 11 Nov 2025 01:21:56 +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=1762824116; cv=none; b=kQQJYRUZ/Z+HQDtdjuzIBQrZShX06Jsn+vzRiPxnNXT/8i/U3L8fEh2LeN7tM/Ewz/iv5oEPOuxka53uMWzuZgdBG88vgn6FNdbAGAUko1GlqTWcLqIFYBfEseAkuUlFKxT3UcxYPCx16v3+l+ibMTN1siAE++JWog7IP+SlbPI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762824116; c=relaxed/simple; bh=Oa2pJR8K2KnrgDDAUuC13rnIXhXDDU0ULlbi1g8ttfE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nMnzKsnAblZOizKgAjZgja+sCh4ZU1tamLXgulweqG9cZcJsYwyGVQTXRR6bPNkFMxEnP8zMYAO61yDKwciiinjCuzVjTBhsAKyeOYH594bn4KQ0vzxFAabDcrWme9i5omjJyiRDk/9w2RmRmPWKqkCxTheOtb9b5jLG1Bz4jbo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ujc8ZOhU; 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="Ujc8ZOhU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BAAEEC19421; Tue, 11 Nov 2025 01:21:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1762824116; bh=Oa2pJR8K2KnrgDDAUuC13rnIXhXDDU0ULlbi1g8ttfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ujc8ZOhUXyRXPZW9qSpPazCnHQPpjdJoRdjgYAac5uvOwCd8ATrUVe0Xxc6e/CvEZ 2vJJVbqCMtuTfilgXZAY4rJJUntA699zIKcniuk1B+Pl9dzxmP5Hg2mB4d6ixcz9Rh 67inEz4uTzdBd4O00BPOA9SUctaQ1nCpjWTsZcLM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot , Tetsuo Handa , Dave Kleikamp , Sasha Levin Subject: [PATCH 6.12 390/565] jfs: Verify inode mode when loading from disk Date: Tue, 11 Nov 2025 09:44:06 +0900 Message-ID: <20251111004535.645913511@linuxfoundation.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251111004526.816196597@linuxfoundation.org> References: <20251111004526.816196597@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tetsuo Handa [ Upstream commit 7a5aa54fba2bd591b22b9b624e6baa9037276986 ] The inode mode loaded from corrupted disk can be invalid. Do like what commit 0a9e74051313 ("isofs: Verify inode mode when loading from disk") does. Reported-by: syzbot Closes: https://syzkaller.appspot.com/bug?extid=895c23f6917da440ed0d Signed-off-by: Tetsuo Handa Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- fs/jfs/inode.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index 5fe8cb4742c21..8ee653aa07ced 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c @@ -59,9 +59,15 @@ struct inode *jfs_iget(struct super_block *sb, unsigned long ino) */ inode->i_link[inode->i_size] = '\0'; } - } else { + } else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode) || + S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) { inode->i_op = &jfs_file_inode_operations; init_special_inode(inode, inode->i_mode, inode->i_rdev); + } else { + printk(KERN_DEBUG "JFS: Invalid file type 0%04o for inode %lu.\n", + inode->i_mode, inode->i_ino); + iget_failed(inode); + return ERR_PTR(-EIO); } unlock_new_inode(inode); return inode; -- 2.51.0