diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2018-04-04 22:38:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-09 09:53:10 +0200 |
| commit | 9fd572f55c537ed0a80d8aec970e5c66db6c291f (patch) | |
| tree | a54d1e59f68807b2abcc710fe188635a35d71278 | |
| parent | c44b81bd7a47e0de466dc20f2d6febdf500cb007 (diff) | |
| download | linux-stable-9fd572f55c537ed0a80d8aec970e5c66db6c291f.tar.gz linux-stable-9fd572f55c537ed0a80d8aec970e5c66db6c291f.tar.bz2 linux-stable-9fd572f55c537ed0a80d8aec970e5c66db6c291f.zip | |
test_firmware: fix setting old custom fw path back on exit, second try
commit e538409257d0217a9bc715686100a5328db75a15 upstream.
Commit 65c79230576 tried to clear the custom firmware path on exit by
writing a single space to the firmware_class.path parameter. This
doesn't work because nothing strips this space from the value stored
and fw_get_filesystem_firmware() only ignores zero-length paths.
Instead, write a null byte.
Fixes: 0a8adf58475 ("test: add firmware_class loader test")
Fixes: 65c79230576 ("test_firmware: fix setting old custom fw path back on exit")
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rwxr-xr-x | tools/testing/selftests/firmware/fw_filesystem.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh index f9508e1a4058..6b63b6bf2661 100755 --- a/tools/testing/selftests/firmware/fw_filesystem.sh +++ b/tools/testing/selftests/firmware/fw_filesystem.sh @@ -46,9 +46,11 @@ test_finish() echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout fi if [ "$OLD_FWPATH" = "" ]; then - OLD_FWPATH=" " + # A zero-length write won't work; write a null byte + printf '\000' >/sys/module/firmware_class/parameters/path + else + echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path fi - echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path rm -f "$FW" rmdir "$FWPATH" } |