From patchwork Tue Jan 8 07:37:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 10751519 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 762E2746 for ; Tue, 8 Jan 2019 07:37:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6212528B6A for ; Tue, 8 Jan 2019 07:37:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 565AE28B6D; Tue, 8 Jan 2019 07:37:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFAED28B6A for ; Tue, 8 Jan 2019 07:37:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5ED7B8E0058; Tue, 8 Jan 2019 02:37:50 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 51F368E0038; Tue, 8 Jan 2019 02:37:50 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 328398E0058; Tue, 8 Jan 2019 02:37:50 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by kanga.kvack.org (Postfix) with ESMTP id C98A18E0038 for ; Tue, 8 Jan 2019 02:37:49 -0500 (EST) Received: by mail-ed1-f71.google.com with SMTP id t2so1223396edb.22 for ; Mon, 07 Jan 2019 23:37:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:message-id :in-reply-to:references:from:subject:to:cc:date; bh=NrmT4Lx4o+hAC21B0RTKwnYMqSRIloSVfvuD0zi8uHI=; b=bISoMDBnZvwu7Af8STFxlgZgLm0piUzPV2VC3KXFEYfaUPgeNko6qXZMr2DlrsZd1Y FFues58wa/Nr777FF4ivxBImXhI86Sv4J2ckjClMPwHw+lpBQgmkxa3tqvshvKQTjoxT XNipcmO77y8cw6YcAzwviGvpdmBiKJodTtvymW+opP5AOoKhBd2fm53orz7pMc2VILgX tVGN12+6xKxmcgofXfbrF9CN5mUoJM5HloQLNHnJDdb10aRYv5BC4EiwoQGdOjer4uKj FxrlkdBiEuEVQ0W7y0dc1cjA8nu+fWfyahh1npcc5JLfWg5tjvypcslPR8PdlY1NoeDb Pq2w== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of christophe.leroy@c-s.fr designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@c-s.fr X-Gm-Message-State: AJcUukcDthQDvyM3pgjnVX1Eanhv+kBlYdeFJYaGmgeZt24+vlJIHwlu ieyqLvC5ebdZozDIzgdxxyUtfQ75YQb9qzU7SLgRsZbYgamMF/lxSmo7m9iD8I19zS7+BrcE8Gm QlUI6pTlpPupv0+Lnhr+PeuyT9Rq1FIoQcoNDUAZzyp+/Zc02dJ8p7KG254/aO/IdDw== X-Received: by 2002:a17:906:77c1:: with SMTP id m1-v6mr859531ejn.233.1546933069302; Mon, 07 Jan 2019 23:37:49 -0800 (PST) X-Google-Smtp-Source: ALg8bN7OpyJjn4Xx49tg7xzYe4TMOjg/1EtDbAqkAVVuzWzA45xDdL2EckufLSgagbS1ojwbIkeB X-Received: by 2002:a17:906:77c1:: with SMTP id m1-v6mr859487ejn.233.1546933068150; Mon, 07 Jan 2019 23:37:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546933068; cv=none; d=google.com; s=arc-20160816; b=ZZrHZPPbRaBX7me8BJHAj56qTWGz7f34mZucncPTIMjHfiBv7M+VXBcf1pFguFOPoN xC/rI/BZ2k1JDqant1LitoT19dJaFby2vbm5KSQaKHNujZFm0QL+y+FQI2wxbGh8UG39 GOs0Wz+b4+me7trftKjyyLp4qJpE/rPybhUKmgf/6FnqzKaX1JLp0+DvS9FuYiscK1+k jHbRuUT2wJ5C72lY9yDqy+SFHhq3CmRCIlYnl41vtfLyVpL3nRG2bSXCtjSArW44Mc1M LZ6KdriFsgNQlXaFd1N6OhFc9oJRMhH9FApbkw1gvacGRtx1cwnr2n8JJoRD5PVHeydd rNFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=date:cc:to:subject:from:references:in-reply-to:message-id; bh=NrmT4Lx4o+hAC21B0RTKwnYMqSRIloSVfvuD0zi8uHI=; b=H9OsbsV1gBffy2BoHN4fHIOxjXSdotSDjA5uG0W7tBDhin0vhcSLblHTnw/UDWdgA5 sMq2cXu1R80x1wOceY4NJwZkLNwcQVAp8lO556AJe85f/ycP8Fi9fz/F6lv5B8nohrcX PhC5Y0sQ9dYIUgwO2xi+gvjR8WhFX/C7CIDFXXBus2oMBliCoqz/lBKIqeQAPMshR+uo XwUkJNc7czjQARs18vK1VFYoLhxbJVnGBIsRpcJAjS7MRhZ2jVlz2XNSAXR6TzcnVGeg rmlnnEl6CvE01SuNJd2LC3XqQrNhy8Nz3xGtrAhRSt8Yg3bPWI4ILpy/6BOcYh8JiJba uYaA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of christophe.leroy@c-s.fr designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@c-s.fr Received: from pegase1.c-s.fr (pegase1.c-s.fr. [93.17.236.30]) by mx.google.com with ESMTPS id 18-v6si737763ejo.149.2019.01.07.23.37.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Jan 2019 23:37:48 -0800 (PST) Received-SPF: pass (google.com: domain of christophe.leroy@c-s.fr designates 93.17.236.30 as permitted sender) client-ip=93.17.236.30; Authentication-Results: mx.google.com; spf=pass (google.com: domain of christophe.leroy@c-s.fr designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@c-s.fr Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 43Ykcp51Hrz9txMh; Tue, 8 Jan 2019 08:37:46 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id M2qPEx4riTTe; Tue, 8 Jan 2019 08:37:46 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 43Ykcp4LFyz9txMf; Tue, 8 Jan 2019 08:37:46 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 7EF578B794; Tue, 8 Jan 2019 08:37:47 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id dN-0XjC5CLUs; Tue, 8 Jan 2019 08:37:47 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 3C85A8B754; Tue, 8 Jan 2019 08:37:47 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 1875369A7C; Tue, 8 Jan 2019 07:37:47 +0000 (UTC) Message-Id: In-Reply-To: <0b0db24e18063076e9d9f4e376994af83da05456.1546932949.git.christophe.leroy@c-s.fr> References: <0b0db24e18063076e9d9f4e376994af83da05456.1546932949.git.christophe.leroy@c-s.fr> From: Christophe Leroy Subject: [PATCH v2 2/2] powerpc: use probe_user_read() To: Kees Cook , Andrew Morton , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Mike Rapoport Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org Date: Tue, 8 Jan 2019 07:37:47 +0000 (UTC) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Instead of opencoding, use probe_user_read() to failessly read a user location. Signed-off-by: Christophe Leroy --- v2: Using probe_user_read() instead of probe_user_address() arch/powerpc/kernel/process.c | 12 +----------- arch/powerpc/mm/fault.c | 6 +----- arch/powerpc/perf/callchain.c | 20 +++----------------- arch/powerpc/perf/core-book3s.c | 8 +------- arch/powerpc/sysdev/fsl_pci.c | 10 ++++------ 5 files changed, 10 insertions(+), 46 deletions(-) diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index ce393df243aa..6a4b59d574c2 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -1298,16 +1298,6 @@ void show_user_instructions(struct pt_regs *regs) pc = regs->nip - (NR_INSN_TO_PRINT * 3 / 4 * sizeof(int)); - /* - * Make sure the NIP points at userspace, not kernel text/data or - * elsewhere. - */ - if (!__access_ok(pc, NR_INSN_TO_PRINT * sizeof(int), USER_DS)) { - pr_info("%s[%d]: Bad NIP, not dumping instructions.\n", - current->comm, current->pid); - return; - } - seq_buf_init(&s, buf, sizeof(buf)); while (n) { @@ -1318,7 +1308,7 @@ void show_user_instructions(struct pt_regs *regs) for (i = 0; i < 8 && n; i++, n--, pc += sizeof(int)) { int instr; - if (probe_kernel_address((const void *)pc, instr)) { + if (probe_user_read(&instr, (void __user *)pc, sizeof(instr))) { seq_buf_printf(&s, "XXXXXXXX "); continue; } diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 887f11bcf330..ec74305fa330 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -276,12 +276,8 @@ static bool bad_stack_expansion(struct pt_regs *regs, unsigned long address, if ((flags & FAULT_FLAG_WRITE) && (flags & FAULT_FLAG_USER) && access_ok(nip, sizeof(*nip))) { unsigned int inst; - int res; - pagefault_disable(); - res = __get_user_inatomic(inst, nip); - pagefault_enable(); - if (!res) + if (!probe_user_read(&inst, nip, sizeof(inst))) return !store_updates_sp(inst); *must_retry = true; } diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c index 0af051a1974e..0680efb2237b 100644 --- a/arch/powerpc/perf/callchain.c +++ b/arch/powerpc/perf/callchain.c @@ -159,12 +159,8 @@ static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret) ((unsigned long)ptr & 7)) return -EFAULT; - pagefault_disable(); - if (!__get_user_inatomic(*ret, ptr)) { - pagefault_enable(); + if (!probe_user_read(ret, ptr, sizeof(*ret))) return 0; - } - pagefault_enable(); return read_user_stack_slow(ptr, ret, 8); } @@ -175,12 +171,8 @@ static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret) ((unsigned long)ptr & 3)) return -EFAULT; - pagefault_disable(); - if (!__get_user_inatomic(*ret, ptr)) { - pagefault_enable(); + if (!probe_user_read(ret, ptr, sizeof(*ret))) return 0; - } - pagefault_enable(); return read_user_stack_slow(ptr, ret, 4); } @@ -307,17 +299,11 @@ static inline int current_is_64bit(void) */ static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret) { - int rc; - if ((unsigned long)ptr > TASK_SIZE - sizeof(unsigned int) || ((unsigned long)ptr & 3)) return -EFAULT; - pagefault_disable(); - rc = __get_user_inatomic(*ret, ptr); - pagefault_enable(); - - return rc; + return probe_user_read(ret, ptr, sizeof(*ret)); } static inline void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry, diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c index b0723002a396..4b64ddf0db68 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c @@ -416,7 +416,6 @@ static void power_pmu_sched_task(struct perf_event_context *ctx, bool sched_in) static __u64 power_pmu_bhrb_to(u64 addr) { unsigned int instr; - int ret; __u64 target; if (is_kernel_addr(addr)) { @@ -427,13 +426,8 @@ static __u64 power_pmu_bhrb_to(u64 addr) } /* Userspace: need copy instruction here then translate it */ - pagefault_disable(); - ret = __get_user_inatomic(instr, (unsigned int __user *)addr); - if (ret) { - pagefault_enable(); + if (probe_user_read(&instr, (unsigned int __user *)addr, sizeof(instr))) return 0; - } - pagefault_enable(); target = branch_target(&instr); if ((!target) || (instr & BRANCH_ABSOLUTE)) diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 918be816b097..c8a1b26489f5 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -1068,13 +1068,11 @@ int fsl_pci_mcheck_exception(struct pt_regs *regs) addr += mfspr(SPRN_MCAR); if (is_in_pci_mem_space(addr)) { - if (user_mode(regs)) { - pagefault_disable(); - ret = get_user(inst, (__u32 __user *)regs->nip); - pagefault_enable(); - } else { + if (user_mode(regs)) + ret = probe_user_read(&inst, (void __user *)regs->nip, + sizeof(inst)); + else ret = probe_kernel_address((void *)regs->nip, inst); - } if (!ret && mcheck_handle_load(regs, inst)) { regs->nip += 4;