projects
/
deliverable
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumerd: use-after-free of metadata bucket
[deliverable/lttng-tools.git]
/
src
/
common
/
ust-consumer
/
ust-consumer.c
diff --git
a/src/common/ust-consumer/ust-consumer.c
b/src/common/ust-consumer/ust-consumer.c
index 54ad208c0c7dbb90f303d5d8269a3fde21590a38..ba5f6e42211d7df37c28adf941a9e7e726713d18 100644
(file)
--- a/
src/common/ust-consumer/ust-consumer.c
+++ b/
src/common/ust-consumer/ust-consumer.c
@@
-68,7
+68,7
@@
static void destroy_channel(struct lttng_consumer_channel *channel)
health_code_update();
health_code_update();
- cds_list_del(&stream->send_node);
+ cds_list_del
_init
(&stream->send_node);
lttng_ust_ctl_destroy_stream(stream->ustream);
lttng_trace_chunk_put(stream->trace_chunk);
free(stream);
lttng_ust_ctl_destroy_stream(stream->ustream);
lttng_trace_chunk_put(stream->trace_chunk);
free(stream);
@@
-204,7
+204,7
@@
static int send_stream_to_thread(struct lttng_consumer_stream *stream,
* global.
*/
stream->globally_visible = 1;
* global.
*/
stream->globally_visible = 1;
- cds_list_del(&stream->send_node);
+ cds_list_del
_init
(&stream->send_node);
ret = lttng_pipe_write(stream_pipe, &stream, sizeof(stream));
if (ret < 0) {
ret = lttng_pipe_write(stream_pipe, &stream, sizeof(stream));
if (ret < 0) {
@@
-949,7
+949,6
@@
error:
* will make sure to clean that list.
*/
consumer_stream_destroy(metadata->metadata_stream, NULL);
* will make sure to clean that list.
*/
consumer_stream_destroy(metadata->metadata_stream, NULL);
- cds_list_del(&metadata->metadata_stream->send_node);
metadata->metadata_stream = NULL;
send_streams_error:
error_no_stream:
metadata->metadata_stream = NULL;
send_streams_error:
error_no_stream:
@@
-1032,7
+1031,6
@@
error_stream:
* new metadata stream.
*/
consumer_stream_destroy(metadata_stream, NULL);
* new metadata stream.
*/
consumer_stream_destroy(metadata_stream, NULL);
- cds_list_del(&metadata_stream->send_node);
metadata_channel->metadata_stream = NULL;
error:
metadata_channel->metadata_stream = NULL;
error:
This page took
0.025331 seconds
and
5
git commands to generate.