Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S932242AbcLHUau (ORCPT <rfc822;w@1wt.eu>);
        Thu, 8 Dec 2016 15:30:50 -0500
Received: from mail-io0-f176.google.com ([209.85.223.176]:33611 "EHLO
        mail-io0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1753174AbcLHUas (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 8 Dec 2016 15:30:48 -0500
MIME-Version: 1.0
In-Reply-To: <20161208194802.2438-1-mcgrof@kernel.org>
References: <20161208184801.1689-1-mcgrof@kernel.org> <20161208194802.2438-1-mcgrof@kernel.org>
From: Kees Cook <keescook@chromium.org>
Date: Thu, 8 Dec 2016 12:30:45 -0800
X-Google-Sender-Auth: tI1jhorflMHfj-QdwAPen0MX8o4
Message-ID: <CAGXu5jLVV6nvTkTkU7oEwSNgOd8Gep1XaF1pTDBY=SRn8ErKeg@mail.gmail.com>
Subject: Re: [RFC 02/10] module: fix memory leak on early load_module() failures
To: "Luis R. Rodriguez" <mcgrof@kernel.org>
Cc: shuah@kernel.org, Jessica Yu <jeyu@redhat.com>,
        Rusty Russell <rusty@rustcorp.com.au>,
        "Eric W. Biederman" <ebiederm@xmission.com>,
        Dmitry Torokhov <dmitry.torokhov@gmail.com>,
        Arnaldo Carvalho de Melo <acme@redhat.com>,
        Jonathan Corbet <corbet@lwn.net>, martin.wilck@suse.com,
        Michal Marek <mmarek@suse.com>, Petr Mladek <pmladek@suse.com>,
        hare@suse.com, rwright@hpe.com, Jeff Mahoney <jeffm@suse.com>,
        DSterba@suse.com, fdmanana@suse.com, neilb@suse.com,
        Guenter Roeck <linux@roeck-us.net>, rgoldwyn@suse.com,
        subashab@codeaurora.org, Heinrich Schuchardt <xypron.glpk@gmx.de>,
        Aaron Tomlin <atomlin@redhat.com>, mbenes@suse.cz,
        "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
        Dan Williams <dan.j.williams@intel.com>,
        Josh Poimboeuf <jpoimboe@redhat.com>,
        "David S. Miller" <davem@davemloft.net>,
        Ingo Molnar <mingo@redhat.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        linux-kselftest@vger.kernel.org,
        "linux-doc@vger.kernel.org" <linux-doc@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2330
Lines: 67

On Thu, Dec 8, 2016 at 11:48 AM, Luis R. Rodriguez <mcgrof@kernel.org> wrote:
> While looking for early possible module loading failures I was
> able to reproduce a memory leak possible with kmemleak. There
> are a few rare ways to trigger a failure:
>
>   o we've run into a failure while processing kernel parameters
>     (parse_args() returns an error)
>   o mod_sysfs_setup() fails
>   o we're a live patch module and copy_module_elf() fails
>
> Chances of running into this issue is really low.
>
> kmemleak splat:
>
> unreferenced object 0xffff9f2c4ada1b00 (size 32):
>   comm "kworker/u16:4", pid 82, jiffies 4294897636 (age 681.816s)
>   hex dump (first 32 bytes):
>     6d 65 6d 73 74 69 63 6b 30 00 00 00 00 00 00 00  memstick0.......
>     00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
>   backtrace:
>     [<ffffffff8c6cfeba>] kmemleak_alloc+0x4a/0xa0
>     [<ffffffff8c200046>] __kmalloc_track_caller+0x126/0x230
>     [<ffffffff8c1bc581>] kstrdup+0x31/0x60
>     [<ffffffff8c1bc5d4>] kstrdup_const+0x24/0x30
>     [<ffffffff8c3c23aa>] kvasprintf_const+0x7a/0x90
>     [<ffffffff8c3b5481>] kobject_set_name_vargs+0x21/0x90
>     [<ffffffff8c4fbdd7>] dev_set_name+0x47/0x50
>     [<ffffffffc07819e5>] memstick_check+0x95/0x33c [memstick]
>     [<ffffffff8c09c893>] process_one_work+0x1f3/0x4b0
>     [<ffffffff8c09cb98>] worker_thread+0x48/0x4e0
>     [<ffffffff8c0a2b79>] kthread+0xc9/0xe0
>     [<ffffffff8c6dab5f>] ret_from_fork+0x1f/0x40
>     [<ffffffffffffffff>] 0xffffffffffffffff
>
> Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>

Acked-by: Kees Cook <keescook@chromium.org>

Is this worth sending through -stable too?

-Kees

> ---
>  kernel/module.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/kernel/module.c b/kernel/module.c
> index f7482db0f843..e420ed67e533 100644
> --- a/kernel/module.c
> +++ b/kernel/module.c
> @@ -3722,6 +3722,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
>         mod_sysfs_teardown(mod);
>   coming_cleanup:
>         mod->state = MODULE_STATE_GOING;
> +       destroy_params(mod->kp, mod->num_kp);
>         blocking_notifier_call_chain(&module_notify_list,
>                                      MODULE_STATE_GOING, mod);
>         klp_module_going(mod);
> --
> 2.10.1
>



-- 
Kees Cook
Nexus Security