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

Commit 96676246 authored by Nikola Pajkovsky's avatar Nikola Pajkovsky Committed by Martin K. Petersen
Browse files

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: default avatarNikola Pajkovsky <npajkovsky@suse.cz>
Reviewed-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a2260323

drivers/scsi/aacraid/aachba.c

+7 −3
Original line number Diff line number Diff line
@@ -3950,8 +3950,12 @@ static long aac_build_sgraw2(struct scsi_cmnd *scsicmd, 
			if (!err_found)

				break;

		}

		if (i > 0 && nseg_new <= sg_max)

			aac_convert_sgraw2(rio2, i, nseg, nseg_new);

		if (i > 0 && nseg_new <= sg_max) {

			int ret = aac_convert_sgraw2(rio2, i, nseg, nseg_new);



			if (ret < 0)

				return ret;

		}

	} else

		rio2->flags |= cpu_to_le16(RIO2_SGL_CONFORMANT);
@@ -3975,7 +3979,7 @@ static int aac_convert_sgraw2(struct aac_raw_io2 *rio2, int pages, int nseg, int 


	sge = kmalloc(nseg_new * sizeof(struct sge_ieee1212), GFP_ATOMIC);

	if (sge == NULL)

		return -1;

		return -ENOMEM;



	for (i = 1, pos = 1; i < nseg-1; ++i) {

		for (j = 0; j < rio2->sge[i].length / (pages * PAGE_SIZE); ++j) {