| From foo@baz Wed Feb 28 16:16:23 CET 2018 |
| From: Ross Lagerwall <ross.lagerwall@citrix.com> |
| Date: Tue, 9 Jan 2018 12:10:21 +0000 |
| Subject: xen/gntdev: Fix off-by-one error when unmapping with holes |
| |
| From: Ross Lagerwall <ross.lagerwall@citrix.com> |
| |
| |
| [ 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@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/xen/gntdev.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| --- a/drivers/xen/gntdev.c |
| +++ b/drivers/xen/gntdev.c |
| @@ -348,10 +348,8 @@ static int unmap_grant_pages(struct gran |
| } |
| 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); |
