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=-12.7 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLACK, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL 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 F35F6C433DF for ; Thu, 28 May 2020 15:01:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AE91C2075F for ; Thu, 28 May 2020 15:01:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="OYx1azbF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE91C2075F Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 56C9180010; Thu, 28 May 2020 11:01:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F61A8001A; Thu, 28 May 2020 11:01:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F23780010; Thu, 28 May 2020 11:01:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0080.hostedemail.com [216.40.44.80]) by kanga.kvack.org (Postfix) with ESMTP id 2352380010 for ; Thu, 28 May 2020 11:01:20 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 88D431042E3 for ; Thu, 28 May 2020 15:01:19 +0000 (UTC) X-FDA: 76866441078.24.dime42_9fa522778a01 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id CE6E2FF956 for ; Thu, 28 May 2020 15:01:08 +0000 (UTC) X-HE-Tag: dime42_9fa522778a01 X-Filterd-Recvd-Size: 7388 Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Thu, 28 May 2020 15:01:08 +0000 (UTC) Received: by mail-pj1-f66.google.com with SMTP id fs4so3288185pjb.5 for ; Thu, 28 May 2020 08:01:08 -0700 (PDT) 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=k4gasz7E8Vka0VphamQPgsMwOl6rPaC5hW405KW6cAI=; b=OYx1azbF4P0dfQ10iSb9La9p4gAK2jIv1Jyus2X+j/g6v3DL392OEZJCMm6Gubuxt8 9B93plARWlCI4yChxjLUa6wtP8iFtPYo3Fob5WH+3DD/hZZ9IN4v13ZXa8Njy19M3w90 5xh6LsJfF8CqhmZueR/sIIgcudTwgCdX8SmdLF3zNwLUL58j2SX4AwlRAC+RzF7Wn5V4 /RdBd83tXL/sKKUzTvL1MHStduUDIOEFxz8tqTe0GX2paOOzPf/ekGvWJgzgtTyuIRvc 1DQfX6vwtJnkDRl39I7N9HAa5GqPluQfoDlQ9rb1nS71Jv+Rbt8U6F79BeEuYlzV+ubl wYmg== 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=k4gasz7E8Vka0VphamQPgsMwOl6rPaC5hW405KW6cAI=; b=eLcjv3UezOnOig27tg7HxEKKH7JCIXtBGBBFwObGAwlypWB0onMTh9/2FwWHm2rB+O Md0Scd8dRKkhiWKUDRDoyFec4ZqgkWKcsAEJqNhibAaEeXBQSmvmcZuf9Z1twHHZzbck aurHFcKE7wCDQ6WZUWuiFYAp9hV3pqfbi7/H/qXbhECjlCc6qpABHL5dtyAgA4AjX1Qw ++6Lgfa22ft3lRvmpOEAlB5cqxZooHToHDrhQLh8LaU9y38ROtfzSHfnBILDZKNdPAj/ lWw8uJeP0YAHLEvYvAm5C/R6tIDmt9JceWrHUB6wG43CmOcyVS8ZkMNqpz5ShLx2kG7X R0MQ== X-Gm-Message-State: AOAM5332hpYw3hb/eQbSw/qB1TmksNPYfR+IGoheymNDJADkN23tkjwu mdC8TUM8f/PS/o/PwplbJSKj0qpS3nwntGIWiOtdyQ== X-Google-Smtp-Source: ABdhPJyyVAv6fiUo0j3cap9zCp8UlZcYGzN4ZXwcx0fZ4+b4Gd56xyiNHKoTi+8a/20TZ9ed9h9YvvDZRqDlC/LfwtA= X-Received: by 2002:a17:90a:2a8e:: with SMTP id j14mr4202521pjd.136.1590678065375; Thu, 28 May 2020 08:01:05 -0700 (PDT) MIME-Version: 1.0 References: <29bd753d5ff5596425905b0b07f51153e2345cc1.1589297433.git.andreyknvl@google.com> <78a81fde6eeda9db72a7fd55fbc33173a515e4b1.1589297433.git.andreyknvl@google.com> <20200528134913.GA1810@lca.pw> In-Reply-To: <20200528134913.GA1810@lca.pw> From: Andrey Konovalov Date: Thu, 28 May 2020 17:00:54 +0200 Message-ID: Subject: Re: [PATCH 2/3] kasan: move kasan_report() into report.c To: Qian Cai Cc: Andrew Morton , Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , kasan-dev , Linux Memory Management List , LKML , Leon Romanovsky , Leon Romanovsky , Randy Dunlap , Josh Poimboeuf Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: CE6E2FF956 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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: On Thu, May 28, 2020 at 3:49 PM Qian Cai wrote: > > On Tue, May 12, 2020 at 05:33:20PM +0200, 'Andrey Konovalov' via kasan-dev wrote: > > The kasan_report() functions belongs to report.c, as it's a common > > functions that does error reporting. > > > > Reported-by: Leon Romanovsky > > Signed-off-by: Andrey Konovalov > > Today's linux-next produced this with Clang 11. > > mm/kasan/report.o: warning: objtool: kasan_report()+0x8a: call to __stack_chk_fail() with UACCESS enabled > > kasan_report at mm/kasan/report.c:536 Hm, the first patch in the series ("kasan: consistently disable debugging features") disables stack protector for kasan files. Is that patch in linux-next? > > > --- > > mm/kasan/common.c | 19 ------------------- > > mm/kasan/report.c | 22 ++++++++++++++++++++-- > > 2 files changed, 20 insertions(+), 21 deletions(-) > > > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > > index 2906358e42f0..757d4074fe28 100644 > > --- a/mm/kasan/common.c > > +++ b/mm/kasan/common.c > > @@ -33,7 +33,6 @@ > > #include > > #include > > #include > > -#include > > > > #include > > #include > > @@ -613,24 +612,6 @@ void kasan_free_shadow(const struct vm_struct *vm) > > } > > #endif > > > > -extern void __kasan_report(unsigned long addr, size_t size, bool is_write, unsigned long ip); > > -extern bool report_enabled(void); > > - > > -bool kasan_report(unsigned long addr, size_t size, bool is_write, unsigned long ip) > > -{ > > - unsigned long flags = user_access_save(); > > - bool ret = false; > > - > > - if (likely(report_enabled())) { > > - __kasan_report(addr, size, is_write, ip); > > - ret = true; > > - } > > - > > - user_access_restore(flags); > > - > > - return ret; > > -} > > - > > #ifdef CONFIG_MEMORY_HOTPLUG > > static bool shadow_mapped(unsigned long addr) > > { > > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > > index 80f23c9da6b0..51ec45407a0b 100644 > > --- a/mm/kasan/report.c > > +++ b/mm/kasan/report.c > > @@ -29,6 +29,7 @@ > > #include > > #include > > #include > > +#include > > > > #include > > > > @@ -454,7 +455,7 @@ static void print_shadow_for_address(const void *addr) > > } > > } > > > > -bool report_enabled(void) > > +static bool report_enabled(void) > > { > > if (current->kasan_depth) > > return false; > > @@ -479,7 +480,8 @@ void kasan_report_invalid_free(void *object, unsigned long ip) > > end_report(&flags); > > } > > > > -void __kasan_report(unsigned long addr, size_t size, bool is_write, unsigned long ip) > > +static void __kasan_report(unsigned long addr, size_t size, bool is_write, > > + unsigned long ip) > > { > > struct kasan_access_info info; > > void *tagged_addr; > > @@ -518,6 +520,22 @@ void __kasan_report(unsigned long addr, size_t size, bool is_write, unsigned lon > > end_report(&flags); > > } > > > > +bool kasan_report(unsigned long addr, size_t size, bool is_write, > > + unsigned long ip) > > +{ > > + unsigned long flags = user_access_save(); > > + bool ret = false; > > + > > + if (likely(report_enabled())) { > > + __kasan_report(addr, size, is_write, ip); > > + ret = true; > > + } > > + > > + user_access_restore(flags); > > + > > + return ret; > > +} > > + > > #ifdef CONFIG_KASAN_INLINE > > /* > > * With CONFIG_KASAN_INLINE, accesses to bogus pointers (outside the high > > -- > > 2.26.2.645.ge9eca65c58-goog > > > > -- > > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/78a81fde6eeda9db72a7fd55fbc33173a515e4b1.1589297433.git.andreyknvl%40google.com.