From patchwork Thu May 26 18:43:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 68713 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp565818qge; Thu, 26 May 2016 12:11:22 -0700 (PDT) X-Received: by 10.66.80.72 with SMTP id p8mr16500748pax.38.1464289881974; Thu, 26 May 2016 12:11:21 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w15si8386814pfa.169.2016.05.26.12.11.21; Thu, 26 May 2016 12:11:21 -0700 (PDT) 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; 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 dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754969AbcEZTLT (ORCPT + 30 others); Thu, 26 May 2016 15:11:19 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:35683 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754303AbcEZTLR (ORCPT ); Thu, 26 May 2016 15:11:17 -0400 Received: by mail-pa0-f45.google.com with SMTP id fy7so15781110pac.2 for ; Thu, 26 May 2016 12:11:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=GQNYqKQdeD2g0ZhgmXatdbVh+VOHelvnptpdg7dL7PM=; b=a1cpfVUGb6cPTVZb87XSrTCvdWMjQNOpAfsO+W83umAYzyP6iEEqBW6kX/G+P2gnAU UNRdtr/UwXPSvZXVE/QUMY7jKGSncVBYu6mwZX1VUKuUsXseM9x0A6Cai+5kbchhJwXq f7n6vVLxDuX7FjzL72pZglCD/vDjomcfTAMMA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GQNYqKQdeD2g0ZhgmXatdbVh+VOHelvnptpdg7dL7PM=; b=ZsBvn15mluQlAChghrWFTAOxs2EdLIctb/wx3yr2MTjncITqu3YF853gXiKZuXqFpo NZkEJypst8+lNXRmlB74cwit4poHDcCHSZyoPXjZzQOm5Nq8ErzgoLPWthkWnGMvW8KQ HGfpDajIDW284Sh3hheGPah0OM0YJGriPfr5s3OnaLoEapR97ZjlEWi6IebvVozn7fiQ xr8D14kzv4YcMyClngP+pptQ6drTlHtnkOLhImntU4I5aX2MLVkSebxXYJ7gOr2uVJk7 kcHDj6i7Q6MhudhQGSiRklUhYNr5RfNpJrRcPqP25N7eCQdIkbX+7U0mCBAIGGWcQ7fa 5myw== X-Gm-Message-State: ALyK8tIBQTEo3PysZBbbF5350R6WBkzlvi+xuVjqltSscrj0gzbvu3f6RmQxFOgoaxHdIKdz X-Received: by 10.67.14.7 with SMTP id fc7mr16428396pad.1.1464289876931; Thu, 26 May 2016 12:11:16 -0700 (PDT) Received: from yshi-Precision-T5600.corp.ad.wrs.com (unknown-216-82.windriver.com. [147.11.216.82]) by smtp.gmail.com with ESMTPSA id f187sm7854421pfb.60.2016.05.26.12.11.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2016 12:11:16 -0700 (PDT) From: Yang Shi To: aryabinin@virtuozzo.com, will.deacon@arm.com, catalin.marinas@arm.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linaro-kernel@lists.linaro.org, yang.shi@linaro.org Subject: [PATCH] arm64: kasan: instrument user memory access API Date: Thu, 26 May 2016 11:43:51 -0700 Message-Id: <1464288231-11304-1-git-send-email-yang.shi@linaro.org> X-Mailer: git-send-email 2.0.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The upstream commit 1771c6e1a567ea0ba2cccc0a4ffe68a1419fd8ef ("x86/kasan: instrument user memory access API") added KASAN instrument to x86 user memory access API, so added such instrument to ARM64 too. Tested by test_kasan module. Signed-off-by: Yang Shi --- arch/arm64/include/asm/uaccess.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) -- 2.0.2 Acked-by: Mark Rutland Tested-by: Mark Rutland diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index 0685d74..ec352fa 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h @@ -23,6 +23,7 @@ */ #include #include +#include #include #include @@ -276,6 +277,8 @@ extern unsigned long __must_check __clear_user(void __user *addr, unsigned long static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) { + kasan_check_write(to, n); + if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else /* security hole - plug it */ @@ -285,6 +288,8 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { + kasan_check_read(from, n); + if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; @@ -297,8 +302,17 @@ static inline unsigned long __must_check copy_in_user(void __user *to, const voi return n; } -#define __copy_to_user_inatomic __copy_to_user -#define __copy_from_user_inatomic __copy_from_user +static inline unsigned long __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) +{ + kasan_check_read(from, n); + return __copy_to_user(to, from, n); +} + +static inline unsigned long __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) +{ + kasan_check_write(to, n); + return __copy_from_user(to, from, n); +} static inline unsigned long __must_check clear_user(void __user *to, unsigned long n) {