Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9899113 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by James Bottomley
Browse files

[SCSI] aacraid: check pci_alloc_consistent errors 



We need to check the address that pci_alloc_consistent() returns since
it might fail.

When pci_alloc_consistent() fails, some IOMMUs set the dma_handle
argument to zero. So we can't use fibptr->hw_fib_pa directly here.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Aacraid List <aacraid@adaptec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 25729a7f

drivers/scsi/aacraid/commctrl.c

+11 −1
Original line number Diff line number Diff line
@@ -90,14 +90,24 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg) 
	if (size < le16_to_cpu(kfib->header.SenderSize))

		size = le16_to_cpu(kfib->header.SenderSize);

	if (size > dev->max_fib_size) {

		dma_addr_t daddr;



		if (size > 2048) {

			retval = -EINVAL;

			goto cleanup;

		}



		kfib = pci_alloc_consistent(dev->pdev, size, &daddr);

		if (!kfib) {

			retval = -ENOMEM;

			goto cleanup;

		}



		/* Highjack the hw_fib */

		hw_fib = fibptr->hw_fib_va;

		hw_fib_pa = fibptr->hw_fib_pa;

		fibptr->hw_fib_va = kfib = pci_alloc_consistent(dev->pdev, size, &fibptr->hw_fib_pa);

		fibptr->hw_fib_va = kfib;

		fibptr->hw_fib_pa = daddr;

		memset(((char *)kfib) + dev->max_fib_size, 0, size - dev->max_fib_size);

		memcpy(kfib, hw_fib, dev->max_fib_size);

	}