projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Missing rcu_read_lock in cmd_list_channels()
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index 0b97ed61a1ec54fc928b1e5a69890ede4002a162..30f7d49babce04dd13abfef85234db060e4e7fba 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-2415,12
+2415,14
@@
ssize_t cmd_list_domains(struct ltt_session *session,
DBG3("Listing domains found UST global domain");
nb_dom++;
DBG3("Listing domains found UST global domain");
nb_dom++;
+ rcu_read_lock();
cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
agt, node.node) {
if (agt->being_used) {
nb_dom++;
}
}
cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
agt, node.node) {
if (agt->being_used) {
nb_dom++;
}
}
+ rcu_read_unlock();
}
if (!nb_dom) {
}
if (!nb_dom) {
@@
-2443,6
+2445,7
@@
ssize_t cmd_list_domains(struct ltt_session *session,
(*domains)[index].buf_type = session->ust_session->buffer_type;
index++;
(*domains)[index].buf_type = session->ust_session->buffer_type;
index++;
+ rcu_read_lock();
cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
agt, node.node) {
if (agt->being_used) {
cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
agt, node.node) {
if (agt->being_used) {
@@
-2451,6
+2454,7
@@
ssize_t cmd_list_domains(struct ltt_session *session,
index++;
}
}
index++;
}
}
+ rcu_read_unlock();
}
end:
return nb_dom;
}
end:
return nb_dom;
@@
-2482,8
+2486,10
@@
ssize_t cmd_list_channels(int domain, struct ltt_session *session,
break;
case LTTNG_DOMAIN_UST:
if (session->ust_session != NULL) {
break;
case LTTNG_DOMAIN_UST:
if (session->ust_session != NULL) {
+ rcu_read_lock();
nb_chan = lttng_ht_get_count(
nb_chan = lttng_ht_get_count(
- session->ust_session->domain_global.channels);
+ session->ust_session->domain_global.channels);
+ rcu_read_unlock();
}
DBG3("Number of UST global channels %zd", nb_chan);
if (nb_chan < 0) {
}
DBG3("Number of UST global channels %zd", nb_chan);
if (nb_chan < 0) {
This page took
0.02489 seconds
and
5
git commands to generate.