Skip to contentSkip to conversation

wl18xx: use strscpy() to instead of strncpy()

PATCH In review [email protected] 2 participants 2 messages Dec 26, 2022 – Jan 5, 2023

Subsystems (3)
Networking Network drivers TI wilink wireless drivers
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH v2 1/1 wl18xx: use strscpy() to instead of strncpy()

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL-terminated strings.

Signed-off-by Xu Panda <[email protected]>
Signed-off-by Yang Yang <[email protected]>

---
change for v2
- use the right tag of wireless-next.

---
 drivers/net/wireless/ti/wl18xx/main.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/wireless/ti/wl18xx/main.c +1 -4
index 0b3cf8477c6c..1e4a430d1543 100644
@@ -1516,12 +1516,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,
+	strscpy(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;
Signature · 1 line
2.15.2