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 AB365C4727E for ; Thu, 1 Oct 2020 23:11:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4843F206C1 for ; Thu, 1 Oct 2020 23:11:16 +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="iBnDmdG2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4843F206C1 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 DAB866B008C; Thu, 1 Oct 2020 19:11:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D5CC86B0092; Thu, 1 Oct 2020 19:11:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4AB56B0093; Thu, 1 Oct 2020 19:11:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0067.hostedemail.com [216.40.44.67]) by kanga.kvack.org (Postfix) with ESMTP id 9912B6B008C for ; Thu, 1 Oct 2020 19:11:15 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3878C8249980 for ; Thu, 1 Oct 2020 23:11:15 +0000 (UTC) X-FDA: 77324904510.24.hall11_1b156212719f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id 1DB471A4A0 for ; Thu, 1 Oct 2020 23:11:15 +0000 (UTC) X-HE-Tag: hall11_1b156212719f X-Filterd-Recvd-Size: 7208 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Thu, 1 Oct 2020 23:11:14 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id c204so39308wmd.5 for ; Thu, 01 Oct 2020 16:11:14 -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=zWR1cCG1rjrYp9C+AfwbmJjQNsNISZ2LulzQ9QrW8Jg=; b=iBnDmdG2QbdUIupU7R1qlwwRTnbzmuTRM56AV3CCPdzO9KkAuMONkhaFBDqyPrOJWg QzEJBsw4FnfGOHuP+Et4EGUZrmeNSa4pcPG9+1lwmSz3XMkNGtVVs8rLAW5ZJl1seLRe z+2uO8floyo3IK6JL4fzTX78As7uG1iVVEbdjkk/RlA5peWOkC5KH3T9lXKKab69sDHW CGCKq73WZUPZmO5t8AJT1nm3uSf8GnZXwqxokAv5hUKrx15Pg5UdXcwQzENPRYlS8GzV z19L0UCk5DoIoGE+Lk05V7x1wKRaONFW2sw7X7Fwmd1FrjSUn93OmwRd5i/7K/uN/ltt 9S3w== 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=zWR1cCG1rjrYp9C+AfwbmJjQNsNISZ2LulzQ9QrW8Jg=; b=O7OMMKsUMQCYbzAh74NGfZRK54CmJHpsoufbYDF7OrgWh+kCEtU73RpQTPt8qd0Xyf m5TouCI5w3P3m+uhnGU85wbqOeASUguzk92y4olLdj4CG6cknac1nXxNFmeV71I7oopP 9G10yjpD2RM9AVi1JYmoUrQZWNQlPVWwCxV0wf1ddkPGanpqVZcSG52yOfgOwCz61PXx y0F10sbBcLnr5l5zM/Ym2RdoISxHIOIceBu9NmgUnqXzWI1FZSRR7WLKpyJyA+mUKQi2 OGq6VskvIDvqKujVTjLoq6qmsjTjphXyqGWBfVkDf/PxO+ydzjLmX2LV12x8xXCErkLm blAA== X-Gm-Message-State: AOAM533MzpXr4TAnQO8ausZVbU0+vUZHcYHrKg2y/1nFRyiF2ynwx5m7 VYy1Dvsaz0U/4ckvjNMyqCFHjhSs/ArtZalr X-Google-Smtp-Source: ABdhPJwFi7pGwWBRvfmOOqbt0bkP9duYro0bQQmfXIFE7EXdfIcKU7Xa3jFJ6861phNI+ttX8TEIl/dVtN9O8U3J X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:adf:f802:: with SMTP id s2mr10978766wrp.328.1601593873339; Thu, 01 Oct 2020 16:11:13 -0700 (PDT) Date: Fri, 2 Oct 2020 01:10:13 +0200 In-Reply-To: Message-Id: <823cf1ad36d0a93ed0ecdd81fab8c5b77437c418.1601593784.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.709.gb0816b6eb0-goog Subject: [PATCH v4 12/39] kasan: hide invalid free check implementation From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com Cc: Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , 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.000305, 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 1865bb92d47a..3eff57e71ff5 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.709.gb0816b6eb0-goog