Skip to contentSkip to conversation

Staging: octeon: Avoid several usecases of strcpy

PATCH In review Sandro Volery 3 participants 7 messages Sep 11, 2019 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: octeon: Avoid several usecases of strcpy

strcpy was used multiple times in strcpy to write into dev->name. I replaced them with strscpy.

---
 drivers/staging/octeon/ethernet.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/octeon/ethernet.c +8 -8
index 8889494adf1f..cf8e9a23ebf9 100644
@@ -784,7 +784,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
 			priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
 			priv->port = CVMX_PIP_NUM_INPUT_PORTS;
 			priv->queue = -1;
-			strcpy(dev->name, "pow%d");
+			strscpy(dev->name, "pow%d", sizeof(dev->name));
 			for (qos = 0; qos < 16; qos++)
 				skb_queue_head_init(&priv->tx_free_list[qos]);
 			dev->min_mtu = VLAN_ETH_ZLEN - mtu_overhead;
@@ -856,39 +856,39 @@ static int cvm_oct_probe(struct platform_device *pdev)
 
 			case CVMX_HELPER_INTERFACE_MODE_NPI:
 				dev->netdev_ops = &cvm_oct_npi_netdev_ops;
-				strcpy(dev->name, "npi%d");
+				strscpy(dev->name, "npi%d", sizeof(dev->name));
 				break;
 
 			case CVMX_HELPER_INTERFACE_MODE_XAUI:
 				dev->netdev_ops = &cvm_oct_xaui_netdev_ops;
-				strcpy(dev->name, "xaui%d");
+				strscpy(dev->name, "xaui%d", sizeof(dev->name));
 				break;
 
 			case CVMX_HELPER_INTERFACE_MODE_LOOP:
 				dev->netdev_ops = &cvm_oct_npi_netdev_ops;
-				strcpy(dev->name, "loop%d");
+				strscpy(dev->name, "loop%d", sizeof(dev->name));
 				break;
 
 			case CVMX_HELPER_INTERFACE_MODE_SGMII:
 				priv->phy_mode = PHY_INTERFACE_MODE_SGMII;
 				dev->netdev_ops = &cvm_oct_sgmii_netdev_ops;
-				strcpy(dev->name, "eth%d");
+				strscpy(dev->name, "eth%d", sizeof(dev->name));
 				break;
 
 			case CVMX_HELPER_INTERFACE_MODE_SPI:
 				dev->netdev_ops = &cvm_oct_spi_netdev_ops;
-				strcpy(dev->name, "spi%d");
+				strscpy(dev->name, "spi%d", sizeof(dev->name));
 				break;
 
 			case CVMX_HELPER_INTERFACE_MODE_GMII:
 				priv->phy_mode = PHY_INTERFACE_MODE_GMII;
 				dev->netdev_ops = &cvm_oct_rgmii_netdev_ops;
-				strcpy(dev->name, "eth%d");
+				strscpy(dev->name, "eth%d", sizeof(dev->name));
 				break;
 
 			case CVMX_HELPER_INTERFACE_MODE_RGMII:
 				dev->netdev_ops = &cvm_oct_rgmii_netdev_ops;
-				strcpy(dev->name, "eth%d");
+				strscpy(dev->name, "eth%d", sizeof(dev->name));
 				cvm_set_rgmii_delay(priv, interface,
 						    port_index);
 				break;
Signature · 1 line
2.23.0
#1 lore raw
Quoted 13 lines · Sandro Volery

strcpy was used multiple times in strcpy to write into dev->name. I replaced them with strscpy.

---
 drivers/staging/octeon/ethernet.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/octeon/ethernet.c +0 -0
index 8889494adf1f..cf8e9a23ebf9 100644

drivers/staging/octeon/ethernet.c static int cvm_oct_probe(struct platform_device *pdev) · line 787

Quoted 5 lines
drivers/staging/octeon/ethernet.c +1 -1
@@ -784,7 +784,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
 			priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
 			priv->port = CVMX_PIP_NUM_INPUT_PORTS;
 			priv->queue = -1;
-			strcpy(dev->name, "pow%d");
+			strscpy(dev->name, "pow%d", sizeof(dev->name));

Is there a program which is generating a warning for this code? We know that "pow%d" is 6 characters and static analysis tools can understand this code fine so we know it's safe.

regards,
dan carpenter

#2 lore raw
Quoted 13 lines · Dan Carpenter
Quoted 8 lines · Sandro Volery

strcpy was used multiple times in strcpy to write into dev->name. I replaced them with strscpy.

---
drivers/staging/octeon/ethernet.c | 16 ++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
Quoted 14 lines

drivers/staging/octeon/ethernet.c static int cvm_oct_probe(struct platform_device *pdev) · line 787

Quoted 10 lines
drivers/staging/octeon/ethernet.c +1 -1
index 8889494adf1f..cf8e9a23ebf9 100644
@@ -784,7 +784,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
           priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
           priv->port = CVMX_PIP_NUM_INPUT_PORTS;
           priv->queue = -1;
-            strcpy(dev->name, "pow%d");
+            strscpy(dev->name, "pow%d", sizeof(dev->name));

Is there a program which is generating a warning for this code? We know that "pow%d" is 6 characters and static analysis tools can understand this code fine so we know it's safe.

Well I was confused too but checkpatch complained about it so I figured I'd clean it up quick

#3 lore raw
Quoted 28 lines · Sandro Volery
Quoted 13 lines · Dan Carpenter
Quoted 8 lines · Sandro Volery

strcpy was used multiple times in strcpy to write into dev->name. I replaced them with strscpy.

---
drivers/staging/octeon/ethernet.c | 16 ++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
Quoted 14 lines

