projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: append_list_to_probes(): increment index
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
modprobe.c
diff --git
a/src/bin/lttng-sessiond/modprobe.c
b/src/bin/lttng-sessiond/modprobe.c
index 5fed97bf992061ee4efd78c148c41ce83fc4646d..d730a1dae972fb6f76a3907c8e1ad95ed2be61e1 100644
(file)
--- a/
src/bin/lttng-sessiond/modprobe.c
+++ b/
src/bin/lttng-sessiond/modprobe.c
@@
-141,23
+141,31
@@
void modprobe_remove_lttng_control(void)
LTTNG_MOD_REQUIRED);
}
LTTNG_MOD_REQUIRED);
}
+static void free_probes(void)
+{
+ int i;
+
+ if (!probes) {
+ return;
+ }
+ for (i = 0; i < nr_probes; ++i) {
+ free(probes[i].name);
+ }
+ free(probes);
+ probes = NULL;
+ nr_probes = 0;
+}
+
/*
* Remove data kernel modules in reverse load order.
*/
void modprobe_remove_lttng_data(void)
{
/*
* Remove data kernel modules in reverse load order.
*/
void modprobe_remove_lttng_data(void)
{
- int i;
-
- if (probes) {
- modprobe_remove_lttng(probes, nr_probes, LTTNG_MOD_OPTIONAL);
-
- for (i = 0; i < nr_probes; ++i) {
- free(probes[i].name);
- }
-
- free(probes);
- probes = NULL;
+ if (!probes) {
+ return;
}
}
+ modprobe_remove_lttng(probes, nr_probes, LTTNG_MOD_OPTIONAL);
+ free_probes();
}
/*
}
/*
@@
-352,10
+360,11
@@
static int append_list_to_probes(const char *list)
{
char *next;
int index = nr_probes, ret;
{
char *next;
int index = nr_probes, ret;
+ char *tmp_list;
assert(list);
assert(list);
-
char *
tmp_list = strdup(list);
+ tmp_list = strdup(list);
if (!tmp_list) {
PERROR("strdup temp list");
return -ENOMEM;
if (!tmp_list) {
PERROR("strdup temp list");
return -ENOMEM;
@@
-379,24
+388,26
@@
static int append_list_to_probes(const char *list)
if (probes_capacity <= nr_probes) {
ret = grow_probes();
if (ret) {
if (probes_capacity <= nr_probes) {
ret = grow_probes();
if (ret) {
-
return ret
;
+
goto error
;
}
}
/* Length 13 is "lttng-probe-" + \0 */
name_len = strlen(next) + 13;
}
}
/* Length 13 is "lttng-probe-" + \0 */
name_len = strlen(next) + 13;
- cur_mod = &probes[index];
+ cur_mod = &probes[index
++
];
cur_mod->name = zmalloc(name_len);
if (!cur_mod->name) {
PERROR("malloc probe list");
cur_mod->name = zmalloc(name_len);
if (!cur_mod->name) {
PERROR("malloc probe list");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto error;
}
ret = snprintf(cur_mod->name, name_len, "lttng-probe-%s", next);
if (ret < 0) {
PERROR("snprintf modprobe name");
}
ret = snprintf(cur_mod->name, name_len, "lttng-probe-%s", next);
if (ret < 0) {
PERROR("snprintf modprobe name");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto error;
}
cur_mod++;
}
cur_mod++;
@@
-404,8
+415,12
@@
static int append_list_to_probes(const char *list)
}
free(tmp_list);
}
free(tmp_list);
-
return 0;
return 0;
+
+error:
+ free(tmp_list);
+ free_probes();
+ return ret;
}
/*
}
/*
@@
-429,15
+444,14
@@
int modprobe_lttng_data(void)
if (list) {
/* User-specified probes. */
ret = append_list_to_probes(list);
if (list) {
/* User-specified probes. */
ret = append_list_to_probes(list);
-
if (ret) {
return ret;
}
} else {
/* Default probes. */
int def_len = ARRAY_SIZE(kern_modules_probes_default);
if (ret) {
return ret;
}
} else {
/* Default probes. */
int def_len = ARRAY_SIZE(kern_modules_probes_default);
- probes = zmalloc(sizeof(*probes) * def_len);
+ probes = zmalloc(sizeof(*probes) * def_len);
if (!probes) {
PERROR("malloc probe list");
return -ENOMEM;
if (!probes) {
PERROR("malloc probe list");
return -ENOMEM;
@@
-450,7
+464,8
@@
int modprobe_lttng_data(void)
if (!name) {
PERROR("strdup probe item");
if (!name) {
PERROR("strdup probe item");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto error;
}
probes[i].name = name;
}
probes[i].name = name;
@@
-469,12
+484,20
@@
int modprobe_lttng_data(void)
if (list) {
ret = append_list_to_probes(list);
if (ret) {
if (list) {
ret = append_list_to_probes(list);
if (ret) {
-
return ret
;
+
goto error
;
}
}
/*
* Load probes modules now.
*/
}
}
/*
* Load probes modules now.
*/
- return modprobe_lttng(probes, nr_probes, LTTNG_MOD_OPTIONAL);
+ ret = modprobe_lttng(probes, nr_probes, LTTNG_MOD_OPTIONAL);
+ if (ret) {
+ goto error;
+ }
+ return ret;
+
+error:
+ free_probes();
+ return ret;
}
}
This page took
0.029963 seconds
and
5
git commands to generate.