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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,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 09E6FC072B1 for ; Thu, 30 May 2019 04:33:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB8552570E for ; Thu, 30 May 2019 04:33:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559190832; bh=bSW/zRakr983HeDe9R0FmG/hQdxqR93bcJ1wDX6JWcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SrqXGeJwHyZBiYFEqyY5KuOXBmgZV826pORIsQAwt7zdmfQOURW9TyBEQTo2O3bNp EjnTqr7snFlzMVYmhC3uxmpyOzXNxMxTrFfvPrv9nU9hC8IgXri1P38f4kJkCIXVze B3nszYEEMB96MR5A43TKOWw761IJOUSagfZYhvpQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727770AbfE3Edw (ORCPT ); Thu, 30 May 2019 00:33:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:58698 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729465AbfE3DN2 (ORCPT ); Wed, 29 May 2019 23:13:28 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 9C28124544; Thu, 30 May 2019 03:13:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186007; bh=bSW/zRakr983HeDe9R0FmG/hQdxqR93bcJ1wDX6JWcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ccJCcSFlMWwswZRM168gicN8SKln76Fe0HLlmeDexyrfkfre/xkz1qDZ3t8CXrvi9 PuztnAm7qU9K1MDdiQ/tMA4/4xPbr8XvkgejzMa3GA82wTSY0kjPdm7vv8JThHUP6D trCEdE4w2mIxE+fN/nJ/nmQzMTcLE+Lz4SyMd9dQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Tobin C. Harding" , David Sterba Subject: [PATCH 5.0 021/346] btrfs: sysfs: Fix error path kobject memory leak Date: Wed, 29 May 2019 20:01:34 -0700 Message-Id: <20190530030541.780803446@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.363386121@linuxfoundation.org> References: <20190530030540.363386121@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: Tobin C. Harding commit 450ff8348808a89cc27436771aa05c2b90c0eef1 upstream. If a call to kobject_init_and_add() fails we must call kobject_put() otherwise we leak memory. Calling kobject_put() when kobject_init_and_add() fails drops the refcount back to 0 and calls the ktype release method (which in turn calls the percpu destroy and kfree). Add call to kobject_put() in the error path of call to kobject_init_and_add(). Cc: stable@vger.kernel.org # v4.4+ Reviewed-by: Greg Kroah-Hartman Signed-off-by: Tobin C. Harding Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/extent-tree.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -3985,8 +3985,7 @@ static int create_space_info(struct btrf info->space_info_kobj, "%s", alloc_name(space_info->flags)); if (ret) { - percpu_counter_destroy(&space_info->total_bytes_pinned); - kfree(space_info); + kobject_put(&space_info->kobj); return ret; }