[PATCH -next] scsi: initio: Fix missing memory allocation modifier

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The function initio_probe_one() allocates a DMA buffer without the
GFP_KERNEL modifier, fix this by using (GFP_KERNEL | GFP_DMA) instead of
only GFP_DMA as the probe happens in non-interrupt context.

At the same time, change the if statement to the more typical kernel
style.

Eliminate the follow smatch warning:
drivers/scsi/initio.c:2850 initio_probe_one() error: no modifiers for
allocation.

Reported-by: Abaci Robot <abaci@xxxxxxxxxxxxxxxxx>
Signed-off-by: Yang Li <yang.lee@xxxxxxxxxxxxxxxxx>
---
 drivers/scsi/initio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 9cdee38..5982274 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -2847,7 +2847,8 @@ static int initio_probe_one(struct pci_dev *pdev,
 
 	for (; num_scb >= MAX_TARGETS + 3; num_scb--) {
 		i = num_scb * sizeof(struct scsi_ctrl_blk);
-		if ((scb = kzalloc(i, GFP_DMA)) != NULL)
+		scb = kzalloc(i, (GFP_KERNEL | GFP_DMA));
+		if (scb)
 			break;
 	}
 
-- 
1.8.3.1




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [SCSI Target Devel]     [Linux SCSI Target Infrastructure]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Linux IIO]     [Samba]     [Device Mapper]

  Powered by Linux