picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kmod-setup: improve for "kdbus" word on the kernel cmdline

Browse source 
We really shouldn't check for words with "strstr()"...
This commit is contained in:
Lennart Poettering 2014-11-14 18:02:30 +01:00
parent f84f9974d8
commit 5f68e74b6a
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core/kmod-setup.c
View file

@ -50,11 +50,24 @@ static void systemd_kmod_log(
static bool cmdline_check_kdbus(void) {
_cleanup_free_ char *line = NULL;
const char *p;
int r;
if (proc_cmdline(&line) < 0)
r = proc_cmdline(&line);
if (r < 0)
return false;
return strstr(line, "kdbus") != NULL;
p = line;
for (;;) {
_cleanup_free_ char *word = NULL;
r = unquote_first_word(&p, &word, true);
if (r <= 0)
return false;
if (streq(word, "kdbus"))
return true;
}
}
#endif