Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp4281913yba; Mon, 29 Apr 2019 17:18:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqyE6PdpURPwSR1UaJKbDiAna6E8A5Bfiz8PBonb5xafi/+olaiFyk+fzXm92iS9AL2LyuPi X-Received: by 2002:a17:902:8a95:: with SMTP id p21mr19982272plo.126.1556583488297; Mon, 29 Apr 2019 17:18:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556583488; cv=none; d=google.com; s=arc-20160816; b=f3cQ7SzLCYMFOdiQH3nl3v4i01UUGGbk9+gWIwzp5e5iOJKA/4evw5DAm5sBW44IuN B3T0JjAoDuUUnI/SiLSAyDX9JGaxInn8ks2zVlctGjVmAdbXhSf9o6w88Jm1nxVrFMo4 CVufFQrtLUW5DPNFZ/CHzqhdgL3r06G9pzlDvQlcQbErQweJm5W57YbYoNUledgv17eh qiiyqIi9Rm3OyQpSiywsicgRf4RCCR+sJ/S3kwnPaRn+vCCysB1nIDG42eJvgXSE8aKr Hz0w/klT/IN88O+LId5IFG0Cm5cyisTOraSPsxZcQG4Yu82TjlTK40/g8Rzmzx6wALbH B3Sw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0O9SAkEGxogfnobPq0czxzKl2mDOpLSVqbenVGSTf9I=; b=qwnzwbl0WNtOYGTjvxP37PRf6W61tcbDvWouW/EIOUByEoMAofyAa+rt9hGTtFpMWW JTLLWQMwM6FVdSXMDiHXLVbbR3coAf7KfSKT5pWxnSX+g3hIfjF+Kmjnzsl1qgRnqvvc xmxPSX67WmdCgTSokqMiDMVSgEC+TSBns4m3Nr8tpwtt1Vxk0kXN8UXKP/z6YmmL7hHl EhVVC0t2PDITJpGaVqQ+hZkTT6hocEivt4MVYug2/GlzdzK4dpT4WrXz597HDt1jpnuW IAS+SvGRsXXWhd3sUwT/LtuTrZO/sej5mH7BTZ846i9X4FwBTNWBhzwKUmqUKQ/Qntna zpfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=yrCKg7ic; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 23si10058649pgu.75.2019.04.29.17.17.52; Mon, 29 Apr 2019 17:18:08 -0700 (PDT) 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=@messagingengine.com header.s=fm2 header.b=yrCKg7ic; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729678AbfD3AQ0 (ORCPT + 99 others); Mon, 29 Apr 2019 20:16:26 -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