Return-Path: Received: from mail-co1nam03on0114.outbound.protection.outlook.com ([104.47.40.114]:42587 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753252AbeBCSHJ (ORCPT ); Sat, 3 Feb 2018 13:07:09 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Ross Lagerwall , Boris Ostrovsky , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 29/32] xen/gntdev: Fix off-by-one error when unmapping with holes Date: Sat, 3 Feb 2018 18:04:40 +0000 Message-ID: <20180203180413.7438-29-alexander.levin@microsoft.com> References: <20180203180413.7438-1-alexander.levin@microsoft.com> In-Reply-To: <20180203180413.7438-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Ross Lagerwall [ 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 Reviewed-by: Boris Ostrovsky Signed-off-by: Boris Ostrovsky Signed-off-by: Sasha Levin --- drivers/xen/gntdev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index a4d749665c9f..44a9d8eb0eb4 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -378,10 +378,8 @@ static int unmap_grant_pages(struct grant_map *map, in= t offset, int pages) } range =3D 0; while (range < pages) { - if (map->unmap_ops[offset+range].handle =3D=3D -1) { - range--; + if (map->unmap_ops[offset+range].handle =3D=3D -1) break; - } range++; } err =3D __unmap_grant_pages(map, offset, range); --=20 2.11.0