From: Roshan Shariff <roshan.shariff@gmail.com>
Date: Mon, 24 May 2021 07:30:38 +0000 (-0600)
Subject: rules.d: Properly quote $env{MODALIAS}
X-Git-Tag: v249-rc1~164
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07c0e5eeaf3183963f4d680555d2289a33735d6e;p=thirdparty%2Fsystemd.git

rules.d: Properly quote $env{MODALIAS}

 Add quotes around use of $env{MODALIAS} in rules.d/80-drivers.rules. The
 modalias can contain whitespace, for example when it is dynamically generated
 using device or vendor IDs.
---

diff --git a/rules.d/80-drivers.rules b/rules.d/80-drivers.rules
index 16fa5d8e323..57d69b8232b 100644
--- a/rules.d/80-drivers.rules
+++ b/rules.d/80-drivers.rules
@@ -2,7 +2,7 @@
 
 ACTION!="add", GOTO="drivers_end"
 
-ENV{MODALIAS}=="?*", RUN{builtin}+="kmod load $env{MODALIAS}"
+ENV{MODALIAS}=="?*", RUN{builtin}+="kmod load '$env{MODALIAS}'"
 SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN{builtin}+="kmod load tifm_sd"
 SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN{builtin}+="kmod load tifm_ms"
 SUBSYSTEM=="memstick", RUN{builtin}+="kmod load ms_block mspro_block"
diff --git a/test/fuzz/fuzz-udev-rules/80-drivers.rules b/test/fuzz/fuzz-udev-rules/80-drivers.rules
index 16fa5d8e323..57d69b8232b 100644
--- a/test/fuzz/fuzz-udev-rules/80-drivers.rules
+++ b/test/fuzz/fuzz-udev-rules/80-drivers.rules
@@ -2,7 +2,7 @@
 
 ACTION!="add", GOTO="drivers_end"
 
-ENV{MODALIAS}=="?*", RUN{builtin}+="kmod load $env{MODALIAS}"
+ENV{MODALIAS}=="?*", RUN{builtin}+="kmod load '$env{MODALIAS}'"
 SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN{builtin}+="kmod load tifm_sd"
 SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN{builtin}+="kmod load tifm_ms"
 SUBSYSTEM=="memstick", RUN{builtin}+="kmod load ms_block mspro_block"