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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, 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 E702DC004C9 for ; Tue, 30 Apr 2019 00:29:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AFB2C2147A for ; Tue, 30 Apr 2019 00:29:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556584153; bh=poR+eWDzf4WV3sftevJ6zBJb3mEk0RVFws0s9dQMoMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LrjWnymIVMxnQWVNCLU7ZAzjo2FJxW1H+4rf6sY1W+AKAney8J0Q4wiEB9b5DREKW R5JUdFlhCzwbdCiaUXbcZakYS4RVcywPYJE5QoTv9d1cQ9x0qvLZwUt/GGqbXrkPqn AKlUjM338FMdebjLdwyEjT5ckSgx3Oa+oAfRX74w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729726AbfD3A3M (ORCPT ); Mon, 29 Apr 2019 20:29:12 -0400 Received: from new1-smtp.messagingengine.com ([66.111.4.221]:43783 "EHLO new1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729214AbfD3A3K (ORCPT ); Mon, 29 Apr 2019 20:29:10 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 74E0313C4E; Mon, 29 Apr 2019 20:29:09 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 29 Apr 2019 20:29:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=6RglNrH0/a9U7I4Q6WAgYckH6cMAteemMXizx6xHHpY=; b=SHroRKDH LZLn1RVZCpLrXRnKxIRmBLcHDJXmIAoogkdfoofa6F5x6sK+datdqXscsi3xlKLZ nU5xNa4XTXwlBFz6eJUEsRRtEouBNjILDcXcX6i3u0mvJkYGx2MvoANPR+8yhz1f S4zuqEFMBgJGM31MeIYXL42UvyrAMyhacsdpJFUOImbPkGkKAb9oRRkZsWN3UqaB aCPr8nwIjPxbyBRnqu/oRIJnAZnMOdHt3QjYLgyHc9HrBjZGYw3AWBJ4xJUqlcHV 0zHyKR2KIdgoP35g3TWZchBqTTvsiOTHkep0n4ST02Mut8n9TWfTslHFzgLiBTLz K5rl03w2KEWX9w== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrieefgdefhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepfdfvohgsihhn ucevrdcujfgrrhguihhnghdfuceothhosghinheskhgvrhhnvghlrdhorhhgqeenucfkph epuddvuddrgeegrddvfedtrddukeeknecurfgrrhgrmhepmhgrihhlfhhrohhmpehtohgs ihhnsehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from eros.localdomain (ppp121-44-230-188.bras2.syd2.internode.on.net [121.44.230.188]) by mail.messagingengine.com (Postfix) with ESMTPA id A6DE5103CC; Mon, 29 Apr 2019 20:29:04 -0400 (EDT) From: "Tobin C. Harding" To: "David S. Miller" Cc: "Tobin C. Harding" , Greg Kroah-Hartman , Tyler Hicks , Andy Shevchenko , Ido Schimmel , Alexander Duyck , Florian Fainelli , Wang Hai , YueHaibing , Amritha Nambiar , Dmitry Torokhov , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] bridge: Fix error path for kobject_init_and_add() Date: Tue, 30 Apr 2019 10:28:15 +1000 Message-Id: <20190430002817.10785-2-tobin@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430002817.10785-1-tobin@kernel.org> References: <20190430002817.10785-1-tobin@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently error return from kobject_init_and_add() is not followed by a call to kobject_put(). This means there is a memory leak. Add call to kobject_put() in error path of kobject_init_and_add(). Signed-off-by: Tobin C. Harding --- net/bridge/br_if.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 41f0a696a65f..e5c8c9941c51 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -607,8 +607,10 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, err = kobject_init_and_add(&p->kobj, &brport_ktype, &(dev->dev.kobj), SYSFS_BRIDGE_PORT_ATTR); - if (err) + if (err) { + kobject_put(&p->kobj); goto err1; + } err = br_sysfs_addif(p); if (err) -- 2.21.0