From patchwork Thu Mar 1 12:53:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 130189 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2761244edc; Thu, 1 Mar 2018 04:56:31 -0800 (PST) X-Google-Smtp-Source: AG47ELsqbefAOnf2X9T+2PxAQoD7nq/9GP88W9nXCb48rqBdKruf0W/DN09VJ7COc2xEpUNy6ROy X-Received: by 2002:a17:902:7046:: with SMTP id h6-v6mr1770843plt.301.1519908991390; Thu, 01 Mar 2018 04:56:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519908991; cv=none; d=google.com; s=arc-20160816; b=OYPLTcjuYODZqLn4gLQLPO3ySBc1BfBDE2eVDv8QOEnmrEcIu8XRvZGSqHDSwginAA ZXy+E678szbzCdQBTbyasSStjtokiMLiBofg9vXBVMGuuYPR2E3bKafFOvPS8bx7TBX0 YwDxWMwFRSMg0w9Rts1+uecZN2RqsBT6nho6If/ByMNUtu9T33V3cDTRSeqqgUz7Yn4P KQSe1Sa6tFXg96aTFH/ZpBmpmYuMInVZcy7GFV6akB9Q02sajkrhNuiAXlAV5JPWI5A2 oZe6tCmiqH9cahprp/KbUHkHnt89p2KlGUzYsCZLZhgj+8QKWJfAV0SZtjCpt/3jyJu+ SQtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=pkSwvmKMHNNLRhymKkKAhX1GDqTiFiQOpUbZ8tKMBgk=; b=Ff0dHKV4QrJJIgDDSTIsQ8VreQpS5hgTZgvuhAlzsNSy8tNThmz8TAv5wpQLk3EMzv ZmOtoCEdMjimvUECZVAnv6TK5G2prLLjKNwCW9nq6AV0WUxPxwt02uRypjFg6/ZNuVQp lTuNzCKqbwUIFku3H+QcM7OxdBg/fkz0OP9WNUYWWaVxMAmikOpGUL1aQysvYj2JDgQA ZvvoYKCkryhUUT9Stur+sz3Em+yHnBG9OPvu0XvbhEJhExdgRBuVO7/4BMzMq08VXvlP SoJ4ac43gjuDEBdX/SaB2jzKOgQNt8aq81dWA+jLhlZpmAWN5Pi201RXCTSS9Ha+V7zp dwrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TWc8Mayd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v17si2956195pfe.186.2018.03.01.04.56.31; Thu, 01 Mar 2018 04:56:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TWc8Mayd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030729AbeCAM41 (ORCPT + 28 others); Thu, 1 Mar 2018 07:56:27 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:38757 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030577AbeCAM4X (ORCPT ); Thu, 1 Mar 2018 07:56:23 -0500 Received: by mail-pf0-f195.google.com with SMTP id d26so2405598pfn.5 for ; Thu, 01 Mar 2018 04:56:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pkSwvmKMHNNLRhymKkKAhX1GDqTiFiQOpUbZ8tKMBgk=; b=TWc8MaydIeTgVwL1bNsWb6speWePBk5cwbeu8tE+wxKd8SsD5cVfgBhwWptS4TtVbN wty/oSLnY4XVK8XAfxr+3+LIXVfEnx+pHfKFbR1prFS0wzbjhvJWGXHXEqmyLXloSg1Q VEnFT/xBJHIOyP5e6cVXuVBA4TQn4CnmF3Mt4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pkSwvmKMHNNLRhymKkKAhX1GDqTiFiQOpUbZ8tKMBgk=; b=aH4JabKBc8ETTRxdv5Ue6qId6A0dnu+Pu/qplx9OYAUc42Nn5ylca5sG0FW/oxk3B1 kkffcwM9cxvMOvlQD5wVfsITn92+LWbo5xhs0O9coNLEsmjbz62y9DP7p8YwAIWwpUlq c5aB65E6XoLgQI+RerUUakdz/JEqh91FZ6QgydXt+iI9Ksis2srYBF6jWea44h980d0E xueYGTuLFtMh3tSPMff/wn9f0PORQlgokGBWKNHN4Zy/9JQwJ8sxnAe4QiXLm1eilaKZ HGeSd3cpZdubSzFG8SelVRX3EZShjBAeMmElf+eSam3fqsxUjKTJx0YJvV+jIJsPZxEl IUUA== X-Gm-Message-State: APf1xPD/jlSi5eaA/Ssh0bmuh/YNX9DTILfAcU/VbI2fRmjBSx+TMN2B X0U5YClLm37F1M3lmT62W0NhbQ== X-Received: by 10.101.86.198 with SMTP id w6mr1462142pgs.434.1519908983165; Thu, 01 Mar 2018 04:56:23 -0800 (PST) Received: from localhost.localdomain (176.122.172.82.16clouds.com. [176.122.172.82]) by smtp.gmail.com with ESMTPSA id x4sm2289655pfb.46.2018.03.01.04.56.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Mar 2018 04:56:22 -0800 (PST) From: Alex Shi To: Marc Zyngier , Will Deacon , Ard Biesheuvel , Catalin Marinas , stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Robin Murphy , Alex Shi Subject: [PATCH 09/45] arm64: Make USER_DS an inclusive limit Date: Thu, 1 Mar 2018 20:53:46 +0800 Message-Id: <1519908862-11425-10-git-send-email-alex.shi@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519908862-11425-1-git-send-email-alex.shi@linaro.org> References: <1519908862-11425-1-git-send-email-alex.shi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robin Murphy commit 51369e398d0d upstream. Currently, USER_DS represents an exclusive limit while KERNEL_DS is inclusive. In order to do some clever trickery for speculation-safe masking, we need them both to behave equivalently - there aren't enough bits to make KERNEL_DS exclusive, so we have precisely one option. This also happens to correct a longstanding false negative for a range ending on the very top byte of kernel memory. Mark Rutland points out that we've actually got the semantics of addresses vs. segments muddled up in most of the places we need to amend, so shuffle the {USER,KERNEL}_DS definitions around such that we can correct those properly instead of just pasting "-1"s everywhere. Signed-off-by: Robin Murphy Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas (cherry picked from commit 83b20dff71ea949431cf57c6aebaaf7ebd5c1991) Signed-off-by: Alex Shi --- arch/arm64/include/asm/processor.h | 3 +++ arch/arm64/include/asm/uaccess.h | 46 ++++++++++++++++++++++---------------- arch/arm64/kernel/entry.S | 2 +- arch/arm64/mm/fault.c | 2 +- 4 files changed, 32 insertions(+), 21 deletions(-) -- 2.7.4 diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 4258f4d..5917147 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -21,6 +21,9 @@ #define TASK_SIZE_64 (UL(1) << VA_BITS) +#define KERNEL_DS UL(-1) +#define USER_DS (TASK_SIZE_64 - 1) + #ifndef __ASSEMBLY__ /* diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index 09c9b59..7b1eb49 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h @@ -36,6 +36,7 @@ #include #include #include +#include #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -62,10 +63,7 @@ struct exception_table_entry extern int fixup_exception(struct pt_regs *regs); -#define KERNEL_DS (-1UL) #define get_ds() (KERNEL_DS) - -#define USER_DS TASK_SIZE_64 #define get_fs() (current_thread_info()->addr_limit) static inline void set_fs(mm_segment_t fs) @@ -90,22 +88,32 @@ static inline void set_fs(mm_segment_t fs) * Returns 1 if the range is valid, 0 otherwise. * * This is equivalent to the following test: - * (u65)addr + (u65)size <= current->addr_limit - * - * This needs 65-bit arithmetic. + * (u65)addr + (u65)size <= (u65)current->addr_limit + 1 */ -#define __range_ok(addr, size) \ -({ \ - unsigned long __addr = (unsigned long __force)(addr); \ - unsigned long flag, roksum; \ - __chk_user_ptr(addr); \ - asm("adds %1, %1, %3; ccmp %1, %4, #2, cc; cset %0, ls" \ - : "=&r" (flag), "=&r" (roksum) \ - : "1" (__addr), "Ir" (size), \ - "r" (current_thread_info()->addr_limit) \ - : "cc"); \ - flag; \ -}) +static inline unsigned long __range_ok(unsigned long addr, unsigned long size) +{ + unsigned long limit = current_thread_info()->addr_limit; + + __chk_user_ptr(addr); + asm volatile( + // A + B <= C + 1 for all A,B,C, in four easy steps: + // 1: X = A + B; X' = X % 2^64 + " adds %0, %0, %2\n" + // 2: Set C = 0 if X > 2^64, to guarantee X' > C in step 4 + " csel %1, xzr, %1, hi\n" + // 3: Set X' = ~0 if X >= 2^64. For X == 2^64, this decrements X' + // to compensate for the carry flag being set in step 4. For + // X > 2^64, X' merely has to remain nonzero, which it does. + " csinv %0, %0, xzr, cc\n" + // 4: For X < 2^64, this gives us X' - C - 1 <= 0, where the -1 + // comes from the carry in being clear. Otherwise, we are + // testing X' - C == 0, subject to the previous adjustments. + " sbcs xzr, %0, %1\n" + " cset %0, ls\n" + : "+r" (addr), "+r" (limit) : "Ir" (size) : "cc"); + + return addr; +} /* * When dealing with data aborts, watchpoints, or instruction traps we may end @@ -114,7 +122,7 @@ static inline void set_fs(mm_segment_t fs) */ #define untagged_addr(addr) sign_extend64(addr, 55) -#define access_ok(type, addr, size) __range_ok(addr, size) +#define access_ok(type, addr, size) __range_ok((unsigned long)(addr), size) #define user_addr_max get_fs #define _ASM_EXTABLE(from, to) \ diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 478f0fe..6915697 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -103,7 +103,7 @@ /* Save the task's original addr_limit and set USER_DS (TASK_SIZE_64) */ ldr x20, [tsk, #TI_ADDR_LIMIT] str x20, [sp, #S_ORIG_ADDR_LIMIT] - mov x20, #TASK_SIZE_64 + mov x20, #USER_DS str x20, [tsk, #TI_ADDR_LIMIT] /* No need to reset PSTATE.UAO, hardware's already set it to 0 for us */ .endif /* \el == 0 */ diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 403fe9e..4df70c9 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -332,7 +332,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, mm_flags |= FAULT_FLAG_WRITE; } - if (is_permission_fault(esr) && (addr < USER_DS)) { + if (is_permission_fault(esr) && (addr < TASK_SIZE)) { /* regs->orig_addr_limit may be 0 if we entered from EL0 */ if (regs->orig_addr_limit == KERNEL_DS) die("Accessing user space memory with fs=KERNEL_DS", regs, esr);