From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1486374-1517681676-2-8294454114095314937 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517681676; b=Oi4VXI9EWqTlSymVGwfcDUQOxfPZm6WeV3FqKKFxSiWNC+E Flf5BG2v56kWeEIIEVc4xQmmxQNJPGYTUGQSPXCMIZbJW4wfZsbY7CSFmCyl79dl yvdzsLgOgIpYL6fYD+ygLCra9XrLjg/GuTRdGsHHYQxVzP5MXzjZQ7/GzAic+X/p 1qnc4kZVWIOothMMjWl0Er/GxvGJn9GRwVixVFOfR3MlB4pWcE+EAcigAbCteFBe XBWzlsgELsQO7Y9vx/WRBOkeX7TCQ+wtwKIALUWKOMIy1W6caYEJq64XlDQgwA5l A9U/Acnh6A/mc8nEMMQwHKMIByRPGq+0rcqkvnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517681676; bh=BunhOI 5q5j2XY0fPLRXJ+v/D1XquzNauhkIa6ehDTzc=; b=R87soA4YVicQ9NlMFbGDcG aA1r2P2kILpFDrHdx6PgKSgwJUugHPMXoftCRpfdD2WHtbxPepUG1So9g7Is/6xE RRyZkcLAMPyf5DHOMxPlENWgGuoHmB8K75i6Hi1VDK9erKzXyKkJ73GRByfIZcv9 JSHxu2POg+htj9hCHyYuwVlLc9h9RacFUFiCAzHzHiMPrYBIC6Iw2Qrzqlv6n1y3 qysgce8y6i0EvswaVpBlJm0/JHVR1rVWkfy9X2FfPT6ro9C04J+qZC9i00yWPzpg 2PsILoO9EL8jTQyIQxldkO9ehM7TkjHrJXXSm4tWa3TqtUdxlL/58kGnShF+HRGQ == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ne0V2Q1c x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ne0V2Q1c x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752969AbeBCSOb (ORCPT ); Sat, 3 Feb 2018 13:14:31 -0500 Received: from mail-bl2nam02on0091.outbound.protection.outlook.com ([104.47.38.91]:39758 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753561AbeBCSHU (ORCPT ); Sat, 3 Feb 2018 13:07:20 -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 3.18 22/24] xen/gntdev: Fix partial gntdev_mmap() cleanup Thread-Topic: [PATCH AUTOSEL for 3.18 22/24] xen/gntdev: Fix partial gntdev_mmap() cleanup Thread-Index: AQHTnRmH/lYLO8DqpkGV/ECkdmi2ZQ== Date: Sat, 3 Feb 2018 18:05:10 +0000 Message-ID: <20180203180444.10801-22-alexander.levin@microsoft.com> References: <20180203180444.10801-1-alexander.levin@microsoft.com> In-Reply-To: <20180203180444.10801-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BL0PR2101MB1025;7:Dyhqt4ecNKueqm9jOATc9w3GL+EiDw/hAeuCxFAp+/6HmH0A7zxjQgmkG2L4PDM1iBg66XvTmfHmWcW8bds0PycrHgOQR1R/OjqYX8bLE7MKe91OG4nVVu5WBskzAeMgi6d/OfQJ6WiFcD2KDTxdAxs4IZuKLmrbI5v4jwlggYRyl0CZp+iIma25PjZNTKFNyX3JpctDCFomoCrdSq5NN+D0Me+zl1vsdFPHazEkH1A4sgk1m3eCXwiuiLvuv5A6 x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: dc627fd1-6d76-4490-9484-08d56b30e3e6 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:BL0PR2101MB1025; x-ms-traffictypediagnostic: BL0PR2101MB1025: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(70601490899591)(146099531331640); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231101)(2400082)(944501161)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011);SRVR:BL0PR2101MB1025;BCL:0;PCL:0;RULEID:;SRVR:BL0PR2101MB1025; x-forefront-prvs: 05724A8921 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39380400002)(366004)(346002)(396003)(376002)(39860400002)(199004)(189003)(6506007)(97736004)(86612001)(6116002)(3846002)(1076002)(59450400001)(76176011)(2906002)(26005)(6346003)(68736007)(102836004)(186003)(72206003)(2501003)(66066001)(2900100001)(53936002)(8666007)(6512007)(14454004)(106356001)(10290500003)(25786009)(8936002)(107886003)(478600001)(6486002)(81166006)(4326008)(81156014)(8676002)(5660300001)(5250100002)(2950100002)(3280700002)(7736002)(305945005)(36756003)(6436002)(6666003)(3660700001)(105586002)(110136005)(86362001)(316002)(99286004)(10090500001)(54906003)(22452003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:BL0PR2101MB1025;H:BL0PR2101MB1027.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: yM6wQpA4kjPC0Z+n+045J/zxcaJi89k0yzwR4E0UlGE1OkVHrSRrYmuLMNmM9pc2rXh+Gvhb6cs2HnZhXdgD+w== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc627fd1-6d76-4490-9484-08d56b30e3e6 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Feb 2018 18:05:10.1433 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR2101MB1025 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Ross Lagerwall [ Upstream commit cf2acf66ad43abb39735568f55e1f85f9844e990 ] 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 Reviewed-by: Boris Ostrovsky Signed-off-by: Boris Ostrovsky Signed-off-by: Sasha Levin --- 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 1c03e30f66b4..5ad2534480ff 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -817,8 +817,10 @@ unlock_out: out_unlock_put: mutex_unlock(&priv->lock); out_put_map: - if (use_ptemod) + if (use_ptemod) { map->vma =3D NULL; + unmap_grant_pages(map, 0, map->count); + } gntdev_put_map(priv, map); return err; } --=20 2.11.0