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 57B1AC43219 for ; Tue, 30 Apr 2019 00:16:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23C5A216FD for ; Tue, 30 Apr 2019 00:16:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556583388; bh=2KeGGqOjl/yK40eA+QkQ7V+mw7NVUV3W31Dd+7Ubxe4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n91oIcucjI6fepixhd2oWoyoxNP/oexS0+wCXetPc6IevzTQXllyeuGQuhqmORoj/ oLHw78qH1OtL24AltTAM9rM2huggLgfqr7Nr0CKO/gU/o0ZIt+0LHjxbAQsYxE75+8 eNNYB1gMP7+KaDRMC/g8qVTOhqBobj4hTG/yi2wY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729686AbfD3AQ1 (ORCPT ); Mon, 29 Apr 2019 20:16:27 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:41101 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729661AbfD3AQZ (ORCPT ); Mon, 29 Apr 2019 20:16:25 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 8FA9F2201F; Mon, 29 Apr 2019 20:16:24 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 29 Apr 2019 20:16:24 -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=0O9SAkEGxogfnobPq0czxzKl2mDOpLSVqbenVGSTf9I=; b=yrCKg7ic SjsSFDI8oLQZFDI/l1G7VOjJ3VcgGyvIrcLRWqkG8X4TxjT1eOwfFHPkE/6XbSBi TwUUEYR15BTthF9zX0x9JNd6iEDukjulcAaoDcMZ3v6I3ats6h3c05E+xqdeR72b W10R0osSgyyVTwbO+vYooBx4NsPZyfBP+IQKbm0r407zBE9iF24HNc5ZP+lR1ypg 13I7kDrOldWEueU0Hc7hxpeM4dSQoAG6aEoSJxdZZf24+Ck29tXYCFIokplS5q9i v7QlSaD4u2NPY7OV319h4h6K6TE9loXr96GsMdbbq1/WNCDZC0mpCTig0KceKm7P hiBZi5PI5WSB6A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrieefgdefgecutefuodetggdotefrodftvf 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 60DD8103CC; Mon, 29 Apr 2019 20:16:21 -0400 (EDT) From: "Tobin C. Harding" To: Josh Poimboeuf , Jiri Kosina , Miroslav Benes , Petr Mladek Cc: "Tobin C. Harding" , Greg Kroah-Hartman , Joe Lawrence , live-patching@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] livepatch: Fix kobject memleak Date: Tue, 30 Apr 2019 10:15:33 +1000 Message-Id: <20190430001534.26246-2-tobin@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430001534.26246-1-tobin@kernel.org> References: <20190430001534.26246-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 --- kernel/livepatch/core.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index eb0ee10a1981..98a7bec41faa 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -727,7 +727,9 @@ static int klp_init_func(struct klp_object *obj, struct klp_func *func) ret = kobject_init_and_add(&func->kobj, &klp_ktype_func, &obj->kobj, "%s,%lu", func->old_name, func->old_sympos ? func->old_sympos : 1); - if (!ret) + if (ret) + kobject_put(&func->kobj); + else func->kobj_added = true; return ret; @@ -803,8 +805,10 @@ static int klp_init_object(struct klp_patch *patch, struct klp_object *obj) name = klp_is_module(obj) ? obj->name : "vmlinux"; ret = kobject_init_and_add(&obj->kobj, &klp_ktype_object, &patch->kobj, "%s", name); - if (ret) + if (ret) { + kobject_put(&func->kobj); return ret; + } obj->kobj_added = true; klp_for_each_func(obj, func) { @@ -862,8 +866,10 @@ static int klp_init_patch(struct klp_patch *patch) ret = kobject_init_and_add(&patch->kobj, &klp_ktype_patch, klp_root_kobj, "%s", patch->mod->name); - if (ret) + if (ret) { + kobject_put(&func->kobj); return ret; + } patch->kobj_added = true; if (patch->replace) { -- 2.21.0