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

Commit 8de58074 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by James Bottomley
Browse files

scsi: storvsc: Fix a bug in copy_from_bounce_buffer() 



We may exit this function without properly freeing up the maapings
we may have acquired. Fix the bug.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: default avatarLong Li <longli@microsoft.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 5117b936

drivers/scsi/storvsc_drv.c

+8 −7
Original line number Diff line number Diff line
@@ -754,21 +754,22 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl, 
			if (bounce_sgl[j].length == PAGE_SIZE) {

				/* full..move to next entry */

				sg_kunmap_atomic(bounce_addr);

				bounce_addr = 0;

				j++;

			}



			/* if we need to use another bounce buffer */

				if (srclen || i != orig_sgl_count - 1)

			if (srclen && bounce_addr == 0)

				bounce_addr = sg_kmap_atomic(bounce_sgl, j);



			} else if (srclen == 0 && i == orig_sgl_count - 1) {

				/* unmap the last bounce that is < PAGE_SIZE */

				sg_kunmap_atomic(bounce_addr);

			}

		}



		sg_kunmap_atomic(src_addr - orig_sgl[i].offset);

	}



	if (bounce_addr)

		sg_kunmap_atomic(bounce_addr);



	local_irq_restore(flags);



	return total_copied;