summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Minor <james.minor@ni.com>2017-01-25 18:13:32 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:43:01 +0000
commit1f7c9094f703c234c9bef6090b958dbe28ec7374 (patch)
tree55a52db3174bc8f560a6bf50d632ddaf22921014
parent50c885e165ac095332cacd010476d013567c4040 (diff)
downloadpoky-1f7c9094f703c234c9bef6090b958dbe28ec7374.tar.gz
kmod: Fix handling of quotes in kernel command line
If a module parameter on the command line contains quotes, any spaces inside those quotes should be included as part of the parameter. Upstream-Status: Accepted (From OE-Core rev: a54be23887cdc24a9b128be0913029fc8e63973d) Signed-off-by: James Minor <james.minor@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc1
-rw-r--r--meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch44
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index a59c30586e..cfa409dbb3 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -22,6 +22,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
22 file://depmod-search.conf \ 22 file://depmod-search.conf \
23 file://avoid_parallel_tests.patch \ 23 file://avoid_parallel_tests.patch \
24 file://fix-O_CLOEXEC.patch \ 24 file://fix-O_CLOEXEC.patch \
25 file://kcmdline_quotes.patch \
25 " 26 "
26 27
27S = "${WORKDIR}/git" 28S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch b/meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch
new file mode 100644
index 0000000000..46bdec59a7
--- /dev/null
+++ b/meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch
@@ -0,0 +1,44 @@
1From 4a6f92a10680e7e36807f5e2ae8e497e8d73a048 Mon Sep 17 00:00:00 2001
2From: James Minor <james.minor@ni.com>
3Date: Fri, 20 Jan 2017 17:15:50 -0600
4Subject: [PATCH] libkmod: Fix handling of quotes in kernel command line
5
6If a module parameter on the command line contains quotes, any
7spaces inside those quotes should be included as part of the
8parameter.
9
10Signed-off-by: James Minor <james.minor@ni.com>
11
12Upstream-Status: Accepted
13---
14 libkmod/libkmod-config.c | 7 +++++++
15 1 file changed, 7 insertions(+)
16
17diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
18index 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--
431.9.1
44