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=-9.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 0AF29C4742C for ; Mon, 16 Nov 2020 12:46:53 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8B0BD20888 for ; Mon, 16 Nov 2020 12:46:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="0LZrvojW"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="dwCtwSG1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B0BD20888 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UEzHLYVjykFeDK+Xgq7DtXKF7Q/g/YjKpbghvnC26sc=; b=0LZrvojWLv2wRMVYyOmh8bODs NPuou2JZEvl3yJLtK4b2dhC0x02OVdnTYCtaOVh0tRySND2T5JTyiXFGoZ8F5uLPCr3WCjuGBbdu1 LWgf2SEgKoSM2fANZ6XORlJsEyWSojAf3RHDBHtLZIAVneHEDV32x5uzj58mO+AWlFkF+2DORXneu 2au3zQQZZAPUuH3m8jj9kwDvEXVOcooQsotIJQfqkQVmHx1XxWQcW9y7bB971xVAYQCsy5sIp0VKD weu+sxuCIipr3mB/uQRn4AstCq/MEkOay0/vuO4r2xasYOzNXf1bBVvrxyHdIqlYAj4kSrH5XqOSU wTR8CXWQQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kedTg-0005ld-6W; Mon, 16 Nov 2020 12:19:24 +0000 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kedTc-0005kL-UN for linux-arm-kernel@lists.infradead.org; Mon, 16 Nov 2020 12:19:22 +0000 Received: by mail-qt1-x842.google.com with SMTP id g15so12609202qtq.13 for ; Mon, 16 Nov 2020 04:19:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/kYjKHOYdbRkTjeegvgMiUR7lrALhGYE7BaLrgneuEo=; b=dwCtwSG1CRtiWFQFZf4fc7QGzmXHSvCxOczUoTS3liWWSeYKySIjb/aNGCMq4vY22z 7S8yG5Hc/Y57cokBs7emePi+zUY6Vf4tLiP3n+dQ+1A6XDOXo5kMf8IWsTzgmGeyBwii wPbPS5Tc8whp73gFMP0tYWZz4kkggygE6KzTRx19J9eA1MBhSUplPG4LIzTI1Uoo0uDw 8Dcn2aB22UdbhjlGkyV5YM0xI7oTIh8zakc6xXl5vQoJepGLlBGmOnV1cG/3LEt6LX8l sIiLdq0+kAHl85li03YQk/T7Vc7n/pg/nIp8HcVUYieU4VObKtdnd0WxyXWN7am+eLcT oJ4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/kYjKHOYdbRkTjeegvgMiUR7lrALhGYE7BaLrgneuEo=; b=pI8BVtA7hOljRDrWvstZ9HDfc4Et2fzSwhQyJ617WrWN2wdAdAcksNjK4noPG56TJl q+3WxZEuvp3fkbAnxUcmHL2cLBnay7jZBq2fD1LePh/yN/HOAx7UqB/sSctZTVJh4tf7 ke/QhHG9LTEDuhiqgx66k6w1PqJ05vp4U8l4McKRVqtkA95YV+gd+LyG+NANei17RFRz tOInisM1WkEn6bUtJgrbr2ssT9zY/guqYDUlVaM08QyKWt5Uco+GMf6RJ3R2iX3z5Hfm SceiB/dkFuyqfmv4ZmQkxNh2pyqEcOIqljEtFvVJUsYCn1P8NJx7x9J2ogQlv7S2VaHx coVQ== X-Gm-Message-State: AOAM533Gl082N99a4c9SfhtZWog5ZtVcyPU+EMblIeXpk6YxQTzksEzb 036QxUEu3iBbJbZ0q9piO0uX7d4U2mFd+2c79ZOgzA== X-Google-Smtp-Source: ABdhPJzVtuVEKbYpXTvA7bt6Bpfm8IWTKWQYpOD+OfdF3VKnQMbyBfE5Xwk1DVVV2nhzbJJ3JbrNZnq9kHaQ20TpoxA= X-Received: by 2002:aed:2744:: with SMTP id n62mr14165891qtd.67.1605529158914; Mon, 16 Nov 2020 04:19:18 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Dmitry Vyukov Date: Mon, 16 Nov 2020 13:19:07 +0100 Message-ID: Subject: Re: [PATCH RFC v2 04/21] kasan: unpoison stack only with CONFIG_KASAN_STACK To: Catalin Marinas X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_071921_054704_781A9CCA X-CRM114-Status: GOOD ( 31.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marco Elver , Elena Petrova , Linux-MM , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev , LKML , Kostya Serebryany , Alexander Potapenko , Linux ARM , Serban Constantinescu , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Peter Collingbourne , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Nov 16, 2020 at 1:16 PM Catalin Marinas wrote: > > On Mon, Nov 16, 2020 at 12:50:00PM +0100, Marco Elver wrote: > > On Mon, 16 Nov 2020 at 11:59, Dmitry Vyukov wrote: > > > On Thu, Oct 29, 2020 at 8:57 PM 'Andrey Konovalov' via kasan-dev > > > wrote: > > > > On Tue, Oct 27, 2020 at 1:44 PM Dmitry Vyukov wrote: > > > > > > > > > > On Thu, Oct 22, 2020 at 3:19 PM Andrey Konovalov wrote: > > > > > > > > > > > > There's a config option CONFIG_KASAN_STACK that has to be enabled for > > > > > > KASAN to use stack instrumentation and perform validity checks for > > > > > > stack variables. > > > > > > > > > > > > There's no need to unpoison stack when CONFIG_KASAN_STACK is not enabled. > > > > > > Only call kasan_unpoison_task_stack[_below]() when CONFIG_KASAN_STACK is > > > > > > enabled. > > > > > > > > > > > > Signed-off-by: Andrey Konovalov > > > > > > Link: https://linux-review.googlesource.com/id/If8a891e9fe01ea543e00b576852685afec0887e3 > > > > > > --- > > > > > > arch/arm64/kernel/sleep.S | 2 +- > > > > > > arch/x86/kernel/acpi/wakeup_64.S | 2 +- > > > > > > include/linux/kasan.h | 10 ++++++---- > > > > > > mm/kasan/common.c | 2 ++ > > > > > > 4 files changed, 10 insertions(+), 6 deletions(-) > > > > > > > > > > > > diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S > > > > > > index ba40d57757d6..bdadfa56b40e 100644 > > > > > > --- a/arch/arm64/kernel/sleep.S > > > > > > +++ b/arch/arm64/kernel/sleep.S > > > > > > @@ -133,7 +133,7 @@ SYM_FUNC_START(_cpu_resume) > > > > > > */ > > > > > > bl cpu_do_resume > > > > > > > > > > > > -#ifdef CONFIG_KASAN > > > > > > +#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK > > > > > > mov x0, sp > > > > > > bl kasan_unpoison_task_stack_below > > > > > > #endif > > > > > > diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S > > > > > > index c8daa92f38dc..5d3a0b8fd379 100644 > > > > > > --- a/arch/x86/kernel/acpi/wakeup_64.S > > > > > > +++ b/arch/x86/kernel/acpi/wakeup_64.S > > > > > > @@ -112,7 +112,7 @@ SYM_FUNC_START(do_suspend_lowlevel) > > > > > > movq pt_regs_r14(%rax), %r14 > > > > > > movq pt_regs_r15(%rax), %r15 > > > > > > > > > > > > -#ifdef CONFIG_KASAN > > > > > > +#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK > > > > > > /* > > > > > > * The suspend path may have poisoned some areas deeper in the stack, > > > > > > * which we now need to unpoison. > > > > > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > > > > > > index 3f3f541e5d5f..7be9fb9146ac 100644 > > > > > > --- a/include/linux/kasan.h > > > > > > +++ b/include/linux/kasan.h > > > > > > @@ -68,8 +68,6 @@ static inline void kasan_disable_current(void) {} > > > > > > > > > > > > void kasan_unpoison_memory(const void *address, size_t size); > > > > > > > > > > > > -void kasan_unpoison_task_stack(struct task_struct *task); > > > > > > - > > > > > > void kasan_alloc_pages(struct page *page, unsigned int order); > > > > > > void kasan_free_pages(struct page *page, unsigned int order); > > > > > > > > > > > > @@ -114,8 +112,6 @@ void kasan_restore_multi_shot(bool enabled); > > > > > > > > > > > > static inline void kasan_unpoison_memory(const void *address, size_t size) {} > > > > > > > > > > > > -static inline void kasan_unpoison_task_stack(struct task_struct *task) {} > > > > > > - > > > > > > static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} > > > > > > static inline void kasan_free_pages(struct page *page, unsigned int order) {} > > > > > > > > > > > > @@ -167,6 +163,12 @@ static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } > > > > > > > > > > > > #endif /* CONFIG_KASAN */ > > > > > > > > > > > > +#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK > > > > > > > > > > && defined(CONFIG_KASAN_STACK) for consistency > > > > > > > > CONFIG_KASAN_STACK is different from other KASAN configs. It's always > > > > defined, and its value is what controls whether stack instrumentation > > > > is enabled. > > > > > > Not sure why we did this instead of the following, but okay. > > > > > > config KASAN_STACK > > > - int > > > - default 1 if KASAN_STACK_ENABLE || CC_IS_GCC > > > - default 0 > > > + bool > > > + default y if KASAN_STACK_ENABLE || CC_IS_GCC > > > + default n > > > > I wondered the same, but then looking at scripts/Makefile.kasan I > > think it's because we directly pass it to the compiler: > > ... > > $(call cc-param,asan-stack=$(CONFIG_KASAN_STACK)) \ > > ... > > Try this instead: > > $(call cc-param,asan-stack=$(if $(CONFIG_KASAN_STACK),1,0)) \ We could have just 1 config instead of 2 as well. For gcc we could do no prompt and default value y, and for clang -- prompt and default value n. I think it should do what we need. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel