Netdev List
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: "Patryk Małek" <patryk.malek@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	"Jeff Kirsher" <jeffrey.t.kirsher@intel.com>
Subject: [net-next 04/14] i40e: Replace strncpy with strlcpy to ensure null termination
Date: Wed, 14 Nov 2018 15:10:22 -0800	[thread overview]
Message-ID: <20181114231032.4013-5-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20181114231032.4013-1-jeffrey.t.kirsher@intel.com>

From: Patryk Małek <patryk.malek@intel.com>

Using strncpy allows destination buffer to be not null terminated
after the copying takes place. strlcpy ensures that's not the
case by explicitly setting last element in the buffer as '\0'.

Signed-off-by: Patryk Małek <patryk.malek@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 14 +++++++-------
 drivers/net/ethernet/intel/i40e/i40e_ptp.c  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 7e4c07227832..b6f4ebb4557e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -14301,23 +14301,23 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 		switch (hw->bus.speed) {
 		case i40e_bus_speed_8000:
-			strncpy(speed, "8.0", PCI_SPEED_SIZE); break;
+			strlcpy(speed, "8.0", PCI_SPEED_SIZE); break;
 		case i40e_bus_speed_5000:
-			strncpy(speed, "5.0", PCI_SPEED_SIZE); break;
+			strlcpy(speed, "5.0", PCI_SPEED_SIZE); break;
 		case i40e_bus_speed_2500:
-			strncpy(speed, "2.5", PCI_SPEED_SIZE); break;
+			strlcpy(speed, "2.5", PCI_SPEED_SIZE); break;
 		default:
 			break;
 		}
 		switch (hw->bus.width) {
 		case i40e_bus_width_pcie_x8:
-			strncpy(width, "8", PCI_WIDTH_SIZE); break;
+			strlcpy(width, "8", PCI_WIDTH_SIZE); break;
 		case i40e_bus_width_pcie_x4:
-			strncpy(width, "4", PCI_WIDTH_SIZE); break;
+			strlcpy(width, "4", PCI_WIDTH_SIZE); break;
 		case i40e_bus_width_pcie_x2:
-			strncpy(width, "2", PCI_WIDTH_SIZE); break;
+			strlcpy(width, "2", PCI_WIDTH_SIZE); break;
 		case i40e_bus_width_pcie_x1:
-			strncpy(width, "1", PCI_WIDTH_SIZE); break;
+			strlcpy(width, "1", PCI_WIDTH_SIZE); break;
 		default:
 			break;
 		}
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
index 1199f0502d6d..e6fc0aff8c99 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
@@ -694,7 +694,7 @@ static long i40e_ptp_create_clock(struct i40e_pf *pf)
 	if (!IS_ERR_OR_NULL(pf->ptp_clock))
 		return 0;
 
-	strncpy(pf->ptp_caps.name, i40e_driver_name,
+	strlcpy(pf->ptp_caps.name, i40e_driver_name,
 		sizeof(pf->ptp_caps.name) - 1);
 	pf->ptp_caps.owner = THIS_MODULE;
 	pf->ptp_caps.max_adj = 999999999;
-- 
2.19.1

  parent reply	other threads:[~2018-11-15  9:15 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-14 23:10 [net-next 00/14][pull request] 40GbE Intel Wired LAN Driver Updates 2018-11-14 Jeff Kirsher
2018-11-14 23:10 ` [net-next 01/14] i40e: Replace spin_is_locked() with lockdep Jeff Kirsher
2018-11-14 23:10 ` [net-next 02/14] i40e: Use a local variable for readability Jeff Kirsher
2018-11-14 23:10 ` [net-next 03/14] i40e: Add capability flag for stopping FW LLDP Jeff Kirsher
2018-11-14 23:10 ` Jeff Kirsher [this message]
2018-11-14 23:10 ` [net-next 05/14] i40e: Protect access to VF control methods Jeff Kirsher
2018-11-14 23:10 ` [net-next 06/14] i40e: update driver version Jeff Kirsher
2018-11-14 23:10 ` [net-next 07/14] i40e: Allow disabling FW LLDP on X722 devices Jeff Kirsher
2018-11-14 23:10 ` [net-next 08/14] i40e: don't restart nway if autoneg not supported Jeff Kirsher
2018-11-14 23:10 ` [net-next 09/14] i40e: always set ks->base.speed in i40e_get_settings_link_up Jeff Kirsher
2018-11-14 23:10 ` [net-next 10/14] virtchnl: white space and reorder Jeff Kirsher
2018-11-14 23:10 ` [net-next 11/14] virtchnl: Fix off by one error Jeff Kirsher
2018-11-14 23:10 ` [net-next 12/14] i40e: Use correct shift for VLAN priority Jeff Kirsher
2018-11-14 23:10 ` [net-next 13/14] i40e: suppress bogus error message Jeff Kirsher
2018-11-14 23:10 ` [net-next 14/14] i40e: prevent overlapping tx_timeout recover Jeff Kirsher
2018-11-15 23:06 ` [net-next 00/14][pull request] 40GbE Intel Wired LAN Driver Updates 2018-11-14 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=20181114231032.4013-5-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=patryk.malek@intel.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