Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp6206959ybv; Tue, 18 Feb 2020 12:02:31 -0800 (PST) X-Google-Smtp-Source: APXvYqzWEkt9l6kFHKSn4nmhxoDtNru4JZuzktTWeEPUe9izhPR75++RK8DYzHHY3HrDkp7fED3R X-Received: by 2002:a05:6808:64d:: with SMTP id z13mr2396581oih.104.1582056151337; Tue, 18 Feb 2020 12:02:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582056151; cv=none; d=google.com; s=arc-20160816; b=0IvLkDE3EKV1r/9Op/mzHqD1u0r2al8itP5hhugzI2wzTfI6Yj38vhVYTcnyJs6H9o 6IY0D0erKF56cgqwZvVEiLxDmfZ554juWscBAiNn75T/ixrerwy+uaQhs+HH+U2Gjmdc zNzdYmTC2wg9N4dq/jcm8WCCioEcsBRxGEikvzK0nZhacFLL43dxOkaBLSiEpc5G4a17 9LBPf2QQuD0icW9SHQTTJbpmks6+jxry49C26JmsOG17cq3HWnwQuBSyE6COvx36eK+x RWjRoi049uNEPhLxLPAN9tKtf4zjBs2Kn7mdhPzHznDSXj9mqJJi68P7Bu6C9tA4vu0A anYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=93ttpJwhtDVSjEdkX1eyeVvOqXJQekMwx9uSlbpRUn0=; b=rXuacxj9VOoWrGMGZ3yIjCpBcSGb26XQSwgHZ2k60brCY0FCxEiZuuzkI8DXZr1xJN yxx1GmTj3IW+NsUjIjbDV/RLs9UUUBau/oDFLZXHd4WiSezf48KpQX1JvYnK8u8XjTz6 HoFgFF6Y5nyOdjRfYNIIWnutlLaczwgil9e/AvF1vtHTPA2YsHin6TCGlJBoVQMz0yXF FAO7Tgs+aug4akUwUwZu3i3FL8k16edTat2lf+38WGsQ98bLmZZR2F3eoAa9HDvk/Ut0 u5/Z5Vuneth53XAzzevgfazPfU3fIh+cheNpbSOfowKIIWNu3pYrmfgoPpaCY4zCe3sv u8UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="aXQl0/1V"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 22si7867561oin.34.2020.02.18.12.02.18; Tue, 18 Feb 2020 12:02:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="aXQl0/1V"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728079AbgBRUBP (ORCPT + 99 others); Tue, 18 Feb 2020 15:01:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:40602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728719AbgBRUBI (ORCPT ); Tue, 18 Feb 2020 15:01:08 -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 E24D024670; Tue, 18 Feb 2020 20:01:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582056068; bh=oHjNPYRc6V5pjSMnY/9ywhh4+Sjp1tPVDNCkJphgWzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aXQl0/1VmfcqrOhcQ1AmvzNmsYMI9blyGYymGsXqxI1HTYde37HM5Ki7DwqTwwBJ8 8Te359uEDR3/ryPvnYF20Exdosu+BUmBvXSzCNBPcpJqrFym9AnhhaomIdKxs4dNSp Ijl4f07aLZwh+POjosO9UyxeYcTaJHapaG9GYgpg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenwen Wang , David Sterba Subject: [PATCH 5.5 22/80] btrfs: ref-verify: fix memory leaks Date: Tue, 18 Feb 2020 20:54:43 +0100 Message-Id: <20200218190434.459046517@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200218190432.043414522@linuxfoundation.org> References: <20200218190432.043414522@linuxfoundation.org> User-Agent: quilt/0.66 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: Wenwen Wang commit f311ade3a7adf31658ed882aaab9f9879fdccef7 upstream. In btrfs_ref_tree_mod(), 'ref' and 'ra' are allocated through kzalloc() and kmalloc(), respectively. In the following code, if an error occurs, the execution will be redirected to 'out' or 'out_unlock' and the function will be exited. However, on some of the paths, 'ref' and 'ra' are not deallocated, leading to memory leaks. For example, if 'action' is BTRFS_ADD_DELAYED_EXTENT, add_block_entry() will be invoked. If the return value indicates an error, the execution will be redirected to 'out'. But, 'ref' is not deallocated on this path, causing a memory leak. To fix the above issues, deallocate both 'ref' and 'ra' before exiting from the function when an error is encountered. CC: stable@vger.kernel.org # 4.15+ Signed-off-by: Wenwen Wang Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/ref-verify.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/fs/btrfs/ref-verify.c +++ b/fs/btrfs/ref-verify.c @@ -744,6 +744,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_i */ be = add_block_entry(fs_info, bytenr, num_bytes, ref_root); if (IS_ERR(be)) { + kfree(ref); kfree(ra); ret = PTR_ERR(be); goto out; @@ -757,6 +758,8 @@ int btrfs_ref_tree_mod(struct btrfs_fs_i "re-allocated a block that still has references to it!"); dump_block_entry(fs_info, be); dump_ref_action(fs_info, ra); + kfree(ref); + kfree(ra); goto out_unlock; } @@ -819,6 +822,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_i "dropping a ref for a existing root that doesn't have a ref on the block"); dump_block_entry(fs_info, be); dump_ref_action(fs_info, ra); + kfree(ref); kfree(ra); goto out_unlock; } @@ -834,6 +838,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_i "attempting to add another ref for an existing ref on a tree block"); dump_block_entry(fs_info, be); dump_ref_action(fs_info, ra); + kfree(ref); kfree(ra); goto out_unlock; }