From patchwork Sat Dec 18 10:35:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paraschiv, Andra-Irina" X-Patchwork-Id: 12686025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB54FC4332F for ; Sat, 18 Dec 2021 10:36:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231526AbhLRKgC (ORCPT ); Sat, 18 Dec 2021 05:36:02 -0500 Received: from smtp-fw-80007.amazon.com ([99.78.197.218]:64265 "EHLO smtp-fw-80007.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229536AbhLRKgB (ORCPT ); Sat, 18 Dec 2021 05:36:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1639823761; x=1671359761; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/rNukEk/AKgue/4kHvkeqzceFYvg0qcH59Ha0VvFu6A=; b=dH1o88zsSAUlKLiD1wAnNE88xq/50+hMM6ux4MAXRAcMZrVAoty7FTug WJ3vk0yEsea17Ob8G3UiH9eCSsyJKZWC4m6cXZFNWmON01fEjTDNVsQun rgN0jQZaPBAdi3Uc3NxLPdSMIs74ULwuPgWgGRzfqs0pD9GziHlQJ9PlA k=; X-IronPort-AV: E=Sophos;i="5.88,216,1635206400"; d="scan'208";a="49408652" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-pdx-2a-5feb294a.us-west-2.amazon.com) ([10.25.36.210]) by smtp-border-fw-80007.pdx80.corp.amazon.com with ESMTP; 18 Dec 2021 10:35:47 +0000 Received: from EX13D16EUB003.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan3.pdx.amazon.com [10.236.137.198]) by email-inbound-relay-pdx-2a-5feb294a.us-west-2.amazon.com (Postfix) with ESMTPS id 3BF629F674; Sat, 18 Dec 2021 10:35:41 +0000 (UTC) Received: from dev-dsk-andraprs-1c-9ffe7195.eu-west-1.amazon.com (10.43.162.55) by EX13D16EUB003.ant.amazon.com (10.43.166.99) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Sat, 18 Dec 2021 10:35:35 +0000 From: Andra Paraschiv To: linux-kernel CC: Alexandru Ciobotaru , Greg KH , Alexandru Vasile , "Marcelo Cerri" , Paolo Bonzini , Stefano Garzarella , Stefan Hajnoczi , Tim Gardner , "Vitaly Kuznetsov" , kvm , ne-devel-upstream , stable , "Andra Paraschiv" Subject: =?utf-8?q?=5BPATCH_v1=C2=A0=5D_nitro=5Fenclaves=3A_Add_mmap=5Fread?= =?utf-8?q?=5Flock=28=29_for_the_get=5Fuser=5Fpages=28=29_call?= Date: Sat, 18 Dec 2021 10:35:25 +0000 Message-ID: <20211218103525.26739-1-andraprs@amazon.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Originating-IP: [10.43.162.55] X-ClientProxiedBy: EX13D02UWB002.ant.amazon.com (10.43.161.160) To EX13D16EUB003.ant.amazon.com (10.43.166.99) Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org After commit 5b78ed24e8ec (mm/pagemap: add mmap_assert_locked() annotations to find_vma*()), the call to get_user_pages() will trigger the mmap assert. static inline void mmap_assert_locked(struct mm_struct *mm) { lockdep_assert_held(&mm->mmap_lock); VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_lock), mm); } [ 62.521410] kernel BUG at include/linux/mmap_lock.h:156! ........................................................... [ 62.538938] RIP: 0010:find_vma+0x32/0x80 ........................................................... [ 62.605889] Call Trace: [ 62.608502] [ 62.610956] ? lock_timer_base+0x61/0x80 [ 62.614106] find_extend_vma+0x19/0x80 [ 62.617195] __get_user_pages+0x9b/0x6a0 [ 62.620356] __gup_longterm_locked+0x42d/0x450 [ 62.623721] ? finish_wait+0x41/0x80 [ 62.626748] ? __kmalloc+0x178/0x2f0 [ 62.629768] ne_set_user_memory_region_ioctl.isra.0+0x225/0x6a0 [nitro_enclaves] [ 62.635776] ne_enclave_ioctl+0x1cf/0x6d7 [nitro_enclaves] [ 62.639541] __x64_sys_ioctl+0x82/0xb0 [ 62.642620] do_syscall_64+0x3b/0x90 [ 62.645642] entry_SYSCALL_64_after_hwframe+0x44/0xae Add mmap_read_lock() for the get_user_pages() call when setting the enclave memory regions. Signed-off-by: Andra Paraschiv Cc: stable@vger.kernel.org --- drivers/virt/nitro_enclaves/ne_misc_dev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c index 8939612ee0e0..6c51ff024036 100644 --- a/drivers/virt/nitro_enclaves/ne_misc_dev.c +++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c @@ -886,8 +886,13 @@ static int ne_set_user_memory_region_ioctl(struct ne_enclave *ne_enclave, goto put_pages; } + mmap_read_lock(current->mm); + gup_rc = get_user_pages(mem_region.userspace_addr + memory_size, 1, FOLL_GET, ne_mem_region->pages + i, NULL); + + mmap_read_unlock(current->mm); + if (gup_rc < 0) { rc = gup_rc;