From patchwork Mon Nov 23 20:07:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11926725 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 28A61C2D0E4 for ; Mon, 23 Nov 2020 20:43:38 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C68C20728 for ; Mon, 23 Nov 2020 20:43:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PupWQ/IW"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="YFYAJmMO"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="lgtA4NzR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C68C20728 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dWw/M8RdxZRPPh2EiNb6QnB/EUOCX4KthqxiyMg0K8U=; b=PupWQ/IWH8yvCxRMMzm/JnzHx m8f+mjwtqEKGOuOWA1kyhDU+GJTzCI2FzNnZdbEdX0V15SI5Zx4XfUmk6dYWQtR1h4cmvA7ZhnfVi jnlKCwDGlShwEP3iv16EEMw0lDSmkyYy10MHnXPESD/DXCgxc1ukJnSfVlotnCj/0snTo/lM11pV1 AE+pAxvkpBMQFauH0MK9Bsh9z+czMSBZfm3IHUV+fA8ZjEfH766QoB5ZOlaoujNtp22BsozwGoLV+ mUO3dhyLJbjObnDTImcF32zIUZ4ogTNyLD9PVX0OpYGrW4Ul3IJK4MRoNkMoXU42ucAz642geSjwm z1dXAaDRQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khIfo-00067t-Py; Mon, 23 Nov 2020 20:42:56 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khIPJ-0006KM-I4 for linux-arm-kernel@merlin.infradead.org; Mon, 23 Nov 2020 20:25:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=VsAI4kIskvc7OgbGXOlaJf5U20hpa/63jMpnaocWLWM=; b=YFYAJmMOd4e/2DVI3Ap1I/czcI Ohbol/Ot4bNmYqNvE0sH0LUG5lpc99uvZqAtxj7oiv+XM8aQmhmx4eRV7FWiXz9taK1Pdxpdzx1n1 dHAG0JACLW+YPPtoit4/lvfmU2uU9orC8ih3EfHBAhFuEXk1Xnh188iNuLkJhKkYzFlJwgA6W3XBp E1ZGJ3wQ0RJlyVPjPtC594F0AnbrpNKR1RNaikB9KoNWVkq1U89w8Mw8F3XaLxTwStR7gY1nnEQp9 hXgbl/8CHYTp1ojzCwo+U4c0MdTWDuLDG5SGhUAlaqZqpavXne1OQuJY1uDKu6NA/JQFi0nc8xnuH J20mCptg==; Received: from mail-qk1-x74a.google.com ([2607:f8b0:4864:20::74a]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khI8r-0005FC-6G for linux-arm-kernel@lists.infradead.org; Mon, 23 Nov 2020 20:08:56 +0000 Received: by mail-qk1-x74a.google.com with SMTP id s128so15571204qke.0 for ; Mon, 23 Nov 2020 12:08:49 -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=VsAI4kIskvc7OgbGXOlaJf5U20hpa/63jMpnaocWLWM=; b=lgtA4NzRKL/sS7cId/OtSk8bpsKjz14BloPlYcl+E2erZjK92bXsA4p8a37FOE46k6 Zu2Mkr+TVz0sub5GN8es0wA2jSJpZKBjIyQGVbEq5lGruBJThs+asHBSMhEK+pipkSZq KtzRRfVyYJL1zFc1GtIZI3Ze4Fqlo7wHN/qS/h/mn88ZzkIm5pgf415vAnBEZLflSx0+ tpYAzbuveP5T6zeGoIEtqVfguTeqU5eTBcrDaKoUgMEFdl4/p0u2wxRnAkzPlpsfxxu4 uTMFqHXQyPRhTfOgud0hIITTPSbxXxkeyUSdnBa0yJHwDqVVa/RLBhopPo3S14gqLiHM GJOw== 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=VsAI4kIskvc7OgbGXOlaJf5U20hpa/63jMpnaocWLWM=; b=Yqr+xAjLFQZ8PfTNLza20rRvZrM+AfNXXfPZgv2tiX0KFJ7BUumCEzsuVqgR2qLawb PnFjmFf6iiqf1/heaFYedBdpYKlRWLIsHCZMRf6ccMpPr2F4cqROTy4S3xnKIMQraZNO P8E2oL4ieRw37S8Qj8JIqXfXIeDdMuHYX0K4MvZJ7I3e1nVic3u0jHlFpAiz4u6WjN7p LcvKRKNSyjzxw4yTJcNL3hJt12GXEmURbPBf4wNMKL/YpFy8lAKhBcuhrT9xo0eMM82W QGG6UkGSu9Qv94x47pMW5ftP0Wr9w80xr8q00w1x8dFTULCripHc+zH7VeJDrbABIvY8 3x1g== X-Gm-Message-State: AOAM530+5FqaJJ8btgez+khBpIH5+Qqe9jhmtc2zSDyUMzLbnsyUrGKJ rGbTkApf2TIW1dtKVDDL8DXUwJsY6LeQJv7Z X-Google-Smtp-Source: ABdhPJzQ44VzGDQGjD82W9CmwEaWld7rLNdT6Y1+lJuUYaoCWdvd/M8e9RFhUQ1m43P7Ba8CtJwX2RPN19SUuUND X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:eac4:: with SMTP id y4mr1106877qvp.19.1606162126939; Mon, 23 Nov 2020 12:08:46 -0800 (PST) Date: Mon, 23 Nov 2020 21:07:36 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH mm v11 12/42] kasan: hide invalid free check implementation From: Andrey Konovalov To: Andrew Morton X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201123_200853_881519_60CAFDFA X-CRM114-Status: GOOD ( 14.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Marco Elver , Catalin Marinas , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Konovalov , Andrey Ryabinin , Vincenzo Frascino , Dmitry Vyukov Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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) \ { \