Commit f2315bf1 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: convert final strncpy() to strlcpy()



Convert the last instances of strncpy() to the preferred strlcpy().
Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 434f1392
...@@ -5947,7 +5947,7 @@ static void e1000_print_device_info(struct e1000_adapter *adapter) ...@@ -5947,7 +5947,7 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
ret_val = e1000_read_pba_string_generic(hw, pba_str, ret_val = e1000_read_pba_string_generic(hw, pba_str,
E1000_PBANUM_LENGTH); E1000_PBANUM_LENGTH);
if (ret_val) if (ret_val)
strncpy((char *)pba_str, "Unknown", sizeof(pba_str) - 1); strlcpy((char *)pba_str, "Unknown", sizeof(pba_str));
e_info("MAC: %d, PHY: %d, PBA No: %s\n", e_info("MAC: %d, PHY: %d, PBA No: %s\n",
hw->mac.type, hw->phy.type, pba_str); hw->mac.type, hw->phy.type, pba_str);
} }
...@@ -6139,7 +6139,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, ...@@ -6139,7 +6139,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
e1000e_set_ethtool_ops(netdev); e1000e_set_ethtool_ops(netdev);
netdev->watchdog_timeo = 5 * HZ; netdev->watchdog_timeo = 5 * HZ;
netif_napi_add(netdev, &adapter->napi, e1000_clean, 64); netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); strlcpy(netdev->name, pci_name(pdev), sizeof(netdev->name));
netdev->mem_start = mmio_start; netdev->mem_start = mmio_start;
netdev->mem_end = mmio_start + mmio_len; netdev->mem_end = mmio_start + mmio_len;
...@@ -6321,7 +6321,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, ...@@ -6321,7 +6321,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
if (!(adapter->flags & FLAG_HAS_AMT)) if (!(adapter->flags & FLAG_HAS_AMT))
e1000e_get_hw_control(adapter); e1000e_get_hw_control(adapter);
strncpy(netdev->name, "eth%d", sizeof(netdev->name) - 1); strlcpy(netdev->name, "eth%d", sizeof(netdev->name));
err = register_netdev(netdev); err = register_netdev(netdev);
if (err) if (err)
goto err_register; goto err_register;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment