Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp4744420yba; Tue, 30 Apr 2019 03:46:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqxe3y2IDM7S3TYnUCs7NvCxwZ1Vi4zJfUgx1+cESZ6Ty5Q1IZ0oXodd+5d7hn8ip7Ms+MOF X-Received: by 2002:a17:902:b217:: with SMTP id t23mr18191278plr.49.1556621182876; Tue, 30 Apr 2019 03:46:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556621182; cv=none; d=google.com; s=arc-20160816; b=xDOu3ZHWxdMg2zULo9jb3X1ZwGfCEtNzVZUurR0U3ogJNG5PhaED49G/UGgcO9HUS0 Q4DwG4j+7KO+5qzQvhfHoLZh1gsG57FYsQtqYzR1IlZqyupCSyaLLX+MbkkmKNAEzQn/ 8QnzUCJ+zif9Z9eDSjm126UfGs7blCjU6Ofqr9NS58rcC0lojO/6X5LBDMkonCNknXUW Vp8vsGkeigaHKpVpjFJQFpfhYkgqDRZ6w7HRE3/o7YJ/5YKQrlzTav6SisvYZmpOKBqH Hxd5oaaj+f4qPR5DMiAEW+3TM9Ru/z/lHE2PwSl9fciad2+co6sCLY6XPZEv9fzc77A5 rQtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :message-id:in-reply-to:subject:cc:to:from:date; bh=znKhZGIPUSGvyiykn7AmqQ+lbuAIFhxl0fMpD4pZkrU=; b=aGzj8qyRA9kXXJbMHLk3Gr8HL45wOswyghUAzogd5DJrlbqMh/GpUrRf8No5GUBHum iVZqDIYf6/NxnVFP9zHMxR2Ozv89DW2XtjV6mzZBMeQCFVCJTeipqrl1hPxankvH/cT9 MP3WNEpWCSK+Kpi7mn7irsqvnWmA30FPTRZnPBTNPt9/jWd87I4E7TGqefTMr9arhNNw qVns6HA6AsV4ZGNGDfSBA3UKqjYglUZYk52cjTPmmyjokvrtwGcR9fERK6DyVQP/0gWi F/KeYfzDoe6e/J0s5/xNNvmTRu2k6cH+sRWEk5kUYTz5xJuNT/KcQuHk9BkxzRo/CSn0 kX0g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 17si39338947pfw.148.2019.04.30.03.46.06; Tue, 30 Apr 2019 03:46:22 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727093AbfD3Ko5 (ORCPT + 99 others); Tue, 30 Apr 2019 06:44:57 -0400 Received: from mx2.suse.de ([195.135.220.15]:55462 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726262AbfD3Ko5 (ORCPT ); Tue, 30 Apr 2019 06:44:57 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 14421AD7C; Tue, 30 Apr 2019 10:44:56 +0000 (UTC) Date: Tue, 30 Apr 2019 12:44:55 +0200 (CEST) From: Miroslav Benes To: "Tobin C. Harding" , Greg Kroah-Hartman cc: Josh Poimboeuf , Jiri Kosina , Petr Mladek , Joe Lawrence , live-patching@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] livepatch: Fix kobject memleak In-Reply-To: <20190430084254.GB11737@kroah.com> Message-ID: References: <20190430001534.26246-1-tobin@kernel.org> <20190430001534.26246-2-tobin@kernel.org> <20190430084254.GB11737@kroah.com> User-Agent: Alpine 2.21 (LSU 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 30 Apr 2019, Greg Kroah-Hartman wrote: > On Tue, Apr 30, 2019 at 10:15:33AM +1000, Tobin C. Harding wrote: > > 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 > > Reviewed-by: Greg Kroah-Hartman Well, it does not even compile... On Tue, 30 Apr 2019, Tobin C. Harding wrote: > 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); kobject_put(&obj->kobj); I suppose. > 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); kobject_put(&patch->kobj); Thanks, Miroslav