From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932203AbcDYLxI (ORCPT ); Mon, 25 Apr 2016 07:53:08 -0400 Received: from mail-am1on0129.outbound.protection.outlook.com ([157.56.112.129]:8992 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754526AbcDYLxG (ORCPT ); Mon, 25 Apr 2016 07:53:06 -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 Subject: [PATCHv8 1/2] x86/vdso: add mremap hook to vm_special_mapping Date: Mon, 25 Apr 2016 14:37:02 +0300 Message-ID: <1461584223-9418-1-git-send-email-dsafonov@virtuozzo.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1460388169-13340-1-git-send-email-dsafonov@virtuozzo.com> References: <1460388169-13340-1-git-send-email-dsafonov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: DB5PR06CA0027.eurprd06.prod.outlook.com (10.162.165.37) To VI1PR0801MB1311.eurprd08.prod.outlook.com (10.167.197.149) X-MS-Office365-Filtering-Correlation-Id: 2026e4ff-0fd4-4d67-a9db-08d36cfe27c0 X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1311;2:PtMD8ioabPxCMzrMUaQaMDzGndgcsdDWUioQ2eG/O3oEcUuRaRq5ZpztUazW/OPtvk8GKjFVUYrtOk8TP59+Agv7y0rjTUs6bzUt3nazczHPTT2IBUNO51+kbhuu9vbx/hh0iH6+udTWGEzV4oy/Z/JVaXjwnAVgLORpVWyUeMta2LYBPwSwyCwxz4wCyy1A;3:KNPtMCAlJqx3mLbwRa+qoxK1tbh0FEBvFvrgycdNl7V6J1HW0TE5T49RKIzVtUv03OZgu9ZF9nm91W3mMU42QkumOqgWcI15SzdhGuYXo9f6tZrYdIxMrUSZE1DVdMb2;25:S3wVr+cIkAgaOUejlyYncxeB+b6SaTvbocW4tSv5QBDCSYxn8SQxadGHwLS8AY5IA+wLiNOsDhD0FJ/W8UxYHkP7xhGUMg7vF5uaB7fMsNHK7TrN9cA1hjaKnLb4nCUHbE4kUCg999sRTOkDr5U6KCNMeLs9QjuinQAI4QcrHDQNllnFudjrziUmLuXt1s/EbpRFdHgcVTdoQZTB63DNGE3qMkflN5wHPkKKKF3v6dwDt9/POGjqYjy82r/IWN0Buke8InBMnbSW7kDWKLqGXJ6MMSABz9kDHyS8+WVllc3c1+cKBYFWWo+j45om9g1RHnNCq01tZtPQBhmQSTrWMjDFbyVnU+8iMZXM0KagtiIUPXAEo5gJgWWBHMafiY5iXYYvXRfQ1RJcg4sxVXYJUy5lDEGwA9czIKvWPEZMqrZl1v/sbG7Y2k/YO4CIFCbr8P+nkyJjhasQzml3jWq+yS5Gno7kD2WP080uXSG1ln97IzqzgNgWnBuiMdWYmjazIcb/7QVwH9KK6ri9YPuzOx96rsnFIKYaQTJiGUjasV7ufFLwjuE0gZ5pGTLRW1RvBlQYZRJR426k9hGKu6i4bJhBguWwaX7+QOeqqLlPEVDars06opdNjhyhLKFUl9MV X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0801MB1311; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(9101521062)(6040130)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041072)(6043046);SRVR:VI1PR0801MB1311;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0801MB1311; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1311;4:PuLgELacadYT8p9NkB2+pk6Z9iCLYYeeNoSiuijxkHLStane+Igr/IbyNzJXTw2eItcWdYTpmSBtKdKy6XV3feZW/m4SO2uMzcYgfx3isP/uS8Vc8dYqRmfXXiWSTCn3lyuvNqL+WWTzYGxv6Pu67Bat+q0Qf1AjSxDmuq6/HRSzNBdEz8mdVPrF9oYe3KNUmYcjA8d0NxU0NtoYk6Aq42uoiKxE9UscRXvTYSf0mauUoO0kJyc2STpNlr7jHKRT6sRn9CTKCYuhDszwJG56HQXCaTu771LlvL6EpaVlh7R7syKMOoSz9QTPg9ecYDNkAGCSnzRZUWa+QP055lzM9p7vQbsdZkW/F60SsG95rqxKtySLM4gL4siD9AFvhREEjgyXVu1LbUPdPAHZ2Ht5fpEuPRqN/P2+Bj8unFpmgAOBI+OuFVba097pA0jcAYuGXvNYhTLQz2kh0VqtzVTLbw== X-Forefront-PRVS: 0923977CCA X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(1096002)(189998001)(3846002)(6116002)(86362001)(586003)(229853001)(110136002)(107886002)(4001430100002)(50466002)(5003940100001)(77096005)(48376002)(33646002)(42186005)(19580395003)(19580405001)(53416004)(2351001)(92566002)(81166005)(4326007)(47776003)(66066001)(50986999)(76176999)(2906002)(5004730100002)(36756003);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR0801MB1311;H:dsafonov.sw.ru;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1311;23:zc6h1hOUygxJXmsDrWzbqk4zriAOgZcyWKVQm3T9f3OpCV9fCLpzU99pcTRIqWfwa5n+8qHQCM9HfVkGUEUapoJRVDrakxGZNaTJf9XGMGVYIgaqKXRvzV69NvKRaTxwz7GO/7j1Wj/C7kNMXIX3mwTApgA8yzP0U+I+AXvfr1gU5CT8PwYX/eXnl4aVHexbPuVD75G/pdC/n+/I+kxCgcJdP7n0XQTA8w5FDFVK6/wcBGrOnHdjr+ep7p6Zu9eI8vVD4DYG/C6ouhtlD95oJ4gceSzStjXL1xECbpsWqejH9v3MURdkYiKP80er3Jr4xAoBqB+Fy6AXFeXgitxdXpeM/r4Dtw6V9+jJDUBeva1zSGeShZI1fxpgO8JR6bgm3W3UadlDWT03y91DLpyRO9s0yjAGX0oFDBAyvXuWljxeqlmnl/ArkBOu1XJY12llfnJvkaSLEQcbx9n87q3hl2Z7nE64R3YqPRznMuKTF6f2iSVG0yPC/me1IwDlt86g9YpFGFp2ADUREXEXWvguqBlIwuAwbf7B49x6V572aLxDxeiYJWlSejxbp3LTWYO2MdVw7i74M9uNUBU/B9uQS+evRbe4F3D92/F/HKedOgr9OvGTQy8NrLcXgRD3BvDXmhH0zU+gLHr6BmTbSUdUEk4vSZyrkXJRFECVDDBBQ5qB5GQrr69vetd4SdIhOsnY1pAZBfj5QwLOvPNTuS1lIeK+ohczgYut/EUzktQPy5iDxPSfw7Be3snFh3FZp26HDbSK6flplVyJzx509LBHDTDWKSlhhvUKVPt1xfWdy1sSBopO1UD8yAEbsjXCKo+vGLYIC5ov334SuF7zUXGPh954FfmP/fP26huFI7lbegLWaL9VHq+6p39/6+XMOnyz X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1311;5:6qPA/wadS/re8+4Jy5fY7naNlVmbHnVTVyYcqZKTqnobZp0WlLbLJvNseeK/vhmoqb62JHYwGncRj7xBB4vffItylH2NVf3dik0Ix1D82VeELfIkZVaMHw0nY2kYTGxll1sHKB78+tNSerhBGweSBw==;24:x6y++OYX1xnol2MZHZWY5+rTPZFwJRD3kY/Y57Gh0TGF+zln8xgSRizTAVmFqScMmW4IzdxipjDqImGWmCxvjA/xU1u5amZHZHvKOLM22ng=;7:sJTagdT2Xr5RfBcdVLEhx9pJVBaX65gaBMsM8TpTZ67zpAqKt5q6hmaURGbmouVLNX08wOUAp5otGdlB7cZ+23rZ/XqzbNJhko/0oEgdImJ+Dkjzj/fckY+8o5lK+Tq/gE4lFvfsl8uUn+ulfODYuyEAkHxy4MQIdiCFgmKjy6oj9+9o7kDsnYQciM9cjFOW;20:E6gQDmuZayz+uFVwv33hZSAN2vj5XcaE89Pdlv7KbduHnKBrINkJI4ghZZ6o6ond1lmVNYBXQiO6rS866vCBrPqksaTBj0sgNTf8omAmU86XJzPrceIRR8krSUEuVZC2F2hibDxkDxqCSxyct34VNMjScxDLYRjs1pzNfMTuCDU= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2016 11:38:41.8802 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1311 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add possibility for userspace 32-bit applications to move vdso mapping. Previously, when userspace app called mremap for vdso, in return path it would land on previous address of vdso page, resulting in segmentation violation. Now it lands fine and returns to userspace with remapped vdso. This will also fix context.vdso pointer for 64-bit, which does not affect the user of vdso after mremap by now, but this may change. As suggested by Andy, return EINVAL for mremap that splits vdso image. Renamed and moved text_mapping structure declaration inside map_vdso, as it used only there and now it complement vvar_mapping variable. There is still problem for remapping vdso in glibc applications: linker relocates addresses for syscalls on vdso page, so you need to relink with the new addresses. Or the next syscall through glibc may fail: Program received signal SIGSEGV, Segmentation fault. #0 0xf7fd9b80 in __kernel_vsyscall () #1 0xf7ec8238 in _exit () from /usr/lib32/libc.so.6 Signed-off-by: Dmitry Safonov --- v8: add WARN_ON_ONCE on current->mm != new_vma->vm_mm v7: build fix v6: moved vdso_image_32 check and fixup code into vdso_fix_landing function with ifdefs around v5: as Andy suggested, add a check that new_vma->vm_mm and current->mm are the same, also check not only in_ia32_syscall() but image == &vdso_image_32 v4: drop __maybe_unused & use image from mm->context instead vdso_image_32 v3: as Andy suggested, return EINVAL in case of splitting vdso blob on mremap; used is_ia32_task instead of ifdefs v2: added __maybe_unused for pt_regs in vdso_mremap arch/x86/entry/vdso/vma.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- include/linux/mm_types.h | 3 +++ mm/mmap.c | 10 ++++++++++ 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c index 10f704584922..0625b66e5648 100644 --- a/arch/x86/entry/vdso/vma.c +++ b/arch/x86/entry/vdso/vma.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -98,10 +99,40 @@ static int vdso_fault(const struct vm_special_mapping *sm, return 0; } -static const struct vm_special_mapping text_mapping = { - .name = "[vdso]", - .fault = vdso_fault, -}; +static void vdso_fix_landing(const struct vdso_image *image, + struct vm_area_struct *new_vma) +{ +#if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION + if (in_ia32_syscall() && image == &vdso_image_32) { + struct pt_regs *regs = current_pt_regs(); + unsigned long vdso_land = image->sym_int80_landing_pad; + unsigned long old_land_addr = vdso_land + + (unsigned long)current->mm->context.vdso; + + /* Fixing userspace landing - look at do_fast_syscall_32 */ + if (regs->ip == old_land_addr) + regs->ip = new_vma->vm_start + vdso_land; + } +#endif +} + +static int vdso_mremap(const struct vm_special_mapping *sm, + struct vm_area_struct *new_vma) +{ + unsigned long new_size = new_vma->vm_end - new_vma->vm_start; + const struct vdso_image *image = current->mm->context.vdso_image; + + if (image->size != new_size) + return -EINVAL; + + if (WARN_ON_ONCE(current->mm != new_vma->vm_mm)) + return -EFAULT; + + vdso_fix_landing(image, new_vma); + current->mm->context.vdso = (void __user *)new_vma->vm_start; + + return 0; +} static int vvar_fault(const struct vm_special_mapping *sm, struct vm_area_struct *vma, struct vm_fault *vmf) @@ -162,6 +193,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr) struct vm_area_struct *vma; unsigned long addr, text_start; int ret = 0; + + static const struct vm_special_mapping vdso_mapping = { + .name = "[vdso]", + .fault = vdso_fault, + .mremap = vdso_mremap, + }; static const struct vm_special_mapping vvar_mapping = { .name = "[vvar]", .fault = vvar_fault, @@ -195,7 +232,7 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr) image->size, VM_READ|VM_EXEC| VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, - &text_mapping); + &vdso_mapping); if (IS_ERR(vma)) { ret = PTR_ERR(vma); diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index c2d75b4fa86c..4d16ab9287af 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -586,6 +586,9 @@ struct vm_special_mapping { int (*fault)(const struct vm_special_mapping *sm, struct vm_area_struct *vma, struct vm_fault *vmf); + + int (*mremap)(const struct vm_special_mapping *sm, + struct vm_area_struct *new_vma); }; enum tlb_flush_reason { diff --git a/mm/mmap.c b/mm/mmap.c index bd2e1a533bc1..ba71658dd1a1 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2930,9 +2930,19 @@ static const char *special_mapping_name(struct vm_area_struct *vma) return ((struct vm_special_mapping *)vma->vm_private_data)->name; } +static int special_mapping_mremap(struct vm_area_struct *new_vma) +{ + struct vm_special_mapping *sm = new_vma->vm_private_data; + + if (sm->mremap) + return sm->mremap(sm, new_vma); + return 0; +} + static const struct vm_operations_struct special_mapping_vmops = { .close = special_mapping_close, .fault = special_mapping_fault, + .mremap = special_mapping_mremap, .name = special_mapping_name, }; -- 2.8.0