Commit 4ee9b0aa authored by Ben Hutchings's avatar Ben Hutchings Committed by Stefan Bader

test_firmware: fix setting old custom fw path back on exit, second try

BugLink: http://bugs.launchpad.net/bugs/1774173

commit e5384092 upstream.

Commit 65c79230 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: 0a8adf58 ("test: add firmware_class loader test")
Fixes: 65c79230 ("test_firmware: fix setting old custom fw path back on exit")
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Acked-by: default avatarLuis R. Rodriguez <mcgrof@kernel.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJuerg Haefliger <juergh@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent 09be7c59
...@@ -29,9 +29,11 @@ test_finish() ...@@ -29,9 +29,11 @@ test_finish()
echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout
fi fi
if [ "$OLD_FWPATH" = "" ]; then if [ "$OLD_FWPATH" = "" ]; then
OLD_FWPATH=" " # A zero-length write won't work; write a null byte
fi printf '\000' >/sys/module/firmware_class/parameters/path
else
echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path
fi
rm -f "$FW" rm -f "$FW"
rmdir "$FWPATH" rmdir "$FWPATH"
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment