Skip to content

Commit

Permalink
ixgbe: cleanup ixgbe_get_drvinfo to be extra careful with buffer boun…
Browse files Browse the repository at this point in the history
…daries

Make the code in ixgbe_get_drvinfo more protected against buffer overflow
boundaries by using snprintf and sizeof with snprintf.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Don Skidmore authored and David S. Miller committed Aug 19, 2010
1 parent 357e8b5 commit 083fc58
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions drivers/net/ixgbe/ixgbe_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -820,16 +820,19 @@ static void ixgbe_get_drvinfo(struct net_device *netdev,
struct ixgbe_adapter *adapter = netdev_priv(netdev);
char firmware_version[32];

strncpy(drvinfo->driver, ixgbe_driver_name, 32);
strncpy(drvinfo->version, ixgbe_driver_version, 32);

sprintf(firmware_version, "%d.%d-%d",
(adapter->eeprom_version & 0xF000) >> 12,
(adapter->eeprom_version & 0x0FF0) >> 4,
adapter->eeprom_version & 0x000F);

strncpy(drvinfo->fw_version, firmware_version, 32);
strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
strncpy(drvinfo->driver, ixgbe_driver_name, sizeof(drvinfo->driver));
strncpy(drvinfo->version, ixgbe_driver_version,
sizeof(drvinfo->version));

snprintf(firmware_version, sizeof(firmware_version), "%d.%d-%d",
(adapter->eeprom_version & 0xF000) >> 12,
(adapter->eeprom_version & 0x0FF0) >> 4,
adapter->eeprom_version & 0x000F);

strncpy(drvinfo->fw_version, firmware_version,
sizeof(drvinfo->fw_version));
strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
sizeof(drvinfo->bus_info));
drvinfo->n_stats = IXGBE_STATS_LEN;
drvinfo->testinfo_len = IXGBE_TEST_LEN;
drvinfo->regdump_len = ixgbe_get_regs_len(netdev);
Expand Down

0 comments on commit 083fc58

Please sign in to comment.