Commit f7854c38 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Martin K. Petersen
Browse files

scsi: aacraid: Fix error handling paths in aac_probe_one() 

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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f371d534

drivers/scsi/aacraid/linit.c

+8 −4
Original line number Diff line number Diff line
@@ -1632,7 +1632,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;
@@ -1657,7 +1657,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));
@@ -1689,8 +1688,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;
@@ -1714,8 +1715,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);