Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5384092 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

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



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>
parent 1ecb1601

tools/testing/selftests/firmware/fw_lib.sh

+6 −4
Original line number Diff line number Diff line
@@ -154,12 +154,14 @@ test_finish() 
	if [ "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then

		echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout

	fi

	if [ "$OLD_FWPATH" = "" ]; then

		OLD_FWPATH=" "

	fi

	if [ "$TEST_REQS_FW_SET_CUSTOM_PATH" = "yes" ]; then

		if [ "$OLD_FWPATH" = "" ]; then

			# 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

	fi

	if [ -f $FW ]; then

		rm -f "$FW"

	fi