Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: aacraid: report -ENOMEM to upper layer from aac_convert_sgraw2()

aac_convert_sgraw2() kmalloc memory and return -1 on error, which should
be -ENOMEM. However, nobody is checking return value, so with this
change, -ENOMEM is propagated to upper layer.

Signed-off-by: Nikola Pajkovsky <npajkovsky@suse.cz>
Reviewed-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Nikola Pajkovsky and committed by
Martin K. Petersen
96676246 a2260323

+7 -3
+7 -3
drivers/scsi/aacraid/aachba.c
··· 3950 if (!err_found) 3951 break; 3952 } 3953 - if (i > 0 && nseg_new <= sg_max) 3954 - aac_convert_sgraw2(rio2, i, nseg, nseg_new); 3955 } else 3956 rio2->flags |= cpu_to_le16(RIO2_SGL_CONFORMANT); 3957 ··· 3979 3980 sge = kmalloc(nseg_new * sizeof(struct sge_ieee1212), GFP_ATOMIC); 3981 if (sge == NULL) 3982 - return -1; 3983 3984 for (i = 1, pos = 1; i < nseg-1; ++i) { 3985 for (j = 0; j < rio2->sge[i].length / (pages * PAGE_SIZE); ++j) {
··· 3950 if (!err_found) 3951 break; 3952 } 3953 + if (i > 0 && nseg_new <= sg_max) { 3954 + int ret = aac_convert_sgraw2(rio2, i, nseg, nseg_new); 3955 + 3956 + if (ret < 0) 3957 + return ret; 3958 + } 3959 } else 3960 rio2->flags |= cpu_to_le16(RIO2_SGL_CONFORMANT); 3961 ··· 3975 3976 sge = kmalloc(nseg_new * sizeof(struct sge_ieee1212), GFP_ATOMIC); 3977 if (sge == NULL) 3978 + return -ENOMEM; 3979 3980 for (i = 1, pos = 1; i < nseg-1; ++i) { 3981 for (j = 0; j < rio2->sge[i].length / (pages * PAGE_SIZE); ++j) {