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, URIBL_BLOCKED,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 1BA1EC6369E for ; Fri, 13 Nov 2020 22:16:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id ACFD3206F9 for ; Fri, 13 Nov 2020 22:16:45 +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="kEaoU6im" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ACFD3206F9 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 3F3216B008C; Fri, 13 Nov 2020 17:16:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 382426B0092; Fri, 13 Nov 2020 17:16:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 185606B0093; Fri, 13 Nov 2020 17:16:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0097.hostedemail.com [216.40.44.97]) by kanga.kvack.org (Postfix) with ESMTP id D83FA6B008C for ; Fri, 13 Nov 2020 17:16:44 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 86A2C3631 for ; Fri, 13 Nov 2020 22:16:44 +0000 (UTC) X-FDA: 77480805528.20.skirt82_28051ef27312 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 67E1D180C07A3 for ; Fri, 13 Nov 2020 22:16:44 +0000 (UTC) X-HE-Tag: skirt82_28051ef27312 X-Filterd-Recvd-Size: 7215 Received: from mail-qv1-f74.google.com (mail-qv1-f74.google.com [209.85.219.74]) by imf06.hostedemail.com (Postfix) with ESMTP for ; Fri, 13 Nov 2020 22:16:43 +0000 (UTC) Received: by mail-qv1-f74.google.com with SMTP id t13so7044789qvm.14 for ; Fri, 13 Nov 2020 14:16:43 -0800 (PST) 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=KBw2xb89iGf5nkQBhVPMBrv+WXUlpFCEGVTeqj9IKE8=; b=kEaoU6imARJ9PUMGylo3WxrvNJwhz4ehol5ihwX1PAJZetS+MYeRsmLL73YYgZJPSj Y1to6lX3L3cZywbseOl5yJksMji3kaOqt5ZEvniI49snje8Yn7/BqWcjwSRkOyDMStR9 u0UH19eQdTaD7lyammRYs91tUiy1mx+SlweE8yjpHaXB+D4rIyALl/bOswEGdcXyo4ir /uotDXbwDUcN93YlnCwaj+NWLIPhIcE20bCRcldSJoQRvhxBZXVdNMjev6tvLfvsE1c/ OWDZy5n0UnAhwdiLLnq7YQCs5rB7gMRE0EToE+ZffqJCxIS7vKMt/zoshLvu8CU2Kpy0 fnVQ== 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=KBw2xb89iGf5nkQBhVPMBrv+WXUlpFCEGVTeqj9IKE8=; b=lNVZ80AWMleCEnOlcehskNGrpPA24z7en8Xjnoye9UR6S7BHTAHarDn7VGADSEB16x FDmnldqGqY9OCR7ayyjhdD6qm0pT8x5vBFV3firW188tdLJsi9vnCu1m+I2a9BNDmYx5 9i0HtfffCFpuE3uodDdrA7HBX27Xw8iL+Ypdoe2cQ9TDp0S/H/+5IA36mkqgug8CGCbE 928RQ1Lq0uiVYVDKfab62C8wV4sU8KU4B/b2XvhnPWIvXgPzbBzu9qKnb8NNqfI56Dg5 G7JRFurNaMxbTJKsRz4cyxNvtEct39rimhrmmye0zpsK29tX3HLJuTCKaq+4SOzXNrdR 4Sjw== X-Gm-Message-State: AOAM530T6J0YOKludPLE1WwhdNeTKjG2sZKS4JWhanW7WMgMwqFO1MIM siNppeq8sg++3ul8GnCIxC+Ma3MJ+HRwOcKG X-Google-Smtp-Source: ABdhPJz28oDTu0JrMVUyvh42LUnx0OaovzkH2m5z3QnEQ90fl2RtrA3qpCClpjEC/kSPUPZ0vfdSYddbzI61o9DW X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:54cd:: with SMTP id j13mr4460435qvx.8.1605305803272; Fri, 13 Nov 2020 14:16:43 -0800 (PST) Date: Fri, 13 Nov 2020 23:15:40 +0100 In-Reply-To: Message-Id: <6b1a801b2132bf11e19c4421b2b079d242b152f3.1605305705.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH mm v10 12/42] kasan: hide invalid free check implementation From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, 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.000000, 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 Reviewed-by: Alexander Potapenko --- 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 b3ebee6fcfca..ae55570b4d32 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -278,25 +278,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; @@ -318,8 +302,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 754217c258a8..67642acafe92 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -188,6 +188,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 eec88bf28c64..e5b5f60bc963 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -166,6 +166,8 @@ void unpoison_range(const void *address, size_t size); 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 c0b3f327812b..64540109c461 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.29.2.299.gdc1121823c-goog