staging/ks7010: Remove all strcpy() uses in favor of strscpy()

PATCH In review Len Baker 2 participants 3 messages Jul 17, 2021 – Jul 23, 2021 Staging

Share & tools

Len Baker

author

2021-07-17 15:38 UTC #0 lore raw

PATCH 1/1 staging/ks7010: Remove all strcpy() uses in favor of strscpy()

strcpy() performs no bounds checking on the destination buffer. This could result in linear overflows beyond the end of the buffer, leading to all kinds of misbehaviors. The safe replacement is strscpy().

Signed-off-by Len Baker <[email protected]>

---
 drivers/staging/ks7010/ks_wlan_net.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

drivers/staging/ks7010/ks_wlan_net.c +5 -5

index 09e7b4cd0138..7a38b1ceeb5c 100644
@@ -158,13 +158,13 @@ static int ks_wlan_get_name(struct net_device *dev,
 
 	/* for SLEEP MODE */
 	if (priv->dev_state < DEVICE_STATE_READY)
-		strcpy(cwrq->name, "NOT READY!");
+		strscpy(cwrq->name, "NOT READY!", sizeof(cwrq->name));
 	else if (priv->reg.phy_type == D_11B_ONLY_MODE)
-		strcpy(cwrq->name, "IEEE 802.11b");
+		strscpy(cwrq->name, "IEEE 802.11b", sizeof(cwrq->name));
 	else if (priv->reg.phy_type == D_11G_ONLY_MODE)
-		strcpy(cwrq->name, "IEEE 802.11g");
+		strscpy(cwrq->name, "IEEE 802.11g", sizeof(cwrq->name));
 	else
-		strcpy(cwrq->name, "IEEE 802.11b/g");
+		strscpy(cwrq->name, "IEEE 802.11b/g", sizeof(cwrq->name));
 
 	return 0;
 }

@@ -1808,7 +1808,7 @@ static int ks_wlan_get_firmware_version(struct net_device *dev,
 {
 	struct ks_wlan_private *priv = netdev_priv(dev);
 
-	strcpy(extra, priv->firmware_version);
+	strscpy(extra, priv->firmware_version, sizeof(extra));
 	dwrq->length = priv->version_size + 1;
 	return 0;
 }

--
2.25.1

Dan Carpenter

2021-07-19 05:26 UTC #1 lore raw

drivers/staging/ks7010/ks_wlan_net.c static int ks_wlan_get_firmware_version(struct net_device *dev, · line 1811

Quoted 6 lines · Len Baker

drivers/staging/ks7010/ks_wlan_net.c +1 -1

@@ -1808,7 +1808,7 @@ static int ks_wlan_get_firmware_version(struct net_device *dev,
 {
 	struct ks_wlan_private *priv = netdev_priv(dev);
 
-	strcpy(extra, priv->firmware_version);
+	strscpy(extra, priv->firmware_version, sizeof(extra));

Extra is a pointer and not an array so this doesn't work.

regards,
dan carpenter

Len Baker

author

2021-07-23 14:30 UTC #2 lore raw

Hi,

Quoted 9 lines · Dan Carpenter

drivers/staging/ks7010/ks_wlan_net.c static int ks_wlan_get_firmware_version(struct net_device *dev, · line 1811
Quoted 6 lines · Len Baker
drivers/staging/ks7010/ks_wlan_net.c +1 -1
@@ -1808,7 +1808,7 @@ static int ks_wlan_get_firmware_version(struct net_device *dev,
 {
 	struct ks_wlan_private *priv = netdev_priv(dev);
 
-	strcpy(extra, priv->firmware_version);
+	strscpy(extra, priv->firmware_version, sizeof(extra));
Extra is a pointer and not an array so this doesn't work.

Apologies. I will send a v2 for review.

Thanks for your time.
Len