mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kees Cook <keescook@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>,
	Ming Lei <ming.lei@canonical.com>,
	"Luis R. Rodriguez" <mcgrof@suse.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	James Morris <james.l.morris@oracle.com>,
	David Howells <dhowells@redhat.com>,
	linux-doc@vger.kernel.org, linux-security-module@vger.kernel.org,
	linux-firmware@kernel.org,
	linux-wireless <linux-wireless@vger.kernel.org>
Subject: [PATCH 7/7] test: add "fd" firmware loading test to selftests
Date: Mon, 14 Jul 2014 14:38:17 -0700	[thread overview]
Message-ID: <1405373897-31671-8-git-send-email-keescook@chromium.org> (raw)
In-Reply-To: <1405373897-31671-1-git-send-email-keescook@chromium.org>

This adds tests for the new "fd" interface to the firmware selftests.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 tools/testing/selftests/firmware/fw_userhelper.sh |   34 ++++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/firmware/fw_userhelper.sh b/tools/testing/selftests/firmware/fw_userhelper.sh
index 6efbade12139..e2766613e5b5 100644
--- a/tools/testing/selftests/firmware/fw_userhelper.sh
+++ b/tools/testing/selftests/firmware/fw_userhelper.sh
@@ -25,6 +25,7 @@ load_fw()
 {
 	local name="$1"
 	local file="$2"
+	local fd="$3"
 
 	# This will block until our load (below) has finished.
 	echo -n "$name" >"$DIR"/trigger_request &
@@ -40,9 +41,16 @@ load_fw()
 		fi
 	done
 
-	echo 1 >"$DIR"/"$name"/loading
-	cat "$file" >"$DIR"/"$name"/data
-	echo 0 >"$DIR"/"$name"/loading
+	if [ -z "$fd" ]; then
+		echo 1 >"$DIR"/"$name"/loading
+		cat "$file" >"$DIR"/"$name"/data
+		echo 0 >"$DIR"/"$name"/loading
+	else
+		if ! echo "$fd" <"$file" >"$DIR"/"$name"/fd 2>/dev/null ; then
+			# If the echo fails, abort to avoid timeout.
+			echo -1 > "$DIR"/"$name"/loading
+		fi
+	fi
 
 	# Wait for request to finish.
 	wait
@@ -83,7 +91,25 @@ if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
 	echo "$0: firmware was not loaded" >&2
 	exit 1
 else
-	echo "$0: user helper firmware loading works"
+	echo "$0: user helper firmware via 'loading' works"
+fi
+
+# Request a bad file descriptor, expected to fail.
+load_fw "$NAME" "$FW" 100
+if diff -q "$FW" /dev/test_firmware >/dev/null ; then
+	echo "$0: firmware was not expected to match" >&2
+	exit 1
+else
+	echo "$0: bad file descriptor correctly fails"
+fi
+
+# Request with the correct file descriptor.
+load_fw "$NAME" "$FW" 0
+if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
+	echo "$0: failed to load with good fd" >&2
+	exit 1
+else
+	echo "$0: user helper firmware via 'fd' works"
 fi
 
 exit 0
-- 
1.7.9.5


  parent reply	other threads:[~2014-07-14 21:38 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-14 21:38 [PATCH 0/7] firmware validation Kees Cook
2014-07-14 21:38 ` [PATCH 1/7] doc: fix minor typos in firmware_class README Kees Cook
2014-07-20  2:20   ` Ming Lei
2014-07-14 21:38 ` [PATCH 2/7] test: add firmware_class loader test Kees Cook
2014-07-18  1:47   ` Greg Kroah-Hartman
2014-07-18 15:27     ` Kees Cook
2014-09-18  1:51   ` Sasha Levin
2014-09-18 16:56     ` Kees Cook
2014-07-14 21:38 ` [PATCH 3/7] security: introduce kernel_fw_from_file hook Kees Cook
2014-07-14 22:24   ` Luis R. Rodriguez
2014-07-14 22:31     ` Kees Cook
2014-07-22 19:39       ` Luis R. Rodriguez
2014-07-22 20:55         ` Kees Cook
2014-07-22 22:11           ` Luis R. Rodriguez
2014-07-22 22:20             ` Kees Cook
2014-07-22 22:25               ` Luis R. Rodriguez
2014-07-23 18:52           ` One Thousand Gnomes
2014-07-18  1:48   ` Greg Kroah-Hartman
2014-07-18 17:11   ` Mimi Zohar
2014-07-14 21:38 ` [PATCH 4/7] firmware_class: perform new LSM checks Kees Cook
2014-07-18  3:41   ` James Morris
2014-07-18 17:05     ` Kees Cook
2014-07-19  7:22       ` James Morris
2014-07-19 15:15         ` Kees Cook
2014-07-20 23:43           ` James Morris
2014-07-21  2:50             ` Mimi Zohar
2014-07-21 17:43   ` Greg Kroah-Hartman
2014-07-14 21:38 ` [PATCH 5/7] firmware_class: extract start loading logic Kees Cook
2014-07-20  3:06   ` Ming Lei
2014-07-14 21:38 ` [PATCH 6/7] firmware_class: add "fd" input file Kees Cook
2014-07-18 17:11   ` Mimi Zohar
2014-07-18 19:04     ` Kees Cook
2014-07-20  3:04   ` Ming Lei
2014-07-20 17:43     ` Kees Cook
2014-07-21  1:42       ` Ming Lei
2014-07-21 15:08         ` Kees Cook
2014-07-21 15:26           ` Greg Kroah-Hartman
2014-07-21 15:43             ` Kees Cook
2014-07-21 16:36               ` Greg Kroah-Hartman
2014-07-21 17:27                 ` Kees Cook
2014-07-21 17:43                   ` Greg Kroah-Hartman
2014-07-14 21:38 ` Kees Cook [this message]
2014-07-18  1:49 ` [PATCH 0/7] firmware validation Greg Kroah-Hartman
2014-07-23 18:53 ` One Thousand Gnomes

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=1405373897-31671-8-git-send-email-keescook@chromium.org \
    --to=keescook@chromium.org \
    --cc=dhowells@redhat.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=james.l.morris@oracle.com \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-firmware@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=mcgrof@suse.com \
    --cc=ming.lei@canonical.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®