diff options
| author | roel kluin <roel.kluin@gmail.com> | 2009-07-17 08:01:54 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-20 08:02:58 -0700 |
| commit | 27e0955184a70c4bd4542ee2da18c749b4f43345 (patch) | |
| tree | 34e2237c397d591ddb53eea5d421052ee617c1f1 | |
| parent | b902e5735272b6a79fe2853180b2ad6658aa9678 (diff) | |
| download | op-kernel-dev-27e0955184a70c4bd4542ee2da18c749b4f43345.zip op-kernel-dev-27e0955184a70c4bd4542ee2da18c749b4f43345.tar.gz | |
b44: strncpy does not null terminate string
strlcpy() will always null terminate the string. Also use the
sizeof(version) to strlcopy() the version string.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/b44.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 36d4d37..1f7f015 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -1756,15 +1756,15 @@ static void b44_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *inf struct b44 *bp = netdev_priv(dev); struct ssb_bus *bus = bp->sdev->bus; - strncpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver)); - strncpy(info->version, DRV_MODULE_VERSION, sizeof(info->driver)); + strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver)); + strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version)); switch (bus->bustype) { case SSB_BUSTYPE_PCI: - strncpy(info->bus_info, pci_name(bus->host_pci), sizeof(info->bus_info)); + strlcpy(info->bus_info, pci_name(bus->host_pci), sizeof(info->bus_info)); break; case SSB_BUSTYPE_PCMCIA: case SSB_BUSTYPE_SSB: - strncpy(info->bus_info, "SSB", sizeof(info->bus_info)); + strlcpy(info->bus_info, "SSB", sizeof(info->bus_info)); break; } } |
