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 02C58C7EE22 for ; Thu, 4 May 2023 19:58:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232172AbjEDT6J (ORCPT ); Thu, 4 May 2023 15:58:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232422AbjEDT4C (ORCPT ); Thu, 4 May 2023 15:56:02 -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 3F30CAD02; Thu, 4 May 2023 12:49:19 -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 9AB49637FF; Thu, 4 May 2023 19:48:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54D95C4339B; Thu, 4 May 2023 19:48:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683229739; bh=RIs3bOZOYO+vIpkypdWAjJCJO9m9XDgB9ZN7hJMrgeE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NaZmIX5v7Bc71tBCMDtnFjP0IZymzkVqF63FNS+wi6XrqOuFvUO68eUSSd6S5iI6j 3n8S0AWm+RZQ21ZsnlHQ/cTjuCL/oqk3AAcuoPhK3z6JWirOWjO62fNaZWqG3b452o or5vP4Xy/5XU3VsKOK20FvDN/sffKFhePFoz2+xvVev2owy6lIyaeO/saKuajOc/2N WGrsBSPFCeLABgb8mkyMxldh2wSbX9rooFDiVBkk0W5aWW2yQzD/btHninSf45OAQs 4aP/25A0aTB8UDkrvFK0aY1Av4d8mANDxvsNAm3jUhCx2PS8bZmLLGijifYVRZgu4b 8zyyPzrruv1CA== 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 5.15 13/30] gfs2: Fix inode height consistency check Date: Thu, 4 May 2023 15:48:06 -0400 Message-Id: <20230504194824.3808028-13-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230504194824.3808028-1-sashal@kernel.org> References: <20230504194824.3808028-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 450032b4c886e..558932ad89d5d 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -394,6 +394,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; @@ -440,7 +441,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