From patchwork Tue Jun 29 01:20:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 12348723 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6D4AC11F64 for ; Tue, 29 Jun 2021 01:20:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 56D216198D for ; Tue, 29 Jun 2021 01:20:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 56D216198D Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2464F8D0073; Mon, 28 Jun 2021 21:20:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1CF3C8D0072; Mon, 28 Jun 2021 21:20:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 021388D0073; Mon, 28 Jun 2021 21:20:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0169.hostedemail.com [216.40.44.169]) by kanga.kvack.org (Postfix) with ESMTP id BB7238D0072 for ; Mon, 28 Jun 2021 21:20:19 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A12C91DAD8 for ; Tue, 29 Jun 2021 01:20:19 +0000 (UTC) X-FDA: 78305005758.15.2EA0CB2 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf30.hostedemail.com (Postfix) with ESMTP id 479D2E00025A for ; Tue, 29 Jun 2021 01:20:19 +0000 (UTC) Received: by mail-yb1-f202.google.com with SMTP id j190-20020a253cc70000b029054c72781aa2so18784801yba.9 for ; Mon, 28 Jun 2021 18:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=iL+VcdblBE9QT1+s5NM44X6VQElYqSgA8A+4/AHGVkM=; b=KZtQAJx1YZzltxCQ62cotIlu6sIjN/klJ8BRYr0JmHnudT+plhrcFQD0kfpc9LfBUT QB9nmIT2c3XUNOT27SEm2tjxaT9PDw/fbBIT8C1BigoVI6ltKhYS/Ms5tXh5QEHF4g8i sWFdqm+dPSxfT1xoi2YfGQVt0JQd7f0cj1TmgzR4ik7XcuUxfNNe6ZP0TYHSYGG7HZBY /rhwdEOGxISYbXBwIOhkf/Sy6JLmhghWxqMhT2mFuOvDM8HQuR5ufnKoY1MGtY8c4O0N Zs9Zrmnozul8ygaIRDwonUcNR8SUqJYUzWoC8eDexnZ/td4PlG0QTm3eUtakEqNCRyFL Ghag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=iL+VcdblBE9QT1+s5NM44X6VQElYqSgA8A+4/AHGVkM=; b=rQbCB8s7VHCYqhxsHPEVawBMBw4wA4fkY7ARQdYO5gmuTjanGSjKNajaSIQB8Kwbrh zPylm9BuNsCtc+4ZP1ou64m8c+OLpmCrcf/7GL6JyiYoldc7NheFCj5Ib8BZ/JAej6mZ vV5EpKpSijxS5gkWPLOP5PZ8sqIEmO1xuTTKZBft7xgA5eOryu4igYbmW9y8wmm50IQT uss3UiKr1RDJK3+2Yz10YW9wL5RfnOG6AztrQHJID6ytR5KLbmuxXZZvi7kn9u0KBubo 2D/aEKChmo88hvRAryJU0HcburbXjqeh+4PhD3iyZILjMPz8SV8n0PkSWdTblaroYbGP zA/A== X-Gm-Message-State: AOAM533twHFPU+mtmtc+pLJ80UPIsYQMK6UgvlYzvaPiqFZuNBycbdyY WiFaxiyouMO7mtl1mp/hkulXtnA= X-Google-Smtp-Source: ABdhPJw/aFPLRd94kV5L5F0Xa2+ETGux1At25LJN8f2k7Gnlnq61PIdliQGtfjR+pUwv1QelFrZQKZI= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:200:87ad:2cac:f512:1bf0]) (user=pcc job=sendgmr) by 2002:a25:aac2:: with SMTP id t60mr14395502ybi.419.1624929618512; Mon, 28 Jun 2021 18:20:18 -0700 (PDT) Date: Mon, 28 Jun 2021 18:20:10 -0700 Message-Id: <20210629012010.1948546-1-pcc@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog Subject: [PATCH] userfaultfd: preserve user-supplied address tag in struct uffd_msg From: Peter Collingbourne To: Catalin Marinas , Vincenzo Frascino , Dave Martin , Will Deacon , Andrew Morton , Andrea Arcangeli Cc: Peter Collingbourne , Alistair Delva , Lokesh Gidra , William McVicker , Evgenii Stepanov , Mitch Phillips , Linux ARM , linux-mm@kvack.org X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 479D2E00025A X-Stat-Signature: wzb53mkedw9979oexpbrs1baa8pz8j8i Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20161025 header.b=KZtQAJx1; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf30.hostedemail.com: domain of 3UnXaYAMKCLMiVVZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--pcc.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3UnXaYAMKCLMiVVZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--pcc.bounces.google.com X-HE-Tag: 1624929619-400031 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: If a user program uses userfaultfd on ranges of heap memory, it may end up passing a tagged pointer to the kernel in the range.start field of the UFFDIO_REGISTER ioctl. This can happen when using an MTE-capable allocator, or on Android if using the Tagged Pointers feature for MTE readiness [1]. When a fault subsequently occurs, the tag is stripped from the fault address returned to the application in the fault.address field of struct uffd_msg. However, from the application's perspective, the tagged address *is* the memory address, so if the application is unaware of memory tags, it may get confused by receiving an address that is, from its point of view, outside of the bounds of the allocation. We observed this behavior in the kselftest for userfaultfd [2] but other applications could have the same problem. Fix this by remembering which tag was used to originally register the userfaultfd and passing that tag back in fault.address. In a future enhancement, we may want to pass back the original fault address, but like SA_EXPOSE_TAGBITS, this should be guarded by a flag. [1] https://source.android.com/devices/tech/debug/tagged-pointers [2] tools/testing/selftests/vm/userfaultfd.c Signed-off-by: Peter Collingbourne Link: https://linux-review.googlesource.com/id/I761aa9f0344454c482b83fcfcce547db0a25501b --- Documentation/arm64/tagged-pointers.rst | 5 +++++ fs/userfaultfd.c | 17 +++++++++++------ include/linux/mm_types.h | 3 ++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Documentation/arm64/tagged-pointers.rst b/Documentation/arm64/tagged-pointers.rst index 19d284b70384..ec8e1f90b744 100644 --- a/Documentation/arm64/tagged-pointers.rst +++ b/Documentation/arm64/tagged-pointers.rst @@ -73,6 +73,11 @@ flag setting. Non-zero tags are never preserved in sigcontext.fault_address regardless of the SA_EXPOSE_TAGBITS flag setting. +When using userfaultfd the address tag supplied in the range.start +field of the UFFDIO_REGISTER ioctl is preserved and returned to +userspace via the fault.address field of struct uffd_msg, and the +tag of the original fault address is discarded. + The architecture prevents the use of a tagged PC, so the upper byte will be set to a sign-extension of bit 55 on exception return. diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index dd7a6c62b56f..adb0f7d0638a 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -110,15 +110,15 @@ static int userfaultfd_wake_function(wait_queue_entry_t *wq, unsigned mode, struct userfaultfd_wake_range *range = key; int ret; struct userfaultfd_wait_queue *uwq; - unsigned long start, len; + unsigned long start, len, addr; uwq = container_of(wq, struct userfaultfd_wait_queue, wq); ret = 0; /* len == 0 means wake all */ start = range->start; len = range->len; - if (len && (start > uwq->msg.arg.pagefault.address || - start + len <= uwq->msg.arg.pagefault.address)) + addr = untagged_addr(uwq->msg.arg.pagefault.address); + if (len && (start > addr || start + len <= addr)) goto out; WRITE_ONCE(uwq->waken, true); /* @@ -480,8 +480,9 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason) init_waitqueue_func_entry(&uwq.wq, userfaultfd_wake_function); uwq.wq.private = current; - uwq.msg = userfault_msg(vmf->address, vmf->flags, reason, - ctx->features); + uwq.msg = userfault_msg( + vmf->address + vmf->vma->vm_userfaultfd_ctx.address_tag, + vmf->flags, reason, ctx->features); uwq.ctx = ctx; uwq.waken = false; @@ -1287,7 +1288,7 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, unsigned long vm_flags, new_flags; bool found; bool basic_ioctls; - unsigned long start, end, vma_end; + unsigned long address_tag, start, end, vma_end; user_uffdio_register = (struct uffdio_register __user *) arg; @@ -1313,6 +1314,9 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, vm_flags |= VM_UFFD_MINOR; } + address_tag = uffdio_register.range.start - + untagged_addr(uffdio_register.range.start); + ret = validate_range(mm, &uffdio_register.range.start, uffdio_register.range.len); if (ret) @@ -1462,6 +1466,7 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, */ vma->vm_flags = new_flags; vma->vm_userfaultfd_ctx.ctx = ctx; + vma->vm_userfaultfd_ctx.address_tag = address_tag; if (is_vm_hugetlb_page(vma) && uffd_disable_huge_pmd_share(vma)) hugetlb_unshare_all_pmds(vma); diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 8f0fb62e8975..cb93e5b17896 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -286,9 +286,10 @@ struct vm_region { }; #ifdef CONFIG_USERFAULTFD -#define NULL_VM_UFFD_CTX ((struct vm_userfaultfd_ctx) { NULL, }) +#define NULL_VM_UFFD_CTX ((struct vm_userfaultfd_ctx) { NULL, 0, }) struct vm_userfaultfd_ctx { struct userfaultfd_ctx *ctx; + unsigned long address_tag; }; #else /* CONFIG_USERFAULTFD */ #define NULL_VM_UFFD_CTX ((struct vm_userfaultfd_ctx) {})