Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1287018

[PATCH 1/4] test: firmware_class: report errors properly on failure

Show all headers | View raw

request_firmware() failures currently won't get reported at all (the
error code is discarded). What's more, we get confusing messages, like:

    # echo -n notafile > /sys/devices/virtual/misc/test_firmware/trigger_request
    [ 8280.311856] test_firmware: loading 'notafile'
    [ 8280.317042] test_firmware: load of 'notafile' failed: -2
    [ 8280.322445] test_firmware: loaded: 0
    # echo $?
    0

Report the failures via write() errors, and don't say we "loaded"
anything.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
 lib/test_firmware.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index 86374c1c49a4..841191061816 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -65,14 +65,19 @@ static ssize_t trigger_request_store(struct device *dev,
 	release_firmware(test_firmware);
 	test_firmware = NULL;
 	rc = request_firmware(&test_firmware, name, dev);
-	if (rc)
+	if (rc) {
 		pr_info("load of '%s' failed: %d\n", name, rc);
-	pr_info("loaded: %zu\n", test_firmware ? test_firmware->size : 0);
+		goto out;
+	}
+	pr_info("loaded: %zu\n", test_firmware->size);
+	rc = count;
+
+out:
 	mutex_unlock(&test_fw_mutex);
 
 	kfree(name);
 
-	return count;
+	return rc;
 }
 static DEVICE_ATTR_WO(trigger_request);
 
-- 
2.6.0.rc2.230.g3dd15c0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/4] test: firmware_class: report errors properly on failure Brian Norris <computersforpeace@gmail.com> - 2015-12-09 03:40 +0100
  [PATCH 4/4] selftests: firmware: add empty string and async tests Brian Norris <computersforpeace@gmail.com> - 2015-12-09 03:40 +0100
    Re: [PATCH 4/4] selftests: firmware: add empty string and async tests Kees Cook <keescook@chromium.org> - 2015-12-09 22:20 +0100
  [PATCH 3/4] firmware: actually return NULL on failed request_firmware_nowait() Brian Norris <computersforpeace@gmail.com> - 2015-12-09 03:50 +0100
    Re: [PATCH 3/4] firmware: actually return NULL on failed request_firmware_nowait() Ming Lei <ming.lei@canonical.com> - 2015-12-09 05:10 +0100
    Re: [PATCH 3/4] firmware: actually return NULL on failed request_firmware_nowait() Kees Cook <keescook@chromium.org> - 2015-12-09 22:20 +0100
  [PATCH 2/4] test: firmware_class: add asynchronous request trigger Brian Norris <computersforpeace@gmail.com> - 2015-12-09 03:50 +0100
    Re: [PATCH 2/4] test: firmware_class: add asynchronous request trigger Kees Cook <keescook@chromium.org> - 2015-12-09 22:10 +0100
      Re: [PATCH 2/4] test: firmware_class: add asynchronous request  trigger Brian Norris <computersforpeace@gmail.com> - 2015-12-09 22:50 +0100
        Re: [PATCH 2/4] test: firmware_class: add asynchronous request trigger Kees Cook <keescook@chromium.org> - 2015-12-09 23:10 +0100
          Re: [PATCH 2/4] test: firmware_class: add asynchronous request  trigger Brian Norris <computersforpeace@gmail.com> - 2015-12-09 23:20 +0100
  Re: [PATCH 1/4] test: firmware_class: report errors properly on failure Kees Cook <keescook@chromium.org> - 2015-12-09 22:20 +0100

csiph-web