From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968471AbeE3BVZ (ORCPT ); Tue, 29 May 2018 21:21:25 -0400 Received: from mail-bn3nam01on0052.outbound.protection.outlook.com ([104.47.33.52]:31520 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S968129AbeE3BVW (ORCPT ); Tue, 29 May 2018 21:21:22 -0400 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+KQZodaAgC4XGIA= Date: Wed, 30 May 2018 01:21:19 +0000 Message-ID: <7B3793E8-8DD9-4566-9CCB-6D1B0C364754@vmware.com> References: <20180419063856.GA7643@kroah.com> <20180419181722.12273-1-namit@vmware.com> <162DEB66-373B-4E01-8D64-3CE7BEF47920@vmware.com> In-Reply-To: <162DEB66-373B-4E01-8D64-3CE7BEF47920@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;SN2PR05MB2717;7:vJ9lw64XRjj30SiWiiKlUfc9qYZdEwkqcXkkEKjr2Auj6MMDBAdbon9LKRl6LVLUiXnV4PmCkLa0dNJg49lVGh527idh8rBV0+3axjFVEG/GCpbotRLmUXWtdEN/ymCscascP9BJOKG3m1lbJnj6U4dKBMsw1BiBywXMzuv37jeNlImt8kGP1xs2FLpB6d3OyJBfLgXxt+c4ImGqAeIgpHoZ631a0JAkS5VBapIqlvfuqB5aRkmNCN9CFMQS9+I1;20:2n7h/KV/bG7/wYMCf3ns5Ts28ndFd2mj1r4iUSOYKdlgfLtfh1HOouj6OXvdCy6suXREI/xg2BHg1IGXFsf30G2l3/5OXXTQhOU/k4w/Kb994UfQEiq1OMZs8MwU9AwuHJCC/RqzZcL6cxuIO/e+wAUc0ux0txJTPI/AKi+WBXY= 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:SN2PR05MB2717; x-ms-traffictypediagnostic: SN2PR05MB2717: 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)(3002001)(10201501046)(3231254)(944501410)(52105095)(93006095)(93001095)(149027)(150027)(6041310)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(6072148)(201708071742011)(7699016);SRVR:SN2PR05MB2717;BCL:0;PCL:0;RULEID:;SRVR:SN2PR05MB2717; x-forefront-prvs: 0688BF9B46 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39380400002)(39860400002)(366004)(396003)(376002)(189003)(199004)(59450400001)(305945005)(6506007)(6512007)(5250100002)(186003)(3660700001)(33656002)(25786009)(102836004)(26005)(81156014)(8676002)(81166006)(3280700002)(53936002)(68736007)(66066001)(4326008)(6486002)(8936002)(7736002)(6116002)(6436002)(3846002)(2906002)(82746002)(229853002)(5660300001)(54906003)(6246003)(110136005)(97736004)(76176011)(99286004)(105586002)(106356001)(39060400002)(316002)(478600001)(476003)(446003)(575784001)(86362001)(14454004)(83716003)(2616005)(2900100001)(11346002)(45080400002)(36756003)(486006);DIR:OUT;SFP:1101;SCL:1;SRVR:SN2PR05MB2717;H:SN2PR05MB2654.namprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-microsoft-antispam-message-info: va9CuwZTYv2/+D9YkSW2FLS97PQ6P/SEaCtPXJ7PfKzUueCgWtS9qj478CNXH8UyRZ6+s6M9/SeMQK2UCRc4O6PQ1pdKUKHT0ReexludsEq4iH0MHOFmRyqTEI3IxqPVAEhplhuCxPsdfLswENnQba4HHzFBLVWaEh3VczKB0Hd/oaj+vHPGjhlj+T1QGvHD spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: <74D6E812624C8041A3DEC260E5BE0BDF@namprd05.prod.outlook.com> MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 304f1a18-bdb2-402c-612c-08d5c5cba5f6 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 304f1a18-bdb2-402c-612c-08d5c5cba5f6 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 May 2018 01:21:19.3911 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR05MB2717 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id w4U1Lag3006401 Nadav Amit wrote: > Ping. Please consider it for inclusion for rc4. > > Nadav Amit wrote: > >> From: Gil Kupfer >> >> The balloon.page field is used for two different purposes if batching is >> 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. >> >> Unfortunately, this dual-purpose of the field introduced a bug: when the >> balloon is popped (e.g., when the machine is reset or the balloon driver >> 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 the >> hypervisor. >> >> The following error occurs during rmmod when kernel checkers are on, and >> the balloon is not empty: >> >> [ 42.307653] ------------[ cut here ]------------ >> [ 42.307657] Kernel BUG at ffffffffba1e4b28 [verbose debug info unavailable] >> [ 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 parport i2c_piix4 nfit mac_hid autofs4 vmwgfx drm_kms_helper hid_generic syscopyarea 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/440BX 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: 0000000000000006 >> [ 42.313972] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff9bf97e08e0a0 >> [ 42.314201] RBP: ffffbfefc163be98 R08: 0000000000000000 R09: 0000000000000000 >> [ 42.314435] R10: 0000000000000000 R11: 0000000000000000 R12: ffffffffc02b97e4 >> [ 42.314505] R13: ffffffffc02b9748 R14: ffffffffc02b9728 R15: 0000000000000200 >> [ 42.314550] FS: 00007f3af5fec700(0000) GS:ffff9bf97e080000(0000) knlGS:0000000000000000 >> [ 42.314599] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >> [ 42.314635] CR2: 00007f44f6f4ab24 CR3: 00000003a7d12000 CR4: 00000000000006e0 >> [ 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: 00000000000000b0 >> [ 42.315996] RAX: ffffffffffffffda RBX: 000055be676401e0 RCX: 00007f3af5b0e8e7 >> [ 42.316951] RDX: 000000000000000a RSI: 0000000000000800 RDI: 000055be67640248 >> [ 42.317887] RBP: 0000000000000003 R08: 0000000000000000 R09: 1999999999999999 >> [ 42.318845] R10: 0000000000000883 R11: 0000000000000206 R12: 00007fffe6cdf130 >> [ 42.319755] R13: 0000000000000000 R14: 0000000000000000 R15: 000055be676401e0 >> [ 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 ]--- >> >> To solve the bug, we eliminate the dual purpose of balloon.page. >> >> 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(-) >> >> 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) >> } >> } >> >> - if (b->batch_page) { >> - vunmap(b->batch_page); >> - b->batch_page = NULL; >> - } >> - >> - if (b->page) { >> - __free_page(b->page); >> - b->page = NULL; >> - } >> + /* Clearing the batch_page unconditionally has no adverse effect */ >> + free_page((unsigned long)b->batch_page); >> + b->batch_page = NULL; >> } >> >> /* >> @@ -991,16 +985,13 @@ static const struct vmballoon_ops vmballoon_batched_ops = { >> >> static bool vmballoon_init_batching(struct vmballoon *b) >> { >> - b->page = alloc_page(VMW_PAGE_ALLOC_NOSLEEP); >> - if (!b->page) >> - return false; >> + struct page *page; >> >> - b->batch_page = vmap(&b->page, 1, VM_MAP, PAGE_KERNEL); >> - if (!b->batch_page) { >> - __free_page(b->page); >> + page = alloc_page(GFP_KERNEL | __GFP_ZERO); >> + if (!page) >> return false; >> - } >> >> + b->batch_page = page_address(page); >> return true; >> } >> >> -- >> 2.14.1 Greg, can you please include this patch?? 4.17 is almost out of the door, and the last version was sent a month ago. If you have any reservations, please let me know immediately. Regards, Nadav