projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: relayd memleaks
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index 0f81d556dd4df73a910471756b75cf6567581a36..152e4bbc86911a00a53f8598e472e7b1545736eb 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-884,7
+884,8
@@
void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
}
DBG("Relay deleting session %" PRIu64, cmd->session->id);
}
DBG("Relay deleting session %" PRIu64, cmd->session->id);
- free(cmd->session->sock);
+
+ lttcomm_destroy_sock(cmd->session->sock);
rcu_read_lock();
cds_lfht_for_each_entry(streams_ht->ht, &iter.iter, node, node) {
rcu_read_lock();
cds_lfht_for_each_entry(streams_ht->ht, &iter.iter, node, node) {
@@
-902,6
+903,8
@@
void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
}
}
rcu_read_unlock();
}
}
rcu_read_unlock();
+
+ free(cmd->session);
}
/*
}
/*
@@
-1176,6
+1179,8
@@
static int write_padding_to_file(int fd, uint32_t size)
PERROR("write padding to file");
}
PERROR("write padding to file");
}
+ free(zeros);
+
end:
return ret;
}
end:
return ret;
}
@@
-1208,9
+1213,12
@@
int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
payload_size -= sizeof(struct lttcomm_relayd_metadata_payload);
if (data_buffer_size < data_size) {
payload_size -= sizeof(struct lttcomm_relayd_metadata_payload);
if (data_buffer_size < data_size) {
+ /* In case the realloc fails, we can free the memory */
+ char *tmp_data_ptr = data_buffer;
data_buffer = realloc(data_buffer, data_size);
if (!data_buffer) {
ERR("Allocating data buffer");
data_buffer = realloc(data_buffer, data_size);
if (!data_buffer) {
ERR("Allocating data buffer");
+ free(tmp_data_ptr);
ret = -1;
goto end;
}
ret = -1;
goto end;
}
@@
-1355,7
+1363,8
@@
int relay_data_available(struct lttcomm_relayd_hdr *recv_hdr,
" and last_seq %" PRIu64, stream_id, stream->prev_seq,
last_net_seq_num);
" and last_seq %" PRIu64, stream_id, stream->prev_seq,
last_net_seq_num);
- if (stream->prev_seq == -1UL || stream->prev_seq <= last_net_seq_num) {
+ /* Avoid wrapping issue */
+ if (((int64_t) (stream->prev_seq - last_net_seq_num)) <= 0) {
/* Data has in fact been written and is available */
ret = 1;
} else {
/* Data has in fact been written and is available */
ret = 1;
} else {
@@
-1481,9
+1490,11
@@
int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
data_size = be32toh(data_hdr.data_size);
if (data_buffer_size < data_size) {
data_size = be32toh(data_hdr.data_size);
if (data_buffer_size < data_size) {
+ char *tmp_data_ptr = data_buffer;
data_buffer = realloc(data_buffer, data_size);
if (!data_buffer) {
ERR("Allocating data buffer");
data_buffer = realloc(data_buffer, data_size);
if (!data_buffer) {
ERR("Allocating data buffer");
+ free(tmp_data_ptr);
ret = -1;
goto end_unlock;
}
ret = -1;
goto end_unlock;
}
@@
-1591,6
+1602,8
@@
void deferred_free_connection(struct rcu_head *head)
{
struct relay_command *relay_connection =
caa_container_of(head, struct relay_command, rcu_node);
{
struct relay_command *relay_connection =
caa_container_of(head, struct relay_command, rcu_node);
+
+ lttcomm_destroy_sock(relay_connection->sock);
free(relay_connection);
}
free(relay_connection);
}
@@
-1606,6
+1619,7
@@
void relay_del_connection(struct lttng_ht *relay_connections_ht,
if (relay_connection->type == RELAY_CONTROL) {
relay_delete_session(relay_connection, streams_ht);
}
if (relay_connection->type == RELAY_CONTROL) {
relay_delete_session(relay_connection, streams_ht);
}
+
call_rcu(&relay_connection->rcu_node,
deferred_free_connection);
}
call_rcu(&relay_connection->rcu_node,
deferred_free_connection);
}
This page took
0.025371 seconds
and
5
git commands to generate.