Re: [PATCH lttng-tools] Fix: null dereference on error path for create_ctx_type

From: "Jérémie Galarneau" <jeremie.galarneau@efficios.com>
To: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Cc: "lttng-dev@lists.lttng.org" <lttng-dev@lists.lttng.org>,
	Jeremie Galarneau <jgalar@efficios.com>
Subject: Re: [PATCH lttng-tools] Fix: null dereference on error path for create_ctx_type
Date: Wed, 25 Jan 2017 19:32:54 -0500	[thread overview]
Message-ID: <CA+jJMxtnRVg8N1CXGcFuxFD-bb_R9eJyGDt9o504ZOD9y501kw__40006.8267401823$1485390877$gmane$org@mail.gmail.com> (raw)
In-Reply-To: <1484665727-24204-1-git-send-email-jonathan.rajotte-julien@efficios.com>

Merged in master, stable-2.9 and stable-2.8.

Thanks!
Jérémie

On 17 January 2017 at 10:08, Jonathan Rajotte
<jonathan.rajotte-julien@efficios.com> wrote:
> When zmalloc of type->opt fail the destroy_ctx_type would result in a
> null dereference.
>
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
> ---
>  src/bin/lttng/commands/add_context.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
> index 5fc65bf..df722bb 100644
> --- a/src/bin/lttng/commands/add_context.c
> +++ b/src/bin/lttng/commands/add_context.c
> @@ -662,7 +662,9 @@ void destroy_ctx_type(struct ctx_type *type)
>         if (!type) {
>                 return;
>         }
> -       free(type->opt->symbol);
> +       if (type->opt) {
> +               free(type->opt->symbol);
> +       }
>         free(type->opt);
>         free(type);
>  }
> --
> 2.7.4
>

-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev