From: Brian Norris <computersforpeace@gmail.com> To: Shuah Khan <shuahkh@osg.samsung.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Ming Lei <ming.lei@canonical.com> Cc: Kees Cook <keescook@chromium.org>, Brian Norris <computersforpeace@gmail.com>, <linux-kernel@vger.kernel.org>, <linux-api@vger.kernel.org>, "Luis R. Rodriguez" <mcgrof@suse.com> Subject: [PATCH v2 5/5] selftests: firmware: add empty string and async tests Date: Wed, 9 Dec 2015 14:50:29 -0800 [thread overview] Message-ID: <1449701429-121423-5-git-send-email-computersforpeace@gmail.com> (raw) In-Reply-To: <1449701429-121423-1-git-send-email-computersforpeace@gmail.com> Now that we've added a 'trigger_async_request' knob to test the request_firmware_nowait() API, let's use it. Also add tests for the empty ("") string, since there have been a couple errors in that handling already. Since we now have real ways that the sysfs write might fail, let's add the appropriate check on the 'echo' lines too. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Acked-by: Kees Cook <keescook@chromium.org> --- v2: * fix some spelling in commit message (wow, I wrote an atrocious sentence!) * use octal notation for printf, since the hex is non-POSIX and doesn't work in dash tools/testing/selftests/firmware/fw_filesystem.sh | 29 ++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh index c4366dc74e01..5c495ad7958a 100755 --- a/tools/testing/selftests/firmware/fw_filesystem.sh +++ b/tools/testing/selftests/firmware/fw_filesystem.sh @@ -48,8 +48,21 @@ echo "ABCD0123" >"$FW" NAME=$(basename "$FW") +if printf '\000' >"$DIR"/trigger_request; then + echo "$0: empty filename should not succeed" >&2 + exit 1 +fi + +if printf '\000' >"$DIR"/trigger_async_request; then + echo "$0: empty filename should not succeed (async)" >&2 + exit 1 +fi + # Request a firmware that doesn't exist, it should fail. -echo -n "nope-$NAME" >"$DIR"/trigger_request +if echo -n "nope-$NAME" >"$DIR"/trigger_request; then + echo "$0: firmware shouldn't have loaded" >&2 + exit 1 +fi if diff -q "$FW" /dev/test_firmware >/dev/null ; then echo "$0: firmware was not expected to match" >&2 exit 1 @@ -74,4 +87,18 @@ else echo "$0: filesystem loading works" fi +# Try the asynchronous version too +if ! echo -n "$NAME" >"$DIR"/trigger_async_request ; then + echo "$0: could not trigger async request" >&2 + exit 1 +fi + +# Verify the contents are what we expect. +if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then + echo "$0: firmware was not loaded (async)" >&2 + exit 1 +else + echo "$0: async filesystem loading works" +fi + exit 0 -- 2.6.0.rc2.230.g3dd15c0
WARNING: multiple messages have this Message-ID (diff)
From: Brian Norris <computersforpeace@gmail.com> To: Shuah Khan <shuahkh@osg.samsung.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Ming Lei <ming.lei@canonical.com> Cc: Kees Cook <keescook@chromium.org>, Brian Norris <computersforpeace@gmail.com>, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, "Luis R. Rodriguez" <mcgrof@suse.com> Subject: [PATCH v2 5/5] selftests: firmware: add empty string and async tests Date: Wed, 9 Dec 2015 14:50:29 -0800 [thread overview] Message-ID: <1449701429-121423-5-git-send-email-computersforpeace@gmail.com> (raw) In-Reply-To: <1449701429-121423-1-git-send-email-computersforpeace@gmail.com> Now that we've added a 'trigger_async_request' knob to test the request_firmware_nowait() API, let's use it. Also add tests for the empty ("") string, since there have been a couple errors in that handling already. Since we now have real ways that the sysfs write might fail, let's add the appropriate check on the 'echo' lines too. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Acked-by: Kees Cook <keescook@chromium.org> --- v2: * fix some spelling in commit message (wow, I wrote an atrocious sentence!) * use octal notation for printf, since the hex is non-POSIX and doesn't work in dash tools/testing/selftests/firmware/fw_filesystem.sh | 29 ++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh index c4366dc74e01..5c495ad7958a 100755 --- a/tools/testing/selftests/firmware/fw_filesystem.sh +++ b/tools/testing/selftests/firmware/fw_filesystem.sh @@ -48,8 +48,21 @@ echo "ABCD0123" >"$FW" NAME=$(basename "$FW") +if printf '\000' >"$DIR"/trigger_request; then + echo "$0: empty filename should not succeed" >&2 + exit 1 +fi + +if printf '\000' >"$DIR"/trigger_async_request; then + echo "$0: empty filename should not succeed (async)" >&2 + exit 1 +fi + # Request a firmware that doesn't exist, it should fail. -echo -n "nope-$NAME" >"$DIR"/trigger_request +if echo -n "nope-$NAME" >"$DIR"/trigger_request; then + echo "$0: firmware shouldn't have loaded" >&2 + exit 1 +fi if diff -q "$FW" /dev/test_firmware >/dev/null ; then echo "$0: firmware was not expected to match" >&2 exit 1 @@ -74,4 +87,18 @@ else echo "$0: filesystem loading works" fi +# Try the asynchronous version too +if ! echo -n "$NAME" >"$DIR"/trigger_async_request ; then + echo "$0: could not trigger async request" >&2 + exit 1 +fi + +# Verify the contents are what we expect. +if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then + echo "$0: firmware was not loaded (async)" >&2 + exit 1 +else + echo "$0: async filesystem loading works" +fi + exit 0 -- 2.6.0.rc2.230.g3dd15c0
next prev parent reply other threads:[~2015-12-09 22:51 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-09 22:50 [PATCH v2 1/5] test: firmware_class: report errors properly on failure Brian Norris 2015-12-09 22:50 ` Brian Norris 2015-12-09 22:50 ` [PATCH v2 2/5] test: firmware_class: use kstrndup() where appropriate Brian Norris 2015-12-09 22:50 ` Brian Norris 2016-01-07 20:55 ` Shuah Khan 2016-01-07 20:55 ` Shuah Khan 2015-12-09 22:50 ` [PATCH v2 3/5] test: firmware_class: add asynchronous request trigger Brian Norris 2015-12-09 22:50 ` Brian Norris 2015-12-09 23:22 ` Kees Cook 2015-12-09 23:22 ` Kees Cook 2016-01-07 20:56 ` Shuah Khan 2015-12-09 22:50 ` [PATCH v2 4/5] firmware: actually return NULL on failed request_firmware_nowait() Brian Norris 2015-12-09 22:50 ` Brian Norris 2015-12-21 19:06 ` Luis R. Rodriguez 2016-01-07 20:56 ` Shuah Khan 2016-01-07 20:56 ` Shuah Khan 2015-12-09 22:50 ` Brian Norris [this message] 2015-12-09 22:50 ` [PATCH v2 5/5] selftests: firmware: add empty string and async tests Brian Norris 2016-01-07 20:57 ` Shuah Khan 2016-01-07 20:57 ` Shuah Khan 2016-01-07 21:39 ` Brian Norris 2016-01-07 21:39 ` Brian Norris 2016-01-07 21:42 ` Shuah Khan 2016-01-07 21:42 ` Shuah Khan 2016-01-07 20:54 ` [PATCH v2 1/5] test: firmware_class: report errors properly on failure Shuah Khan 2016-01-07 20:54 ` Shuah Khan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1449701429-121423-5-git-send-email-computersforpeace@gmail.com \ --to=computersforpeace@gmail.com \ --cc=gregkh@linuxfoundation.org \ --cc=keescook@chromium.org \ --cc=linux-api@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mcgrof@suse.com \ --cc=ming.lei@canonical.com \ --cc=shuahkh@osg.samsung.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.