diff options
Diffstat (limited to 'meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch')
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch b/meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch deleted file mode 100644 index 46bdec59a7..0000000000 --- a/meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 4a6f92a10680e7e36807f5e2ae8e497e8d73a048 Mon Sep 17 00:00:00 2001 | ||
2 | From: James Minor <james.minor@ni.com> | ||
3 | Date: Fri, 20 Jan 2017 17:15:50 -0600 | ||
4 | Subject: [PATCH] libkmod: Fix handling of quotes in kernel command line | ||
5 | |||
6 | If a module parameter on the command line contains quotes, any | ||
7 | spaces inside those quotes should be included as part of the | ||
8 | parameter. | ||
9 | |||
10 | Signed-off-by: James Minor <james.minor@ni.com> | ||
11 | |||
12 | Upstream-Status: Accepted | ||
13 | --- | ||
14 | libkmod/libkmod-config.c | 7 +++++++ | ||
15 | 1 file changed, 7 insertions(+) | ||
16 | |||
17 | diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c | ||
18 | index 57fbe37..ea40d19 100644 | ||
19 | --- a/libkmod/libkmod-config.c | ||
20 | +++ b/libkmod/libkmod-config.c | ||
21 | @@ -497,6 +497,7 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config) | ||
22 | char buf[KCMD_LINE_SIZE]; | ||
23 | int fd, err; | ||
24 | char *p, *modname, *param = NULL, *value = NULL, is_module = 1; | ||
25 | + bool is_quoted = false; | ||
26 | |||
27 | fd = open("/proc/cmdline", O_RDONLY|O_CLOEXEC); | ||
28 | if (fd < 0) { | ||
29 | @@ -514,6 +515,12 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config) | ||
30 | } | ||
31 | |||
32 | for (p = buf, modname = buf; *p != '\0' && *p != '\n'; p++) { | ||
33 | + if (*p == '"') { | ||
34 | + is_quoted = !is_quoted; | ||
35 | + continue; | ||
36 | + } | ||
37 | + if (is_quoted) | ||
38 | + continue; | ||
39 | switch (*p) { | ||
40 | case ' ': | ||
41 | *p = '\0'; | ||
42 | -- | ||
43 | 1.9.1 | ||
44 | |||