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=-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,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 EDC72C3276C for ; Thu, 2 Jan 2020 22:43:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B959920863 for ; Thu, 2 Jan 2020 22:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578005036; bh=nQT92VES4cV9D+HrZBfDmZA5vdKgHGuMiMjlgpw1iqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iTYbcAejSp3b95LG70scDQLPFe6R/G+DtGY+hJB0KdNTLSjbluJoA52F74JqzVdNt mav9nq7cW5Wcp8Uf1V5G57ifKP0lAdCEL4edME/hRC0BbhviGbmDwUTpzgtmMvL+PF uJYgBXQ/b+dBO0PZSnl1j3q0F1+ePbuUFETKauvk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729998AbgABWn4 (ORCPT ); Thu, 2 Jan 2020 17:43:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:42130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730667AbgABWeD (ORCPT ); Thu, 2 Jan 2020 17:34:03 -0500 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 8D5E721835; Thu, 2 Jan 2020 22:34:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004443; bh=nQT92VES4cV9D+HrZBfDmZA5vdKgHGuMiMjlgpw1iqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HOYf2dkM9tK8dUzs52JWNtj0cU9H7HIFuhbKLEnTfXo14/wvhzmg/9mMXJqGfnSLm cek/rAtvlpuLg/co8hLOXrUC+tt74WCCcImRV8HemNXOMU8Xr3mtwbJQbRPfUIh8l9 YsW9tix81byUhTX/5j8sSWSsGHOD2VarH36GDGWE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Filipe Manana , Johannes Thumshirn , Josef Bacik , David Sterba Subject: [PATCH 4.4 001/137] btrfs: do not leak reloc root if we fail to read the fs root Date: Thu, 2 Jan 2020 23:06:14 +0100 Message-Id: <20200102220546.831163853@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.618583146@linuxfoundation.org> References: <20200102220546.618583146@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josef Bacik commit ca1aa2818a53875cfdd175fb5e9a2984e997cce9 upstream. If we fail to read the fs root corresponding with a reloc root we'll just break out and free the reloc roots. But we remove our current reloc_root from this list higher up, which means we'll leak this reloc_root. Fix this by adding ourselves back to the reloc_roots list so we are properly cleaned up. CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Filipe Manana Reviewed-by: Johannes Thumshirn Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/relocation.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -4454,6 +4454,7 @@ int btrfs_recover_relocation(struct btrf reloc_root->root_key.offset); if (IS_ERR(fs_root)) { err = PTR_ERR(fs_root); + list_add_tail(&reloc_root->root_list, &reloc_roots); goto out_free; }