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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, 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 8159DC28CC5 for ; Sat, 8 Jun 2019 03:52:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 552A620833 for ; Sat, 8 Jun 2019 03:52:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rq0ze1HY"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="CtSxM/iJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 552A620833 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9MGb50VPVRB0yt6eY3cz8xqChXXr/CRphC/3u9Q3yDU=; b=rq0ze1HYle/9ZT XXhfK2PK5mpnghSgoke13gzrIxy8ALNvmvDrhZwi6hBBHAbkwE6cRazzo0NAKf1ET1xJ3Pdqb9W49 BfVgkJRC421xxxHiVLyyot4pELtO10xjKlH7oWnWMEbW8oNSlK8D0Yvo1oEP0TURBcjrYtxDFf2Pg RJ9qto97H/MwQCW4Fjwcyvq+ovPsygdeeCnKTw/Jml7yi9oxwQse9Lh+Y3JRHACY0FBfRCqPkrqPU tvYLGlWdfpigqFhiC+vFxJHKdmcB794qPb+CTuLTUKc+7oxJiEzmhDYArqqFHOrWLmuAfKn4bsFVL mEpDdunbV40/IkBH6sQQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hZSOZ-00011y-PY; Sat, 08 Jun 2019 03:51:55 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hZSOU-0000zk-PR for linux-arm-kernel@lists.infradead.org; Sat, 08 Jun 2019 03:51:53 +0000 Received: by mail-pg1-x543.google.com with SMTP id d30so2133305pgm.7 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=YHIhAsbR/xRjHJpRF9YI9LWwDWKzM97qDxuhSzUm81Hc4pgbTIWqDh+wwacxTtxI8k Ehox8BaBb+Wjvcmi7TLspKIryywGF4gCfkfMJNUmKM2iL90KtM6JLlLI0RRfj46qxhzP N8vCl7v9IAuiFuj9bxUKr2dICJlXJRjHlDpToODehv2eHo7T8zTrKBXrWZmBF6n0Ln68 VLxDUHKyHOysVmElyGDfbkG3EOtEA2zdOvecXWACcRLmj1P6/XzgYQU04dXO/TB4fFR0 Dga9Nti0Y+tjxiszw/yumQDoAv/2D3KPu+c+AZXz8/39WKggQs3lw/Ld7Z1RmalYllEu yQ7Q== X-Gm-Message-State: APjAAAUm3emEhffYgjRmi/SeXtC4xLNur6EtRoVxr7YWljsWpI/Ypg69 pnYDiQjTZr+4bVLOXk3ZMamC+Q== 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 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-Disposition: inline In-Reply-To: <045a94326401693e015bf80c444a4d946a5c68ed.1559580831.git.andreyknvl@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190607_205150_828490_998E3378 X-CRM114-Status: GOOD ( 20.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , kvm@vger.kernel.org, Szabolcs Nagy , Catalin Marinas , Will Deacon , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Khalid Aziz , linux-kselftest@vger.kernel.org, Felix Kuehling , Vincenzo Frascino , Jacob Bramley , Leon Romanovsky , linux-rdma@vger.kernel.org, amd-gfx@lists.freedesktop.org, Christoph Hellwig , Jason Gunthorpe , Dmitry Vyukov , Dave Martin , Evgeniy Stepanov , linux-media@vger.kernel.org, Kevin Brodsky , Ruben Ayrapetyan , Ramana Radhakrishnan , Alex Williamson , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, Kostya Serebryany , Greg Kroah-Hartman , Yishai Hadas , linux-kernel@vger.kernel.org, Jens Wiklander , Lee Smith , Alexander Deucher , Andrew Morton , enh , Robin Murphy , Christian Koenig , Luc Van Oostenryck Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel