[lttng-tools] Fix: use newly created event filter for condition check
diff mbox series

Message ID 20190924145316.21302-1-jonathan.rajotte-julien@efficios.com
State Superseded, archived
Headers show
Series
  • [lttng-tools] Fix: use newly created event filter for condition check
Related show

Commit Message

Jonathan Rajotte Sept. 24, 2019, 2:53 p.m. UTC
4c5e3185d75ffe90b04107744693964d9051fb6b introduced a regression while
fixing the filter and filter_expression ownership.

Setting the "filter" object to NULL prevents the call to
add_filter_app_ctx when needed.

We use the filter from the newly created event to
perform the check and the call to add_filter_app_ctx.

Fixes coverity #1399733

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
---
 src/bin/lttng-sessiond/event.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Mathieu Desnoyers Sept. 24, 2019, 3:08 p.m. UTC | #1
----- On Sep 24, 2019, at 10:53 AM, Jonathan Rajotte jonathan.rajotte-julien at efficios.com wrote:

> 4c5e3185d75ffe90b04107744693964d9051fb6b introduced a regression while
> fixing the filter and filter_expression ownership.

What is this commit ? I'm having trouble finding it. Can you double-check and
provide the commit Subject as well ?

Typically:

commit 1234567890ab "Commit subject" ....

Thanks,

Mathieu

> 
> Setting the "filter" object to NULL prevents the call to
> add_filter_app_ctx when needed.
> 
> We use the filter from the newly created event to
> perform the check and the call to add_filter_app_ctx.
> 
> Fixes coverity #1399733
> 
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
> ---
> src/bin/lttng-sessiond/event.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
> index f32db4429..a8b7646da 100644
> --- a/src/bin/lttng-sessiond/event.c
> +++ b/src/bin/lttng-sessiond/event.c
> @@ -513,8 +513,9 @@ int event_agent_enable(struct ltt_ust_session *usess,
> 		created = 1;
> 	}
> 
> -	if (created && filter) {
> -		ret = add_filter_app_ctx(filter, filter_expression, agt);
> +	if (created && aevent->filter) {
> +		ret = add_filter_app_ctx(
> +				aevent->filter, aevent->filter_expression, agt);
> 		if (ret != LTTNG_OK) {
> 			goto error;
> 		}
> --
> 2.17.1
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Jonathan Rajotte Sept. 24, 2019, 3:22 p.m. UTC | #2
> > 4c5e3185d75ffe90b04107744693964d9051fb6b introduced a regression while
> > fixing the filter and filter_expression ownership.
> 
> What is this commit ? I'm having trouble finding it. Can you double-check and
> provide the commit Subject as well ?

Seems like I copied the parent tree commit.

See v2

Cheers

Patch
diff mbox series

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index f32db4429..a8b7646da 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -513,8 +513,9 @@  int event_agent_enable(struct ltt_ust_session *usess,
 		created = 1;
 	}
 
-	if (created && filter) {
-		ret = add_filter_app_ctx(filter, filter_expression, agt);
+	if (created && aevent->filter) {
+		ret = add_filter_app_ctx(
+				aevent->filter, aevent->filter_expression, agt);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}