Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp1031777imm; Thu, 31 May 2018 13:57:59 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK2fjWf2tGCty7OXBiATeKEoP2AmiHs8dsaCZxt5mY/NihhEi1LUpJyhOczP+rooZZOiv1Q X-Received: by 2002:a63:2bc4:: with SMTP id r187-v6mr6660861pgr.231.1527800279384; Thu, 31 May 2018 13:57:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527800279; cv=none; d=google.com; s=arc-20160816; b=fTWlscMuu0jc+hqOXIQEc3l2sIggC416Rv4s5yw8q3jrWcGGjRge8ggW3F7rZDmtcN 05Vl6DuxZ3O5fwjac50+wd3gydrYh8XIp7bqNnWB0RFmGVZM2HEqyOm+5VNCI4PubyMT nIn+aiQv0/v/ZJwBbupUYcPLmibfGmUHd9+rfZMAWeAGlS/FEUm8qdwZTfLv8r5b9wV7 eQGiKslgY866UUs5wFWAaLINaHNym64j/yPhlw5disBvg2AK3cW1+QVxSD4Q3mT2jRfr /dgg26s8Ez1XgB4JsodGneu6FYbttXKiU2RH9e8PfeJ+cTZOpfImrZpTMCI5lMQUbC02 MXGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-id:spamdiagnosticmetadata:spamdiagnosticoutput :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=cQM9yzgefOIA4YqR9kJhiXJN/IrfP2D6m+Xdg9evMw8=; b=xjTNxaMnrlAgJOQGJcl74Bh7hFwnji2G8qoItjKqbJkM6evGiJ4c9QabtwiBRG7lRB qjaAHQ+kaKfjvhes9NJITergSgwE7owJj4RD0wbDGyIcRH33rYhk+YgT0tV5e6GN9d7g 9FF4phVzFem0O/CPDFgFiN+0ZoJnvyfU53adkR4p+aCauhf4tLxVw8dQfUDA6eHfFJWQ cyIWSCKv57k4+63kRg3STaip3YlEZj4zDCmR2s8PKd7bD0PxyAodEmNAbDKBQrw3eSZe ysj/S8G4yKI7s8dnrzZqHott0M5a6n5qnkricjkVVuXtXMRsh7GLf5vnJPomiDaj+i0q IOIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@vmware.com header.s=selector1 header.b=kms3cgwQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=vmware.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f35-v6si36972311plh.193.2018.05.31.13.57.44; Thu, 31 May 2018 13:57:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@vmware.com header.s=selector1 header.b=kms3cgwQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=vmware.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750805AbeEaU5A (ORCPT + 99 others); Thu, 31 May 2018 16:57:00 -0400 Received: from mail-by2nam01on0084.outbound.protection.outlook.com ([104.47.34.84]:15714 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750711AbeEaU4z (ORCPT ); Thu, 31 May 2018 16:56:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cQM9yzgefOIA4YqR9kJhiXJN/IrfP2D6m+Xdg9evMw8=; b=kms3cgwQhOAAdO0HGCjxLgOPgQljrqoMQScswrzMNYdYDOU4h499fzgsnfoI3/YaF7oHTV2/x52/A2EyD8Wmar7Ietu/Sx2tjQfPYA7evWcOXRcnPxwpBfwyM1zhK+s44Q3Hckr+VYCq3num4R+Ho8/24jBnBUUaPD9bDd5r6q8= Received: from SN2PR05MB2654.namprd05.prod.outlook.com (10.166.212.137) by SN2PR05MB2494.namprd05.prod.outlook.com (10.166.213.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.5; Thu, 31 May 2018 20:56:53 +0000 Received: from SN2PR05MB2654.namprd05.prod.outlook.com ([fe80::dcb:7409:11fc:2327]) by SN2PR05MB2654.namprd05.prod.outlook.com ([fe80::dcb:7409:11fc:2327%4]) with mapi id 15.20.0820.010; Thu, 31 May 2018 20:56:53 +0000 From: Nadav Amit To: Arnd Bergmann , Greg Kroah-Hartman CC: Xavier Deguillard , pv-drivers , LKML , Gil Kupfer , Oleksandr Natalenko , "ldu@redhat.com" , "stable@vger.kernel.org" Subject: Re: [PATCH v3] vmw_balloon: fixing double free when batching mode is off Thread-Topic: [PATCH v3] vmw_balloon: fixing double free when batching mode is off Thread-Index: AQHT2Argu2pZ34klIkGamyuxGjdz+KQZodaAgC4XGICAAtrGAA== Date: Thu, 31 May 2018 20:56:52 +0000 Message-ID: <4D5BA2F0-377D-4959-9786-95E195EE2D22@vmware.com> References: <20180419063856.GA7643@kroah.com> <20180419181722.12273-1-namit@vmware.com> <162DEB66-373B-4E01-8D64-3CE7BEF47920@vmware.com> <7B3793E8-8DD9-4566-9CCB-6D1B0C364754@vmware.com> In-Reply-To: <7B3793E8-8DD9-4566-9CCB-6D1B0C364754@vmware.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=namit@vmware.com; x-originating-ip: [50.204.119.4] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;SN2PR05MB2494;7:8rHsCgLSQRMQypx9wGkGa6Po0jv5UmJFTzINYfZiWRwc5+VTb0GlLQnhJqtupMyKcx1E4LOtEfmZD2ykiN5VHRtb+XbUwF6zxkqipOQ+QvyRFqrBWai100jAUPZIrhVVGR3CFIencQKJYcR94BDHl6hG7RVHUd8t1pachovJDrOd9vXCgmAVQSmLGsPZijZMQ864au0MXRrT+U5MMTOiqjzx5lTRsW4LnipwDavwlgK35k+L8GbNNLP2iMrLRoBO;20:gbTlZ+/cm/7naFAnvYaaGJd5Zemgtslhm1WPb4Df0dkZZ/KtaX+dOoTHdN6inMfFd+y47LEo2tyNvee6fyrEv+k6zupwMgC7gsrabY2T2vztOhKsA84RSmj+cUse+ZfnAVNTGfddpBhSCLAcsHTWmCsUiTOIsjGAPxJXXtphsco= x-ms-exchange-antispam-srfa-diagnostics: SOS; x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020);SRVR:SN2PR05MB2494; x-ms-traffictypediagnostic: SN2PR05MB2494: x-ld-processed: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0,ExtAddr x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(61668805478150)(9452136761055)(85827821059158); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(6072148)(201708071742011)(7699016);SRVR:SN2PR05MB2494;BCL:0;PCL:0;RULEID:;SRVR:SN2PR05MB2494; x-forefront-prvs: 06891E23FB x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39380400002)(376002)(366004)(396003)(39860400002)(346002)(199004)(189003)(76176011)(305945005)(6506007)(106356001)(316002)(45080400002)(3280700002)(478600001)(3660700001)(68736007)(93886005)(82746002)(83716003)(97736004)(99286004)(25786009)(110136005)(5660300001)(7736002)(59450400001)(2906002)(54906003)(4326008)(39060400002)(36756003)(66066001)(105586002)(3846002)(6116002)(476003)(2616005)(6246003)(6436002)(486006)(53936002)(81166006)(8676002)(6512007)(11346002)(2900100001)(446003)(81156014)(33656002)(8936002)(229853002)(186003)(6486002)(5250100002)(86362001)(26005)(575784001)(102836004)(14454004);DIR:OUT;SFP:1101;SCL:1;SRVR:SN2PR05MB2494;H:SN2PR05MB2654.namprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: CeA/7t4vTspJ4iZnBfbuGA0lHBByCjifEALZu+RoAueUMiM21QMIPuA3Tc+IMdZnZtXYP9QXoQzfurii5a9qpT6GHz9acV6Tm2DIaFnajaAUN5gJiRDNUsizqA+dNgeeZAFIG63jMYSZw5xbGzmZ1YdbZIjIbXvKEhhbi6kN5kBMYfDaemodb/KF+z2eR3Yp spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 3c2e5fae-7654-400d-fdaa-08d5c7390992 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c2e5fae-7654-400d-fdaa-08d5c7390992 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 May 2018 20:56:52.8863 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR05MB2494 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Nadav Amit wrote: > Nadav Amit wrote: >=20 >> Ping. Please consider it for inclusion for rc4. >>=20 >> Nadav Amit wrote: >>=20 >>> From: Gil Kupfer >>>=20 >>> The balloon.page field is used for two different purposes if batching i= s >>> on or off. If batching is on, the field point to the page which is used >>> to communicate with with the hypervisor. If it is off, balloon.page >>> points to the page that is about to be (un)locked. >>>=20 >>> Unfortunately, this dual-purpose of the field introduced a bug: when th= e >>> balloon is popped (e.g., when the machine is reset or the balloon drive= r >>> is explicitly removed), the balloon driver frees, unconditionally, the >>> page that is held in balloon.page. As a result, if batching is >>> disabled, this leads to double freeing the last page that is sent to th= e >>> hypervisor. >>>=20 >>> The following error occurs during rmmod when kernel checkers are on, an= d >>> the balloon is not empty: >>>=20 >>> [ 42.307653] ------------[ cut here ]------------ >>> [ 42.307657] Kernel BUG at ffffffffba1e4b28 [verbose debug info unava= ilable] >>> [ 42.307720] invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC >>> [ 42.312512] Modules linked in: vmw_vsock_vmci_transport vsock ppdev = joydev vmw_balloon(-) input_leds serio_raw vmw_vmci parport_pc shpchp parpo= rt i2c_piix4 nfit mac_hid autofs4 vmwgfx drm_kms_helper hid_generic syscopy= area sysfillrect usbhid sysimgblt fb_sys_fops hid ttm mptspi scsi_transport= _spi ahci mptscsih drm psmouse vmxnet3 libahci mptbase pata_acpi >>> [ 42.312766] CPU: 10 PID: 1527 Comm: rmmod Not tainted 4.12.0+ #5 >>> [ 42.312803] Hardware name: VMware, Inc. VMware Virtual Platform/440B= X Desktop Reference Platform, BIOS 6.00 09/30/2016 >>> [ 42.313042] task: ffff9bf9680f8000 task.stack: ffffbfefc1638000 >>> [ 42.313290] RIP: 0010:__free_pages+0x38/0x40 >>> [ 42.313510] RSP: 0018:ffffbfefc163be98 EFLAGS: 00010246 >>> [ 42.313731] RAX: 000000000000003e RBX: ffffffffc02b9720 RCX: 0000000= 000000006 >>> [ 42.313972] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff9bf= 97e08e0a0 >>> [ 42.314201] RBP: ffffbfefc163be98 R08: 0000000000000000 R09: 0000000= 000000000 >>> [ 42.314435] R10: 0000000000000000 R11: 0000000000000000 R12: fffffff= fc02b97e4 >>> [ 42.314505] R13: ffffffffc02b9748 R14: ffffffffc02b9728 R15: 0000000= 000000200 >>> [ 42.314550] FS: 00007f3af5fec700(0000) GS:ffff9bf97e080000(0000) kn= lGS:0000000000000000 >>> [ 42.314599] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>> [ 42.314635] CR2: 00007f44f6f4ab24 CR3: 00000003a7d12000 CR4: 0000000= 0000006e0 >>> [ 42.314864] Call Trace: >>> [ 42.315774] vmballoon_pop+0x102/0x130 [vmw_balloon] >>> [ 42.315816] vmballoon_exit+0x42/0xd64 [vmw_balloon] >>> [ 42.315853] SyS_delete_module+0x1e2/0x250 >>> [ 42.315891] entry_SYSCALL_64_fastpath+0x23/0xc2 >>> [ 42.315924] RIP: 0033:0x7f3af5b0e8e7 >>> [ 42.315949] RSP: 002b:00007fffe6ce0148 EFLAGS: 00000206 ORIG_RAX: 00= 000000000000b0 >>> [ 42.315996] RAX: ffffffffffffffda RBX: 000055be676401e0 RCX: 00007f3= af5b0e8e7 >>> [ 42.316951] RDX: 000000000000000a RSI: 0000000000000800 RDI: 000055b= e67640248 >>> [ 42.317887] RBP: 0000000000000003 R08: 0000000000000000 R09: 1999999= 999999999 >>> [ 42.318845] R10: 0000000000000883 R11: 0000000000000206 R12: 00007ff= fe6cdf130 >>> [ 42.319755] R13: 0000000000000000 R14: 0000000000000000 R15: 000055b= e676401e0 >>> [ 42.320606] Code: c0 74 1c f0 ff 4f 1c 74 02 5d c3 85 f6 74 07 e8 0f= d8 ff ff 5d c3 31 f6 e8 c6 fb ff ff 5d c3 48 c7 c6 c8 0f c5 ba e8 58 be 02= 00 <0f> 0b 66 0f 1f 44 00 00 66 66 66 66 90 48 85 ff 75 01 c3 55 48 >>> [ 42.323462] RIP: __free_pages+0x38/0x40 RSP: ffffbfefc163be98 >>> [ 42.325735] ---[ end trace 872e008e33f81508 ]--- >>>=20 >>> To solve the bug, we eliminate the dual purpose of balloon.page. >>>=20 >>> Fixes: f220a80f0c2e ("VMware balloon: add batching to the vmw_balloon."= ) >>> Cc: stable@vger.kernel.org >>> Reported-by: Oleksandr Natalenko >>> Signed-off-by: Gil Kupfer >>> Signed-off-by: Nadav Amit >>> Reviewed-by: Xavier Deguillard >>> --- >>> drivers/misc/vmw_balloon.c | 23 +++++++---------------- >>> 1 file changed, 7 insertions(+), 16 deletions(-) >>>=20 >>> diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c >>> index 9047c0a529b2..efd733472a35 100644 >>> --- a/drivers/misc/vmw_balloon.c >>> +++ b/drivers/misc/vmw_balloon.c >>> @@ -576,15 +576,9 @@ static void vmballoon_pop(struct vmballoon *b) >>> } >>> } >>>=20 >>> - if (b->batch_page) { >>> - vunmap(b->batch_page); >>> - b->batch_page =3D NULL; >>> - } >>> - >>> - if (b->page) { >>> - __free_page(b->page); >>> - b->page =3D NULL; >>> - } >>> + /* Clearing the batch_page unconditionally has no adverse effect */ >>> + free_page((unsigned long)b->batch_page); >>> + b->batch_page =3D NULL; >>> } >>>=20 >>> /* >>> @@ -991,16 +985,13 @@ static const struct vmballoon_ops vmballoon_batch= ed_ops =3D { >>>=20 >>> static bool vmballoon_init_batching(struct vmballoon *b) >>> { >>> - b->page =3D alloc_page(VMW_PAGE_ALLOC_NOSLEEP); >>> - if (!b->page) >>> - return false; >>> + struct page *page; >>>=20 >>> - b->batch_page =3D vmap(&b->page, 1, VM_MAP, PAGE_KERNEL); >>> - if (!b->batch_page) { >>> - __free_page(b->page); >>> + page =3D alloc_page(GFP_KERNEL | __GFP_ZERO); >>> + if (!page) >>> return false; >>> - } >>>=20 >>> + b->batch_page =3D page_address(page); >>> return true; >>> } >>>=20 >>> --=20 >>> 2.14.1 >=20 > Greg, can you please include this patch?? 4.17 is almost out of the door, > and the last version was sent a month ago. >=20 > If you have any reservations, please let me know immediately. Arnd, Perhaps you can - the very least - respond (or just include the patch)? The last version of this patch was sent over a month ago. Thanks, Nadav=