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=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 DAE64C10F00 for ; Mon, 18 Mar 2019 11:47:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A772420854 for ; Mon, 18 Mar 2019 11:47:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727533AbfCRLrZ (ORCPT ); Mon, 18 Mar 2019 07:47:25 -0400 Received: from foss.arm.com ([217.140.101.70]:60942 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727079AbfCRLrY (ORCPT ); Mon, 18 Mar 2019 07:47:24 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 02AC81650; Mon, 18 Mar 2019 04:47:24 -0700 (PDT) Received: from [10.1.199.35] (e107154-lin.cambridge.arm.com [10.1.199.35]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D824F3F614; Mon, 18 Mar 2019 04:47:17 -0700 (PDT) Subject: Re: [PATCH v11 09/14] kernel, arm64: untag user pointers in prctl_set_mm* To: Andrey Konovalov , Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Kees Cook , Kate Stewart , Greg Kroah-Hartman , Andrew Morton , Ingo Molnar , "Kirill A . Shutemov" , Shuah Khan , Vincenzo Frascino , Eric Dumazet , "David S. Miller" , Alexei Starovoitov , Daniel Borkmann , Steven Rostedt , Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Dmitry Vyukov , Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Chintan Pandya , Luc Van Oostenryck , Dave Martin , Szabolcs Nagy References: From: Kevin Brodsky Message-ID: <96675b72-d325-0682-4864-b6a96f63f8fd@arm.com> Date: Mon, 18 Mar 2019 11:47:15 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 15/03/2019 19:51, 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. > > prctl_set_mm() and prctl_set_mm_map() use provided user pointers for vma > lookups, which can only by done with untagged pointers. > > Untag user pointers in these functions. > > Signed-off-by: Andrey Konovalov > --- > kernel/sys.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/kernel/sys.c b/kernel/sys.c > index 12df0e5434b8..8e56d87cc6db 100644 > --- a/kernel/sys.c > +++ b/kernel/sys.c > @@ -1993,6 +1993,18 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data > if (copy_from_user(&prctl_map, addr, sizeof(prctl_map))) > return -EFAULT; > > + prctl_map->start_code = untagged_addr(prctl_map.start_code); > + prctl_map->end_code = untagged_addr(prctl_map.end_code); > + prctl_map->start_data = untagged_addr(prctl_map.start_data); > + prctl_map->end_data = untagged_addr(prctl_map.end_data); > + prctl_map->start_brk = untagged_addr(prctl_map.start_brk); > + prctl_map->brk = untagged_addr(prctl_map.brk); > + prctl_map->start_stack = untagged_addr(prctl_map.start_stack); > + prctl_map->arg_start = untagged_addr(prctl_map.arg_start); > + prctl_map->arg_end = untagged_addr(prctl_map.arg_end); > + prctl_map->env_start = untagged_addr(prctl_map.env_start); > + prctl_map->env_end = untagged_addr(prctl_map.env_end); As the buildbot suggests, those -> should be . instead :) You might want to check your local build with CONFIG_CHECKPOINT_RESTORE=y. > + > error = validate_prctl_map(&prctl_map); > if (error) > return error; > @@ -2106,6 +2118,8 @@ static int prctl_set_mm(int opt, unsigned long addr, > opt != PR_SET_MM_MAP_SIZE))) > return -EINVAL; > > + addr = untagged_addr(addr); This is a bit too coarse, addr is indeed used for find_vma() later on, but it is also used to access memory, by prctl_set_mm_mmap() and prctl_set_auxv(). Kevin > + > #ifdef CONFIG_CHECKPOINT_RESTORE > if (opt == PR_SET_MM_MAP || opt == PR_SET_MM_MAP_SIZE) > return prctl_set_mm_map(opt, (const void __user *)addr, arg4); From mboxrd@z Thu Jan 1 00:00:00 1970 From: kevin.brodsky at arm.com (Kevin Brodsky) Date: Mon, 18 Mar 2019 11:47:15 +0000 Subject: [PATCH v11 09/14] kernel, arm64: untag user pointers in prctl_set_mm* In-Reply-To: References: Message-ID: <96675b72-d325-0682-4864-b6a96f63f8fd@arm.com> On 15/03/2019 19:51, 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. > > prctl_set_mm() and prctl_set_mm_map() use provided user pointers for vma > lookups, which can only by done with untagged pointers. > > Untag user pointers in these functions. > > Signed-off-by: Andrey Konovalov > --- > kernel/sys.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/kernel/sys.c b/kernel/sys.c > index 12df0e5434b8..8e56d87cc6db 100644 > --- a/kernel/sys.c > +++ b/kernel/sys.c > @@ -1993,6 +1993,18 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data > if (copy_from_user(&prctl_map, addr, sizeof(prctl_map))) > return -EFAULT; > > + prctl_map->start_code = untagged_addr(prctl_map.start_code); > + prctl_map->end_code = untagged_addr(prctl_map.end_code); > + prctl_map->start_data = untagged_addr(prctl_map.start_data); > + prctl_map->end_data = untagged_addr(prctl_map.end_data); > + prctl_map->start_brk = untagged_addr(prctl_map.start_brk); > + prctl_map->brk = untagged_addr(prctl_map.brk); > + prctl_map->start_stack = untagged_addr(prctl_map.start_stack); > + prctl_map->arg_start = untagged_addr(prctl_map.arg_start); > + prctl_map->arg_end = untagged_addr(prctl_map.arg_end); > + prctl_map->env_start = untagged_addr(prctl_map.env_start); > + prctl_map->env_end = untagged_addr(prctl_map.env_end); As the buildbot suggests, those -> should be . instead :) You might want to check your local build with CONFIG_CHECKPOINT_RESTORE=y. > + > error = validate_prctl_map(&prctl_map); > if (error) > return error; > @@ -2106,6 +2118,8 @@ static int prctl_set_mm(int opt, unsigned long addr, > opt != PR_SET_MM_MAP_SIZE))) > return -EINVAL; > > + addr = untagged_addr(addr); This is a bit too coarse, addr is indeed used for find_vma() later on, but it is also used to access memory, by prctl_set_mm_mmap() and prctl_set_auxv(). Kevin > + > #ifdef CONFIG_CHECKPOINT_RESTORE > if (opt == PR_SET_MM_MAP || opt == PR_SET_MM_MAP_SIZE) > return prctl_set_mm_map(opt, (const void __user *)addr, arg4); From mboxrd@z Thu Jan 1 00:00:00 1970 From: kevin.brodsky@arm.com (Kevin Brodsky) Date: Mon, 18 Mar 2019 11:47:15 +0000 Subject: [PATCH v11 09/14] kernel, arm64: untag user pointers in prctl_set_mm* In-Reply-To: References: Message-ID: <96675b72-d325-0682-4864-b6a96f63f8fd@arm.com> Content-Type: text/plain; charset="UTF-8" Message-ID: <20190318114715.q6nz6RlCDlv7RTsDm9H5UFzwAvjl_ch5fs_a-msAv1g@z> On 15/03/2019 19:51, 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. > > prctl_set_mm() and prctl_set_mm_map() use provided user pointers for vma > lookups, which can only by done with untagged pointers. > > Untag user pointers in these functions. > > Signed-off-by: Andrey Konovalov > --- > kernel/sys.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/kernel/sys.c b/kernel/sys.c > index 12df0e5434b8..8e56d87cc6db 100644 > --- a/kernel/sys.c > +++ b/kernel/sys.c > @@ -1993,6 +1993,18 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data > if (copy_from_user(&prctl_map, addr, sizeof(prctl_map))) > return -EFAULT; > > + prctl_map->start_code = untagged_addr(prctl_map.start_code); > + prctl_map->end_code = untagged_addr(prctl_map.end_code); > + prctl_map->start_data = untagged_addr(prctl_map.start_data); > + prctl_map->end_data = untagged_addr(prctl_map.end_data); > + prctl_map->start_brk = untagged_addr(prctl_map.start_brk); > + prctl_map->brk = untagged_addr(prctl_map.brk); > + prctl_map->start_stack = untagged_addr(prctl_map.start_stack); > + prctl_map->arg_start = untagged_addr(prctl_map.arg_start); > + prctl_map->arg_end = untagged_addr(prctl_map.arg_end); > + prctl_map->env_start = untagged_addr(prctl_map.env_start); > + prctl_map->env_end = untagged_addr(prctl_map.env_end); As the buildbot suggests, those -> should be . instead :) You might want to check your local build with CONFIG_CHECKPOINT_RESTORE=y. > + > error = validate_prctl_map(&prctl_map); > if (error) > return error; > @@ -2106,6 +2118,8 @@ static int prctl_set_mm(int opt, unsigned long addr, > opt != PR_SET_MM_MAP_SIZE))) > return -EINVAL; > > + addr = untagged_addr(addr); This is a bit too coarse, addr is indeed used for find_vma() later on, but it is also used to access memory, by prctl_set_mm_mmap() and prctl_set_auxv(). Kevin > + > #ifdef CONFIG_CHECKPOINT_RESTORE > if (opt == PR_SET_MM_MAP || opt == PR_SET_MM_MAP_SIZE) > return prctl_set_mm_map(opt, (const void __user *)addr, arg4); 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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 291F4C43381 for ; Mon, 18 Mar 2019 11:47:34 +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 EF78E20854 for ; Mon, 18 Mar 2019 11:47:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OmAuUWd6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF78E20854 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com 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-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IX4e4qg6vfhxnbK1bdkoLGuyTRqGqj5KiFyc+C6wR1U=; b=OmAuUWd6daJYenxWdUNZpQWtO Wpv0I92N/ACe1uzc3lyJb1z3m4ZjUIUXYK3H85w+pDJ5rBk9ZASIxMWpWf9Flje9LGaI7edT7za4i iQ/lFnclYWA2fW7FrBmrWg44ycoDAgGPauniG/NJg4xjQM5eCuHtiJqu9/VCkoQ0NxOy2Mbf2/Ror W8+F1zu2GqvTkZJdxnG1tTIu/CdTbBF3VKi9zRn6fJ8mu9YirhKAGG7zh0Go/elnzkQ+P03vvG0w7 eKdlft9AEFKiYrpjIkqe4gD4HFEwvSqgj6eLm+23CedG6vwiwOEOdL34MfDSqg43VTSdI02e5aqFn ZAwmakS4g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5qjo-000415-9i; Mon, 18 Mar 2019 11:47:28 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5qjl-00040Y-1r for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 11:47:26 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 02AC81650; Mon, 18 Mar 2019 04:47:24 -0700 (PDT) Received: from [10.1.199.35] (e107154-lin.cambridge.arm.com [10.1.199.35]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D824F3F614; Mon, 18 Mar 2019 04:47:17 -0700 (PDT) Subject: Re: [PATCH v11 09/14] kernel, arm64: untag user pointers in prctl_set_mm* To: Andrey Konovalov , Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Kees Cook , Kate Stewart , Greg Kroah-Hartman , Andrew Morton , Ingo Molnar , "Kirill A . Shutemov" , Shuah Khan , Vincenzo Frascino , Eric Dumazet , "David S. Miller" , Alexei Starovoitov , Daniel Borkmann , Steven Rostedt , Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org References: From: Kevin Brodsky Message-ID: <96675b72-d325-0682-4864-b6a96f63f8fd@arm.com> Date: Mon, 18 Mar 2019 11:47:15 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_044725_161305_E9A6FF4D X-CRM114-Status: GOOD ( 21.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chintan Pandya , Jacob Bramley , Ruben Ayrapetyan , Szabolcs Nagy , Lee Smith , Kostya Serebryany , Dmitry Vyukov , Ramana Radhakrishnan , Luc Van Oostenryck , Dave Martin , Evgeniy Stepanov Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 15/03/2019 19:51, 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. > > prctl_set_mm() and prctl_set_mm_map() use provided user pointers for vma > lookups, which can only by done with untagged pointers. > > Untag user pointers in these functions. > > Signed-off-by: Andrey Konovalov > --- > kernel/sys.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/kernel/sys.c b/kernel/sys.c > index 12df0e5434b8..8e56d87cc6db 100644 > --- a/kernel/sys.c > +++ b/kernel/sys.c > @@ -1993,6 +1993,18 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data > if (copy_from_user(&prctl_map, addr, sizeof(prctl_map))) > return -EFAULT; > > + prctl_map->start_code = untagged_addr(prctl_map.start_code); > + prctl_map->end_code = untagged_addr(prctl_map.end_code); > + prctl_map->start_data = untagged_addr(prctl_map.start_data); > + prctl_map->end_data = untagged_addr(prctl_map.end_data); > + prctl_map->start_brk = untagged_addr(prctl_map.start_brk); > + prctl_map->brk = untagged_addr(prctl_map.brk); > + prctl_map->start_stack = untagged_addr(prctl_map.start_stack); > + prctl_map->arg_start = untagged_addr(prctl_map.arg_start); > + prctl_map->arg_end = untagged_addr(prctl_map.arg_end); > + prctl_map->env_start = untagged_addr(prctl_map.env_start); > + prctl_map->env_end = untagged_addr(prctl_map.env_end); As the buildbot suggests, those -> should be . instead :) You might want to check your local build with CONFIG_CHECKPOINT_RESTORE=y. > + > error = validate_prctl_map(&prctl_map); > if (error) > return error; > @@ -2106,6 +2118,8 @@ static int prctl_set_mm(int opt, unsigned long addr, > opt != PR_SET_MM_MAP_SIZE))) > return -EINVAL; > > + addr = untagged_addr(addr); This is a bit too coarse, addr is indeed used for find_vma() later on, but it is also used to access memory, by prctl_set_mm_mmap() and prctl_set_auxv(). Kevin > + > #ifdef CONFIG_CHECKPOINT_RESTORE > if (opt == PR_SET_MM_MAP || opt == PR_SET_MM_MAP_SIZE) > return prctl_set_mm_map(opt, (const void __user *)addr, arg4); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel