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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham 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 01F32C3A5A4 for ; Fri, 30 Aug 2019 09:41:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D00F821670 for ; Fri, 30 Aug 2019 09:41:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727814AbfH3JlP (ORCPT ); Fri, 30 Aug 2019 05:41:15 -0400 Received: from foss.arm.com ([217.140.110.172]:57372 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727800AbfH3JlP (ORCPT ); Fri, 30 Aug 2019 05:41:15 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 40F76344; Fri, 30 Aug 2019 02:41:14 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E080A3F718; Fri, 30 Aug 2019 02:41:12 -0700 (PDT) Date: Fri, 30 Aug 2019 10:41:10 +0100 From: Mark Rutland To: Viresh Kumar Cc: stable@vger.kernel.org, Julien Thierry , linux-arm-kernel@lists.infradead.org, Catalin Marinas , Marc Zyngier , Will Deacon , Russell King , Vincent Guittot , mark.brown@arm.com Subject: Re: [PATCH ARM64 v4.4 V3 09/44] mm/kasan: add API to check memory regions Message-ID: <20190830094110.GI46475@lakrids.cambridge.arm.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.1+11 (2f07cb52) (2018-12-01) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, Aug 29, 2019 at 05:03:54PM +0530, Viresh Kumar wrote: > From: Andrey Ryabinin > > commit 64f8ebaf115bcddc4aaa902f981c57ba6506bc42 upstream. > > Memory access coded in an assembly won't be seen by KASAN as a compiler > can instrument only C code. Add kasan_check_[read,write]() API which is > going to be used to check a certain memory range. > > Link: http://lkml.kernel.org/r/1462538722-1574-3-git-send-email-aryabinin@virtuozzo.com > Signed-off-by: Andrey Ryabinin > Acked-by: Alexander Potapenko > Cc: Dmitry Vyukov > Cc: Ingo Molnar > Cc: "H. Peter Anvin" > Cc: Thomas Gleixner > Signed-off-by: Andrew Morton > Signed-off-by: Linus Torvalds > [ v4.4: Fixed MAINTAINERS conflict and added whole kasan entry. Drop 4th > argument to check_memory_region(). ] > Signed-off-by: Viresh Kumar Reviewed-by: Mark Rutland [v4.4 backport] Mark. > --- > MAINTAINERS | 14 ++++++++++++++ > include/linux/kasan-checks.h | 12 ++++++++++++ > mm/kasan/kasan.c | 12 ++++++++++++ > 3 files changed, 38 insertions(+) > create mode 100644 include/linux/kasan-checks.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index f4d4a5544dc1..2a8826732967 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -5982,6 +5982,20 @@ S: Maintained > F: Documentation/hwmon/k8temp > F: drivers/hwmon/k8temp.c > > +KASAN > +M: Andrey Ryabinin > +R: Alexander Potapenko > +R: Dmitry Vyukov > +L: kasan-dev@googlegroups.com > +S: Maintained > +F: arch/*/include/asm/kasan.h > +F: arch/*/mm/kasan_init* > +F: Documentation/kasan.txt > +F: include/linux/kasan*.h > +F: lib/test_kasan.c > +F: mm/kasan/ > +F: scripts/Makefile.kasan > + > KCONFIG > M: "Yann E. MORIN" > L: linux-kbuild@vger.kernel.org > diff --git a/include/linux/kasan-checks.h b/include/linux/kasan-checks.h > new file mode 100644 > index 000000000000..b7f8aced7870 > --- /dev/null > +++ b/include/linux/kasan-checks.h > @@ -0,0 +1,12 @@ > +#ifndef _LINUX_KASAN_CHECKS_H > +#define _LINUX_KASAN_CHECKS_H > + > +#ifdef CONFIG_KASAN > +void kasan_check_read(const void *p, unsigned int size); > +void kasan_check_write(const void *p, unsigned int size); > +#else > +static inline void kasan_check_read(const void *p, unsigned int size) { } > +static inline void kasan_check_write(const void *p, unsigned int size) { } > +#endif > + > +#endif > diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c > index b7397b459960..1cdcab0c976a 100644 > --- a/mm/kasan/kasan.c > +++ b/mm/kasan/kasan.c > @@ -274,6 +274,18 @@ static __always_inline void check_memory_region(unsigned long addr, > void __asan_loadN(unsigned long addr, size_t size); > void __asan_storeN(unsigned long addr, size_t size); > > +void kasan_check_read(const void *p, unsigned int size) > +{ > + check_memory_region((unsigned long)p, size, false); > +} > +EXPORT_SYMBOL(kasan_check_read); > + > +void kasan_check_write(const void *p, unsigned int size) > +{ > + check_memory_region((unsigned long)p, size, true); > +} > +EXPORT_SYMBOL(kasan_check_write); > + > #undef memset > void *memset(void *addr, int c, size_t len) > { > -- > 2.21.0.rc0.269.g1a574e7a288b >