Re: [PATCH] perf test: Fix hist testcases when kptr_restrict is on

[Jiri Olsa]

On Mon, Dec 14, 2015 at 12:11:13PM +0900, Namhyung Kim wrote:
> Currently if kptr_restrict is enabled, all hist tests failed with
> segfaults.  This is because machine__create_kernel_maps() in
> setup_fake_machine() failed in that situation, and it called
> machine__delete() on the error path.  But outer callers again called
> machines__exit() causing double free for the host machine.

Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>

thanks,
jirka

> 
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
> ---
>  tools/perf/tests/hists_common.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c
> index 46f453b1de60..bcfd081ee1d2 100644
> --- a/tools/perf/tests/hists_common.c
> +++ b/tools/perf/tests/hists_common.c
> @@ -88,8 +88,8 @@ struct machine *setup_fake_machine(struct machines *machines)
>  	}
>  
>  	if (machine__create_kernel_maps(machine)) {
> -		pr_debug("Not enough memory for machine setup\n");
> -		goto out;
> +		pr_debug("Cannot create kernel maps\n");
> +		return NULL;
>  	}
>  
>  	for (i = 0; i < ARRAY_SIZE(fake_threads); i++) {
> @@ -155,7 +155,6 @@ struct machine *setup_fake_machine(struct machines *machines)
>  out:
>  	pr_debug("Not enough memory for machine setup\n");
>  	machine__delete_threads(machine);
> -	machine__delete(machine);
>  	return NULL;
>  }
>  
> -- 
> 2.6.4
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/