static pthread_mutex_t relayd_net_seq_idx_lock = PTHREAD_MUTEX_INITIALIZER;
static uint64_t relayd_net_seq_idx;
+static int validate_event_name(const char *);
+static int validate_ust_event_name(const char *);
+static int cmd_enable_event_internal(struct ltt_session *session,
+ struct lttng_domain *domain,
+ char *channel_name, struct lttng_event *event,
+ char *filter_expression,
+ struct lttng_filter_bytecode *filter,
+ struct lttng_event_exclusion *exclusion,
+ int wpipe);
+
/*
* Create a session path used by list_lttng_sessions for the case that the
* session consumer is on the network.
/*
* Fill lttng_channel array of all channels.
*/
-static void list_lttng_channels(int domain, struct ltt_session *session,
- struct lttng_channel *channels)
+static void list_lttng_channels(enum lttng_domain_type domain,
+ struct ltt_session *session, struct lttng_channel *channels)
{
int i = 0;
struct ltt_kernel_channel *kchan;
* domain adding the default trace directory.
*/
static int add_uri_to_consumer(struct consumer_output *consumer,
- struct lttng_uri *uri, int domain, const char *session_name)
+ struct lttng_uri *uri, enum lttng_domain_type domain,
+ const char *session_name)
{
int ret = LTTNG_OK;
const char *default_trace_dir;
/*
* Connect to the relayd using URI and send the socket to the right consumer.
*/
-static int send_consumer_relayd_socket(int domain, unsigned int session_id,
- struct lttng_uri *relayd_uri, struct consumer_output *consumer,
+static int send_consumer_relayd_socket(enum lttng_domain_type domain,
+ unsigned int session_id, struct lttng_uri *relayd_uri,
+ struct consumer_output *consumer,
struct consumer_socket *consumer_sock,
char *session_name, char *hostname, int session_live_timer)
{
* helper function to facilitate sending the information to the consumer for a
* session.
*/
-static int send_consumer_relayd_sockets(int domain, unsigned int session_id,
- struct consumer_output *consumer, struct consumer_socket *sock,
- char *session_name, char *hostname, int session_live_timer)
+static int send_consumer_relayd_sockets(enum lttng_domain_type domain,
+ unsigned int session_id, struct consumer_output *consumer,
+ struct consumer_socket *sock, char *session_name,
+ char *hostname, int session_live_timer)
{
int ret = LTTNG_OK;
/*
* Command LTTNG_DISABLE_CHANNEL processed by the client thread.
*/
-int cmd_disable_channel(struct ltt_session *session, int domain,
- char *channel_name)
+int cmd_disable_channel(struct ltt_session *session,
+ enum lttng_domain_type domain, char *channel_name)
{
int ret;
struct ltt_ust_session *usess;
*
* Called with session lock held.
*/
-int cmd_track_pid(struct ltt_session *session, int domain, int pid)
+int cmd_track_pid(struct ltt_session *session, enum lttng_domain_type domain,
+ int pid)
{
int ret;
*
* Called with session lock held.
*/
-int cmd_untrack_pid(struct ltt_session *session, int domain, int pid)
+int cmd_untrack_pid(struct ltt_session *session, enum lttng_domain_type domain,
+ int pid)
{
int ret;
/*
* Command LTTNG_DISABLE_EVENT processed by the client thread.
*/
-int cmd_disable_event(struct ltt_session *session, int domain,
- char *channel_name,
+int cmd_disable_event(struct ltt_session *session,
+ enum lttng_domain_type domain, char *channel_name,
struct lttng_event *event)
{
int ret;
DBG("Disable event command for event \'%s\'", event->name);
event_name = event->name;
+ if (validate_event_name(event_name)) {
+ ret = LTTNG_ERR_INVALID_EVENT_NAME;
+ goto error;
+ }
/* Error out on unhandled search criteria */
if (event->loglevel_type || event->loglevel != -1 || event->enabled
|| event->pid || event->filter || event->exclusion) {
- return LTTNG_ERR_UNK;
+ ret = LTTNG_ERR_UNK;
+ goto error;
}
rcu_read_lock();
*/
if (ksess->has_non_default_channel && channel_name[0] == '\0') {
ret = LTTNG_ERR_NEED_CHANNEL_NAME;
- goto error;
+ goto error_unlock;
}
kchan = trace_kernel_get_channel_by_name(channel_name, ksess);
if (kchan == NULL) {
ret = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
- goto error;
+ goto error_unlock;
}
switch (event->type) {
case LTTNG_EVENT_ALL:
ret = event_kernel_disable_event_all(kchan);
if (ret != LTTNG_OK) {
- goto error;
+ goto error_unlock;
}
break;
case LTTNG_EVENT_TRACEPOINT: /* fall-through */
event_name);
}
if (ret != LTTNG_OK) {
- goto error;
+ goto error_unlock;
}
break;
case LTTNG_EVENT_PROBE:
case LTTNG_EVENT_FUNCTION_ENTRY:
ret = event_kernel_disable_event(kchan, event_name);
if (ret != LTTNG_OK) {
- goto error;
+ goto error_unlock;
}
break;
default:
ret = LTTNG_ERR_UNK;
- goto error;
+ goto error_unlock;
}
kernel_wait_quiescent(kernel_tracer_fd);
usess = session->ust_session;
+ if (validate_ust_event_name(event_name)) {
+ ret = LTTNG_ERR_INVALID_EVENT_NAME;
+ goto error_unlock;
+ }
+
/*
* If a non-default channel has been created in the
* session, explicitely require that -c chan_name needs
*/
if (usess->has_non_default_channel && channel_name[0] == '\0') {
ret = LTTNG_ERR_NEED_CHANNEL_NAME;
- goto error;
+ goto error_unlock;
}
uchan = trace_ust_find_channel_by_name(usess->domain_global.channels,
channel_name);
if (uchan == NULL) {
ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
- goto error;
+ goto error_unlock;
}
switch (event->type) {
case LTTNG_EVENT_ALL:
ret = event_ust_disable_tracepoint(usess, uchan, event_name);
if (ret != LTTNG_OK) {
- goto error;
+ goto error_unlock;
}
break;
default:
ret = LTTNG_ERR_UNK;
- goto error;
+ goto error_unlock;
}
DBG3("Disable UST event %s in channel %s completed", event_name,
break;
default:
ret = LTTNG_ERR_UNK;
- goto error;
+ goto error_unlock;
}
agt = trace_ust_find_agent(usess, domain);
if (!agt) {
ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND;
- goto error;
+ goto error_unlock;
}
/* The wild card * means that everything should be disabled. */
if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
ret = event_agent_disable(usess, agt, event_name);
}
if (ret != LTTNG_OK) {
- goto error;
+ goto error_unlock;
}
break;
}
default:
ret = LTTNG_ERR_UND;
- goto error;
+ goto error_unlock;
}
ret = LTTNG_OK;
-error:
+error_unlock:
rcu_read_unlock();
+error:
return ret;
}
/*
* Command LTTNG_ADD_CONTEXT processed by the client thread.
*/
-int cmd_add_context(struct ltt_session *session, int domain,
+int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
char *channel_name, struct lttng_event_context *ctx, int kwpipe)
{
int ret, chan_kern_created = 0, chan_ust_created = 0;
return ret;
}
-static int cmd_enable_event_internal(struct ltt_session *session,
- struct lttng_domain *domain,
- char *channel_name, struct lttng_event *event,
- char *filter_expression,
- struct lttng_filter_bytecode *filter,
- struct lttng_event_exclusion *exclusion,
- int wpipe);
-
/*
* Internal version of cmd_enable_event() with a supplemental
* "internal_event" flag which is used to enable internal events which should
/*
* Command LTTNG_LIST_TRACEPOINTS processed by the client thread.
*/
-ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events)
+ssize_t cmd_list_tracepoints(enum lttng_domain_type domain,
+ struct lttng_event **events)
{
int ret;
ssize_t nb_events = 0;
/*
* Command LTTNG_LIST_TRACEPOINT_FIELDS processed by the client thread.
*/
-ssize_t cmd_list_tracepoint_fields(int domain,
+ssize_t cmd_list_tracepoint_fields(enum lttng_domain_type domain,
struct lttng_event_field **fields)
{
int ret;
* Called with session lock held.
*/
ssize_t cmd_list_tracker_pids(struct ltt_session *session,
- int domain, int32_t **pids)
+ enum lttng_domain_type domain, int32_t **pids)
{
int ret;
ssize_t nr_pids = 0;
/*
* Command LTTNG_CALIBRATE processed by the client thread.
*/
-int cmd_calibrate(int domain, struct lttng_calibrate *calibrate)
+int cmd_calibrate(enum lttng_domain_type domain,
+ struct lttng_calibrate *calibrate)
{
int ret;
/*
* Command LTTNG_REGISTER_CONSUMER processed by the client thread.
*/
-int cmd_register_consumer(struct ltt_session *session, int domain,
- const char *sock_path, struct consumer_data *cdata)
+int cmd_register_consumer(struct ltt_session *session,
+ enum lttng_domain_type domain, const char *sock_path,
+ struct consumer_data *cdata)
{
int ret, sock;
struct consumer_socket *socket = NULL;
/*
* Command LTTNG_LIST_CHANNELS processed by the client thread.
*/
-ssize_t cmd_list_channels(int domain, struct ltt_session *session,
- struct lttng_channel **channels)
+ssize_t cmd_list_channels(enum lttng_domain_type domain,
+ struct ltt_session *session, struct lttng_channel **channels)
{
int ret;
ssize_t nb_chan = 0;
/*
* Command LTTNG_LIST_EVENTS processed by the client thread.
*/
-ssize_t cmd_list_events(int domain, struct ltt_session *session,
- char *channel_name, struct lttng_event **events)
+ssize_t cmd_list_events(enum lttng_domain_type domain,
+ struct ltt_session *session, char *channel_name,
+ struct lttng_event **events)
{
int ret = 0;
ssize_t nb_event = 0;