From patchwork Wed Apr 22 09:56:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 227084 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 0B01BC5518C for ; Wed, 22 Apr 2020 10:52:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CFBAB2076E for ; Wed, 22 Apr 2020 10:52:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587552725; bh=Ja639FxrMib3/dXWNWjCEqNbtbnGORU9JLmmSaPyidY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qcNApLGaPPr20LEZsNiy1g/hwlI3qTAR8ZYL2Sfv/bMaxnZO793yylBlMtzzz6VLt u/BWKwZ06iVD1tCCmREC3cJwBr4mzsRGnLkgVQhohj5y7DBebGmNaImJnVpPGWUTcV bDjA+e9QFAEpg2celMu91gkyigMS5QcJx3YwViZc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728997AbgDVKKh (ORCPT ); Wed, 22 Apr 2020 06:10:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:40470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728488AbgDVKKe (ORCPT ); Wed, 22 Apr 2020 06:10:34 -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 83D372070B; Wed, 22 Apr 2020 10:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550234; bh=Ja639FxrMib3/dXWNWjCEqNbtbnGORU9JLmmSaPyidY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bpb9BBKDYzQ+LaSYcsCWE+mxM8q3dJ/m6802I7/guUjBfz4UoHyDtyMasgURgSI+E SW63qL3PGPd3u4piqjiLtqDdH6ccFz/EfQC276pJudwwdO+pxXxnYIArtdl7xz8SI7 5hPa3AAq2scgdn1gI+Pxbyw3RJtmw+TKWxgRUNuo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qu Wenruo , Josef Bacik , David Sterba Subject: [PATCH 4.14 064/199] btrfs: drop block from cache on error in relocation Date: Wed, 22 Apr 2020 11:56:30 +0200 Message-Id: <20200422095104.659709437@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095057.806111593@linuxfoundation.org> References: <20200422095057.806111593@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Josef Bacik commit 8e19c9732ad1d127b5575a10f4fbcacf740500ff upstream. If we have an error while building the backref tree in relocation we'll process all the pending edges and then free the node. However if we integrated some edges into the cache we'll lose our link to those edges by simply freeing this node, which means we'll leak memory and references to any roots that we've found. Instead we need to use remove_backref_node(), which walks through all of the edges that are still linked to this node and free's them up and drops any root references we may be holding. CC: stable@vger.kernel.org # 4.9+ Reviewed-by: Qu Wenruo Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/relocation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -1194,7 +1194,7 @@ out: free_backref_node(cache, lower); } - free_backref_node(cache, node); + remove_backref_node(cache, node); return ERR_PTR(err); } ASSERT(!node || !node->detached);