projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix all strncpy() usage: need to set a final \0 character at the end
[lttng-tools.git]
/
ltt-sessiond
/
main.c
diff --git
a/ltt-sessiond/main.c
b/ltt-sessiond/main.c
index 1e2a0831dc80187b4b581e72ef97a037762a3fa4..36d4423ca29d6494babf3d5338b9cc5e3bcc76c8 100644
(file)
--- a/
ltt-sessiond/main.c
+++ b/
ltt-sessiond/main.c
@@
-1,5
+1,6
@@
/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-40,9
+41,9
@@
#include <urcu/list.h> /* URCU list library (-lurcu) */
#include <lttng/lttng.h>
#include <urcu/list.h> /* URCU list library (-lurcu) */
#include <lttng/lttng.h>
+#include <lttng/lttng-sessiond-comm.h>
#include "context.h"
#include "context.h"
-#include "liblttsessiondcomm.h"
#include "ltt-sessiond.h"
#include "lttngerr.h"
#include "kernel-ctl.h"
#include "ltt-sessiond.h"
#include "lttngerr.h"
#include "kernel-ctl.h"
@@
-114,6
+115,22
@@
static int modprobe_remove_kernel_modules(void);
*/
static struct ltt_session_list *session_list_ptr;
*/
static struct ltt_session_list *session_list_ptr;
+static gid_t allowed_group(void)
+{
+ struct group *grp;
+
+ if (opt_tracing_group) {
+ grp = getgrnam(opt_tracing_group);
+ } else {
+ grp = getgrnam(default_tracing_group);
+ }
+ if (!grp) {
+ return -1;
+ } else {
+ return grp->gr_gid;
+ }
+}
+
/*
* Init quit pipe.
*
/*
* Init quit pipe.
*
@@
-272,6
+289,7
@@
static int send_kconsumerd_channel_fds(int sock, struct ltt_kernel_channel *chan
lkm.state = stream->state;
lkm.max_sb_size = channel->channel->attr.subbuf_size;
strncpy(lkm.path_name, stream->pathname, PATH_MAX);
lkm.state = stream->state;
lkm.max_sb_size = channel->channel->attr.subbuf_size;
strncpy(lkm.path_name, stream->pathname, PATH_MAX);
+ lkm.path_name[PATH_MAX - 1] = '\0';
DBG("Sending fd %d to kconsumerd", lkm.fd);
DBG("Sending fd %d to kconsumerd", lkm.fd);
@@
-321,6
+339,7
@@
static int send_kconsumerd_fds(int sock, struct ltt_kernel_session *session)
lkm.state = ACTIVE_FD;
lkm.max_sb_size = session->metadata->conf->attr.subbuf_size;
strncpy(lkm.path_name, session->metadata->pathname, PATH_MAX);
lkm.state = ACTIVE_FD;
lkm.max_sb_size = session->metadata->conf->attr.subbuf_size;
strncpy(lkm.path_name, session->metadata->pathname, PATH_MAX);
+ lkm.path_name[PATH_MAX - 1] = '\0';
ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm));
if (ret < 0) {
ret = lttcomm_send_fds_unix_sock(sock, &lkm, &lkm.fd, 1, sizeof(lkm));
if (ret < 0) {
@@
-1045,7
+1064,7
@@
static int mount_debugfs(char *path)
int ret;
char *type = "debugfs";
int ret;
char *type = "debugfs";
- ret = mkdir_recursive(path, S_IRWXU | S_IRWXG);
+ ret = mkdir_recursive(path, S_IRWXU | S_IRWXG
, geteuid(), getegid()
);
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
@@
-1226,9
+1245,10
@@
static int create_kernel_session(struct ltt_session *session)
goto error;
}
goto error;
}
- ret = mkdir_recursive(session->path, S_IRWXU | S_IRWXG );
+ ret = mkdir_recursive(session->path, S_IRWXU | S_IRWXG,
+ geteuid(), allowed_group());
if (ret < 0) {
if (ret < 0) {
- if (ret != EEXIST) {
+ if (ret !=
-
EEXIST) {
ERR("Trace directory creation error");
goto error;
}
ERR("Trace directory creation error");
goto error;
}
@@
-1257,7
+1277,9
@@
static void list_lttng_sessions(struct lttng_session *sessions)
*/
cds_list_for_each_entry(session, &session_list_ptr->head, list) {
strncpy(sessions[i].path, session->path, PATH_MAX);
*/
cds_list_for_each_entry(session, &session_list_ptr->head, list) {
strncpy(sessions[i].path, session->path, PATH_MAX);
+ sessions[i].path[PATH_MAX - 1] = '\0';
strncpy(sessions[i].name, session->name, NAME_MAX);
strncpy(sessions[i].name, session->name, NAME_MAX);
+ sessions[i].name[NAME_MAX - 1] = '\0';
i++;
}
}
i++;
}
}
@@
-1303,6
+1325,7
@@
static void list_lttng_events(struct ltt_kernel_channel *kchan,
/* Kernel channels */
cds_list_for_each_entry(event, &kchan->events_list.head , list) {
strncpy(events[i].name, event->event->name, LTTNG_SYMBOL_NAME_LEN);
/* Kernel channels */
cds_list_for_each_entry(event, &kchan->events_list.head , list) {
strncpy(events[i].name, event->event->name, LTTNG_SYMBOL_NAME_LEN);
+ events[i].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
events[i].enabled = event->enabled;
switch (event->event->instrumentation) {
case LTTNG_KERNEL_TRACEPOINT:
events[i].enabled = event->enabled;
switch (event->event->instrumentation) {
case LTTNG_KERNEL_TRACEPOINT:
@@
-1426,6
+1449,7
@@
static int process_client_msg(struct command_ctx *cmd_ctx)
strncpy(kctx.u.perf_counter.name,
cmd_ctx->lsm->u.context.ctx.u.perf_counter.name,
LTTNG_SYMBOL_NAME_LEN);
strncpy(kctx.u.perf_counter.name,
cmd_ctx->lsm->u.context.ctx.u.perf_counter.name,
LTTNG_SYMBOL_NAME_LEN);
+ kctx.u.perf_counter.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
/* Add kernel context to kernel tracer. See context.c */
ret = add_kernel_context(cmd_ctx->session->kernel_session, &kctx,
/* Add kernel context to kernel tracer. See context.c */
ret = add_kernel_context(cmd_ctx->session->kernel_session, &kctx,
@@
-2044,7
+2068,7
@@
static int process_client_msg(struct command_ctx *cmd_ctx)
goto setup_error;
}
goto setup_error;
}
- DBG("Listing events (%
ld
events)", nb_event);
+ DBG("Listing events (%
zu
events)", nb_event);
list_lttng_events(kchan,
(struct lttng_event *)(cmd_ctx->llm->payload));
list_lttng_events(kchan,
(struct lttng_event *)(cmd_ctx->llm->payload));
@@
-2423,8
+2447,6
@@
end:
*/
static int check_existing_daemon(void)
{
*/
static int check_existing_daemon(void)
{
- int ret;
-
if (access(client_unix_sock_path, F_OK) < 0 &&
access(apps_unix_sock_path, F_OK) < 0)
return 0;
if (access(client_unix_sock_path, F_OK) < 0 &&
access(apps_unix_sock_path, F_OK) < 0)
return 0;
@@
-2444,14
+2466,10
@@
static int check_existing_daemon(void)
static int set_permissions(void)
{
int ret;
static int set_permissions(void)
{
int ret;
- struct group *grp;
-
- /* Decide which group name to use */
- (opt_tracing_group != NULL) ?
- (grp = getgrnam(opt_tracing_group)) :
- (grp = getgrnam(default_tracing_group));
+ gid_t gid;
- if (grp == NULL) {
+ gid = allowed_group();
+ if (gid < 0) {
if (is_root) {
WARN("No tracing group detected");
ret = 0;
if (is_root) {
WARN("No tracing group detected");
ret = 0;
@@
-2463,21
+2481,21
@@
static int set_permissions(void)
}
/* Set lttng run dir */
}
/* Set lttng run dir */
- ret = chown(LTTNG_RUNDIR, 0, g
rp->gr_g
id);
+ ret = chown(LTTNG_RUNDIR, 0, gid);
if (ret < 0) {
ERR("Unable to set group on " LTTNG_RUNDIR);
perror("chown");
}
/* lttng client socket path */
if (ret < 0) {
ERR("Unable to set group on " LTTNG_RUNDIR);
perror("chown");
}
/* lttng client socket path */
- ret = chown(client_unix_sock_path, 0, g
rp->gr_g
id);
+ ret = chown(client_unix_sock_path, 0, gid);
if (ret < 0) {
ERR("Unable to set group on %s", client_unix_sock_path);
perror("chown");
}
/* kconsumerd error socket path */
if (ret < 0) {
ERR("Unable to set group on %s", client_unix_sock_path);
perror("chown");
}
/* kconsumerd error socket path */
- ret = chown(kconsumerd_err_unix_sock_path, 0, g
rp->gr_g
id);
+ ret = chown(kconsumerd_err_unix_sock_path, 0, gid);
if (ret < 0) {
ERR("Unable to set group on %s", kconsumerd_err_unix_sock_path);
perror("chown");
if (ret < 0) {
ERR("Unable to set group on %s", kconsumerd_err_unix_sock_path);
perror("chown");
This page took
0.026354 seconds
and
4
git commands to generate.