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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95B2CC43334 for ; Tue, 12 Jul 2022 20:36:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8ACFF9400CF; Tue, 12 Jul 2022 16:36:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 85C96940063; Tue, 12 Jul 2022 16:36:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7240D9400CF; Tue, 12 Jul 2022 16:36:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 60E43940063 for ; Tue, 12 Jul 2022 16:36:52 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1D90A20B7F for ; Tue, 12 Jul 2022 20:36:52 +0000 (UTC) X-FDA: 79679606664.28.A4EECE4 Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) by imf16.hostedemail.com (Postfix) with ESMTP id AF7A8180061 for ; Tue, 12 Jul 2022 20:36:51 +0000 (UTC) Received: by mail-io1-f48.google.com with SMTP id u20so9020101iob.8 for ; Tue, 12 Jul 2022 13:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Y/kf7WpiJhpV7S8Lv6B6nSloUE3ZIK760tIURsCB2pw=; b=HK+0DWTz7CWIFl+SYCiY0c1eT23V1rfCJ2QRHvfA8bSUNlP5B7cbxj+fSAo0QWdQZF L4916vyqIJ6hBECNHpwM9VpomRkI9oU7ux781zK8Ag6wUNbvi0zH1theP+ClUZe+WfHY bB29E+meNCNUo/BX9CrmNicvZbvo7Dsb1noCwXeeg8uBLkIOTzOd2JFGDmLPi5Fxrwdh pVPnnhlFhQXWdSntoI9CvaNMVywddCOqtSosLlEXuaU9ngzuYPqFAR4H3H3Z9UHakffi K5w8ACxyuEOxAhWUkNEfCxymzEHp020sUAC2tCxdWfJj6r37lwRMsOlfEC07Le2qsU6U hBRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Y/kf7WpiJhpV7S8Lv6B6nSloUE3ZIK760tIURsCB2pw=; b=Kn7RP+U4pdz2nrZPPU9YzlaYCyhI5WbBtMwEVQ81GVuo/gcZZMzZfdd8ODAegWi2MN 0ueCu9WaCyqFpwqFdoZX3XIVLl1ogWa95yFFENy9hBq2ZBovxQvZm5WrE5PauB3NYO2S l4Wz48mnLSsgDwuiGkpQm4FcydCu601bFFElUyu+ThAgsEXbg/ODhu0MQOtHuNSQYSWb BMaW5kJ3hkHTIDIQTKPYIUPAPMMxo4gnFlznyVUrFlHMAur3sjurUbIt18AZqKC0J1Xu wEFS+fniTB5RSyki5t41kTOllZ+SklDMSvW5efdIBlNxvQcMY1TWuHO8TJHI7XCZvW/A C0jw== X-Gm-Message-State: AJIora8mDw7C9232fUGQKc3hI1y2qQZMQVfFPa2v/awMz2b8tMJpR8Ao Ne6xHaWkmewjak/NNtheUiUSmuZ9Hmnm8Ti7zFU= X-Google-Smtp-Source: AGRyM1vcVt7E6J7CXFHWcDWieOMzcW12/B3aaLXom2LHjUZJ7rjCMBYmaxd73fcDTKZ0bf0NWkgwf+myIsxTC/h2scA= X-Received: by 2002:a05:6638:3812:b0:33f:4a06:ad48 with SMTP id i18-20020a056638381200b0033f4a06ad48mr9488946jav.71.1657658210925; Tue, 12 Jul 2022 13:36:50 -0700 (PDT) MIME-Version: 1.0 References: <20220615062219.22618-1-Kuan-Ying.Lee@mediatek.com> In-Reply-To: <20220615062219.22618-1-Kuan-Ying.Lee@mediatek.com> From: Andrey Konovalov Date: Tue, 12 Jul 2022 22:36:40 +0200 Message-ID: Subject: Re: [PATCH] kasan: separate double free case from invalid free To: Kuan-Ying Lee Cc: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Vincenzo Frascino , Andrew Morton , Matthias Brugger , Chinwen Chang , =?UTF-8?B?WWVlIExlZSAo5p2O5bu66Kq8KQ==?= , casper.li@mediatek.com, Andrew Yang , kasan-dev , Linux Memory Management List , LKML , Linux ARM , "moderated list:ARM/Mediatek SoC support" Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657658211; a=rsa-sha256; cv=none; b=M2PkUgTzmRJd49gfUoshnGx03cx4bGnBuzrqjVY1/wVq3cMvwWwW8bdZLKUxGM1soB5+CD PaqBxrb6h0/buKakBiLjmfdcYeEbYwJK23bgUM32n+MgKVucu05y2HvUOyaomG6eJK3RnE zqYxaxfv+JulU8Hk9gI+Ic3M3EGeDHY= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=HK+0DWTz; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf16.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.166.48 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657658211; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Y/kf7WpiJhpV7S8Lv6B6nSloUE3ZIK760tIURsCB2pw=; b=kzArtH5tjyqx/NrHV/TXLizxQP8+jW8KeoBvRCUE4CcE2xL8Jvv9sp5p9mOEBch2hIgzxp RHCqmpOQ+lLg87dB0+opYQiY6Ih4qHraQCIc7as+8WngAUcdaSi2KTsesDqRNIuIDTkzH3 FxnnygV+Nbk15wlDj0GL+52f+BTS/dk= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: AF7A8180061 Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=HK+0DWTz; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf16.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.166.48 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com X-Stat-Signature: 9entrqyzgcc7dfnqoj4674wgithz37ri X-Rspam-User: X-HE-Tag: 1657658211-305536 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 Wed, Jun 15, 2022 at 8:22 AM 'Kuan-Ying Lee' via kasan-dev wrote: > > Currently, KASAN describes all invalid-free/double-free bugs as > "double-free or invalid-free". This is ambiguous. > > KASAN should report "double-free" when a double-free is a more > likely cause (the address points to the start of an object) and > report "invalid-free" otherwise [1]. > > [1] https://bugzilla.kernel.org/show_bug.cgi?id=212193 > > Signed-off-by: Kuan-Ying Lee > --- > mm/kasan/common.c | 8 ++++---- > mm/kasan/kasan.h | 3 ++- > mm/kasan/report.c | 12 ++++++++---- > 3 files changed, 14 insertions(+), 9 deletions(-) > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index c40c0e7b3b5f..707c3a527fcb 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -343,7 +343,7 @@ static inline bool ____kasan_slab_free(struct kmem_cache *cache, void *object, > > if (unlikely(nearest_obj(cache, virt_to_slab(object), object) != > object)) { > - kasan_report_invalid_free(tagged_object, ip); > + kasan_report_invalid_free(tagged_object, ip, KASAN_REPORT_INVALID_FREE); > return true; > } > > @@ -352,7 +352,7 @@ static inline bool ____kasan_slab_free(struct kmem_cache *cache, void *object, > return false; > > if (!kasan_byte_accessible(tagged_object)) { > - kasan_report_invalid_free(tagged_object, ip); > + kasan_report_invalid_free(tagged_object, ip, KASAN_REPORT_DOUBLE_FREE); > return true; > } > > @@ -377,12 +377,12 @@ bool __kasan_slab_free(struct kmem_cache *cache, void *object, > static inline bool ____kasan_kfree_large(void *ptr, unsigned long ip) > { > if (ptr != page_address(virt_to_head_page(ptr))) { > - kasan_report_invalid_free(ptr, ip); > + kasan_report_invalid_free(ptr, ip, KASAN_REPORT_INVALID_FREE); > return true; > } > > if (!kasan_byte_accessible(ptr)) { > - kasan_report_invalid_free(ptr, ip); > + kasan_report_invalid_free(ptr, ip, KASAN_REPORT_DOUBLE_FREE); > return true; > } > > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 610d60d6e5b8..01c03e45acd4 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -125,6 +125,7 @@ static inline bool kasan_sync_fault_possible(void) > enum kasan_report_type { > KASAN_REPORT_ACCESS, > KASAN_REPORT_INVALID_FREE, > + KASAN_REPORT_DOUBLE_FREE, > }; > > struct kasan_report_info { > @@ -277,7 +278,7 @@ static inline void kasan_print_address_stack_frame(const void *addr) { } > > bool kasan_report(unsigned long addr, size_t size, > bool is_write, unsigned long ip); > -void kasan_report_invalid_free(void *object, unsigned long ip); > +void kasan_report_invalid_free(void *object, unsigned long ip, enum kasan_report_type type); > > struct page *kasan_addr_to_page(const void *addr); > struct slab *kasan_addr_to_slab(const void *addr); > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > index b341a191651d..fe3f606b3a98 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -176,8 +176,12 @@ static void end_report(unsigned long *flags, void *addr) > static void print_error_description(struct kasan_report_info *info) > { > if (info->type == KASAN_REPORT_INVALID_FREE) { > - pr_err("BUG: KASAN: double-free or invalid-free in %pS\n", > - (void *)info->ip); > + pr_err("BUG: KASAN: invalid-free in %pS\n", (void *)info->ip); > + return; > + } > + > + if (info->type == KASAN_REPORT_DOUBLE_FREE) { > + pr_err("BUG: KASAN: double-free in %pS\n", (void *)info->ip); > return; > } > > @@ -433,7 +437,7 @@ static void print_report(struct kasan_report_info *info) > } > } > > -void kasan_report_invalid_free(void *ptr, unsigned long ip) > +void kasan_report_invalid_free(void *ptr, unsigned long ip, enum kasan_report_type type) > { > unsigned long flags; > struct kasan_report_info info; > @@ -448,7 +452,7 @@ void kasan_report_invalid_free(void *ptr, unsigned long ip) > > start_report(&flags, true); > > - info.type = KASAN_REPORT_INVALID_FREE; > + info.type = type; > info.access_addr = ptr; > info.first_bad_addr = kasan_reset_tag(ptr); > info.access_size = 0; > -- > 2.18.0 Reviewed-by: Andrey Konovalov Thanks for the patch!