Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-03 17:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Staging: octeon: Avoid several usecases of strcpy

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

Signed-off-by: Sandro Volery <sandro@volery.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20190911062359.GA14886@volery
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sandro Volery 2019-09-11 08:23:59 +02:00 committed by Greg Kroah-Hartman
parent 63350bdb38
commit 129dac3700
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/octeon/ethernet.c
View File

@ -794,7 +794,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED; priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
priv->port = CVMX_PIP_NUM_INPUT_PORTS; priv->port = CVMX_PIP_NUM_INPUT_PORTS;
priv->queue = -1; priv->queue = -1;
strcpy(dev->name, "pow%d"); strscpy(dev->name, "pow%d", sizeof(dev->name));
for (qos = 0; qos < 16; qos++) for (qos = 0; qos < 16; qos++)
skb_queue_head_init(&priv->tx_free_list[qos]); skb_queue_head_init(&priv->tx_free_list[qos]);
dev->min_mtu = VLAN_ETH_ZLEN - mtu_overhead; dev->min_mtu = VLAN_ETH_ZLEN - mtu_overhead;
@ -866,39 +866,39 @@ static int cvm_oct_probe(struct platform_device *pdev)
case CVMX_HELPER_INTERFACE_MODE_NPI: case CVMX_HELPER_INTERFACE_MODE_NPI:
dev->netdev_ops = &cvm_oct_npi_netdev_ops; dev->netdev_ops = &cvm_oct_npi_netdev_ops;
strcpy(dev->name, "npi%d"); strscpy(dev->name, "npi%d", sizeof(dev->name));
break; break;
case CVMX_HELPER_INTERFACE_MODE_XAUI: case CVMX_HELPER_INTERFACE_MODE_XAUI:
dev->netdev_ops = &cvm_oct_xaui_netdev_ops; dev->netdev_ops = &cvm_oct_xaui_netdev_ops;
strcpy(dev->name, "xaui%d"); strscpy(dev->name, "xaui%d", sizeof(dev->name));
break; break;
case CVMX_HELPER_INTERFACE_MODE_LOOP: case CVMX_HELPER_INTERFACE_MODE_LOOP:
dev->netdev_ops = &cvm_oct_npi_netdev_ops; dev->netdev_ops = &cvm_oct_npi_netdev_ops;
strcpy(dev->name, "loop%d"); strscpy(dev->name, "loop%d", sizeof(dev->name));
break; break;
case CVMX_HELPER_INTERFACE_MODE_SGMII: case CVMX_HELPER_INTERFACE_MODE_SGMII:
priv->phy_mode = PHY_INTERFACE_MODE_SGMII; priv->phy_mode = PHY_INTERFACE_MODE_SGMII;
dev->netdev_ops = &cvm_oct_sgmii_netdev_ops; dev->netdev_ops = &cvm_oct_sgmii_netdev_ops;
strcpy(dev->name, "eth%d"); strscpy(dev->name, "eth%d", sizeof(dev->name));
break; break;
case CVMX_HELPER_INTERFACE_MODE_SPI: case CVMX_HELPER_INTERFACE_MODE_SPI:
dev->netdev_ops = &cvm_oct_spi_netdev_ops; dev->netdev_ops = &cvm_oct_spi_netdev_ops;
strcpy(dev->name, "spi%d"); strscpy(dev->name, "spi%d", sizeof(dev->name));
break; break;
case CVMX_HELPER_INTERFACE_MODE_GMII: case CVMX_HELPER_INTERFACE_MODE_GMII:
priv->phy_mode = PHY_INTERFACE_MODE_GMII; priv->phy_mode = PHY_INTERFACE_MODE_GMII;
dev->netdev_ops = &cvm_oct_rgmii_netdev_ops; dev->netdev_ops = &cvm_oct_rgmii_netdev_ops;
strcpy(dev->name, "eth%d"); strscpy(dev->name, "eth%d", sizeof(dev->name));
break; break;
case CVMX_HELPER_INTERFACE_MODE_RGMII: case CVMX_HELPER_INTERFACE_MODE_RGMII:
dev->netdev_ops = &cvm_oct_rgmii_netdev_ops; 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, cvm_set_rgmii_delay(priv, interface,
port_index); port_index);
break; break;