summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-10-09 16:32:18 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-10-09 16:32:18 -0700
commit6e84230941d133d40c074a5258a318e867bc77da (patch)
treea45ffce91bc546a7e5651b3eddf469774d64a768 /drivers/net
parent2690915ff34a2398aa58dc8010faad6ab7ec6c73 (diff)
parent5bad01206d00b2bf52f78bb78c46c82130c7b2c6 (diff)
Merge "wcnss: fix integer underflow in wcnss_wlan"
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/wcnss/wcnss_wlan.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/wcnss/wcnss_wlan.c b/drivers/net/wireless/wcnss/wcnss_wlan.c
index 13ae5c3c2471..b97e550cba5d 100644
--- a/drivers/net/wireless/wcnss/wcnss_wlan.c
+++ b/drivers/net/wireless/wcnss/wcnss_wlan.c
@@ -2368,6 +2368,12 @@ static void wcnss_nvbin_dnld(void)
goto out;
}
+ if (nv->size <= 4) {
+ pr_err("wcnss: %s: request_firmware failed for %s (file size = %zu)\n",
+ __func__, NVBIN_FILE, nv->size);
+ goto out;
+ }
+
/* First 4 bytes in nv blob is validity bitmap.
* We cannot validate nv, so skip those 4 bytes.
*/