linux-kernel - Re: [PATCH] ftrace: Do not copy old hash when resetting.

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]

Date:	Mon, 14 Jul 2014 08:21:17 -0400
From:	Steven Rostedt <rostedt@...dmis.org>
To:	Wang Nan <wangnan0@...wei.com>
Cc:	Ingo Molnar <mingo@...hat.com>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] ftrace: Do not copy old hash when resetting.

On Mon, 14 Jul 2014 12:10:00 +0800
Wang Nan <wangnan0@...wei.com> wrote:

> If we are going to reset hash, we don't need to duplicate old hash
> and remove every entries right after allocation.
> 
> Signed-off-by: Wang Nan <wangnan0@...wei.com>
> Cc: Steven Rostedt <rostedt@...dmis.org>
> Cc: Ingo Molnar <mingo@...hat.com>
> ---
>  kernel/trace/ftrace.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 5b372e3..52d6931 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -3471,14 +3471,16 @@ ftrace_set_hash(struct ftrace_ops *ops, unsigned char *buf, int len,
>  	else
>  		orig_hash = &ops->notrace_hash;
>  
> -	hash = alloc_and_copy_ftrace_hash(FTRACE_HASH_DEFAULT_BITS, *orig_hash);
> +	if (!reset)
> +		hash = alloc_and_copy_ftrace_hash(FTRACE_HASH_DEFAULT_BITS, *orig_hash);
> +	else
> +		hash = alloc_ftrace_hash(FTRACE_HASH_DEFAULT_BITS);

I'm fine with this patch, but please swap the if statement above. I
prefer the if condition being positive if there's also an else
statement above. That is:

	if (reset)
		hash = alloc_ftrace_hash();
	else
		hash = alloc_and_copy_ftrace_hash();

-- Steve

> +
>  	if (!hash) {
>  		ret = -ENOMEM;
>  		goto out_regex_unlock;
>  	}
>  
> -	if (reset)
> -		ftrace_filter_reset(hash);
>  	if (buf && !ftrace_match_records(hash, buf, len)) {
>  		ret = -EINVAL;
>  		goto out_regex_unlock;

--
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/