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 X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A05DC433DF for ; Thu, 30 Jul 2020 08:12:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EE0C02075F for ; Thu, 30 Jul 2020 08:12:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596096762; bh=5z15zI3/T6HQEd0E/ow7TCeuC7Za8Ty+Of0kwIHX7t8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ciq4A9HIGxS/EyIGbNBNzict94VL5wIZcjieSFxPym2Nh6U6j/jAfYl2EsS53R8zG tis4rEZwlbucHmUg58xa37ObbWm3TMovJgBbIBo3+vjrfN54YbaBWZo2wyuG56CNbs b/Ma/ZRFJqg79SX5m6PMax0ryu6Ac+qts9tCJO9Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730075AbgG3IMk (ORCPT ); Thu, 30 Jul 2020 04:12:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:51914 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729669AbgG3IMi (ORCPT ); Thu, 30 Jul 2020 04:12:38 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 201732075F; Thu, 30 Jul 2020 08:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596096757; bh=5z15zI3/T6HQEd0E/ow7TCeuC7Za8Ty+Of0kwIHX7t8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2GuDaEmMTx9Cgv9sH+pNHybde7K3Z8ox+QEnt2ubyZPUzNyFB0cH4V/dhjGK7nqUL 8CxTCxM/13HvHMvd2yE8e6mc2fuM1YLy/Xx8t+iujdZ1oPxFEZfWi8Vppf01vVwq26 vVfQL4ZF0HnHtuWim61hdLYK/M0AGfoKP9ZfzXaM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Sandeen , Christoph Hellwig , "Darrick J. Wong" , "Nobuhiro Iwamatsu (CIP)" Subject: [PATCH 4.4 49/54] xfs: set format back to extents if xfs_bmap_extents_to_btree Date: Thu, 30 Jul 2020 10:05:28 +0200 Message-Id: <20200730074423.544960348@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200730074421.203879987@linuxfoundation.org> References: <20200730074421.203879987@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric Sandeen commit 2c4306f719b083d17df2963bc761777576b8ad1b upstream. If xfs_bmap_extents_to_btree fails in a mode where we call xfs_iroot_realloc(-1) to de-allocate the root, set the format back to extents. Otherwise we can assume we can dereference ifp->if_broot based on the XFS_DINODE_FMT_BTREE format, and crash. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199423 Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong [iwamatsu: backported to 4.4.y] Signed-off-by: Nobuhiro Iwamatsu (CIP) Signed-off-by: Greg Kroah-Hartman --- fs/xfs/libxfs/xfs_bmap.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -793,6 +793,8 @@ xfs_bmap_extents_to_btree( *logflagsp = 0; if ((error = xfs_alloc_vextent(&args))) { xfs_iroot_realloc(ip, -1, whichfork); + ASSERT(ifp->if_broot == NULL); + XFS_IFORK_FMT_SET(ip, whichfork, XFS_DINODE_FMT_EXTENTS); xfs_btree_del_cursor(cur, XFS_BTREE_ERROR); return error; }