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=-16.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 B1B4CC433E6 for ; Fri, 29 Jan 2021 18:50:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 11B1E64D99 for ; Fri, 29 Jan 2021 18:50:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11B1E64D99 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 30DA48D0003; Fri, 29 Jan 2021 13:50:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2951A8D0001; Fri, 29 Jan 2021 13:50:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 136298D0003; Fri, 29 Jan 2021 13:50:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0204.hostedemail.com [216.40.44.204]) by kanga.kvack.org (Postfix) with ESMTP id ECE158D0001 for ; Fri, 29 Jan 2021 13:50:28 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id A8764180AD83E for ; Fri, 29 Jan 2021 18:50:28 +0000 (UTC) X-FDA: 77759703336.30.flock07_140d58d275aa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 4D820180B3C94 for ; Fri, 29 Jan 2021 18:50:28 +0000 (UTC) X-HE-Tag: flock07_140d58d275aa X-Filterd-Recvd-Size: 4923 Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Fri, 29 Jan 2021 18:50:27 +0000 (UTC) Received: by mail-qk1-f202.google.com with SMTP id j78so7816080qke.11 for ; Fri, 29 Jan 2021 10:50:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=edlz3XbCYDia7c2gqKzN5FK6RAL7HO75a2b9pwPLi9o=; b=p0cuGC6uFFNLHjWlQLakZAxQQJgRk6G0D6LX6qzjT5dK2fs9fixJJw+zgdSaB+EhKs Px5erEn2BL7CG39x2R3gCVyh93v+p/hdyYTQAMIpOz3b9A13p0kObVGTYT8JzFCpi0x9 FUSCtI4eKNB6D49gcHsJuKTCRvSkmwqlF09dTPYtgWampxxSAdNkfSLYZnVB8LDnbBIG AGbMZDLOKwTMOe1ZAb17RrFjWoKBYMtQpBiBhmMtdMLd52qY3WGLWiGLAWfj5l/LLHOz Pm+X5DPJMB2mp/jbTFnXPiBYe46zKz8scT4jMiZCa8tCGr5pE2DwZV74gFm10EzkN85h M9tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=edlz3XbCYDia7c2gqKzN5FK6RAL7HO75a2b9pwPLi9o=; b=HQApBjN9MAcF++i/xjQeyFWXb7kG/TRWNwYg+s1Te0W5JvBY0H5U7ABRqWb4xuNx// 8mBhfasUIQYNF8t6hfoaNVFs84AD39u6FoMGxOfxJN6mVCzNZosxi56DiqQvK9j9bUWd gCbsQ+GFxYbHl9y1tp0+9FJ/Vt0gJmfEfi9/FqkkAZ2p2CGC5kWK6YWK6fOXUVEM7AG6 nVr6oouwd+OkuJxqkV2v1rB2jDpj9Hncw10b62wq3ESOd4+CQkAE7uI6oXUYS36zZSiN eOPQ0lNfifrnMdOSTqDheWNOD2Bd5q0N4igUxXU8qBU2//BX7mIo3bzrI6Z8HoysrLo+ tNWQ== X-Gm-Message-State: AOAM531dj8aTPyO5muEwnJvl9/zfQbICru89rMyNT6JspDrmKmU37nt4 emAQnhxUvMsYqL7Jtjy/pF6gIJJjmu331rlN X-Google-Smtp-Source: ABdhPJznVMEKJWnqt/qcGVZ2IAaYJgoTFuP2I61TJJuJQfaSosdBi1z/YCkiVbXLxyxaZ6roHV0PpgUbEkdPs13D X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:b59a:: with SMTP id g26mr5014944qve.26.1611946226898; Fri, 29 Jan 2021 10:50:26 -0800 (PST) Date: Fri, 29 Jan 2021 19:50:22 +0100 Message-Id: <9dc196006921b191d25d10f6e611316db7da2efc.1611946152.git.andreyknvl@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH mm] kasan: untag addresses for KFENCE From: Andrey Konovalov To: Andrew Morton Cc: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Marco Elver , kasan-dev@googlegroups.com, 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: KFENCE annotations operate on untagged addresses. Untag addresses in KASAN runtime where they might be tagged. Signed-off-by: Andrey Konovalov --- This can be squashed into: revert kasan-remove-kfence-leftovers kfence, kasan: make KFENCE compatible with KASA --- mm/kasan/common.c | 2 +- mm/kasan/kasan.h | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index a390fae9d64b..fe852f3cfa42 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -416,7 +416,7 @@ static void *____kasan_kmalloc(struct kmem_cache *cache, const void *object, if (unlikely(object == NULL)) return NULL; - if (is_kfence_address(object)) + if (is_kfence_address(kasan_reset_tag(object))) return (void *)object; redzone_start = round_up((unsigned long)(object + size), diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 11c6e3650468..4fb8106f8e31 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -320,22 +320,28 @@ static inline u8 kasan_random_tag(void) { return 0; } static inline void kasan_poison(const void *address, size_t size, u8 value) { + address = kasan_reset_tag(address); + /* Skip KFENCE memory if called explicitly outside of sl*b. */ if (is_kfence_address(address)) return; - hw_set_mem_tag_range(kasan_reset_tag(address), + hw_set_mem_tag_range((void *)address, round_up(size, KASAN_GRANULE_SIZE), value); } static inline void kasan_unpoison(const void *address, size_t size) { + u8 tag = get_tag(address); + + address = kasan_reset_tag(address); + /* Skip KFENCE memory if called explicitly outside of sl*b. */ if (is_kfence_address(address)) return; - hw_set_mem_tag_range(kasan_reset_tag(address), - round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); + hw_set_mem_tag_range((void *)address, + round_up(size, KASAN_GRANULE_SIZE), tag); } static inline bool kasan_byte_accessible(const void *addr) -- 2.30.0.365.g02bc693789-goog