Fix: lttng_event_notifier_group_error_counter_cmd does not respect caller convention

[deliverable/lttng-ust.git] / liblttng-ust / lttng-ust-abi.c

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 9ba5acd5a60d72f9e9ede918a70b2cab87243abc..8fd2e95806e792c6a4e501de3931940cf57e8494 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -1,24 +1,9 @@
 /*
- * lttng-ust-abi.c
- *
- * LTTng UST ABI
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ * LTTng UST ABI
  *
  * Mimic system calls for:
  * - session creation, returns an object descriptor or failure.
@@ -719,7 +704,7 @@ long lttng_event_notifier_enabler_cmd(int objd, unsigned int cmd, unsigned long
        case LTTNG_UST_CAPTURE:
                return lttng_event_notifier_enabler_attach_capture_bytecode(
                        event_notifier_enabler,
-                       (struct lttng_ust_bytecode_node *) arg);
+                       (struct lttng_ust_bytecode_node **) arg);
        case LTTNG_UST_ENABLE:
                return lttng_event_notifier_enabler_enable(event_notifier_enabler);
        case LTTNG_UST_DISABLE:
@@ -748,23 +733,35 @@ static
 long lttng_event_notifier_group_error_counter_cmd(int objd, unsigned int cmd, unsigned long arg,
        union ust_args *uargs, void *owner)
 {
+       int ret;
        struct lttng_counter *counter = objd_private(objd);
 
        switch (cmd) {
        case LTTNG_UST_COUNTER_GLOBAL:
-               return -EINVAL;         /* Unimplemented. */
+               ret = -EINVAL;  /* Unimplemented. */
+               break;
        case LTTNG_UST_COUNTER_CPU:
        {
                struct lttng_ust_counter_cpu *counter_cpu =
                        (struct lttng_ust_counter_cpu *)arg;
-               return lttng_counter_set_cpu_shm(counter->counter,
+
+               ret = lttng_counter_set_cpu_shm(counter->counter,
                        counter_cpu->cpu_nr, uargs->counter_shm.shm_fd);
+               if (!ret) {
+                       /* Take ownership of the shm_fd. */
+                       uargs->counter_shm.shm_fd = -1;
+               }
+               break;
        }
        default:
-               return -EINVAL;
+               ret = -EINVAL;
+               break;
        }
+
+       return ret;
 }
 
+LTTNG_HIDDEN
 int lttng_release_event_notifier_group_error_counter(int objd)
 {
        struct lttng_counter *counter = objd_private(objd);