aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2005-09-28 17:50:51 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-04 07:49:12 -0400
commitdbc2309d90b59fbb2676dc2e39150aa095e8c222 (patch)
tree9d17c84d17c5a46e38fa07fef518f955c9944b5b /drivers
parent53232803241ae0f26b39897a4d4b37775837de00 (diff)
[PATCH] s2io: change strncpy length arg to use size of target
Use the size of the target array for the length argument to strncpy instead of the size of the source or a magic number. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/s2io.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 4b9f1828845e..eff747cf3113 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -4177,11 +4177,10 @@ static void s2io_ethtool_gdrvinfo(struct net_device *dev,
4177{ 4177{
4178 nic_t *sp = dev->priv; 4178 nic_t *sp = dev->priv;
4179 4179
4180 strncpy(info->driver, s2io_driver_name, sizeof(s2io_driver_name)); 4180 strncpy(info->driver, s2io_driver_name, sizeof(info->driver));
4181 strncpy(info->version, s2io_driver_version, 4181 strncpy(info->version, s2io_driver_version, sizeof(info->version));
4182 sizeof(s2io_driver_version)); 4182 strncpy(info->fw_version, "", sizeof(info->fw_version));
4183 strncpy(info->fw_version, "", 32); 4183 strncpy(info->bus_info, pci_name(sp->pdev), sizeof(info->bus_info));
4184 strncpy(info->bus_info, pci_name(sp->pdev), 32);
4185 info->regdump_len = XENA_REG_SPACE; 4184 info->regdump_len = XENA_REG_SPACE;
4186 info->eedump_len = XENA_EEPROM_SPACE; 4185 info->eedump_len = XENA_EEPROM_SPACE;
4187 info->testinfo_len = S2IO_TEST_LEN; 4186 info->testinfo_len = S2IO_TEST_LEN;