ixgbe: Change some uses of strncpy to strlcpy
authorMark Rustad <mark.d.rustad@intel.com>
Fri, 6 Jun 2014 01:57:06 +0000 (01:57 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 24 Jul 2014 09:16:32 +0000 (02:16 -0700)
Change some uses of strncpy to use the more appropriate strlcpy
when clearing is not needed to prevent information leakage. Also
change some length arguments to use the preferred sizeof form.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

index 16e8e444c616cd4a312b5a19319446f6e1359482..9aa9d0ba6d3e6cc36e31969f00160e6d427ecb2a 100644 (file)
@@ -8161,7 +8161,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netdev->netdev_ops = &ixgbe_netdev_ops;
        ixgbe_set_ethtool_ops(netdev);
        netdev->watchdog_timeo = 5 * HZ;
-       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
+       strlcpy(netdev->name, pci_name(pdev), sizeof(netdev->name));
 
        adapter->bd_number = cards_found;
 
@@ -8386,9 +8386,9 @@ skip_sriov:
        }
        ixgbe_check_minimum_link(adapter, expected_gts);
 
-       err = ixgbe_read_pba_string_generic(hw, part_str, IXGBE_PBANUM_LENGTH);
+       err = ixgbe_read_pba_string_generic(hw, part_str, sizeof(part_str));
        if (err)
-               strncpy(part_str, "Unknown", IXGBE_PBANUM_LENGTH);
+               strlcpy(part_str, "Unknown", sizeof(part_str));
        if (ixgbe_is_sfp(hw) && hw->phy.sfp_type != ixgbe_sfp_type_not_present)
                e_dev_info("MAC: %d, PHY: %d, SFP+: %d, PBA No: %s\n",
                           hw->mac.type, hw->phy.type, hw->phy.sfp_type,