From patchwork Mon Dec 3 17:06:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 10710081 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 7A56B14BD for ; Mon, 3 Dec 2018 17:06:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 632202A6BB for ; Mon, 3 Dec 2018 17:06:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5734D2AD12; Mon, 3 Dec 2018 17:06:48 +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 97D292A6BB for ; Mon, 3 Dec 2018 17:06:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7ED136B6A4E; Mon, 3 Dec 2018 12:06:46 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 79CCA6B6A4F; Mon, 3 Dec 2018 12:06:46 -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 68C7A6B6A50; Mon, 3 Dec 2018 12:06:46 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by kanga.kvack.org (Postfix) with ESMTP id 0DB906B6A4E for ; Mon, 3 Dec 2018 12:06:46 -0500 (EST) Received: by mail-wm1-f69.google.com with SMTP id t62-v6so4538766wmg.6 for ; Mon, 03 Dec 2018 09:06:46 -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 :from:subject:to:cc:date; bh=f6E/TiWEYMLxyLhMFHwh9hK9B/RVSByGvDVXegjlwLM=; b=DhR7CEeZlFo+z8AdiNMH1BImb4DdgWGkX7BCP0LELo/49qIEZFLMutFK24hHDtj2KH aig2uY6ZGfUdSQLm2dzDWqAY0yzxVcmKCG43ZEFZ+iLwX5qd0YeJTM4hUnZ+ngzpFVqR 2wI/LqEPnv/t01SG1aVQf9I/H4TbjonsFTsZoX+orkZaRocGWciugj4ml23dyoSKNvXG JbvhO5NDPU2HAtPw9bsv10zWFLhZYjBHVuQxQZ9izhIxkCLqom2z81IutZKc2G8abIYK +fCCuZULHV7YOZFDBM2HPorDgEqrrjo8qV1cMd0z/nXXChokxGpCq2eOcJl+n0gzCpII hSIA== 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: AA+aEWYcsxlxpAd+EXiPXCX0TGgIolQEx6y5KFt6Zz73iH/iiZ1qE4ak WNzkvNt4z246xt6JQqv5qX90D/M1fx7G0sr+mnwNcAbATm0ZOOCfLCLmHB8s41cBpEAQ/TFDDor RdOd+BWIBMu79GuyDtU71BviyNJd9w2NO0T3JbEsSamoXXy4uMYYs5dEiV9LeFTGRqA== X-Received: by 2002:a1c:b0f:: with SMTP id 15mr9384522wml.128.1543856805546; Mon, 03 Dec 2018 09:06:45 -0800 (PST) X-Google-Smtp-Source: AFSGD/VMLejLq8vs0fv4ntKJH4bq76nHTg1R+zfVwZkEbLd/TJld2yDs01cELuQnLzDtP6UCUMAX X-Received: by 2002:a1c:b0f:: with SMTP id 15mr9384462wml.128.1543856804516; Mon, 03 Dec 2018 09:06:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543856804; cv=none; d=google.com; s=arc-20160816; b=yHFxU2i22aV/1HgljJ6zoaC7QG24acTuVDAslVvSc1HW1XI6rDzUplNsY1PTMMADle oY/h9YKq1SPsYW9oxj1K4ANudU3m3DwldO2znIalzrv2pqM6UjFcHqzA2vXTYMsLUk0v n9hSbhboasM+txRGKd34iJEepTBk9whgptKt5aGJ6uV6xH6kUeHcbhIeOFggHmsIotOf /epeF8n/a2fxJVL2FVMFieRuHa2jBFHQfnvmZJL71AM4yYwtUmwD7OW0sdpTOiEnnPGO ozTuDBO/AtE9DINuKc1HGBR22Sz5LcbvnOvcM6aOsra2bBQZwC2fzEM+PPjN3xe2XsoH KoAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=date:cc:to:subject:from:message-id; bh=f6E/TiWEYMLxyLhMFHwh9hK9B/RVSByGvDVXegjlwLM=; b=0Z47FfSYkzvPG+1ZWtkIBP0iGawbuZe01OLFmN+KknLpX9dzQKxnBAjXLuWYge31xf mt1z5mn9p+4Pk51H7HB94gi1lg11Kyzg9X7LA5cUOlaypbbRbTLKS8uRllOC6MT1LmUT nkZ/l3PhZBnnc4ATygGwGV9ai9cTS2QtU9rsq8fB7Di2EYcuq5tip9LvC64rC3bnL+1G xHVgqxZhFQOcWwvszOBFlisEn6Jaz7G0wuwST6Xw8BXjS+67qaO2oqWeQYbB0wzFjKcF x+T1cxs3Fhd3zA4eTjRHpzXieRm0/7GWkgrj2cYoF045WV0zFmG8MLFnKGDnzdz8mwf9 WgTw== 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 x12si11016001wrt.114.2018.12.03.09.06.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Dec 2018 09:06:44 -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 437rxr4Hkpz9tyyG; Mon, 3 Dec 2018 18:06:40 +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 SWiAnz58A0pf; Mon, 3 Dec 2018 18:06:40 +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 437rxr3f1rz9tyyF; Mon, 3 Dec 2018 18:06:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C54FA8B7B8; Mon, 3 Dec 2018 18:06:43 +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 kV2y1tG9fbml; Mon, 3 Dec 2018 18:06:43 +0100 (CET) Received: from po14163vm.idsi0.si.c-s.fr (unknown [192.168.232.3]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 6704A8B79E; Mon, 3 Dec 2018 18:06:43 +0100 (CET) Received: by po14163vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 0508F6BEF5; Mon, 3 Dec 2018 17:06:42 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH 1/2] mm: add probe_user_read() and probe_user_address() To: Kees Cook , Andrew Morton , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org Date: Mon, 3 Dec 2018 17:06:42 +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 In the powerpc, there are several places implementing safe access to user data. This is sometimes implemented using probe_kernel_address() with additional access_ok() verification, sometimes with get_user() enclosed in a pagefault_disable()/enable() pair, etc... : show_user_instructions() bad_stack_expansion() p9_hmi_special_emu() fsl_pci_mcheck_exception() read_user_stack_64() read_user_stack_32() on PPC64 read_user_stack_32() on PPC32 power_pmu_bhrb_to() In the same spirit as probe_kernel_read() and probe_kernel_address(), this patch adds probe_user_read() and probe_user_address(). probe_user_read() does the same as probe_kernel_read() but first checks that it is really a user address. probe_user_address() is a shortcut to probe_user_read() Signed-off-by: Christophe Leroy --- Changes since RFC: Made a static inline function instead of weak function as recommended by Kees. include/linux/uaccess.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index efe79c1cdd47..83ea8aefca75 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -266,6 +266,48 @@ extern long strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count); #define probe_kernel_address(addr, retval) \ probe_kernel_read(&retval, addr, sizeof(retval)) +/** + * probe_user_read(): safely attempt to read from a user location + * @dst: pointer to the buffer that shall take the data + * @src: address to read from + * @size: size of the data chunk + * + * Safely read from address @src to the buffer at @dst. If a kernel fault + * happens, handle that and return -EFAULT. + * + * We ensure that the copy_from_user is executed in atomic context so that + * do_page_fault() doesn't attempt to take mmap_sem. This makes + * probe_user_read() suitable for use within regions where the caller + * already holds mmap_sem, or other locks which nest inside mmap_sem. + */ + +#ifndef probe_user_read +static __always_inline long probe_user_read(void *dst, const void __user *src, + size_t size) +{ + long ret; + + if (!access_ok(VERIFY_READ, src, size)) + return -EFAULT; + + pagefault_disable(); + ret = __copy_from_user_inatomic(dst, src, size); + pagefault_enable(); + + return ret ? -EFAULT : 0; +} +#endif + +/** + * probe_user_address(): safely attempt to read from a user location + * @addr: address to read from + * @retval: read into this variable + * + * Returns 0 on success, or -EFAULT. + */ +#define probe_user_address(addr, retval) \ + probe_user_read(&(retval), addr, sizeof(retval)) + #ifndef user_access_begin #define user_access_begin() do { } while (0) #define user_access_end() do { } while (0)