linux-kernel - Re: [PATCH] livepatch: klp_disable_func returnes once it does not satisfy the condition

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 for Android: free password hash cracker in your pocket

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

Date:	Mon, 13 Jul 2015 22:51:15 -0500
From:	Josh Poimboeuf <jpoimboe@...hat.com>
To:	Minfei Huang <mhuang@...hat.com>
Cc:	sjenning@...hat.com, jkosina@...e.cz, vojtech@...e.cz,
	live-patching@...r.kernel.org, linux-kernel@...r.kernel.org,
	Minfei Huang <mnfhuang@...il.com>
Subject: Re: [PATCH] livepatch: klp_disable_func returnes once it does not
 satisfy the condition

On Tue, Jul 14, 2015 at 11:15:37AM +0800, Minfei Huang wrote:
> From: Minfei Huang <mnfhuang@...il.com>
> 
> It is more better that klp_disable_func returnes immediately, if
> func->state and func->old_addr do not satisfy the condition.
> 
> We should robust the livepatch code, although the above situation never
> happen in current code path.
> 
> Signed-off-by: Minfei Huang <mnfhuang@...il.com>
> ---
>  kernel/livepatch/core.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
> index c40ebcc..6e53441 100644
> --- a/kernel/livepatch/core.c
> +++ b/kernel/livepatch/core.c
> @@ -348,8 +348,10 @@ static void klp_disable_func(struct klp_func *func)
>  {
>  	struct klp_ops *ops;
>  
> -	WARN_ON(func->state != KLP_ENABLED);
> -	WARN_ON(!func->old_addr);
> +	if (WARN_ON(func->state != KLP_ENABLED))
> +		return;
> +	if (WARN_ON(!func->old_addr))
> +		return;
>  
>  	ops = klp_find_ops(func->old_addr);
>  	if (WARN_ON(!ops))

Acked-by: Josh Poimboeuf <jpoimboe@...hat.com>
--
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/