Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754436AbeAIMUM (ORCPT + 1 other); Tue, 9 Jan 2018 07:20:12 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:55057 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754272AbeAIMUL (ORCPT ); Tue, 9 Jan 2018 07:20:11 -0500 X-IronPort-AV: E=Sophos;i="5.46,335,1511827200"; d="scan'208";a="465135867" From: Ross Lagerwall To: CC: Ross Lagerwall , Boris Ostrovsky , Juergen Gross , Subject: [PATCH 2/2] xen/gntdev: Fix partial gntdev_mmap() cleanup Date: Tue, 9 Jan 2018 12:10:22 +0000 Message-ID: <20180109121022.11467-2-ross.lagerwall@citrix.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180109121022.11467-1-ross.lagerwall@citrix.com> References: <20180109121022.11467-1-ross.lagerwall@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: When cleaning up after a partially successful gntdev_mmap(), unmap the successfully mapped grant pages otherwise Xen will kill the domain if in debug mode (Attempt to implicitly unmap a granted PTE) or Linux will kill the process and emit "BUG: Bad page map in process" if Xen is in release mode. This is only needed when use_ptemod is true because gntdev_put_map() will unmap grant pages itself when use_ptemod is false. Signed-off-by: Ross Lagerwall --- drivers/xen/gntdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index d3391a1..bd56653 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -1071,8 +1071,10 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) out_unlock_put: mutex_unlock(&priv->lock); out_put_map: - if (use_ptemod) + if (use_ptemod) { map->vma = NULL; + unmap_grant_pages(map, 0, map->count); + } gntdev_put_map(priv, map); return err; } -- 2.9.5