From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-it0-f70.google.com (mail-it0-f70.google.com [209.85.214.70]) by kanga.kvack.org (Postfix) with ESMTP id 6701A6B025E for ; Wed, 29 Jun 2016 06:59:00 -0400 (EDT) Received: by mail-it0-f70.google.com with SMTP id g127so88756852ith.3 for ; Wed, 29 Jun 2016 03:59:00 -0700 (PDT) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0119.outbound.protection.outlook.com. [104.47.0.119]) by mx.google.com with ESMTPS id g16si2525122otd.237.2016.06.29.03.58.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Jun 2016 03:58:59 -0700 (PDT) From: Dmitry Safonov Subject: [PATCHv2 1/6] x86/vdso: unmap vdso blob on vvar mapping failure Date: Wed, 29 Jun 2016 13:57:31 +0300 Message-ID: <20160629105736.15017-2-dsafonov@virtuozzo.com> In-Reply-To: <20160629105736.15017-1-dsafonov@virtuozzo.com> References: <20160629105736.15017-1-dsafonov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain Sender: owner-linux-mm@kvack.org List-ID: To: linux-kernel@vger.kernel.org Cc: 0x7f454c46@gmail.com, linux-mm@kvack.org, mingo@redhat.com, luto@amacapital.net, gorcunov@openvz.org, xemul@virtuozzo.com, oleg@redhat.com, Dmitry Safonov , Andy Lutomirski , Thomas Gleixner , "H. Peter Anvin" , x86@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" Cc: Cyrill Gorcunov Cc: Pavel Emelyanov Cc: x86@kernel.org 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.9.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752059AbcF2LNH (ORCPT ); Wed, 29 Jun 2016 07:13:07 -0400 Received: from mail-am1on0123.outbound.protection.outlook.com ([157.56.112.123]:25824 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751982AbcF2LNF (ORCPT ); Wed, 29 Jun 2016 07:13:05 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=dsafonov@virtuozzo.com; From: Dmitry Safonov To: CC: <0x7f454c46@gmail.com>, , , , , , , Dmitry Safonov , Andy Lutomirski , Thomas Gleixner , "H. Peter Anvin" , Subject: [PATCHv2 1/6] x86/vdso: unmap vdso blob on vvar mapping failure Date: Wed, 29 Jun 2016 13:57:31 +0300 Message-ID: <20160629105736.15017-2-dsafonov@virtuozzo.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160629105736.15017-1-dsafonov@virtuozzo.com> References: <20160629105736.15017-1-dsafonov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: HE1PR0801CA0018.eurprd08.prod.outlook.com (10.167.184.28) To HE1PR0801MB1738.eurprd08.prod.outlook.com (10.168.149.150) X-MS-Office365-Filtering-Correlation-Id: f1bc03e9-3deb-4d7e-935f-08d3a00c5edd X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1738;2:g5vwTfwmJ2SsOhvhG1R9Ery3cyDVmw0yC1tiXwiq1yoTdmxz4FdPoIySbtzyWB0Y7xx0lBERZ1mjSJw8UmUe/2nkGZ37MAiINwZeeqwv+sq8r+EQvBdrHYtmQF7vpTtsJurGibpc4+pGMTHx5tnzZlz+Z0+LNf/hDmn8hg1a0MSSgdFHcte6qHGTKes9rHiI;3:y4UZXqhtvjOT5GXrYk9qNagPN5wvqSc523fKofAS9tVNjv7qG/OnynFQHyyKSwbP43d6V4DGzxzcRO4NM30q7p23BEkKB6jFpsgbvWbr4wm28iMH13BD4AsQOMP1vKPK;25:UGYzc5hO7GQk+s4jv2hu5498gKgKbwmkpqkZW3tUqlWHxpF+fskr8d9f8Sw4s0dxd3iOU4M8TO1zA4OfZQRoSuQMnsyON+lUTd9b3Th3iS3TrUPos1SBCqWV8e2oKUw3pZUqE9lTkt+aGEXUSh9f8CTo5MqB9c3hlrO9y+jDGwnhrKwyu1Hevoq3o63UwNSUzepTYMvyrjFdyGWE6RjQJkvjQggQRIm4i+LrpHBp7vQpd6rE5TTrc0ycBiUEPvSEj0OWRREsdsUpIsvS+uMS+pAQEbvjGLRzZqR56KBgmgT7omX0Dqm01mk456BBu8eF0C2pF4JxfVh/Yiefrhetr5Cuo1PdJckPUT95aAmSMyWrsM7q6skjM9rRxnMgTHCyhOjQUZ/cQ7ud9Xdodcvt7Y6Ol+2F1nxz2fqdDC00zQ0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0801MB1738; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041072)(6043046);SRVR:HE1PR0801MB1738;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0801MB1738; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1738;4:MtoNKAY2A6Nerj2dKjGPa7Z3Cf+OX0uUFx0KB6KjZUtbuDMomNaoATIBkexz7Hk53Dw7lffoD9ou3+EpUv/LiRRjGCf5MZ/IzPw3vh7cmNyD5zAfCbcVV7rrKbyvwBmnPwt0XwET+cHRLzg7y0lhG69c8I5kx/qtFQxCH3CtE5GWBVkH+GeN9DdBq3LW0l9d3+Rcqj/ZVTInnoJ4dNQxC7p0gS8nXmJXdOULM2B8LcAXWmemRc4Qf2RcHzSVM8iiw3HSaVliufCeBS0A3PwKa7t4DR8XT19dOuril8HehfLy5/JIecdAMcyhQQloGku1jbijZ9rsbUwqEy5zQLZ7q6+QnQUMqdYp9LmYWxfvN96JV+nWoSHCF13p49ihXXWgMFbciINVsLeUd/LfbrgQwNY5aIsdHv0idYhudqG1mXU= X-Forefront-PRVS: 09888BC01D X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(979002)(6009001)(7916002)(199003)(189002)(2950100001)(5003940100001)(110136002)(19580395003)(19580405001)(77096005)(76176999)(189998001)(69596002)(50986999)(47776003)(66066001)(42186005)(101416001)(53416004)(50466002)(97736004)(33646002)(106356001)(68736007)(7846002)(86362001)(7736002)(105586002)(229853001)(2351001)(1076002)(4326007)(2906002)(3846002)(6116002)(50226002)(305945005)(36756003)(586003)(92566002)(48376002)(81166006)(8676002)(81156014)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR0801MB1738;H:dsafonov.sw.ru;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0801MB1738;23:tIWCP6cZPsLZ1Gy43IGphgnDOPEv+Cv1un70r0c?= =?us-ascii?Q?DwWj5r9oOSTVR7QxLZ0GJQmW+P/e1Jjl66Oo70zoeSWRTwNP0uHs6J77KCrD?= =?us-ascii?Q?nD5JcKv3wWYILdpR4HtYCphZIo+HfVp9BateZOgQQAJWwYZTCxfSZozdx36k?= =?us-ascii?Q?Nf9kFT2Daj/6n+ni5JjocR9P0P+wsBlYWo9YAmKSUaQv3Nh0TnhcABboCV5k?= =?us-ascii?Q?M9ZvoTzpnacKU4uCzqJlpjmZS53oJZPpn8pfZ0fmfpJFEakMT1zjQKFQEiY/?= =?us-ascii?Q?tEA50DnYpyRo5sMlbRXVLu+53IM5MbFSCv7XJfbcowdjS2/85IbuIC0WbSWH?= =?us-ascii?Q?NPxZsMNRqONPhDlE+NAxTxT06o3bVXCRQD1wxJZRfDnA6By+u+pfn1xJ62LD?= =?us-ascii?Q?/hYHCSyJ63NPbkzRSL/74lZqCAv5JLm7N+BbauY2Wy8r1KiERqbaGmEy+i60?= =?us-ascii?Q?ZXMawk/B6eAcndNOuVnbw7f1Bn65iJQteJ2dRRH7x8ajBTMN4wgIcFTB2YFR?= =?us-ascii?Q?ggpEfUTSPgehhqnWlfQMA28w9u7AFi65KTTHpzcAQXezm22lUAQwn7D4p2TC?= =?us-ascii?Q?yy9TBYB8TRb2dQerxZq5JybxQJN9QOETiMeSDFV0Ae2rfAtCOsmJI6gm/oh3?= =?us-ascii?Q?XZnUV4ZMa/Ngjwvd+cG2Bax7OxiCYoH/YXjdIy+y1lTcjhp6Brm6xVzQtjyA?= =?us-ascii?Q?j6zjRmijBhb7QZ0WrQD1x1gl34hTwfsFhg6jAa8O/bSe/lqMlmA2TFZV7vuf?= =?us-ascii?Q?nBjYwPyGFeVrmH3YK+rlBD9PUPphXOzHNjvPeY8ikpQEO5CTyXJxnhvR5B84?= =?us-ascii?Q?VYMfOHph785qpDcFjgyy2Huz1IOlFAVnYVZuDzj4pIbzOwOXbH5VST17RkL6?= =?us-ascii?Q?P74EVJu4ZcMKJaKySiyQmHzJY18tuiSZsyiDJFiFYUHNNgH+t3MBHNebz+zz?= =?us-ascii?Q?ZCQJGomkx78mC7rnNgr5QV1LFYjeK4IUo3shppucSsA0u185yWWYZy7hhz7T?= =?us-ascii?Q?T9FP595wUvkCbfyUMtZOsYxf/Mkh3pI7sQ3oZhtVesWDT2TYIMHv/22MQ/n2?= =?us-ascii?Q?qEQbnnCAG+R892WbtzSF6ODG/Q3MGwtwv+xefoYOALsocSeMjS3l789yUEED?= =?us-ascii?Q?bLDdW50ckgmFfvhebLfvJPRTUGKJkIOkm2gykQqd+57mFFdfDFIc99KlU8O4?= =?us-ascii?Q?Wz8fV+MN+1vZxhLZwXokbjSeMLVhkSZZNnUeEXupeYKaJVtZpo80HZ6gU6w?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1738;6:b18zwc5h+tzt3HdNCQaLXOI/B+dj/PSOkQwcxIM03dRNMYIaaJySyooLQ7R0HRZ0GAGgTRxhNKBlqg2voz0EN7OOzpt2xI9UyQJ4P8r/U+4jYzqQMcfzxuhV/6rrtPR8uEA3WNVM1uWHWs9IXyt0t6po2YRGTMnKebV/BGufNcfJs0D+jXSr0lj5vvsJvJzLxZXP5Hl9LEvNYdQVS9JgKreMQ7MBym4x3FY2OgG8LDSaah0p7atQeLxRFCtSA206Nu5WbI0yxTtMEny0qqj4Z8gaJ8SCBwGnp+ewPob1btIJWAhIXNfnGJHeHUUtrcDZG4YJ2/w+OE2Xe4YAdckfHA==;5:wYC8g5AZPRcJg2q71KUJ5JJ2GEQpetYzeGASc7uscpr5E/tUrGgYpMVUEkC0vicuQiyZ0X3rkaTlcVub+FaSwKHTN2i3JcaaDHAarR8NSJqVWBJjEPpXqWmc6cetTlon/CqDZNZMsWoDRPItozruzQ==;24:2Kuog2NAq0isa58C+fG5F9gCO0ESxBpNcSkOYHDsOLIEMuRFY55sa/38asHoFWAnRgTq2+rTG1VEEsH3TyxtN0t2yZU7doog/Coyy8WYHws=;7:1ItF/vVbmFsse6nE8yfmSpPInO289YD/nGBowI0D93B+D4F4CetxgJA9FyyFgGf3+GGr9GmG8fdPqCgAtRgv+1JkexPy6kkvryE8YYQg0GAd8G1vmvd1OSWQRdxtwTbqOXtcAO6UlGHerKFrpTpHJkPvs8BDq6M72wrXNjnBsSW4MNDnV2NQP2+u9ZLOBLwZ7OC8LJ+P3RJ3k6T5paUu/titifH2FYhh05GdZZOw9uTp0Ua+zleF5SDvjcRl4JQWs+Uq7pY0XxaMfb9JhV4ntg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1738;20:TPTd6JFBOoJzO4VM21UVyY10UW9YHrahmCZyPVvGYqiO28xrzm4KNqaJxKwFCI96Be6OhusfXShll4aIHK9FuyeA5NBSNnYiMU5n+Glbw522dlX/vhPV7VUwieA+hAzS44HKuJqYnUODpoq6YTwMzzzh/J5A+S44xWWxUjpTcSY= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2016 10:58:56.6150 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1738 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" Cc: Cyrill Gorcunov Cc: Pavel Emelyanov Cc: x86@kernel.org 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.9.0