lkml.org 
[lkml]   [2020]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 245/330] scsi: aacraid: Fix error handling paths in aac_probe_one()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit f7854c382240c1686900b2f098b36430c6f5047e ]

    If 'scsi_host_alloc()' or 'kcalloc()' fail, 'error' is known to be 0. Set
    it explicitly to -ENOMEM before branching to the error handling path.

    While at it, remove 2 useless assignments to 'error'. These values are
    overwridden a few lines later.

    Link: https://lore.kernel.org/r/20200412094039.8822-1-christophe.jaillet@wanadoo.fr
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/aacraid/linit.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
    index 514aed38b5afe..1035f947f1bcf 100644
    --- a/drivers/scsi/aacraid/linit.c
    +++ b/drivers/scsi/aacraid/linit.c
    @@ -1607,7 +1607,7 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
    struct Scsi_Host *shost;
    struct aac_dev *aac;
    struct list_head *insert = &aac_devices;
    - int error = -ENODEV;
    + int error;
    int unique_id = 0;
    u64 dmamask;
    int mask_bits = 0;
    @@ -1632,7 +1632,6 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
    error = pci_enable_device(pdev);
    if (error)
    goto out;
    - error = -ENODEV;

    if (!(aac_drivers[index].quirks & AAC_QUIRK_SRC)) {
    error = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
    @@ -1664,8 +1663,10 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
    pci_set_master(pdev);

    shost = scsi_host_alloc(&aac_driver_template, sizeof(struct aac_dev));
    - if (!shost)
    + if (!shost) {
    + error = -ENOMEM;
    goto out_disable_pdev;
    + }

    shost->irq = pdev->irq;
    shost->unique_id = unique_id;
    @@ -1690,8 +1691,11 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
    aac->fibs = kcalloc(shost->can_queue + AAC_NUM_MGT_FIB,
    sizeof(struct fib),
    GFP_KERNEL);
    - if (!aac->fibs)
    + if (!aac->fibs) {
    + error = -ENOMEM;
    goto out_free_host;
    + }
    +
    spin_lock_init(&aac->fib_lock);

    mutex_init(&aac->ioctl_mutex);
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-09-18 04:06    [W:3.930 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site