scsi: message: fusion: Adjustments for mptsas_find_phyinfo_by_phys_disk_num()
Subsystems (3)
cover scsi: message: fusion: Adjustments for mptsas_find_phyinfo_by_phys_disk_num()
From: Markus Elfring <[email protected]>
Date: Wed, 27 Dec 2023 10:54:32 +0100
A few update suggestions were taken into account
from static source code analysis.
Markus Elfring (2):
Improve data processing
Move an assignment for the variable “phy_info”
drivers/message/fusion/mptsas.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
--
2.43.0
PATCH 1/2 scsi: message: fusion: Improve data processing in mptsas_find_phyinfo_by_phys_disk_num()
From: Markus Elfring <[email protected]>
Date: Wed, 27 Dec 2023 10:23:09 +0100
The kfree() function was called in one case by the mptsas_find_phyinfo_by_phys_disk_num() function during error handling even if the passed variable contained a null pointer.
This issue was detected by using the Coccinelle software.
1. Thus use another label.
2. Delete an initialisation for the variable “phys_disk” which became unnecessary with this refactoring.
--- drivers/message/fusion/mptsas.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/message/fusion/mptsas.c +6 -3
@@ -4171,7 +4171,7 @@ mptsas_find_phyinfo_by_phys_disk_num(MPT_ADAPTER *ioc, u8 phys_disk_num, {struct mptsas_phyinfo *phy_info =NULL ;struct mptsas_portinfo *port_info; -RaidPhysDiskPage1_t *phys_disk =NULL ; +RaidPhysDiskPage1_t *phys_disk;int num_paths;u64 sas_address =0 ;int i;
@@ -4182,11 +4182,13 @@ mptsas_find_phyinfo_by_phys_disk_num(MPT_ADAPTER *ioc, u8 phys_disk_num,/* dual port support */ num_paths =mpt_raid_phys_disk_get_num_paths (ioc, phys_disk_num);if (!num_paths) - goto out; + goto lock_mutex; + phys_disk =kzalloc (offsetof(RaidPhysDiskPage1_t , Path) + (num_paths *sizeof (RAID_PHYS_DISK1_PATH )),GFP_KERNEL );if (!phys_disk) - goto out; + goto lock_mutex; +mpt_raid_phys_disk_pg1 (ioc, phys_disk_num, phys_disk);for (i =0 ; i < num_paths; i++) {if ((phys_disk->Path[i].Flags &1 ) !=0 )
@@ -4211,6 +4213,7 @@ mptsas_find_phyinfo_by_phys_disk_num(MPT_ADAPTER *ioc, u8 phys_disk_num,* Extra code to handle RAID0 case, where the sas_address is not updated * in phys_disk_page_1 when hotswapped */ +lock_mutex:mutex_lock (&ioc->sas_topology_mutex);list_for_each_entry (port_info, &ioc->sas_topology, list) {for (i =0 ; i < port_info->num_phys && !phy_info; i++) {
--
2.43.0
PATCH 2/2 scsi: message: fusion: Move an assignment for the variable “phy_info” in mptsas_find_phyinfo_by_phys_disk_num()
In reply to Markus ElfringFrom: Markus Elfring <[email protected]>
Date: Wed, 27 Dec 2023 10:42:03 +0100
Move one assignment for the variable “phy_info” closer to the place where this pointer is used.
--- drivers/message/fusion/mptsas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/message/fusion/mptsas.c +2 -2
@@ -4169,14 +4169,13 @@ static struct mptsas_phyinfo * mptsas_find_phyinfo_by_phys_disk_num(MPT_ADAPTER *ioc, u8 phys_disk_num, u8 channel, u8 id) { -struct mptsas_phyinfo *phy_info =NULL ; +struct mptsas_phyinfo *phy_info;struct mptsas_portinfo *port_info;RaidPhysDiskPage1_t *phys_disk;int num_paths;u64 sas_address =0 ;int i; - phy_info =NULL ;if (!ioc->raid_data.pIocPg3)return NULL ;/* dual port support */
@@ -4190,6 +4189,7 @@ mptsas_find_phyinfo_by_phys_disk_num(MPT_ADAPTER *ioc, u8 phys_disk_num, goto lock_mutex;mpt_raid_phys_disk_pg1 (ioc, phys_disk_num, phys_disk); + phy_info =NULL ;for (i =0 ; i < num_paths; i++) {if ((phys_disk->Path[i].Flags &1 ) !=0 )/* entry no longer valid */
--
2.43.0