summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2018-10-19 13:58:01 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-12-13 09:16:10 +0100
commit27b504af882ba40e4bbada1fec430ffef98f12ca (patch)
tree31ab164e6e389eeec3555f3a21a2f88b5ffaa723 /lib
parent0e3e8e31877a043c0180f2a011bae22db509d67f (diff)
downloadlinux-stable-27b504af882ba40e4bbada1fec430ffef98f12ca.tar.gz
linux-stable-27b504af882ba40e4bbada1fec430ffef98f12ca.tar.bz2
linux-stable-27b504af882ba40e4bbada1fec430ffef98f12ca.zip
test_firmware: fix error return getting clobbered
[ Upstream commit 8bb0a88600f0267cfcc245d34f8c4abe8c282713 ] In the case where eq->fw->size > PAGE_SIZE the error return rc is being set to EINVAL however this is being overwritten to rc = req->fw->size because the error exit path via label 'out' is not being taken. Fix this by adding the jump to the error exit path 'out'. Detected by CoverityScan, CID#1453465 ("Unused value") Fixes: c92316bf8e94 ("test_firmware: add batched firmware tests") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/test_firmware.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index b984806d7d7b..7cab9a9869ac 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -837,6 +837,7 @@ static ssize_t read_firmware_show(struct device *dev,
if (req->fw->size > PAGE_SIZE) {
pr_err("Testing interface must use PAGE_SIZE firmware for now\n");
rc = -EINVAL;
+ goto out;
}
memcpy(buf, req->fw->data, req->fw->size);