projects
/
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
[lttng-tools.git]
/
src
/
common
/
ust-consumer
/
ust-consumer.cpp
diff --git
a/src/common/ust-consumer/ust-consumer.cpp
b/src/common/ust-consumer/ust-consumer.cpp
index 42a097b955e96e73a330f38b634099d34c1f0c62..1740bbe71e2bdf22a9f36c399a4764089ccf515d 100644
(file)
--- a/
src/common/ust-consumer/ust-consumer.cpp
+++ b/
src/common/ust-consumer/ust-consumer.cpp
@@
-67,7
+67,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);
@@
-203,7
+203,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) {
@@
-950,7
+950,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:
@@
-1034,7
+1033,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.024705 seconds
and
4
git commands to generate.