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

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
...@@ -754,21 +754,22 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl, ...@@ -754,21 +754,22 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl,
if (bounce_sgl[j].length == PAGE_SIZE) { if (bounce_sgl[j].length == PAGE_SIZE) {
/* full..move to next entry */ /* full..move to next entry */
sg_kunmap_atomic(bounce_addr); sg_kunmap_atomic(bounce_addr);
bounce_addr = 0;
j++; j++;
}
/* if we need to use another bounce buffer */ /* 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); 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); sg_kunmap_atomic(src_addr - orig_sgl[i].offset);
} }
if (bounce_addr)
sg_kunmap_atomic(bounce_addr);
local_irq_restore(flags); local_irq_restore(flags);
return total_copied; return total_copied;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment