From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 7 Apr 2021 16:04:58 +0000 (-0400)
Subject: Fix: sessiond: error accounting: dereference of null pointer on error path
X-Git-Tag: v2.13.0-rc1~157
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5d650dcd9e04bcabd53fdf5f3104b93eb82bc0a9;p=lttng-tools.git

Fix: sessiond: error accounting: dereference of null pointer on error path

1452201 Dereference after null check

Either the check against null is unnecessary, or there may be a null pointer dereference.

In event_notifier_error_accounting_register_app: Pointer is checked against null but then dereferenced anyway (CWE-476)

Reported-by: Coverity Scan
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I169fd6434606b2a35e076ae9258de6597565effe
---

diff --git a/src/bin/lttng-sessiond/event-notifier-error-accounting.c b/src/bin/lttng-sessiond/event-notifier-error-accounting.c
index 035f3a036..34dc2b4fe 100644
--- a/src/bin/lttng-sessiond/event-notifier-error-accounting.c
+++ b/src/bin/lttng-sessiond/event-notifier-error-accounting.c
@@ -481,7 +481,6 @@ event_notifier_error_accounting_register_app(struct ust_app *app)
 	cpu_counters = NULL;
 	goto end;
 
-error_allocate_cpu_counters:
 error_send_cpu_counter_data:
 error_duplicate_cpu_counter:
 	/* Teardown any duplicated cpu counters. */
@@ -498,6 +497,7 @@ error_duplicate_cpu_counter:
 		free(cpu_counters[i]);
 	}
 
+error_allocate_cpu_counters:
 error_send_counter_data:
 	ustctl_release_object(-1, new_counter);
 	free(new_counter);