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 64A37309EFF; Wed, 3 Dec 2025 15:37:34 +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=1764776254; cv=none; b=girFG5wT/dmlnjQ38Iiw2eevj4TAryQPXlz2ivBsAerNdLarxlo/qaJZgMzUig7CFs/6kWINlqBEt3pNQX2jz2wvktb1i3v0YRkJdonhtgPseP/9viX3mmQqFy82rVx0JhhiNYTpLzFVmRoODGXGbL/NQ4CO0urTJfLIYKEVIQQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764776254; c=relaxed/simple; bh=OieaGKzYkQmv2oWRBBHFK1aCAA9jfJzeADyn5/VmeU8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kblN31TGejiATXCZ4W6CeUFxFRtRB9Kep2jZpbfLYr+HIk/CGtAjGyhHAMILG6WUemAFpw5AHNnyrM86Sjk8S6INjfy5+nRDWokjvfnoQdoSl2A8sVicr038T6S375P5fSGgb7UVLMIJUsUIB2uc04/PYK9/AKHEkUFS+tqmvt8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=urTUypqH; 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="urTUypqH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6D3DC4CEF5; Wed, 3 Dec 2025 15:37:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764776254; bh=OieaGKzYkQmv2oWRBBHFK1aCAA9jfJzeADyn5/VmeU8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=urTUypqHJuuYi4us8A+66/XNAecVmtX5LblYJCZGWNa1cYF7sZyGy3/diRUH4C9Ab 6tXUeQzVFFKsPZcFDFz436pTTWXBoya9YJpqAFesqa6O2fQxOJbgYtrYuw4I8VJ162 Qg1W9lFus9y8oJz7bhZnp2+eTPPXXcUtZwiGwnQU= 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 5.10 126/300] jfs: Verify inode mode when loading from disk Date: Wed, 3 Dec 2025 16:25:30 +0100 Message-ID: <20251203152405.280725784@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152400.447697997@linuxfoundation.org> References: <20251203152400.447697997@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 5.10-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 2472b33e3a2d8..01f55fac31cf3 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