projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
ath
/
ath6kl
/
init.c
diff --git
a/drivers/net/wireless/ath/ath6kl/init.c
b/drivers/net/wireless/ath/ath6kl/init.c
index 12241b1c57cd28023d0278c57f347457583bc017..6ae0734f86e0f9e58053362307273921e9fdfd67 100644
(file)
--- a/
drivers/net/wireless/ath/ath6kl/init.c
+++ b/
drivers/net/wireless/ath/ath6kl/init.c
@@
-995,7
+995,7
@@
static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name)
switch (ie_id) {
case ATH6KL_FW_IE_FW_VERSION:
strlcpy(ar->wiphy->fw_version, data,
-
sizeof(ar->wiphy->fw_version
));
+
min(sizeof(ar->wiphy->fw_version), ie_len+1
));
ath6kl_dbg(ATH6KL_DBG_BOOT,
"found fw version %s\n",