From: Andrey Konovalov <andreyknvl@google.com> 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 <catalin.marinas@arm.com>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Will Deacon <will.deacon@arm.com>, Mark Rutland <mark.rutland@arm.com>, Andrew Morton <akpm@linux-foundation.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Kees Cook <keescook@chromium.org>, Yishai Hadas <yishaih@mellanox.com>, Felix Kuehling <Felix.Kuehling@amd.com>, Alexander Deucher <Alexander.Deucher@amd.com>, Christian Koenig <Christian.Koenig@amd.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Jens Wiklander <jens.wiklander@linaro.org>, Alex Williamson <alex.williamson@redhat.com>, Leon Romanovsky <leon@kernel.org>, Luc Van Oostenryck <luc.vanoostenryck@gmail.com>, Dave Martin <Dave.Martin@arm.com>, Khalid Aziz <khalid.aziz@oracle.com>, enh <enh@google.com>, Jason Gunthorpe <jgg@ziepe.ca>, Christoph Hellwig <hch@infradead.org>, Dmitry Vyukov <dvyukov@google.com>, Kostya Serebryany <kcc@google.com>, Evgeniy Stepanov <eugenis@google.com>, Lee Smith <Lee.Smith@arm.com>, Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>, Jacob Bramley <Jacob.Bramley@arm.com>, Ruben Ayrapetyan <Ruben.Ayrapetyan@arm.com>, Robin Murphy <robin.murphy@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, Szabolcs Nagy <Szabolcs.Nagy@arm.com>, Andrey Konovalov <andreyknvl@google.com> Subject: [PATCH v17 14/15] vfio/type1, arm64: untag user pointers in vaddr_get_pfn Date: Wed, 12 Jun 2019 13:43:31 +0200 Message-ID: <e86d8cd6bd0ade9cce6304594bcaf0c8e7f788b0.1560339705.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1560339705.git.andreyknvl@google.com> 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. Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- 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) { -- 2.22.0.rc2.383.gf4fbbf30c2-goog
next prev parent reply index Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-12 11:43 [PATCH v17 00/15] arm64: untag user pointers passed to the kernel Andrey Konovalov 2019-06-12 11:43 ` [PATCH v17 01/15] arm64: untag user pointers in access_ok and __uaccess_mask_ptr Andrey Konovalov 2019-06-12 14:26 ` Vincenzo Frascino 2019-06-12 11:43 ` [PATCH v17 02/15] lib, arm64: untag user pointers in strn*_user Andrey Konovalov 2019-06-12 14:28 ` Vincenzo Frascino 2019-06-12 11:43 ` [PATCH v17 03/15] arm64: Introduce prctl() options to control the tagged user addresses ABI Andrey Konovalov 2019-06-12 14:30 ` Vincenzo Frascino 2019-06-12 14:55 ` Catalin Marinas 2019-06-13 11:02 ` Dave Martin 2019-06-13 15:26 ` Catalin Marinas 2019-06-14 5:13 ` Kees Cook 2019-06-18 9:18 ` Dave Martin 2019-06-13 11:16 ` Dave Martin 2019-06-13 15:35 ` Catalin Marinas 2019-06-13 15:45 ` Vincenzo Frascino 2019-06-13 15:57 ` Catalin Marinas 2019-06-13 16:15 ` Vincenzo Frascino 2019-06-17 13:56 ` Catalin Marinas 2019-06-17 16:56 ` Szabolcs Nagy 2019-06-17 16:57 ` Evgenii Stepanov 2019-06-17 17:18 ` Catalin Marinas 2019-06-17 21:59 ` Evgenii Stepanov 2019-06-19 14:45 ` Andrey Konovalov 2019-06-19 15:29 ` Catalin Marinas 2019-06-12 11:43 ` [PATCH v17 04/15] mm, arm64: untag user pointers passed to memory syscalls Andrey Konovalov 2019-06-12 14:31 ` Vincenzo Frascino 2019-06-19 15:55 ` Khalid Aziz 2019-06-19 16:46 ` Khalid Aziz 2019-06-24 14:22 ` Andrey Konovalov 2019-06-12 11:43 ` [PATCH v17 05/15] mm, arm64: untag user pointers in mm/gup.c Andrey Konovalov 2019-06-12 14:33 ` Vincenzo Frascino 2019-06-19 16:41 ` Khalid Aziz 2019-06-12 11:43 ` [PATCH v17 06/15] mm, arm64: untag user pointers in get_vaddr_frames Andrey Konovalov 2019-06-12 14:34 ` Vincenzo Frascino 2019-06-19 16:48 ` Khalid Aziz 2019-06-12 11:43 ` [PATCH v17 07/15] fs, arm64: untag user pointers in copy_mount_options Andrey Konovalov 2019-06-12 14:35 ` Vincenzo Frascino 2019-06-19 20:01 ` Khalid Aziz 2019-06-12 11:43 ` [PATCH v17 08/15] userfaultfd, arm64: untag user pointers Andrey Konovalov 2019-06-12 14:40 ` Vincenzo Frascino 2019-06-12 11:43 ` [PATCH v17 09/15] drm/amdgpu, " Andrey Konovalov 2019-06-12 11:43 ` [PATCH v17 10/15] drm/radeon, arm64: untag user pointers in radeon_gem_userptr_ioctl Andrey Konovalov 2019-06-12 11:43 ` [PATCH v17 11/15] IB/mlx4, arm64: untag user pointers in mlx4_get_umem_mr Andrey Konovalov 2019-06-12 11:43 ` [PATCH v17 12/15] media/v4l2-core, arm64: untag user pointers in videobuf_dma_contig_user_get Andrey Konovalov 2019-06-19 20:05 ` Khalid Aziz 2019-06-12 11:43 ` [PATCH v17 13/15] tee/shm, arm64: untag user pointers in tee_shm_register Andrey Konovalov 2019-06-12 11:43 ` Andrey Konovalov [this message] 2019-06-12 14:41 ` [PATCH v17 14/15] vfio/type1, arm64: untag user pointers in vaddr_get_pfn Vincenzo Frascino 2019-06-12 15:58 ` Auger Eric 2019-06-12 11:43 ` [PATCH v17 15/15] selftests, arm64: add a selftest for passing tagged pointers to kernel Andrey Konovalov 2019-06-12 12:30 ` Szabolcs Nagy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=e86d8cd6bd0ade9cce6304594bcaf0c8e7f788b0.1560339705.git.andreyknvl@google.com \ --to=andreyknvl@google.com \ --cc=Alexander.Deucher@amd.com \ --cc=Christian.Koenig@amd.com \ --cc=Dave.Martin@arm.com \ --cc=Felix.Kuehling@amd.com \ --cc=Jacob.Bramley@arm.com \ --cc=Lee.Smith@arm.com \ --cc=Ramana.Radhakrishnan@arm.com \ --cc=Ruben.Ayrapetyan@arm.com \ --cc=Szabolcs.Nagy@arm.com \ --cc=akpm@linux-foundation.org \ --cc=alex.williamson@redhat.com \ --cc=amd-gfx@lists.freedesktop.org \ --cc=catalin.marinas@arm.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=dvyukov@google.com \ --cc=enh@google.com \ --cc=eugenis@google.com \ --cc=gregkh@linuxfoundation.org \ --cc=hch@infradead.org \ --cc=jens.wiklander@linaro.org \ --cc=jgg@ziepe.ca \ --cc=kcc@google.com \ --cc=keescook@chromium.org \ --cc=kevin.brodsky@arm.com \ --cc=khalid.aziz@oracle.com \ --cc=kvm@vger.kernel.org \ --cc=leon@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-rdma@vger.kernel.org \ --cc=luc.vanoostenryck@gmail.com \ --cc=mark.rutland@arm.com \ --cc=mchehab@kernel.org \ --cc=robin.murphy@arm.com \ --cc=vincenzo.frascino@arm.com \ --cc=will.deacon@arm.com \ --cc=yishaih@mellanox.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
KVM Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/kvm/0 kvm/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 kvm kvm/ https://lore.kernel.org/kvm \ kvm@vger.kernel.org public-inbox-index kvm Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.kvm AGPL code for this site: git clone https://public-inbox.org/public-inbox.git