drivers/staging/octeon/ethernet.c static int cvm_oct_probe(struct platform_device *pdev) · line 787

Quoted 10 lines
drivers/staging/octeon/ethernet.c +1 -1
index 8889494adf1f..cf8e9a23ebf9 100644
@@ -784,7 +784,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
           priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
           priv->port = CVMX_PIP_NUM_INPUT_PORTS;
           priv->queue = -1;
-            strcpy(dev->name, "pow%d");
+            strscpy(dev->name, "pow%d", sizeof(dev->name));

Is there a program which is generating a warning for this code? We know that "pow%d" is 6 characters and static analysis tools can understand this code fine so we know it's safe.

Quoted 2 lines

Well I was confused too but checkpatch complained about it so I figured I'd clean it up quick

Ah. It's a new checkpatch warning. I don't care in that case. I'm fine with replacing all of these in that case.

regards,
dan carpenter

#4 lore raw
Quoted 30 lines · Dan Carpenter
Quoted 28 lines · Sandro Volery
Quoted 27 lines
Quoted 3 lines · Dan Carpenter
Quoted 13 lines · Sandro Volery

strcpy was used multiple times in strcpy to write into dev->name. I replaced them with strscpy.

---
drivers/staging/octeon/ethernet.c | 16 ++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/octeon/ethernet.c +0 -0
index 8889494adf1f..cf8e9a23ebf9 100644

drivers/staging/octeon/ethernet.c static int cvm_oct_probe(struct platform_device *pdev) · line 787

Quoted 5 lines
drivers/staging/octeon/ethernet.c +1 -1
@@ -784,7 +784,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
          priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
          priv->port = CVMX_PIP_NUM_INPUT_PORTS;
          priv->queue = -1;
-            strcpy(dev->name, "pow%d");
+            strscpy(dev->name, "pow%d", sizeof(dev->name));

Is there a program which is generating a warning for this code? We know that "pow%d" is 6 characters and static analysis tools can understand this code fine so we know it's safe.

Quoted 5 lines
Quoted 2 lines

Well I was confused too but checkpatch complained about it so I figured I'd clean it up quick

Ah. It's a new checkpatch warning. I don't care in that case. I'm fine with replacing all of these in that case.

Alright thanks. Can you review this?

Thanks,
Sandro V

Reviewed-by
#5 lore raw
Quoted 32 lines · Sandro Volery
Quoted 30 lines · Dan Carpenter
Quoted 28 lines · Sandro Volery
Quoted 27 lines
Quoted 3 lines · Dan Carpenter
Quoted 13 lines · Sandro Volery

strcpy was used multiple times in strcpy to write into dev->name. I replaced them with strscpy.

---
drivers/staging/octeon/ethernet.c | 16 ++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/octeon/ethernet.c +0 -0
index 8889494adf1f..cf8e9a23ebf9 100644

drivers/staging/octeon/ethernet.c static int cvm_oct_probe(struct platform_device *pdev) · line 787

Quoted 5 lines
drivers/staging/octeon/ethernet.c +1 -1
@@ -784,7 +784,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
          priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
          priv->port = CVMX_PIP_NUM_INPUT_PORTS;
          priv->queue = -1;
-            strcpy(dev->name, "pow%d");
+            strscpy(dev->name, "pow%d", sizeof(dev->name));

Is there a program which is generating a warning for this code? We know that "pow%d" is 6 characters and static analysis tools can understand this code fine so we know it's safe.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Well I was confused too but checkpatch complained about it so I figured I'd clean it up quick

Ah. It's a new checkpatch warning. I don't care in that case. I'm fine with replacing all of these in that case.

Alright thanks. Can you review this?

Sure.

regards,
dan carpenter

#6 lore raw
In reply to Dan Carpenter
Quoted 8 lines · Dan Carpenter
Quoted 7 lines · Sandro Volery
Quoted 7 lines · Dan Carpenter
Quoted 2 lines · Sandro Volery

strcpy was used multiple times in strcpy to write into dev->name. I replaced them with strscpy.

Yes, that's obviously what the patch does. The commit log is supposed to explain _why_.

Quoted 20 lines
Quoted 20 lines
Quoted 19 lines
Quoted 10 lines

---
drivers/staging/octeon/ethernet.c | 16 ++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/octeon/ethernet.c +0 -0
index 8889494adf1f..cf8e9a23ebf9 100644

drivers/staging/octeon/ethernet.c static int cvm_oct_probe(struct platform_device *pdev) · line 787

Quoted 5 lines
drivers/staging/octeon/ethernet.c +1 -1
@@ -784,7 +784,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
           priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
           priv->port = CVMX_PIP_NUM_INPUT_PORTS;
           priv->queue = -1;
-            strcpy(dev->name, "pow%d");
+            strscpy(dev->name, "pow%d", sizeof(dev->name));

Is there a program which is generating a warning for this code? We know that "pow%d" is 6 characters and static analysis tools can understand this code fine so we know it's safe.

Quoted 5 lines
Quoted 2 lines

Well I was confused too but checkpatch complained about it so I figured I'd clean it up quick

Ah. It's a new checkpatch warning. I don't care in that case. I'm fine with replacing all of these in that case.

But why? It actually gives _less_ compile-time checking (gcc and all static tools know perfectly well what strcpy is and does, but knows nothing of strscpy). And using sizeof() instead of ARRAY_SIZE() means a future reader is not even sure dev->name is not just a pointer.

Moreover, it's very likely also a runtime and .text pessimization, again because gcc knows what strcpy does, so it can just do a few immediate stores (e.g. 0x25776f70 for the "pow%" part) instead of emitting an actual function call.

Rasmus