diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-12-09 14:50:25 -0800 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-12-06 21:20:02 -0500 |
| commit | 1201551923258d881d3da469f7e40b4bdd4798f8 (patch) | |
| tree | 540569dbad02c70e8f2b73ce2ae254bd07238f30 /lib | |
| parent | ce22f7f94f48f6280e278d905665ababd757d302 (diff) | |
test: firmware_class: report errors properly on failure
[ Upstream commit 47e0bbb7fa985a0f1b5794a8653fae4f8f49de77 ]
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>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test_firmware.c | 11 |
1 files 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); |