From: Bruce Allan Date: Fri, 16 Dec 2011 00:46:59 +0000 (+0000) Subject: e1000e: convert final strncpy() to strlcpy() X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~352 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a00bdd0622d15da97be87a5136b2bfc353abcf3e;p=users%2Fjedix%2Flinux-maple.git e1000e: convert final strncpy() to strlcpy() Convert the last instances of strncpy() to the preferred strlcpy(). (cherry picked from commit f2315bf1d1c6e9e0e05262b7910a8f1491d2d60e) Signed-off-by: Bruce Allan Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Signed-off-by: Joe Jin --- diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index fb08c7520e535..513f7dcec54c6 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -5935,7 +5935,7 @@ static void e1000_print_device_info(struct e1000_adapter *adapter) ret_val = e1000_read_pba_string_generic(hw, pba_str, E1000_PBANUM_LENGTH); 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", hw->mac.type, hw->phy.type, pba_str); } @@ -6127,7 +6127,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, e1000e_set_ethtool_ops(netdev); netdev->watchdog_timeo = 5 * HZ; 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_end = mmio_start + mmio_len; @@ -6309,7 +6309,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, if (!(adapter->flags & FLAG_HAS_AMT)) 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); if (err) goto err_register;