From patchwork Thu Aug 20 09:20:56 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: 265779 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=-9.8 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,URIBL_BLOCKED,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 CCC06C433E3 for ; Thu, 20 Aug 2020 09:54:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A279E2078D for ; Thu, 20 Aug 2020 09:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597917240; bh=crriVwRzruW/S6F9UNpL/puyd/CplqrZrX/VuKY9V9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tor80ijk6+wpadXoCrzV6XyhXG6iPr4ufwSZF5DLuDS5Ok892deQ05GjhOl6ZN7/z hdIGIxMyqvPLFBEj4TZvHlXm7oEC4eAVv7PdLL3uz5tb/syrNf8xPoLLhNPoYZ7yrf x7hevfoga/1LKgekrZcQ5MXxAkWZCgzwOLnkeMHc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729840AbgHTJx7 (ORCPT ); Thu, 20 Aug 2020 05:53:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:36106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730085AbgHTJx5 (ORCPT ); Thu, 20 Aug 2020 05:53:57 -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 134B72067C; Thu, 20 Aug 2020 09:53:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597917236; bh=crriVwRzruW/S6F9UNpL/puyd/CplqrZrX/VuKY9V9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mJdW9Q3mXSRC/5/I3iFxCIrZmeLnsFCqJkkDS9UCdNuHfFFUOU9dQH3cQ3Yxd9sda rbvHuqhk/y4vvOCCFMkC/xw+z01IdfleV0zJ+MKeU8HPTxcdTL3XVd3ZF+DhWtJV4y dUQNxi0lxTnyHEO5mmdIq6ykcCzypKOfLEA0hR8c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tom Rix , David Sterba Subject: [PATCH 4.19 11/92] btrfs: ref-verify: fix memory leak in add_block_entry Date: Thu, 20 Aug 2020 11:20:56 +0200 Message-Id: <20200820091538.100290697@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091537.490965042@linuxfoundation.org> References: <20200820091537.490965042@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: Tom Rix commit d60ba8de1164e1b42e296ff270c622a070ef8fe7 upstream. clang static analysis flags this error fs/btrfs/ref-verify.c:290:3: warning: Potential leak of memory pointed to by 're' [unix.Malloc] kfree(be); ^~~~~ The problem is in this block of code: if (root_objectid) { struct root_entry *exist_re; exist_re = insert_root_entry(&exist->roots, re); if (exist_re) kfree(re); } There is no 'else' block freeing when root_objectid is 0. Add the missing kfree to the else branch. Fixes: fd708b81d972 ("Btrfs: add a extent ref verify tool") CC: stable@vger.kernel.org # 4.19+ Signed-off-by: Tom Rix Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/ref-verify.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/btrfs/ref-verify.c +++ b/fs/btrfs/ref-verify.c @@ -297,6 +297,8 @@ static struct block_entry *add_block_ent exist_re = insert_root_entry(&exist->roots, re); if (exist_re) kfree(re); + } else { + kfree(re); } kfree(be); return exist;