Commit 8b5b1e87 authored by Matthew R. Ochs's avatar Matthew R. Ochs Committed by James Bottomley

cxlflash: Correct usage of scsi_host_put()

Currently, scsi_host_put() is being called prematurely in the
remove path and is missing entirely in an error cleanup path.
The former can lead to memory being freed too early with
subsequent access potentially corrupting data whilst the former
would result in a memory leak.

Move the usage on remove to be the last cleanup action taken
and introduce a call to scsi_host_put() in the one initialization
error path that does not use remove to cleanup.
Signed-off-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: default avatarManoj N. Kumar <manoj@linux.vnet.ibm.com>
Reviewed-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent e5ce067b
...@@ -733,7 +733,6 @@ static void cxlflash_remove(struct pci_dev *pdev) ...@@ -733,7 +733,6 @@ static void cxlflash_remove(struct pci_dev *pdev)
case INIT_STATE_SCSI: case INIT_STATE_SCSI:
cxlflash_term_local_luns(cfg); cxlflash_term_local_luns(cfg);
scsi_remove_host(cfg->host); scsi_remove_host(cfg->host);
scsi_host_put(cfg->host);
/* Fall through */ /* Fall through */
case INIT_STATE_AFU: case INIT_STATE_AFU:
term_afu(cfg); term_afu(cfg);
...@@ -743,6 +742,7 @@ static void cxlflash_remove(struct pci_dev *pdev) ...@@ -743,6 +742,7 @@ static void cxlflash_remove(struct pci_dev *pdev)
case INIT_STATE_NONE: case INIT_STATE_NONE:
flush_work(&cfg->work_q); flush_work(&cfg->work_q);
free_mem(cfg); free_mem(cfg);
scsi_host_put(cfg->host);
break; break;
} }
...@@ -2404,6 +2404,7 @@ static int cxlflash_probe(struct pci_dev *pdev, ...@@ -2404,6 +2404,7 @@ static int cxlflash_probe(struct pci_dev *pdev,
dev_err(&pdev->dev, "%s: call to scsi_host_alloc failed!\n", dev_err(&pdev->dev, "%s: call to scsi_host_alloc failed!\n",
__func__); __func__);
rc = -ENOMEM; rc = -ENOMEM;
scsi_host_put(cfg->host);
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment