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=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL 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 47B13C433DB for ; Mon, 1 Feb 2021 10:40:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DA30B64E99 for ; Mon, 1 Feb 2021 10:40:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA30B64E99 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 2148C6B006E; Mon, 1 Feb 2021 05:40:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C4E66B0070; Mon, 1 Feb 2021 05:40:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0DC946B0071; Mon, 1 Feb 2021 05:40:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0127.hostedemail.com [216.40.44.127]) by kanga.kvack.org (Postfix) with ESMTP id EC2726B006E for ; Mon, 1 Feb 2021 05:40:17 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A61D83626 for ; Mon, 1 Feb 2021 10:40:17 +0000 (UTC) X-FDA: 77769354474.08.river48_4e0a11c275c1 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 8ABB41819E772 for ; Mon, 1 Feb 2021 10:40:17 +0000 (UTC) X-HE-Tag: river48_4e0a11c275c1 X-Filterd-Recvd-Size: 5381 Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Mon, 1 Feb 2021 10:40:17 +0000 (UTC) Received: by mail-ot1-f45.google.com with SMTP id i20so15769116otl.7 for ; Mon, 01 Feb 2021 02:40:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eZ3P7u3TRYoNHUYZqgM31be6IdJ5ULeRL5Xx+spxYug=; b=J+G/5cHAOoeeChiA2gvAbHNdL/cLBHqEBYggQT9DagQENHw2vR2w4LUTIVIvHsJlK3 BvSxBLO/KJ9Er43uplO1k6Nn3E7BdwDOUPopWx+aZ2FXgSNK2JI54UIJklO0rX6zBdIw 9aE46+23PnFPuBR/2G774C/y/2rLDh99LNWGG61nW8kLmQ/1fKZ7pUel0nZixWV701sR lir1+JvjiGlvFswRQDg9gL3k2utSVl1RbNnAEgpAVy+TGfmBa6+LL3rI3QTkWKj3rHXX wKXMyKhWSF+JDGlBb0PeCkMlr3RwSEiMoODTJAVp6Em7TF2WzW9954ZDEDfbmnbcxnY/ Hmkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=eZ3P7u3TRYoNHUYZqgM31be6IdJ5ULeRL5Xx+spxYug=; b=LJStH/DJTmGdiaB3mGIAlkns18fyVR59omXFyC3vMQbcra3MoC8vTXdQjISSFNPJIy 1WlCuChZUqXQHRHYlashYJr2VYx0vJMVr5LhMCcUbXkvL4qE9t/bUrlDc0UdD6jNMExG EE6/pz8OeMDjiTL9Cs5u9NcAbBAZ/dRL2wpVaEQycsA8LhDa2rULG0+MXHJdMXiRv0Ow WdDZdAkBoBjxDZRbP+OF8Y9kknr4SFWnxbCTKB/rAJMoIZXci7u3Fal9h4ca4VZLGEEr RBovi7lPzRIGKT7tgozRp3HWcZDIB+bVBOzLcqnzoKkKSrj9D1PH58NMgrQmT2ou7QiG rS5g== X-Gm-Message-State: AOAM532ADqjmjhuFANNVn7PwjLQnZjfvRFpMKk1M36SuYXjG+alJYfI2 0KkGJFjOaSGH2BX8adCJk3s8X+hlJQDIsPkKM5/WAA== X-Google-Smtp-Source: ABdhPJxbLZb3s83wkvuMcsz//ZdUo7T5QE3e00JDOcFsWOEZM13K0O32Rx5cT+vayqYjgDKiCVKQe0Xa2wvImTBggmo= X-Received: by 2002:a9d:4687:: with SMTP id z7mr11570191ote.233.1612176016311; Mon, 01 Feb 2021 02:40:16 -0800 (PST) MIME-Version: 1.0 References: <9dc196006921b191d25d10f6e611316db7da2efc.1611946152.git.andreyknvl@google.com> In-Reply-To: <9dc196006921b191d25d10f6e611316db7da2efc.1611946152.git.andreyknvl@google.com> From: Marco Elver Date: Mon, 1 Feb 2021 11:40:05 +0100 Message-ID: Subject: Re: [PATCH mm] kasan: untag addresses for KFENCE To: Andrey Konovalov Cc: Andrew Morton , Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , kasan-dev , Linux Memory Management List , LKML 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: On Fri, 29 Jan 2021 at 19:50, Andrey Konovalov wrote: > > KFENCE annotations operate on untagged addresses. > > Untag addresses in KASAN runtime where they might be tagged. > > Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver Thank you! > --- > > 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 >