From 85687a9a4f8a620b91b78b1ea4c76a11d386f06d Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Wed, 27 Sep 2006 12:53:17 -0700 Subject: [PATCH] --- yaml --- r: 37943 b: refs/heads/master c: 0eb5a34cdf34ad07b6db2df1e523aaf6574601b4 h: refs/heads/master i: 37941: 1e3b79a52c970c91e94ee8632da6adeb44a245b3 37939: 9f72850df6ccdfc89251930a1f44f54493559480 37935: 605da1670566497daac84bcbedfb02a44c19473c v: v3 --- [refs] | 2 +- trunk/drivers/net/e100.c | 2 +- trunk/drivers/net/e1000/e1000_main.c | 2 +- trunk/drivers/net/ixgb/ixgb_main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9318b526ee2d..e9ed5fdcdbbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0abb6eb12806cf99ea815810d470423083c3b9f4 +refs/heads/master: 0eb5a34cdf34ad07b6db2df1e523aaf6574601b4 diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c index d9750e269a56..ab0868cb120c 100644 --- a/trunk/drivers/net/e100.c +++ b/trunk/drivers/net/e100.c @@ -2572,7 +2572,7 @@ static int __devinit e100_probe(struct pci_dev *pdev, #ifdef CONFIG_NET_POLL_CONTROLLER netdev->poll_controller = e100_netpoll; #endif - strcpy(netdev->name, pci_name(pdev)); + strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); nic = netdev_priv(netdev); nic->netdev = netdev; diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 082c02918a41..bd673802e8ce 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -759,7 +759,7 @@ e1000_probe(struct pci_dev *pdev, #ifdef CONFIG_NET_POLL_CONTROLLER netdev->poll_controller = e1000_netpoll; #endif - strcpy(netdev->name, pci_name(pdev)); + strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); netdev->mem_start = mmio_start; netdev->mem_end = mmio_start + mmio_len; diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c index a88c2b8b66b1..fb4c1ad745b2 100644 --- a/trunk/drivers/net/ixgb/ixgb_main.c +++ b/trunk/drivers/net/ixgb/ixgb_main.c @@ -437,7 +437,7 @@ ixgb_probe(struct pci_dev *pdev, netdev->poll_controller = ixgb_netpoll; #endif - strcpy(netdev->name, pci_name(pdev)); + strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); netdev->mem_start = mmio_start; netdev->mem_end = mmio_start + mmio_len; netdev->base_addr = adapter->hw.io_base;