Copyright ownership transfer

[lttng-ust.git] / src / lib / lttng-ust-ctl / ustctl.c

diff --git a/src/lib/lttng-ust-ctl/ustctl.c b/src/lib/lttng-ust-ctl/ustctl.c
index 46a1c89dee6f568a21188c12c840fe79222280be..94d8484328dc03fa05a3a78b5bb2a6be908355e6 100644 (file)
--- a/src/lib/lttng-ust-ctl/ustctl.c
+++ b/src/lib/lttng-ust-ctl/ustctl.c
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-only
  *
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011-2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
@@ -394,15 +394,15 @@ int lttng_ust_ctl_add_context(int sock, struct lttng_ust_context_attr *ctx,
        }
        ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
        if (ret < 0) {
+               if (ret == -EINVAL) {
+                       /*
+                        * Command unknown from remote end. The communication socket is
+                        * now out-of-sync and needs to be shutdown.
+                        */
+                       (void) ustcomm_shutdown_unix_sock(sock);
+               }
                goto end;
-       } else if (ret == -EINVAL) {
-               /*
-                * Command unknown from remote end. The communication socket is
-                * now out-of-sync and needs to be shutdown.
-                */
-               (void) ustcomm_shutdown_unix_sock(sock);
        }
-
        context_data->handle = -1;
        DBG("Context created successfully");
        *_context_data = context_data;
@@ -2408,7 +2408,6 @@ int get_cred(int sock,
 /*
  * Override application uid/gid with unix socket credentials. Use the
  * first group of the cr_groups.
- * Use the pid and ppid provided by the application on registration.
  */
 static
 int get_cred(int sock,
@@ -2422,21 +2421,25 @@ int get_cred(int sock,
        socklen_t xucred_len = sizeof(struct xucred);
        int ret;
 
-       ret = getsockopt(sock, SOL_SOCKET, LOCAL_PEERCRED, &xucred, &xucred_len);
+       ret = getsockopt(sock, SOL_LOCAL, LOCAL_PEERCRED, &xucred, &xucred_len);
        if (ret) {
                return -LTTNG_UST_ERR_PEERCRED;
        }
        if (xucred.cr_version != XUCRED_VERSION || xucred.cr_ngroups < 1) {
                return -LTTNG_UST_ERR_PEERCRED;
        }
-       DBG("Unix socket peercred [ uid: %u, gid: %u ], "
-               "application registered claiming [ pid: %d, ppid: %d, uid: %u, gid: %u ]",
-               xucred.cr_uid, xucred.cr_groups[0],
+       DBG("Unix socket peercred [ pid: %u, uid: %u, gid: %u ], "
+               "application registered claiming [ pid: %u, ppid: %u, uid: %u, gid: %u ]",
+               xucred.cr_pid, xucred.cr_uid, xucred.cr_groups[0],
                reg_msg->pid, reg_msg->ppid, reg_msg->uid, reg_msg->gid);
-       *pid = reg_msg->pid;
-       *ppid = reg_msg->ppid;
+       *pid = xucred.cr_pid;
        *uid = xucred.cr_uid;
        *gid = xucred.cr_groups[0];
+       if (xucred.cr_pid == reg_msg->pid) {
+               *ppid = reg_msg->ppid;
+       } else {
+               *ppid = 0;
+       }
        return 0;
 }
 #else