Re: [PATCH 1/2] tracing: Fix memory leak on failure path in ftrace_allocate_pages()

[Steven Rostedt]

On Wed, 11 Jun 2014 17:06:53 +0900
Namhyung Kim <namhyung@xxxxxxxxxx> wrote:

> As struct ftrace_page is managed in a single linked list, it should
> free from the start page.
> 
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
> ---
>  kernel/trace/ftrace.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 5b372e3ed675..ddfda763ded7 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -2398,7 +2398,8 @@ ftrace_allocate_pages(unsigned long num_to_init)
>  	return start_pg;
>  
>   free_pages:
> -	while (start_pg) {
> +	pg = start_pg;
> +	while (pg) {

It works with just the added "pg = start_page", I would keep the
while (start_pg) still.

-- Steve

>  		order = get_count_order(pg->size / ENTRIES_PER_PAGE);
>  		free_pages((unsigned long)pg->records, order);
>  		start_pg = pg->next;

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