UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Long Li <longli@microsoft.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
This commit is contained in:
K. Y. Srinivasan 2015-03-27 00:27:18 -07:00 committed by James Bottomley
parent 5117b93696
commit 8de580742f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/scsi/storvsc_drv.c
View File

@ -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)
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);
}
/* if we need to use another bounce buffer */
if (srclen && bounce_addr == 0)
bounce_addr = sg_kmap_atomic(bounce_sgl, j);
}
sg_kunmap_atomic(src_addr - orig_sgl[i].offset);
}
if (bounce_addr)
sg_kunmap_atomic(bounce_addr);
local_irq_restore(flags);
return total_copied;