korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-21 13:24:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

scsi: mpi3mr: Fix expander node leak in mpi3mr_remove()

Browse Source 
Add a missing resource clean up in .remove.

Fixes: e22bae3066 ("scsi: mpi3mr: Add expander devices to STL")
Signed-off-by: Tomas Henzl <thenzl@redhat.com>
Link: https://lore.kernel.org/r/20230302234336.25456-7-thenzl@redhat.com
Acked-by: Sathya Prakash Veerichetty <sathya.prakash@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Tomas Henzl 2023-03-03 00:43:36 +01:00 committed by Martin K. Petersen
parent c798304470
commit ce756daa36
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/mpi3mr/mpi3mr.h
View File

@ -1393,4 +1393,6 @@ void mpi3mr_flush_drv_cmds(struct mpi3mr_ioc *mrioc);
void mpi3mr_flush_cmds_for_unrecovered_controller(struct mpi3mr_ioc *mrioc); void mpi3mr_flush_cmds_for_unrecovered_controller(struct mpi3mr_ioc *mrioc);
void mpi3mr_free_enclosure_list(struct mpi3mr_ioc *mrioc); void mpi3mr_free_enclosure_list(struct mpi3mr_ioc *mrioc);
int mpi3mr_process_admin_reply_q(struct mpi3mr_ioc *mrioc); int mpi3mr_process_admin_reply_q(struct mpi3mr_ioc *mrioc);
void mpi3mr_expander_node_remove(struct mpi3mr_ioc *mrioc,
struct mpi3mr_sas_node *sas_expander);
#endif /*MPI3MR_H_INCLUDED*/ #endif /*MPI3MR_H_INCLUDED*/

7
drivers/scsi/mpi3mr/mpi3mr_os.c
View File

@ -5079,6 +5079,7 @@ static void mpi3mr_remove(struct pci_dev *pdev)
unsigned long flags; unsigned long flags;
struct mpi3mr_tgt_dev *tgtdev, *tgtdev_next; struct mpi3mr_tgt_dev *tgtdev, *tgtdev_next;
struct mpi3mr_hba_port *port, *hba_port_next; struct mpi3mr_hba_port *port, *hba_port_next;
struct mpi3mr_sas_node *sas_expander, *sas_expander_next;
if (!shost) if (!shost)
return; return;
@ -5119,6 +5120,12 @@ static void mpi3mr_remove(struct pci_dev *pdev)
mpi3mr_cleanup_resources(mrioc); mpi3mr_cleanup_resources(mrioc);
spin_lock_irqsave(&mrioc->sas_node_lock, flags); spin_lock_irqsave(&mrioc->sas_node_lock, flags);
list_for_each_entry_safe_reverse(sas_expander, sas_expander_next,
&mrioc->sas_expander_list, list) {
spin_unlock_irqrestore(&mrioc->sas_node_lock, flags);
mpi3mr_expander_node_remove(mrioc, sas_expander);
spin_lock_irqsave(&mrioc->sas_node_lock, flags);
}
list_for_each_entry_safe(port, hba_port_next, &mrioc->hba_port_table_list, list) { list_for_each_entry_safe(port, hba_port_next, &mrioc->hba_port_table_list, list) {
ioc_info(mrioc, ioc_info(mrioc,
"removing hba_port entry: %p port: %d from hba_port list\n", "removing hba_port entry: %p port: %d from hba_port list\n",

5
drivers/scsi/mpi3mr/mpi3mr_transport.c
View File

@ -9,9 +9,6 @@
#include "mpi3mr.h" #include "mpi3mr.h"
static void mpi3mr_expander_node_remove(struct mpi3mr_ioc *mrioc,
struct mpi3mr_sas_node *sas_expander);
/** /**
* mpi3mr_post_transport_req - Issue transport requests and wait * mpi3mr_post_transport_req - Issue transport requests and wait
* @mrioc: Adapter instance reference * @mrioc: Adapter instance reference
@ -2164,7 +2161,7 @@ out_fail:
* *
* Return nothing. * Return nothing.
*/ */
static void mpi3mr_expander_node_remove(struct mpi3mr_ioc *mrioc, void mpi3mr_expander_node_remove(struct mpi3mr_ioc *mrioc,
struct mpi3mr_sas_node *sas_expander) struct mpi3mr_sas_node *sas_expander)
{ {
struct mpi3mr_sas_port *mr_sas_port, *next; struct mpi3mr_sas_port *mr_sas_port, *next;