linux-kernel - Re: [PATCH] livepatch: add module locking around kallsyms calls

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAKoi8FK-WFzU3fQa4heEnkWYQFw70mt=P=+58PYP_YTLMoiJgw@mail.gmail.com>
Date:	Tue, 2 Jun 2015 10:52:16 +0800
From:	Minfei Huang <mnfhuang@...il.com>
To:	Miroslav Benes <mbenes@...e.cz>
Cc:	Josh Poimboeuf <jpoimboe@...hat.com>,
	"sjenning@...hat.com" <sjenning@...hat.com>,
	Jiri Kosina <jkosina@...e.cz>,
	Vojtěch Pavlík <vojtech@...e.cz>,
	"live-patching@...r.kernel.org" <live-patching@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	pmladek@...e.cz
Subject: Re: [PATCH] livepatch: add module locking around kallsyms calls

On Mon, Jun 1, 2015 at 11:48 PM, Miroslav Benes <mbenes@...e.cz> wrote:
> The list of loaded modules is walked through in
> module_kallsyms_on_each_symbol (called by kallsyms_on_each_symbol). The
> module_mutex lock should be acquired to prevent potential corruptions
> in the list.
>
> This was uncovered with new lockdep asserts in module code introduced by
> the commit 0be964be0d45 ("module: Sanitize RCU usage and locking") in
> recent next- trees.
>
> Signed-off-by: Miroslav Benes <mbenes@...e.cz>
> ---
>  kernel/livepatch/core.c | 18 +++++++++++++-----
>  1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
> index e6c8d54..c40ebcc 100644
> --- a/kernel/livepatch/core.c
> +++ b/kernel/livepatch/core.c
> @@ -179,7 +179,9 @@ static int klp_find_object_symbol(const char *objname, const char *name,
>                 .count = 0
>         };
>
> +       mutex_lock(&module_mutex);
>         kallsyms_on_each_symbol(klp_find_callback, &args);
> +       mutex_unlock(&module_mutex);
>
>         if (args.count == 0)
>                 pr_err("symbol '%s' not found in symbol table\n", name);
> @@ -219,13 +221,19 @@ static int klp_verify_vmlinux_symbol(const char *name, unsigned long addr)
>                 .name = name,
>                 .addr = addr,
>         };
> +       int ret;
>
> -       if (kallsyms_on_each_symbol(klp_verify_callback, &args))
> -               return 0;
> +       mutex_lock(&module_mutex);
> +       ret = kallsyms_on_each_symbol(klp_verify_callback, &args);
> +       mutex_unlock(&module_mutex);
>

Hi.
In livepatch code path, returning value 0 may represent the right, but
sometime represent wrong, like the above function.

Is it possible that we can wrap such function and return the unified
value? Thus we can not confuse the returning value any more.

Otherwise annotation is appreciate.

Thanks
Minfei

> -       pr_err("symbol '%s' not found at specified address 0x%016lx, kernel mismatch?\n",
> -               name, addr);
> -       return -EINVAL;
> +       if (!ret) {
> +               pr_err("symbol '%s' not found at specified address 0x%016lx, kernel mismatch?\n",
> +                       name, addr);
> +               return -EINVAL;
> +       }
> +
> +       return 0;
>  }
>
>  static int klp_find_verify_func_addr(struct klp_object *obj,
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe live-patching" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/