From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161451AbcFANPJ (ORCPT ); Wed, 1 Jun 2016 09:15:09 -0400 Received: from mail-am1on0116.outbound.protection.outlook.com ([157.56.112.116]:59568 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758297AbcFANNU (ORCPT ); Wed, 1 Jun 2016 09:13:20 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=virtuozzo.com; From: Dmitry Safonov To: , CC: , , , , <0x7f454c46@gmail.com>, , , , , Dmitry Safonov , Andy Lutomirski Subject: [PATCH 1/6] x86/vdso: unmap vdso blob on vvar mapping failure Date: Wed, 1 Jun 2016 16:11:32 +0300 Message-ID: <1464786697-20639-2-git-send-email-dsafonov@virtuozzo.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1464786697-20639-1-git-send-email-dsafonov@virtuozzo.com> References: <1464786697-20639-1-git-send-email-dsafonov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: AM5PR0901CA0029.eurprd09.prod.outlook.com (10.164.186.167) To DB6PR0801MB1286.eurprd08.prod.outlook.com (10.168.11.16) X-MS-Office365-Filtering-Correlation-Id: a8aacbdf-ae89-4389-9dc7-08d38a1e794a X-Microsoft-Exchange-Diagnostics: 1;DB6PR0801MB1286;2:pLlnegMdjd8AeA7CeTmS3722Yt4zLkuXOpK06g0lWsLzkYztY+JmQwBcAnCC5WDl861EKDDePxYfdGWmVuGWEG7esR+kNilXep32Z05HRqU/Uu7dQLcTRgHDyz2P8yTcKZMmspnsfv77DsYau/N9gNhH3jYahJthA8kAnpgFI7SCijU5Yo368v0V6/e3VL2D;3:BPfoOwzS38AUZIqUwftIPpN/mwKCAR+c/7JijZEsXBwuog/UKN58ziG/RE3GbTro62PmE+zKp8/4oTwXaEp3Q5FC2/yTUOpkrDoZyCP3Q0KbVdTrTxT2ppglv0Q3g+V9;25:nxbFlDqPZyan79+wmBi/EQUh0I0KATtJMk7VVlTvOR9oyA/vvFqRwlJx/3nC1A8QY/S1rRj9ZxEGq7LQN5zG5BLvzXCNpCCMAZQg74HSswX5nZz6F5KCFJoaiI0UZgGaCGSOye22vnOVVSXJAqGS5YzJurh+nNPu7ITRAk434FzutuLpK5dq3zs2zjGb6N0WFT8OrYWZ3OORdNUGUouY+Um2+7d0fy8tiGrELpKcFmb/uZKO6aSbR8RTxBkYGFTV2IdU6bJj2MLWN/tKlQ3sFYPTtWg61qbV8O8NhJ8HVw2O0tzlVgdpENz1pMzy3jRFJs0lcoKjupA6jLzMu4RDcCakLBgqDAT95V1qw+4wt6T+fhOv5urCa5YlTnTwSFcxU0b0+gv8FuJ1JPXLZ0tQ/PtYQQLfFQeGZS81VVv6VVQ= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0801MB1286; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041072)(6043046);SRVR:DB6PR0801MB1286;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0801MB1286; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0801MB1286;4:yz6dpmTfUgikyudDxjg4qkpavjf2bhy97zUZ1wgagsIcglQI7vYwxLOOP0mqXATG0P60PdteRLbjh8zwLaL01rjybdSC1t84QVn1GCF+QMAt8rGD+I7ustVvNoPO0PNk2db7Yx3Wez757SbJdOkk/DPMrAhyT3AWrRnXWc9t7OKNFbgQVUI6t4R3VHUwDUayrtS2P9oBssA8/1VzBvKfzTN/Bdgg1EBBJonYwp3k6ZQc5Vf6OCGFQuDU6Or8U+M8pJoYtC/zpnQP9GGvDl+l6+kmETEGc2xG41i2FCJ8wnB3M6QCR3V2KpkOC2NFa4twnu1COa5IbFu4JOpbnshJ/w1klY/v67R3TrWoHcuJ6LfVzvpSw3MbE6GCyiPs9yOLt/mtprY/hhXBwyLtCQhFVp8Gr7pr7fC0B/klmbapTjk= X-Forefront-PRVS: 096029FF66 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(189998001)(5008740100001)(19580405001)(229853001)(19580395003)(8676002)(77096005)(33646002)(53416004)(5001770100001)(42186005)(5003940100001)(81166006)(586003)(50466002)(48376002)(6116002)(86362001)(66066001)(36756003)(47776003)(2950100001)(50986999)(50226002)(92566002)(3846002)(4326007)(76176999)(5004730100002)(2906002);DIR:OUT;SFP:1102;SCL:1;SRVR:DB6PR0801MB1286;H:dsafonov.sw.ru;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0801MB1286;23:g8PVmdEoFBaEKYHpfVauX84BON7qsEgmpRD6RowqQIpgU+RFXIVY74FO1MVJcFnZLlr5sF3hW1U0HGY8J0oqYikQVZiXBpFmMkLTr5OFSAcA2uMVTas7o4aXREhiPDq4+m+VUuzd9m4727EIivIwGEHDrEmZYgL9CzJ3Oy6viIQtfDQ3NAGYZqMgX05S8ByUuJqlnbhlPnsAmZLzDPMDC5SiBg3s/lUpRvKkfVAst+ThnlxN3YB/wEql1IHYglWtor29ndvpO14TkTykBQJOPB9CLwCSetfaS10aIgQF0S4FWtQiKUnaI6ekuFL4QRhHA+utvokcjcLc6cTexQAtXB5CxSr2L/faCv2fCLlQOd2RZYodb+0nGtb+YMzV0tmH0GJzJMUEmsBtTMTmtboW38t11ewYjJb0FD3JoTmu2G+BLsImB6b1hevWZIgxKXNavCjrgVtaJAVA0myoA3GpmyI+mcD92OsEolRDtf+bhChPYAJzxqN7Jd0B4bxHiquqoiFKvD/Gsr3Ia62YwnTNiVssJQCliKB/YyUnttjqdWCYNwNIIBU7XxPkjwaewmuALFhuvAVEMMoRWTnTg9YDfLar4IHzdJpxeP4SV03g7MPfCn6PM09zY4RWm7I1/sRx3J7yEHc7zUmj+DLlFbn15B+oKJIn3PY4Gr279zP2Z7YnmWROyPbo4/fcFsKh8gpkVBjmJPBTaWxF5EYpyx6G9q75p6XUPNC3KhP/eiYhLcPhJpquJTjXvvKZ98YG2vScD6/XsL8B3OjzbOqWaus0BE4ncDMzw1hA62LGG2qzVmgHUJbxZRcmOMjhgmPYowljaF7a52r5+yugC+364lQtrLrgFxQqhEvt6cs6MYRCEnRLeVCbJjh9YGrmuwnVI5k4JU9cpgPJyoshkfp855Mdyw== X-Microsoft-Exchange-Diagnostics: 1;DB6PR0801MB1286;5:a2dgqwvJJpEjfQL+hf+P7Hj3V2SLgLnBxfD/h5ZoRhYkSF3gA9Q2CehdMDVxcLCZovcXBF3ui+7wVmE31aWAIxkMaGKKZ7Ywu97CwLc6A74J7ldiFTKTmVxU2umAE+MqFR+GdwMv6MHFbYH+32LkJQ==;24:S2Nn2lP9+A0CGNqCwYJwobR5qr/A/UvA399VGlfSUrgN8XsaKcoJGMZZpGxMA+Y0Yr0icMeViaR3VBm1f7PBSNBB3clJOYg9o2iZgWDw1WA=;7:24i8XysvhIAQE0+E12aGaUs4fuP5Q5r219BzQtRjKkmh2pZicAaMrvDM/rlt7asJ2LWS6DkoGpGTj3GRmdXL4/3qWe0KZlj5QIjsCswiDtC03oK7gm/a9QP5C7nTFW5mCc299kWGg9yh8kCVSnde5cruxyqAe5ZOVEwSMagVztfkezuJQpMFWVdHsHYkcgQ2;20:H7/VHFSVizCz5fHd0h7Y8C70WVm3D0mftoodwELslWseoXa8UI5/EqElngkdi7eUEiLUrwEsjANF8EN8ao3MrxH9riTrErYQUFL/L+Mkw7edt0WyLbkABBRSjAJ3x/eR7V++FRjv13t8sVyiAqSxkQAw4NVb21KrtgKek5/3lbw= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2016 13:13:06.1081 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1286 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If remapping of vDSO blob failed on vvar mapping, we need to unmap previously mapped vDSO blob. Cc: Andy Lutomirski Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Signed-off-by: Dmitry Safonov --- arch/x86/entry/vdso/vma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c index 3329844e3c43..387028e6755d 100644 --- a/arch/x86/entry/vdso/vma.c +++ b/arch/x86/entry/vdso/vma.c @@ -238,7 +238,7 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr) if (IS_ERR(vma)) { ret = PTR_ERR(vma); - goto up_fail; + do_munmap(mm, text_start, image->size); } up_fail: -- 2.8.2