public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Mark Rustad <mark.d.rustad@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 02/14] ixgbe: Change some uses of strncpy to strlcpy
Date: Thu, 24 Jul 2014 06:13:12 -0700	[thread overview]
Message-ID: <1406207604-31653-3-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1406207604-31653-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Mark Rustad <mark.d.rustad@intel.com>

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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 16e8e44..9aa9d0b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -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,
-- 
1.9.3

  parent reply	other threads:[~2014-07-24 13:14 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-24 13:13 [net-next 00/14][pull request] Intel Wired LAN Driver Updates 2014-07-24 Jeff Kirsher
2014-07-24 13:13 ` [net-next 01/14] ixgbe: Fix possible null-dereference in error path Jeff Kirsher
2014-07-24 13:13 ` Jeff Kirsher [this message]
2014-07-24 13:13 ` [net-next 03/14] ixgbe: fix use of list_for_each in ixgbe_enumerate_functions Jeff Kirsher
2014-07-24 16:48   ` Keller, Jacob E
2014-07-24 13:13 ` [net-next 04/14] ixgbe: don't check minimum link when direct assigned to virtual machine Jeff Kirsher
2014-07-24 13:13 ` [net-next 05/14] igb: Add message when malformed packets detected by hw Jeff Kirsher
2014-07-24 13:13 ` [net-next 06/14] igb: bump igb version to 5.2.13 Jeff Kirsher
2014-07-24 13:13 ` [net-next 07/14] i40e: fix format mismatch in drivers/net/ethernet/intel/i40e/i40e_debugfs.c Jeff Kirsher
2014-07-24 13:13 ` [net-next 08/14] i40e/i40evf: Add nvmupdate support Jeff Kirsher
2014-07-24 13:13 ` [net-next 09/14] i40e/i40evf: fix extension header csum logic Jeff Kirsher
2014-07-24 13:13 ` [net-next 10/14] i40evf: don't wait so long Jeff Kirsher
2014-07-24 13:13 ` [net-next 11/14] i40e/i40evf: ARQ copy desc data even for failed commands Jeff Kirsher
2014-07-24 13:13 ` [net-next 12/14] i40e: Fix firmware API version errors Jeff Kirsher
2014-07-24 13:13 ` [net-next 13/14] i40e: Give link more time after setting flow control Jeff Kirsher
2014-07-24 13:13 ` [net-next 14/14] i40e: always print aqtx answer Jeff Kirsher
2014-07-24 18:42   ` Joe Perches
2014-07-24 19:20     ` Nelson, Shannon
2014-07-24 19:56       ` Joe Perches
2014-07-24 20:13         ` Nelson, Shannon
2014-07-25  6:08 ` [net-next 00/14][pull request] Intel Wired LAN Driver Updates 2014-07-24 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1406207604-31653-3-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=mark.d.rustad@intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox