drivers/net/ethernet/qlogic/netxen: Change netxen_nic_get_brd_name_by_type() return the name
Subsystems (2)
PATCH 1/1 drivers/net/ethernet/qlogic/netxen: Change netxen_nic_get_brd_name_by_type() return the name
From: David Laight <[email protected]>
Instead of copying the name into a caller supplied buffer just return the address. Return NULL is not found and change the caller to "Unknown" for brn_name as well as serial_num.
---
This is one of a group of patches that remove potentially unbounded strcpy() calls.
They are mostly replaced by strscpy() or, when strlen() has just been called, with memcpy() (usually including the '\0').
Calls with copy string literals into arrays are left unchanged. They are safe and easily detected as such.
The changes were made by getting the compiler to detect the calls and then fixing the code by hand.
Note that all the changes are only compile tested.
Some Makefiles were changed to allow files to contain strcpy(). As well as 'difficult to fix' files, this included 'show' functions as they really need to use sysfs_emit() or seq_printf().
All the patches are being sent individually to avoid very long cc lists. Apologies for the terse commit messages and likely unexpected tags. (There are about 100 patches in total.)
.../net/ethernet/qlogic/netxen/netxen_nic.h | 18 +++++------------- .../ethernet/qlogic/netxen/netxen_nic_main.c | 8 +++++--- 2 files changed, 10 insertions(+), 16 deletions(-)
drivers/net/ethernet/qlogic/netxen/netxen_nic.h +5 -13
@@ -1833,23 +1833,15 @@ static const struct netxen_brdinfo netxen_boards[] = {#define NUM_SUPPORTED_BOARDS ARRAY_SIZE(netxen_boards) -static inline int netxen_nic_get_brd_name_by_type (u32 type,char *name) +static inline const char *netxen_nic_get_brd_name_by_type (u32 type) { -int i, found =0 ; +int i;for (i =0 ; i <NUM_SUPPORTED_BOARDS ; ++i) { -if (netxen_boards[i].brdtype == type) { -strcpy (name, netxen_boards[i].short_name); - found =1 ; -break ; - } +if (netxen_boards[i].brdtype == type) +return netxen_boards[i].short_name; } -if (!found) { -strcpy (name,"Unknown" ); -return -EINVAL ; - } - -return 0 ; +return NULL ; }static inline u32 netxen_tx_avail (struct nx_host_tx_ring *tx_ring)
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +5 -3
@@ -812,7 +812,7 @@ static void netxen_check_options(struct netxen_adapter *adapter) {u32 fw_major, fw_minor, fw_build, prev_fw_version; -char brd_name[NETXEN_MAX_SHORT_NAME ]; +const char *brd_name;char serial_num[32 ];int i, offset, val, err;__le32 *ptr32;
@@ -853,9 +853,11 @@ netxen_check_options(struct netxen_adapter *adapter) }if (adapter->portnum ==0 ) { -if (netxen_nic_get_brd_name_by_type (adapter->ahw.board_type, - brd_name)) + brd_name =netxen_nic_get_brd_name_by_type (adapter->ahw.board_type); +if (!brd_name) { + brd_name ="Unknown" ;strcpy (serial_num,"Unknown" ); + } pr_info("%s: %s Board S/N %s Chip rev 0x%x\n", module_name(THIS_MODULE),
Signature · 1 line
2.39.5