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=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL 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 C533CC49EA7 for ; Mon, 28 Jun 2021 06:00:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6AF49610E5 for ; Mon, 28 Jun 2021 06:00:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AF49610E5 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 AE27A8D001C; Mon, 28 Jun 2021 02:00:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB8528D0016; Mon, 28 Jun 2021 02:00:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 932EB8D001C; Mon, 28 Jun 2021 02:00:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0005.hostedemail.com [216.40.44.5]) by kanga.kvack.org (Postfix) with ESMTP id 62A918D0016 for ; Mon, 28 Jun 2021 02:00:22 -0400 (EDT) Received: from smtpin31.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 40A45180AD820 for ; Mon, 28 Jun 2021 06:00:22 +0000 (UTC) X-FDA: 78302082684.31.B04E434 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by imf18.hostedemail.com (Postfix) with ESMTP id DA1F620010A2 for ; Mon, 28 Jun 2021 06:00:21 +0000 (UTC) Received: by mail-ot1-f50.google.com with SMTP id 110-20020a9d0a770000b0290466fa79d098so946901otg.9 for ; Sun, 27 Jun 2021 23:00:21 -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=pKd6dJBV4N8YLl9Ne/rLrhUWGWga9X9929E81Ir9VwE=; b=wOYvQpibWIPMRLcfT6idVBBV8wATamkZFDKpHusk7Fo3lgzVLAWMN9D+M9vwwsiW6C DDeMAp21F4ZS7WK3YPM0vfSAAbmY5/qtn/8ZrABf8D8qxyyEtpWaqdgULKhkvsoRGFCw HKvQI1zNqgG0tDUPSVFzKcon/gWQDfLANAQeEf6NtHyUEL8YXOcuVRMtqAjgmWryNRAs sPVlwKrrzOCMd1ylsWPQPKZsMXUj1o5kDzo5/ieVx/I/iH0uP2/3x3tVtCdHZEm2GvMU Vsc2U1OTqOz0MzDTmfi1ctc82bH7XmFqxMCfq9bzBQs3YcxmevH3xo0Vwyag5KJMNjJk ly5A== 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=pKd6dJBV4N8YLl9Ne/rLrhUWGWga9X9929E81Ir9VwE=; b=fFXWkZAcztfTXzxDVoIV/ntTSsfrh3r+tKKsVZ2wZZgYy58XR6l+lQEeAdfw+H8G3i AVw1FsrOirH8i8gJ4ec2bP5l46nCOZsy7IhVQeSxxOQ8wKAQxo2h1gNuvepVY3+O6dTV H0C5SocYIJHCYjF6JZh13K25MT2P+fUIU03pp1eSwpPBSowgJqlXC946zxMjD8TBhXJP Llhstz34bbIdR2gaY8YNzTvv/yd7VnOEV1yzdIWfsL2rPS8GptiyBeIW+yBOUUMWDiyj +CgHu1aqctDK8Je1mBnQfNRef1aYGbkKB4YVSFazhXbHyfcHGuP7q8wzVay75ko641oT YveQ== X-Gm-Message-State: AOAM531zpkiPZ+7tndLgqQll8S/c5BQ8xBqxK7ox7ShCHF6bt+MKs0Cz 9BIoQnqiSuG9ao9U76J6LbPrwmyKHpzDufppfB7GDA== X-Google-Smtp-Source: ABdhPJzA2IFID8tun7oERGpWqPVMP48KePWvkmte3ec8WSeiBddQ7sGWP0Fdekh0raRVe38hjTt3bQ4Pjo3WuS5OkFY= X-Received: by 2002:a05:6830:93:: with SMTP id a19mr19965428oto.17.1624860021048; Sun, 27 Jun 2021 23:00:21 -0700 (PDT) MIME-Version: 1.0 References: <20210626100931.22794-1-Kuan-Ying.Lee@mediatek.com> <20210626100931.22794-3-Kuan-Ying.Lee@mediatek.com> In-Reply-To: <20210626100931.22794-3-Kuan-Ying.Lee@mediatek.com> From: Marco Elver Date: Mon, 28 Jun 2021 08:00:00 +0200 Message-ID: Subject: Re: [PATCH v4 2/3] kasan: integrate the common part of two KASAN tag-based modes To: Kuan-Ying Lee Cc: Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Andrew Morton , Matthias Brugger , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, wsd_upstream@mediatek.com, chinwen.chang@mediatek.com, nicholas.tang@mediatek.com Content-Type: text/plain; charset="UTF-8" Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20161025 header.b=wOYvQpib; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of elver@google.com designates 209.85.210.50 as permitted sender) smtp.mailfrom=elver@google.com X-Stat-Signature: ac19cncke7atf31xd8sh3eqjey4cnusp X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: DA1F620010A2 X-HE-Tag: 1624860021-692429 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 Sat, 26 Jun 2021 at 12:09, Kuan-Ying Lee wrote: > > 1. Move kasan_get_free_track() and kasan_set_free_info() > into tags.c and combine these two functions for > SW_TAGS and HW_TAGS kasan mode. > 2. Move kasan_get_bug_type() to report_tags.c and > make this function compatible for SW_TAGS and > HW_TAGS kasan mode. > > Signed-off-by: Kuan-Ying Lee > Suggested-by: Marco Elver > Suggested-by: Greg Kroah-Hartman > Cc: Andrey Ryabinin > Cc: Alexander Potapenko > Cc: Andrey Konovalov > Cc: Dmitry Vyukov > Cc: Andrew Morton Reviewed-by: Marco Elver > --- > mm/kasan/Makefile | 4 +-- > mm/kasan/hw_tags.c | 22 --------------- > mm/kasan/report_hw_tags.c | 5 ---- > mm/kasan/report_sw_tags.c | 43 ---------------------------- > mm/kasan/report_tags.c | 51 +++++++++++++++++++++++++++++++++ > mm/kasan/sw_tags.c | 41 --------------------------- > mm/kasan/tags.c | 59 +++++++++++++++++++++++++++++++++++++++ > 7 files changed, 112 insertions(+), 113 deletions(-) > create mode 100644 mm/kasan/report_tags.c > create mode 100644 mm/kasan/tags.c > > diff --git a/mm/kasan/Makefile b/mm/kasan/Makefile > index 9fe39a66388a..adcd9acaef61 100644 > --- a/mm/kasan/Makefile > +++ b/mm/kasan/Makefile > @@ -37,5 +37,5 @@ CFLAGS_sw_tags.o := $(CC_FLAGS_KASAN_RUNTIME) > > obj-$(CONFIG_KASAN) := common.o report.o > obj-$(CONFIG_KASAN_GENERIC) += init.o generic.o report_generic.o shadow.o quarantine.o > -obj-$(CONFIG_KASAN_HW_TAGS) += hw_tags.o report_hw_tags.o > -obj-$(CONFIG_KASAN_SW_TAGS) += init.o report_sw_tags.o shadow.o sw_tags.o > +obj-$(CONFIG_KASAN_HW_TAGS) += hw_tags.o report_hw_tags.o tags.o report_tags.o > +obj-$(CONFIG_KASAN_SW_TAGS) += init.o report_sw_tags.o shadow.o sw_tags.o tags.o report_tags.o > diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c > index ed5e5b833d61..4ea8c368b5b8 100644 > --- a/mm/kasan/hw_tags.c > +++ b/mm/kasan/hw_tags.c > @@ -216,28 +216,6 @@ void __init kasan_init_hw_tags(void) > pr_info("KernelAddressSanitizer initialized\n"); > } > > -void kasan_set_free_info(struct kmem_cache *cache, > - void *object, u8 tag) > -{ > - struct kasan_alloc_meta *alloc_meta; > - > - alloc_meta = kasan_get_alloc_meta(cache, object); > - if (alloc_meta) > - kasan_set_track(&alloc_meta->free_track[0], GFP_NOWAIT); > -} > - > -struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, > - void *object, u8 tag) > -{ > - struct kasan_alloc_meta *alloc_meta; > - > - alloc_meta = kasan_get_alloc_meta(cache, object); > - if (!alloc_meta) > - return NULL; > - > - return &alloc_meta->free_track[0]; > -} > - > void kasan_alloc_pages(struct page *page, unsigned int order, gfp_t flags) > { > /* > diff --git a/mm/kasan/report_hw_tags.c b/mm/kasan/report_hw_tags.c > index 42b2168755d6..5dbbbb930e7a 100644 > --- a/mm/kasan/report_hw_tags.c > +++ b/mm/kasan/report_hw_tags.c > @@ -15,11 +15,6 @@ > > #include "kasan.h" > > -const char *kasan_get_bug_type(struct kasan_access_info *info) > -{ > - return "invalid-access"; > -} > - > void *kasan_find_first_bad_addr(void *addr, size_t size) > { > return kasan_reset_tag(addr); > diff --git a/mm/kasan/report_sw_tags.c b/mm/kasan/report_sw_tags.c > index 821a14a19a92..d2298c357834 100644 > --- a/mm/kasan/report_sw_tags.c > +++ b/mm/kasan/report_sw_tags.c > @@ -29,49 +29,6 @@ > #include "kasan.h" > #include "../slab.h" > > -const char *kasan_get_bug_type(struct kasan_access_info *info) > -{ > -#ifdef CONFIG_KASAN_TAGS_IDENTIFY > - struct kasan_alloc_meta *alloc_meta; > - struct kmem_cache *cache; > - struct page *page; > - const void *addr; > - void *object; > - u8 tag; > - int i; > - > - tag = get_tag(info->access_addr); > - addr = kasan_reset_tag(info->access_addr); > - page = kasan_addr_to_page(addr); > - if (page && PageSlab(page)) { > - cache = page->slab_cache; > - object = nearest_obj(cache, page, (void *)addr); > - alloc_meta = kasan_get_alloc_meta(cache, object); > - > - if (alloc_meta) { > - for (i = 0; i < KASAN_NR_FREE_STACKS; i++) { > - if (alloc_meta->free_pointer_tag[i] == tag) > - return "use-after-free"; > - } > - } > - return "out-of-bounds"; > - } > - > -#endif > - /* > - * If access_size is a negative number, then it has reason to be > - * defined as out-of-bounds bug type. > - * > - * Casting negative numbers to size_t would indeed turn up as > - * a large size_t and its value will be larger than ULONG_MAX/2, > - * so that this can qualify as out-of-bounds. > - */ > - if (info->access_addr + info->access_size < info->access_addr) > - return "out-of-bounds"; > - > - return "invalid-access"; > -} > - > void *kasan_find_first_bad_addr(void *addr, size_t size) > { > u8 tag = get_tag(addr); > diff --git a/mm/kasan/report_tags.c b/mm/kasan/report_tags.c > new file mode 100644 > index 000000000000..8a319fc16dab > --- /dev/null > +++ b/mm/kasan/report_tags.c > @@ -0,0 +1,51 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (c) 2014 Samsung Electronics Co., Ltd. > + * Copyright (c) 2020 Google, Inc. > + */ > + > +#include "kasan.h" > +#include "../slab.h" > + > +const char *kasan_get_bug_type(struct kasan_access_info *info) > +{ > +#ifdef CONFIG_KASAN_TAGS_IDENTIFY > + struct kasan_alloc_meta *alloc_meta; > + struct kmem_cache *cache; > + struct page *page; > + const void *addr; > + void *object; > + u8 tag; > + int i; > + > + tag = get_tag(info->access_addr); > + addr = kasan_reset_tag(info->access_addr); > + page = kasan_addr_to_page(addr); > + if (page && PageSlab(page)) { > + cache = page->slab_cache; > + object = nearest_obj(cache, page, (void *)addr); > + alloc_meta = kasan_get_alloc_meta(cache, object); > + > + if (alloc_meta) { > + for (i = 0; i < KASAN_NR_FREE_STACKS; i++) { > + if (alloc_meta->free_pointer_tag[i] == tag) > + return "use-after-free"; > + } > + } > + return "out-of-bounds"; > + } > +#endif > + > + /* > + * If access_size is a negative number, then it has reason to be > + * defined as out-of-bounds bug type. > + * > + * Casting negative numbers to size_t would indeed turn up as > + * a large size_t and its value will be larger than ULONG_MAX/2, > + * so that this can qualify as out-of-bounds. > + */ > + if (info->access_addr + info->access_size < info->access_addr) > + return "out-of-bounds"; > + > + return "invalid-access"; > +} > diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c > index dd05e6c801fa..bd3f540feb47 100644 > --- a/mm/kasan/sw_tags.c > +++ b/mm/kasan/sw_tags.c > @@ -167,47 +167,6 @@ void __hwasan_tag_memory(unsigned long addr, u8 tag, unsigned long size) > } > EXPORT_SYMBOL(__hwasan_tag_memory); > > -void kasan_set_free_info(struct kmem_cache *cache, > - void *object, u8 tag) > -{ > - struct kasan_alloc_meta *alloc_meta; > - u8 idx = 0; > - > - alloc_meta = kasan_get_alloc_meta(cache, object); > - if (!alloc_meta) > - return; > - > -#ifdef CONFIG_KASAN_TAGS_IDENTIFY > - idx = alloc_meta->free_track_idx; > - alloc_meta->free_pointer_tag[idx] = tag; > - alloc_meta->free_track_idx = (idx + 1) % KASAN_NR_FREE_STACKS; > -#endif > - > - kasan_set_track(&alloc_meta->free_track[idx], GFP_NOWAIT); > -} > - > -struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, > - void *object, u8 tag) > -{ > - struct kasan_alloc_meta *alloc_meta; > - int i = 0; > - > - alloc_meta = kasan_get_alloc_meta(cache, object); > - if (!alloc_meta) > - return NULL; > - > -#ifdef CONFIG_KASAN_TAGS_IDENTIFY > - for (i = 0; i < KASAN_NR_FREE_STACKS; i++) { > - if (alloc_meta->free_pointer_tag[i] == tag) > - break; > - } > - if (i == KASAN_NR_FREE_STACKS) > - i = alloc_meta->free_track_idx; > -#endif > - > - return &alloc_meta->free_track[i]; > -} > - > void kasan_tag_mismatch(unsigned long addr, unsigned long access_info, > unsigned long ret_ip) > { > diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c > new file mode 100644 > index 000000000000..8f48b9502a17 > --- /dev/null > +++ b/mm/kasan/tags.c > @@ -0,0 +1,59 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * This file contains common tag-based KASAN code. > + * > + * Copyright (c) 2018 Google, Inc. > + * Copyright (c) 2020 Google, Inc. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "kasan.h" > + > +void kasan_set_free_info(struct kmem_cache *cache, > + void *object, u8 tag) > +{ > + struct kasan_alloc_meta *alloc_meta; > + u8 idx = 0; > + > + alloc_meta = kasan_get_alloc_meta(cache, object); > + if (!alloc_meta) > + return; > + > +#ifdef CONFIG_KASAN_TAGS_IDENTIFY > + idx = alloc_meta->free_track_idx; > + alloc_meta->free_pointer_tag[idx] = tag; > + alloc_meta->free_track_idx = (idx + 1) % KASAN_NR_FREE_STACKS; > +#endif > + > + kasan_set_track(&alloc_meta->free_track[idx], GFP_NOWAIT); > +} > + > +struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, > + void *object, u8 tag) > +{ > + struct kasan_alloc_meta *alloc_meta; > + int i = 0; > + > + alloc_meta = kasan_get_alloc_meta(cache, object); > + if (!alloc_meta) > + return NULL; > + > +#ifdef CONFIG_KASAN_TAGS_IDENTIFY > + for (i = 0; i < KASAN_NR_FREE_STACKS; i++) { > + if (alloc_meta->free_pointer_tag[i] == tag) > + break; > + } > + if (i == KASAN_NR_FREE_STACKS) > + i = alloc_meta->free_track_idx; > +#endif > + > + return &alloc_meta->free_track[i]; > +} > -- > 2.18.0 > > -- > 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/20210626100931.22794-3-Kuan-Ying.Lee%40mediatek.com.