From: Dominique Martinet <asmadeus@codewreck.org>
To: unlisted-recipients:; (no To-header on input)
Cc: Dominique Martinet <asmadeus@codewreck.org>,
Kalle Valo <kvalo@codeaurora.org>,
"David S. Miller" <davem@davemloft.net>,
Thomas Gleixner <tglx@linutronix.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kate Stewart <kstewart@linuxfoundation.org>,
Philippe Ombredanne <pombredanne@nexb.com>,
Joe Perches <joe@perches.com>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 11/18] wireless/ti: change strncpy+truncation to strlcpy
Date: Fri, 13 Jul 2018 03:25:49 +0200 [thread overview]
Message-ID: <1531445149-19607-1-git-send-email-asmadeus@codewreck.org> (raw)
In-Reply-To: <1531444483-17338-1-git-send-email-asmadeus@codewreck.org>
Generated by scripts/coccinelle/misc/strncpy_truncation.cocci
Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
---
Please see https://marc.info/?l=linux-kernel&m=153144450722324&w=2 (the
first patch of the serie) for the motivation behind this patch
drivers/net/wireless/ti/wl1251/acx.c | 9 +--------
drivers/net/wireless/ti/wl18xx/main.c | 5 +----
drivers/net/wireless/ti/wlcore/boot.c | 5 +----
3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/drivers/net/wireless/ti/wl1251/acx.c b/drivers/net/wireless/ti/wl1251/acx.c
index f78fc3880423..c4f1a63300bb 100644
--- a/drivers/net/wireless/ti/wl1251/acx.c
+++ b/drivers/net/wireless/ti/wl1251/acx.c
@@ -150,14 +150,7 @@ int wl1251_acx_fw_version(struct wl1251 *wl, char *buf, size_t len)
}
/* be careful with the buffer sizes */
- strncpy(buf, rev->fw_version, min(len, sizeof(rev->fw_version)));
-
- /*
- * if the firmware version string is exactly
- * sizeof(rev->fw_version) long or fw_len is less than
- * sizeof(rev->fw_version) it won't be null terminated
- */
- buf[min(len, sizeof(rev->fw_version)) - 1] = '\0';
+ strlcpy(buf, rev->fw_version, min(len, sizeof(rev->fw_version)));
out:
kfree(rev);
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index ca0f936fc119..8595e9bf1cfa 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -1529,12 +1529,9 @@ static int wl18xx_handle_static_data(struct wl1271 *wl,
struct wl18xx_static_data_priv *static_data_priv =
(struct wl18xx_static_data_priv *) static_data->priv;
- strncpy(wl->chip.phy_fw_ver_str, static_data_priv->phy_version,
+ strlcpy(wl->chip.phy_fw_ver_str, static_data_priv->phy_version,
sizeof(wl->chip.phy_fw_ver_str));
- /* make sure the string is NULL-terminated */
- wl->chip.phy_fw_ver_str[sizeof(wl->chip.phy_fw_ver_str) - 1] = '\0';
-
wl1271_info("PHY firmware version: %s", static_data_priv->phy_version);
return 0;
diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
index f00509ea8aca..6b33951d5b34 100644
--- a/drivers/net/wireless/ti/wlcore/boot.c
+++ b/drivers/net/wireless/ti/wlcore/boot.c
@@ -55,12 +55,9 @@ static int wlcore_boot_parse_fw_ver(struct wl1271 *wl,
{
int ret;
- strncpy(wl->chip.fw_ver_str, static_data->fw_version,
+ strlcpy(wl->chip.fw_ver_str, static_data->fw_version,
sizeof(wl->chip.fw_ver_str));
- /* make sure the string is NULL-terminated */
- wl->chip.fw_ver_str[sizeof(wl->chip.fw_ver_str) - 1] = '\0';
-
ret = sscanf(wl->chip.fw_ver_str + 4, "%u.%u.%u.%u.%u",
&wl->chip.fw_ver[0], &wl->chip.fw_ver[1],
&wl->chip.fw_ver[2], &wl->chip.fw_ver[3],
--
2.17.1
next prev parent reply other threads:[~2018-07-13 1:25 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-13 1:14 [PATCH 01/18] coccinelle: change strncpy+truncation to strlcpy Dominique Martinet
2018-07-13 1:25 ` [PATCH 02/18] block/aoenet: " Dominique Martinet
2018-07-13 14:16 ` Jens Axboe
2018-07-13 15:31 ` Dominique Martinet
2018-07-13 1:25 ` [PATCH 03/18] drm_property: " Dominique Martinet
2018-07-13 1:25 ` [PATCH 04/18] nouveau: " Dominique Martinet
2018-07-13 1:25 ` [PATCH 05/18] iio: " Dominique Martinet
2018-07-15 10:39 ` Jonathan Cameron
2018-07-16 11:42 ` Dominique Martinet
2018-07-22 8:13 ` Jonathan Cameron
2018-07-13 1:25 ` [PATCH 06/18] mptctl: " Dominique Martinet
2018-07-13 1:25 ` [PATCH 07/18] hisilicon: " Dominique Martinet
2018-07-13 1:25 ` [PATCH 08/18] myricom: " Dominique Martinet
2018-07-13 1:25 ` [PATCH 09/18] qlogic/qed: " Dominique Martinet
2018-07-13 1:25 ` [PATCH 10/18] brcmsmac: " Dominique Martinet
2018-07-13 7:19 ` Arend van Spriel
2018-07-13 1:25 ` Dominique Martinet [this message]
2018-07-13 7:38 ` [PATCH 11/18] wireless/ti: " Greg Kroah-Hartman
2018-07-13 7:47 ` Arend van Spriel
2018-07-13 8:13 ` Dominique Martinet
2018-07-13 18:56 ` Rustad, Mark D
2018-07-27 9:19 ` Kalle Valo
2018-07-13 1:25 ` [PATCH 12/18] test_power: " Dominique Martinet
2018-07-13 1:25 ` [PATCH 13/18] ibmvscsi: " Dominique Martinet
2018-07-13 1:25 ` [PATCH 14/18] kdb_support: " Dominique Martinet
2018-07-13 10:33 ` Daniel Thompson
2018-07-13 15:18 ` Dominique Martinet
2018-07-16 8:23 ` Daniel Thompson
2018-07-13 1:26 ` [PATCH 15/18] blktrace: " Dominique Martinet
2019-03-15 1:37 ` Steven Rostedt
2019-03-15 2:01 ` Jens Axboe
2019-03-15 6:30 ` Dominique Martinet
2019-03-15 14:29 ` Jens Axboe
2018-07-13 1:26 ` [PATCH 16/18] tools/accounting: " Dominique Martinet
2018-07-13 1:26 ` [PATCH 17/18] perf: " Dominique Martinet
2018-07-13 1:26 ` [PATCH 18/18] cpupower: " Dominique Martinet
2018-07-24 16:31 ` Shuah Khan
2018-08-14 15:45 ` Daniel Díaz
2018-08-14 19:27 ` Dominique Martinet
2018-08-20 14:27 ` Shuah Khan
2018-07-13 7:44 ` [Cocci] [PATCH 01/18] coccinelle: " Himanshu Jha
2018-07-13 8:00 ` Dominique Martinet
2018-07-13 9:14 ` Himanshu Jha
2018-07-13 9:44 ` Julia Lawall
2018-07-13 10:21 ` Himanshu Jha
2018-07-13 10:50 ` Julia Lawall
2018-07-13 16:11 ` Dominique Martinet
2018-07-14 8:12 ` [PATCH v2] coccinelle: strncpy+truncation by strscpy Dominique Martinet
2018-07-14 11:54 ` Julia Lawall
[not found] ` <alpine.DEB.2.20.1807140743550.3356@hadrien>
2018-07-14 13:08 ` Dominique Martinet
2018-07-14 20:36 ` Julia Lawall
2018-07-14 14:34 ` [v2] Coccinelle: Replace strncpy() + truncation by strscpy() SF Markus Elfring
2018-07-20 0:36 ` [PATCH v3] coccinelle: suggest replacing strncpy+truncation by strscpy Dominique Martinet
2018-07-20 5:33 ` Julia Lawall
2018-07-20 5:40 ` Dominique Martinet
2018-07-20 5:49 ` Julia Lawall
2018-07-20 5:57 ` Dominique Martinet
2018-07-20 6:03 ` Julia Lawall
2018-07-20 11:00 ` [v3] Coccinelle: " SF Markus Elfring
2018-07-20 9:40 ` SF Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1531445149-19607-1-git-send-email-asmadeus@codewreck.org \
--to=asmadeus@codewreck.org \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=kstewart@linuxfoundation.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pombredanne@nexb.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).