From patchwork Mon Jun 3 16:55:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10973329 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 59B716C5 for ; Mon, 3 Jun 2019 16:56:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 413B528684 for ; Mon, 3 Jun 2019 16:56:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33D222873C; Mon, 3 Jun 2019 16:56:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6F872873A for ; Mon, 3 Jun 2019 16:56:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3B1176B0277; Mon, 3 Jun 2019 12:56:14 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 35DB66B0278; Mon, 3 Jun 2019 12:56:14 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2022F6B0279; Mon, 3 Jun 2019 12:56:14 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by kanga.kvack.org (Postfix) with ESMTP id DB1FE6B0277 for ; Mon, 3 Jun 2019 12:56:13 -0400 (EDT) Received: by mail-qt1-f200.google.com with SMTP id c54so8088261qtc.14 for ; Mon, 03 Jun 2019 09:56:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=i5cRHHCicMsppSSBbFWeJPgqhQ8FMrYjuCKfr4hxLgs=; b=npPbK+KvitGD39XFjYKO5VvSPYvG0KRGdjJeQTVUHx4YFv00FLFOO91/WP9xwsITel /TYpUmAqNVT+H1wA5h43SF90AaprbOMiauzAxTyAeIlVKf6jeTtj2rOiu9VFkyuNZRDm rYvxo06NZ1AI08y5p8drh8Kpk160FByZDc4jNCNDiV+TSvoAZON202eT893EKMS0KFRg +iWu2rI3th0eRgdbNlE6DMr6K9637mcHG2PWlH81BLV55ZM/0v3aO+4fEqMkMZcSI9wO BIul03P+MDZa3Eikj64BRkOqcc7p7hYGqVyfsmPcyPYdUIwxvAjMJDpRnrEWZaQScNN1 8qdA== X-Gm-Message-State: APjAAAXnVRU92GVBEcZfN5Cje+tOIMnNFI4K7rj6EqJSGapvfvUfTMAr L7iDYsGAiWj2vFockFPh546/74Hl3paHGsblghO1oEbujqRc4qje0DZppH8J3mAy8HmDtoTjCl2 DCgiUyDhFjl2evVGmJBVvXyU27ul1D1clKBI3D9YhBg28kyjbTlj02+dmyn1j2+XOxQ== X-Received: by 2002:a0c:ae54:: with SMTP id z20mr8780884qvc.227.1559580973630; Mon, 03 Jun 2019 09:56:13 -0700 (PDT) X-Received: by 2002:a0c:ae54:: with SMTP id z20mr8780852qvc.227.1559580973196; Mon, 03 Jun 2019 09:56:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559580973; cv=none; d=google.com; s=arc-20160816; b=M8eR0R/YPNvYUluBn5Pyl3RT4LAO0dUqLFT2H2f+k2yyT/0kvgEEp3muJYdTD8da5G KKwSjY9Fm7VEUMkLUZspotYmwkZ7bo3lGceycIdqsCp2u/ipW5ljHvS0p/A7hVjMqLq0 CzAcltjhUSO8yD+VUI+iKwhEd0lG/kOSRjpuJmr97YxVNdYri7iTsV7weos07stIRlCh XIh0+GkRWJu90gka4hF4DMuuIGnA+2M7qp+iYcUczTL+LmqSjA59t3fDgcGqTf/Y9q+s /ASq1f1MbCsoLnofig51zdDCDSgE2EYLaRayZYJwi8RmCnrtNsXYcDjFkEhMHEd9pHgT DCfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:dkim-signature; bh=i5cRHHCicMsppSSBbFWeJPgqhQ8FMrYjuCKfr4hxLgs=; b=S3pYEZCrmDj6hoAMRObtOSdx4kYYnk0j4A3RzWk5PifJav6wz8Tn5Rhg2Hh6ABWJzu j9fMyRvVt08JXrwlGDbm0Ou1SlJ2vGd7tqdRHjHOYxIm+8l254bl9QLcb42JDZWPZ8Gy r+sge6dSyuyjcyRjNvkWoIMD6rghouaqeEupL2QqbzLco2c+AxFney+pA4DdyfNVtgex m2nosrZtoct1vTEgzTWE02M4dDCnhoBry1ZkwWPFyXj8W08JrR0U06OqyJqVbTJBE/xP BJlO+kx/NdUwHifQCyXhx98X0UoYqY1DraTmPJExuqEe4oGXJ+6LVLx1Y92AvHIXBwGn yAWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=sT3L0ZTG; spf=pass (google.com: domain of 3lfh1xaokcjev8yczj58g619916z.x97638fi-775gvx5.9c1@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3LFH1XAoKCJEv8yCzJ58G619916z.x97638FI-775Gvx5.9C1@flex--andreyknvl.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73]) by mx.google.com with SMTPS id u39sor2788947qte.45.2019.06.03.09.56.13 for (Google Transport Security); Mon, 03 Jun 2019 09:56:13 -0700 (PDT) Received-SPF: pass (google.com: domain of 3lfh1xaokcjev8yczj58g619916z.x97638fi-775gvx5.9c1@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=sT3L0ZTG; spf=pass (google.com: domain of 3lfh1xaokcjev8yczj58g619916z.x97638fi-775gvx5.9c1@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3LFH1XAoKCJEv8yCzJ58G619916z.x97638FI-775Gvx5.9C1@flex--andreyknvl.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=i5cRHHCicMsppSSBbFWeJPgqhQ8FMrYjuCKfr4hxLgs=; b=sT3L0ZTGkrRVM9BsAKw3Is1YEd5yvotnvZZfNxBe7skB1Imy3yNX3RzPcWZ3L4hBJj Ir4PWq35E8DDBUgoDYzLkuASMa2VdGiH7s1U8yAi9EYUyTsOvvYIL5k/dOIxx+s0hJjp ivARA7eJCU7WpCZIyl+ggUCauMPneV4kiO9mITdC3bmCRoqBY9+znI9pjppaD8UIqueE q8SkWjwj6UsZy3S43cNZjsMLUMGx3YCtYO4jYJeCvlUuA0j/KAAmJ8e05Wl5fyvRzmAY H4Wc9GjlHrhbudDD44rVO5eJTf6U73Fu89LC7maXdjap9rfTt5/4PxbL/ZJXa8oMOVpN Mbbw== X-Google-Smtp-Source: APXvYqxlndJ8+4ezg3WqxZgwPuj7croHV+8pOSI6UJilulRqZobP0HRc/RuNHVT76apRYIt7gunvINxeeY21hcHq X-Received: by 2002:ac8:2817:: with SMTP id 23mr23534732qtq.174.1559580972876; Mon, 03 Jun 2019 09:56:12 -0700 (PDT) Date: Mon, 3 Jun 2019 18:55:17 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.22.0.rc1.311.g5d7573a151-goog Subject: [PATCH v16 15/16] vfio/type1, arm64: untag user pointers in vaddr_get_pfn From: Andrey Konovalov To: linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-rdma@vger.kernel.org, linux-media@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: Catalin Marinas , Vincenzo Frascino , Will Deacon , Mark Rutland , Andrew Morton , Greg Kroah-Hartman , Kees Cook , Yishai Hadas , Felix Kuehling , Alexander Deucher , Christian Koenig , Mauro Carvalho Chehab , Jens Wiklander , Alex Williamson , Leon Romanovsky , Luc Van Oostenryck , Dave Martin , Khalid Aziz , enh , Jason Gunthorpe , Christoph Hellwig , Dmitry Vyukov , Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Robin Murphy , Kevin Brodsky , Szabolcs Nagy , Andrey Konovalov 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: X-Virus-Scanned: ClamAV using ClamSMTP This patch is a part of a series that extends arm64 kernel ABI to allow to pass tagged user pointers (with the top byte set to something else other than 0x00) as syscall arguments. vaddr_get_pfn() uses provided user pointers for vma lookups, which can only by done with untagged pointers. Untag user pointers in this function. Signed-off-by: Andrey Konovalov Reviewed-by: Kees Cook Reviewed-by: Catalin Marinas --- drivers/vfio/vfio_iommu_type1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 3ddc375e7063..528e39a1c2dd 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -384,6 +384,8 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr, down_read(&mm->mmap_sem); + vaddr = untagged_addr(vaddr); + vma = find_vma_intersection(mm, vaddr, vaddr + 1); if (vma && vma->vm_flags & VM_PFNMAP) {