projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: illegal memory access in cmd_snapshot_list_outputs
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.c
diff --git
a/src/bin/lttng-sessiond/ust-app.c
b/src/bin/lttng-sessiond/ust-app.c
index bbba4a604e4b5d120840496bb4c7f3a4d625a25d..b1599eb4ed3304be03dd22d36d314e929ed9976c 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.c
+++ b/
src/bin/lttng-sessiond/ust-app.c
@@
-4432,7
+4432,6
@@
int ust_app_flush_app_session(struct ust_app *app,
cds_lfht_for_each_entry(ua_sess->channels->ht, &iter.iter, ua_chan,
node.node) {
health_code_update();
cds_lfht_for_each_entry(ua_sess->channels->ht, &iter.iter, ua_chan,
node.node) {
health_code_update();
- assert(ua_chan->is_sent);
ret = consumer_flush_channel(socket, ua_chan->key);
if (ret) {
ERR("Error flushing consumer channel");
ret = consumer_flush_channel(socket, ua_chan->key);
if (ret) {
ERR("Error flushing consumer channel");
@@
-5475,7
+5474,6
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
uint64_t nb_packets_per_stream)
{
int ret = 0;
uint64_t nb_packets_per_stream)
{
int ret = 0;
- unsigned int snapshot_done = 0;
struct lttng_ht_iter iter;
struct ust_app *app;
char pathname[PATH_MAX];
struct lttng_ht_iter iter;
struct ust_app *app;
char pathname[PATH_MAX];
@@
-5527,7
+5525,6
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
- snapshot_done = 1;
}
break;
}
}
break;
}
@@
-5580,7
+5577,6
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
- snapshot_done = 1;
}
break;
}
}
break;
}
@@
-5589,15
+5585,6
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
break;
}
break;
}
- if (!snapshot_done) {
- /*
- * If no snapshot was made and we are not in the error path, this means
- * that there are no buffers thus no (prior) application to snapshot
- * data from so we have simply NO data.
- */
- ret = -ENODATA;
- }
-
error:
rcu_read_unlock();
return ret;
error:
rcu_read_unlock();
return ret;
This page took
0.03063 seconds
and
4
git commands to generate.