From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76EFDC77B78 for ; Thu, 4 May 2023 19:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231668AbjEDTxZ (ORCPT ); Thu, 4 May 2023 15:53:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231771AbjEDTwX (ORCPT ); Thu, 4 May 2023 15:52:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C07EA150F0; Thu, 4 May 2023 12:47:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E8C77637C0; Thu, 4 May 2023 19:47:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A58C5C4339C; Thu, 4 May 2023 19:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683229631; bh=wyK6FEtqetmuKN/UDCqas19MN25BkJV4mWUXvVLOZLQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J1ppQdK+8v9ZTdiu0RRVYdT6gEX0VfCfQss5V7PXNtXXCuq8bOWUxBQoVcG9urODY DRbLlCyeYUweIFqulXbqvmG7q37mP8/SETwnesthzvBhStgFCo2Rp7L6eVXST1/gnS WwsI5HgzZy66hCGFmeWUdFLqKlkVDETNlIDeZT1IBSe3RC1TKm8p385ENmMqJTGG8X OHcLXwwjplEtl2SgVxF6DxoZrY7GxcLY27zvR9yPfWXqJIbxe341ckJkQDeM+86PT9 H6KuZI5thmjnmwb2VGpKQNSRS2rxCkNyL2HdnrfH1UT6pl906D8TV9UQYpiZdKzoYB OHyHBDSnMztDQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andreas Gruenbacher , syzbot+45d4691b1ed3c48eba05@syzkaller.appspotmail.com, Sasha Levin , rpeterso@redhat.com, cluster-devel@redhat.com Subject: [PATCH AUTOSEL 6.1 17/49] gfs2: Fix inode height consistency check Date: Thu, 4 May 2023 15:45:54 -0400 Message-Id: <20230504194626.3807438-17-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230504194626.3807438-1-sashal@kernel.org> References: <20230504194626.3807438-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andreas Gruenbacher [ Upstream commit cfcdb5bad34f600aed7613c3c1a5e618111f77b7 ] The maximum allowed height of an inode's metadata tree depends on the filesystem block size; it is lower for bigger-block filesystems. When reading in an inode, make sure that the height doesn't exceed the maximum allowed height. Arrays like sd_heightsize are sized to be big enough for any filesystem block size; they will often be slightly bigger than what's needed for a specific filesystem. Reported-by: syzbot+45d4691b1ed3c48eba05@syzkaller.appspotmail.com Signed-off-by: Andreas Gruenbacher Signed-off-by: Sasha Levin --- fs/gfs2/glops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index d78b61ecc1cdf..7762483f5f20f 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -393,6 +393,7 @@ static int inode_go_demote_ok(const struct gfs2_glock *gl) static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) { + struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode); const struct gfs2_dinode *str = buf; struct timespec64 atime; u16 height, depth; @@ -439,7 +440,7 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) /* i_diskflags and i_eattr must be set before gfs2_set_inode_flags() */ gfs2_set_inode_flags(inode); height = be16_to_cpu(str->di_height); - if (unlikely(height > GFS2_MAX_META_HEIGHT)) + if (unlikely(height > sdp->sd_max_height)) goto corrupt; ip->i_height = (u8)height; -- 2.39.2