openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
roel kluin 2009-07-17 08:01:54 +00:00 committed by David S. Miller
parent b902e57352
commit 27e0955184
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/b44.c
View File

@ -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;
}
}