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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 88671C433E7 for ; Mon, 12 Oct 2020 20:45:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 25C39208D5 for ; Mon, 12 Oct 2020 20:45:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Qb8mGGA5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 25C39208D5 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 8818F94001D; Mon, 12 Oct 2020 16:45:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 85781940009; Mon, 12 Oct 2020 16:45:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F8B094001D; Mon, 12 Oct 2020 16:45:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0196.hostedemail.com [216.40.44.196]) by kanga.kvack.org (Postfix) with ESMTP id 40950940009 for ; Mon, 12 Oct 2020 16:45:44 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id DF5028249980 for ; Mon, 12 Oct 2020 20:45:43 +0000 (UTC) X-FDA: 77364454566.22.gate80_620f4c8271fd Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id B84D718038E67 for ; Mon, 12 Oct 2020 20:45:43 +0000 (UTC) X-HE-Tag: gate80_620f4c8271fd X-Filterd-Recvd-Size: 7218 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf47.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 20:45:43 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id p29so11449146qve.17 for ; Mon, 12 Oct 2020 13:45:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=w5C2W2DY9SAvZH/qaocnCGPCQ8ZMERi9GQeckWB8bok=; b=Qb8mGGA59hLL96H9n4wZTwTCQmo2f1Y8s2N9qAyX44nKBmlSwKIJyA2fOpSDTEEY62 1a7SmrGdLrxGFJGvQtaI0zf/crGciYHNobZdRWuQGZz3xjiEI0GEF0k5F0MDyi73Fn8g Sf2hHuxdnJ3GDLwDLG/hJ3+D1yOw6M2odk3mjtcKfqHY9WiuMoSQl2ClemQ8k/3j2vgr xxJ+VJR3q0dqRb35yh1fT9gOBc4PF8RXVwQvUFln48jiK7X2kEUCheygNRm3stKJMVXd XNemY7BWfdoM24VrlCBpqDjPGFgpVecwmO4v/eKVagK9h49SQkA/lZrtmxZkqe280vK2 jBfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=w5C2W2DY9SAvZH/qaocnCGPCQ8ZMERi9GQeckWB8bok=; b=VCJBHQGzFUbGs3Sy379fplRBz6dEJx1QnTAuFbXt3fDWttYIIZCm9i9tc6bYMvbPoa 6sOS+47MceMDlkMGrf2OTT9IULgvEajAi92VmZSuescj4K37k1cqqQOBzhblgIbjLsne qhWoBdBlKQjnPOr2H2mZUbuQkX+LwGSp11ebakcW/XvQ8G5QfF+rVGLl3ZYLafPobjNs 4F5HUoJtS3+7nC5r4gVhQ1ZLHkd/qeFjdYIqIs9nUUDr/HSlDaV/kE1RQKgw+IlEdSVo Q5EYxI7j2Fr1sGQcX8qKcD6c5mDAwcFu+0HQWddiRF+KTRa2EoUFq05eNwh0skJMM/19 XvHw== X-Gm-Message-State: AOAM530f6hdggK9YBESrVnqPqvuAj/8qkGjB+QuO5Ofwc2Ayxs9IUNXs +EaxELQInDbuq18XDVHKL2k5PPAUTMi/b8s9 X-Google-Smtp-Source: ABdhPJx0+G225vjwuSVOUfMcvs4JiztOy++XKHcZN1gNDyorfaVWZ/mhsXfgInQFZnY6Tnkq7csSN/Fy301L4VKV X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:146e:: with SMTP id c14mr26719107qvy.22.1602535542528; Mon, 12 Oct 2020 13:45:42 -0700 (PDT) Date: Mon, 12 Oct 2020 22:44:27 +0200 In-Reply-To: Message-Id: <1d1755d107694267933ccf22045f9d4480a00593.1602535397.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.1011.ga647a8990f-goog Subject: [PATCH v5 21/40] kasan: hide invalid free check implementation From: Andrey Konovalov To: Catalin Marinas , Will Deacon Cc: Vincenzo Frascino , kasan-dev@googlegroups.com, Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.001359, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This is a preparatory commit for the upcoming addition of a new hardware tag-based (MTE-based) KASAN mode. For software KASAN modes the check is based on the value in the shadow memory. Hardware tag-based KASAN won't be using shadow, so hide the implementation of the check in check_invalid_free(). Also simplify the code for software tag-based mode. No functional changes for software modes. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver --- Change-Id: I5fae9531c9fc948eb4d4e0c589744032fc5a0789 --- mm/kasan/common.c | 19 +------------------ mm/kasan/generic.c | 7 +++++++ mm/kasan/kasan.h | 2 ++ mm/kasan/sw_tags.c | 9 +++++++++ 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 123abfb760d4..543e6bf2168f 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -272,25 +272,9 @@ void * __must_check kasan_init_slab_obj(struct kmem_cache *cache, return (void *)object; } -static inline bool shadow_invalid(u8 tag, s8 shadow_byte) -{ - if (IS_ENABLED(CONFIG_KASAN_GENERIC)) - return shadow_byte < 0 || - shadow_byte >= KASAN_GRANULE_SIZE; - - /* else CONFIG_KASAN_SW_TAGS: */ - if ((u8)shadow_byte == KASAN_TAG_INVALID) - return true; - if ((tag != KASAN_TAG_KERNEL) && (tag != (u8)shadow_byte)) - return true; - - return false; -} - static bool __kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip, bool quarantine) { - s8 shadow_byte; u8 tag; void *tagged_object; unsigned long rounded_up_size; @@ -309,8 +293,7 @@ static bool __kasan_slab_free(struct kmem_cache *cache, void *object, if (unlikely(cache->flags & SLAB_TYPESAFE_BY_RCU)) return false; - shadow_byte = READ_ONCE(*(s8 *)kasan_mem_to_shadow(object)); - if (shadow_invalid(tag, shadow_byte)) { + if (check_invalid_free(tagged_object)) { kasan_report_invalid_free(tagged_object, ip); return true; } diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index ec4417156943..e1af3b6c53b8 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -187,6 +187,13 @@ bool check_memory_region(unsigned long addr, size_t size, bool write, return check_memory_region_inline(addr, size, write, ret_ip); } +bool check_invalid_free(void *addr) +{ + s8 shadow_byte = READ_ONCE(*(s8 *)kasan_mem_to_shadow(addr)); + + return shadow_byte < 0 || shadow_byte >= KASAN_GRANULE_SIZE; +} + void kasan_cache_shrink(struct kmem_cache *cache) { quarantine_remove_cache(cache); diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index a2e71818d464..325bfd82bce4 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -164,6 +164,8 @@ void kasan_poison_memory(const void *address, size_t size, u8 value); bool check_memory_region(unsigned long addr, size_t size, bool write, unsigned long ret_ip); +bool check_invalid_free(void *addr); + void *find_first_bad_addr(void *addr, size_t size); const char *get_bug_type(struct kasan_access_info *info); diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index 4bdd7dbd6647..b2638c2cd58a 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -121,6 +121,15 @@ bool check_memory_region(unsigned long addr, size_t size, bool write, return true; } +bool check_invalid_free(void *addr) +{ + u8 tag = get_tag(addr); + u8 shadow_byte = READ_ONCE(*(u8 *)kasan_mem_to_shadow(reset_tag(addr))); + + return (shadow_byte == KASAN_TAG_INVALID) || + (tag != KASAN_TAG_KERNEL && tag != shadow_byte); +} + #define DEFINE_HWASAN_LOAD_STORE(size) \ void __hwasan_load##size##_noabort(unsigned long addr) \ { \ -- 2.28.0.1011.ga647a8990f-goog