p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix a page leak in vhost_scsi_iov_to_sgl() error recovery 

we are advancing sg as we go, so the pages we need to drop in
case of error are *before* the current sg.

Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-09-24 18:36:44 -04:00
parent 09cf698a59
commit 11d49e9d08
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/vhost/scsi.c
View File

@ -688,6 +688,7 @@ vhost_scsi_iov_to_sgl(struct vhost_scsi_cmd *cmd, bool write,
struct scatterlist *sg, int sg_count) struct scatterlist *sg, int sg_count)
{ {
size_t off = iter->iov_offset; size_t off = iter->iov_offset;
struct scatterlist *p = sg;
int i, ret; int i, ret;
for (i = 0; i < iter->nr_segs; i++) { for (i = 0; i < iter->nr_segs; i++) {
@ -696,8 +697,8 @@ vhost_scsi_iov_to_sgl(struct vhost_scsi_cmd *cmd, bool write,
ret = vhost_scsi_map_to_sgl(cmd, base, len, sg, write); ret = vhost_scsi_map_to_sgl(cmd, base, len, sg, write);
if (ret < 0) { if (ret < 0) {
for (i = 0; i < sg_count; i++) { while (p < sg) {
struct page *page = sg_page(&sg[i]); struct page *page = sg_page(p++);
if (page) if (page)
put_page(page); put_page(page);
} }