summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Dreßler <verdre@v0yd.nl>2021-11-03 21:18:00 +0100
committerKalle Valo <kvalo@codeaurora.org>2021-11-26 18:29:38 +0200
commitdeb573f1d7ddd182ef1792c71d62883d0f833f17 (patch)
tree84e33ae98c8456ff5573bba44b45c8de91ea792b
parent939b571a3b62b64cf407fa5dbc3941bc87e0ba3b (diff)
downloadlinux-deb573f1d7ddd182ef1792c71d62883d0f833f17.tar.gz
linux-deb573f1d7ddd182ef1792c71d62883d0f833f17.tar.bz2
linux-deb573f1d7ddd182ef1792c71d62883d0f833f17.zip
mwifiex: Ensure the version string from the firmware is 0-terminated
We assume at a few places that priv->version_str is 0-terminated, but right now we trust the firmware that this is the case with the version string we get from it. Let's rather ensure this ourselves and replace the last character with '\0'. Signed-off-by: Jonas Dreßler <verdre@v0yd.nl> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20211103201800.13531-4-verdre@v0yd.nl
-rw-r--r--drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
index 6c7b0b9bc4e9..1a4ae8a42a31 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
@@ -734,6 +734,9 @@ static int mwifiex_ret_ver_ext(struct mwifiex_private *priv,
MWIFIEX_VERSION_STR_LENGTH);
memcpy(priv->version_str, ver_ext->version_str,
MWIFIEX_VERSION_STR_LENGTH);
+
+ /* Ensure the version string from the firmware is 0-terminated */
+ priv->version_str[MWIFIEX_VERSION_STR_LENGTH - 1] = '\0';
}
return 0;
}