From mboxrd@z Thu Jan 1 00:00:00 1970 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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED autolearn=unavailable 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 3AB63C468BC for ; Sat, 8 Jun 2019 03:52:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0812B212F5 for ; Sat, 8 Jun 2019 03:52:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="CtSxM/iJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730484AbfFHDwP (ORCPT ); Fri, 7 Jun 2019 23:52:15 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:35874 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731001AbfFHDwP (ORCPT ); Fri, 7 Jun 2019 23:52:15 -0400 Received: by mail-pf1-f193.google.com with SMTP id u22so2235078pfm.3 for ; Fri, 07 Jun 2019 20:51:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=+sAqEcYebSGTQqNUHJjZvXdBrlSAt8m9jXPFyYB00fA=; b=CtSxM/iJFdFOilMt5IYz49fhtrPJpe1biMjSLL9dNHxYjLjFZgiPdCXtt2Os7+WUWp 2h97ew7Js16BFPaL91oYsoUi+i2fwl58zxZoJKC+5LpNlJocOwDirIXVuEvjdms0IvZ/ xj006iO3/Sm/g4St20TSl0BbuhpEFIrb4EXp0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=+sAqEcYebSGTQqNUHJjZvXdBrlSAt8m9jXPFyYB00fA=; b=MeJWAO/NDiWBak7/5Dbq4EEXLU4Z09JPlRDDymOTP6R+sJyow3vtUXJqv8+N81he+s B4X44ncFJ70IYkmoY6EUQD8akzHzTiCqL12Lo1lA64YbrewjBu/rE8xxNvOCd6So7/BK +kJDHFaGBeYveI5i+P50BsDfrsXwGecb2V1u/YyFI6u+uLAd+7LhYWpaeS1XyO9WV/Re nN/DfibUOn29w44vQfuCKFccPGvfsqSEa3aSSMZpvDItNg2r6oiEbhX66gDiYOx6Wd8C Mb2BAfbBeGDqfT8naOhG4Ww+5mI2KVZQD7fWa4EsV1GeDjOiyiJDpMyQfBugOSuEsqSb RffA== X-Gm-Message-State: APjAAAUsT6jBd4cwN7lCxaeqtwvjM6IMpMg5GaagBOHOiFgpL1SvCnrf i6FSVgaa2VtCkzezUHr2UNgoTA== X-Google-Smtp-Source: APXvYqwaFwR9TdiH8fcP0E7/plCUQ2bJqcAs+FgbmWIC/6eFKnV6hJ+Yk3YTH/8Vcg8+zQmbsZgqwQ== X-Received: by 2002:a17:90a:b104:: with SMTP id z4mr9232885pjq.102.1559965909964; Fri, 07 Jun 2019 20:51:49 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id k13sm3360691pgq.45.2019.06.07.20.51.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jun 2019 20:51:49 -0700 (PDT) Date: Fri, 7 Jun 2019 20:51:48 -0700 From: Kees Cook To: Andrey Konovalov Cc: 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, Catalin Marinas , Vincenzo Frascino , Will Deacon , Mark Rutland , Andrew Morton , Greg Kroah-Hartman , 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 Subject: Re: [PATCH v16 05/16] arm64: untag user pointers passed to memory syscalls Message-ID: <201906072051.7B66635BE@keescook> References: <045a94326401693e015bf80c444a4d946a5c68ed.1559580831.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <045a94326401693e015bf80c444a4d946a5c68ed.1559580831.git.andreyknvl@google.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Mon, Jun 03, 2019 at 06:55:07PM +0200, Andrey Konovalov wrote: > 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. > > This patch allows tagged pointers to be passed to the following memory > syscalls: get_mempolicy, madvise, mbind, mincore, mlock, mlock2, mprotect, > mremap, msync, munlock. > > Signed-off-by: Andrey Konovalov Reviewed-by: Kees Cook -Kees > --- > mm/madvise.c | 2 ++ > mm/mempolicy.c | 3 +++ > mm/mincore.c | 2 ++ > mm/mlock.c | 4 ++++ > mm/mprotect.c | 2 ++ > mm/mremap.c | 2 ++ > mm/msync.c | 2 ++ > 7 files changed, 17 insertions(+) > > diff --git a/mm/madvise.c b/mm/madvise.c > index 628022e674a7..39b82f8a698f 100644 > --- a/mm/madvise.c > +++ b/mm/madvise.c > @@ -810,6 +810,8 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior) > size_t len; > struct blk_plug plug; > > + start = untagged_addr(start); > + > if (!madvise_behavior_valid(behavior)) > return error; > > diff --git a/mm/mempolicy.c b/mm/mempolicy.c > index 01600d80ae01..78e0a88b2680 100644 > --- a/mm/mempolicy.c > +++ b/mm/mempolicy.c > @@ -1360,6 +1360,7 @@ static long kernel_mbind(unsigned long start, unsigned long len, > int err; > unsigned short mode_flags; > > + start = untagged_addr(start); > mode_flags = mode & MPOL_MODE_FLAGS; > mode &= ~MPOL_MODE_FLAGS; > if (mode >= MPOL_MAX) > @@ -1517,6 +1518,8 @@ static int kernel_get_mempolicy(int __user *policy, > int uninitialized_var(pval); > nodemask_t nodes; > > + addr = untagged_addr(addr); > + > if (nmask != NULL && maxnode < nr_node_ids) > return -EINVAL; > > diff --git a/mm/mincore.c b/mm/mincore.c > index c3f058bd0faf..64c322ed845c 100644 > --- a/mm/mincore.c > +++ b/mm/mincore.c > @@ -249,6 +249,8 @@ SYSCALL_DEFINE3(mincore, unsigned long, start, size_t, len, > unsigned long pages; > unsigned char *tmp; > > + start = untagged_addr(start); > + > /* Check the start address: needs to be page-aligned.. */ > if (start & ~PAGE_MASK) > return -EINVAL; > diff --git a/mm/mlock.c b/mm/mlock.c > index 080f3b36415b..e82609eaa428 100644 > --- a/mm/mlock.c > +++ b/mm/mlock.c > @@ -674,6 +674,8 @@ static __must_check int do_mlock(unsigned long start, size_t len, vm_flags_t fla > unsigned long lock_limit; > int error = -ENOMEM; > > + start = untagged_addr(start); > + > if (!can_do_mlock()) > return -EPERM; > > @@ -735,6 +737,8 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len) > { > int ret; > > + start = untagged_addr(start); > + > len = PAGE_ALIGN(len + (offset_in_page(start))); > start &= PAGE_MASK; > > diff --git a/mm/mprotect.c b/mm/mprotect.c > index bf38dfbbb4b4..19f981b733bc 100644 > --- a/mm/mprotect.c > +++ b/mm/mprotect.c > @@ -465,6 +465,8 @@ static int do_mprotect_pkey(unsigned long start, size_t len, > const bool rier = (current->personality & READ_IMPLIES_EXEC) && > (prot & PROT_READ); > > + start = untagged_addr(start); > + > prot &= ~(PROT_GROWSDOWN|PROT_GROWSUP); > if (grows == (PROT_GROWSDOWN|PROT_GROWSUP)) /* can't be both */ > return -EINVAL; > diff --git a/mm/mremap.c b/mm/mremap.c > index fc241d23cd97..1d98281f7204 100644 > --- a/mm/mremap.c > +++ b/mm/mremap.c > @@ -606,6 +606,8 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, > LIST_HEAD(uf_unmap_early); > LIST_HEAD(uf_unmap); > > + addr = untagged_addr(addr); > + > if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE)) > return ret; > > diff --git a/mm/msync.c b/mm/msync.c > index ef30a429623a..c3bd3e75f687 100644 > --- a/mm/msync.c > +++ b/mm/msync.c > @@ -37,6 +37,8 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags) > int unmapped_error = 0; > int error = -EINVAL; > > + start = untagged_addr(start); > + > if (flags & ~(MS_ASYNC | MS_INVALIDATE | MS_SYNC)) > goto out; > if (offset_in_page(start)) > -- > 2.22.0.rc1.311.g5d7573a151-goog > -- Kees Cook