diff options
| author | Ross Lagerwall <ross.lagerwall@citrix.com> | 2018-01-09 12:10:21 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-03 10:24:37 +0100 |
| commit | 5aee2c142e3d7803cb8535fb92806b1f239390bc (patch) | |
| tree | fbf17f70ceb0c9846b7745d4595d1f4f9321f832 | |
| parent | 197faf0c3a146bd61b0e0eeffec340a491786f7f (diff) | |
| download | linux-stable-5aee2c142e3d7803cb8535fb92806b1f239390bc.tar.gz linux-stable-5aee2c142e3d7803cb8535fb92806b1f239390bc.tar.bz2 linux-stable-5aee2c142e3d7803cb8535fb92806b1f239390bc.zip | |
xen/gntdev: Fix off-by-one error when unmapping with holes
[ Upstream commit 951a010233625b77cde3430b4b8785a9a22968d1 ]
If the requested range has a hole, the calculation of the number of
pages to unmap is off by one. Fix it.
Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/xen/gntdev.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 57efbd3b053b..d3391a1e3796 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -380,10 +380,8 @@ static int unmap_grant_pages(struct grant_map *map, int offset, int pages) } range = 0; while (range < pages) { - if (map->unmap_ops[offset+range].handle == -1) { - range--; + if (map->unmap_ops[offset+range].handle == -1) break; - } range++; } err = __unmap_grant_pages(map, offset, range); |