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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 993B2C4740A for ; Mon, 7 Oct 2019 07:30:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 6874C2084D for ; Mon, 7 Oct 2019 07:30:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cVrHUHMw"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="VlTtBxnD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6874C2084D 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+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MJLPUTDNFbcg1y+PVqSncVzCL7TSDxwv8M8dRUzuyNM=; b=cVrHUHMw5eJd9f uAmGo218dX8QCP9Z/Y5jq3YP0YjJvBZwxDzh/qkNXTev4XcwNwRhns86RTUSgxOKahGSq3Zl2D+Kk 0uGFJzLETKIIP4vh99juZf8UXTbRtT+9QtUPhqxGDo7ILGBsKom3X8hmIu9oTgiAOm/5sd0Q5wRhI TZiNiFIAu0cjuXNGXcYD96b04e1w0mVv61Ra731Zt/0G1yEfhaiMwiDh7hHRA9favraTFixG/AUNC bToeK0sRaSM6/5DRvc+tbNymosvsGkzORNJwYpdnSH7rrE6b7H0ZwKnRZVawhvevPKxt5Mf+zl0xS eKf5M/ZUm3OfP14ydJew==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHNT7-0001W1-GP; Mon, 07 Oct 2019 07:30:09 +0000 Received: from mail-qk1-x742.google.com ([2607:f8b0:4864:20::742]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHNSz-0000w4-55 for linux-arm-kernel@lists.infradead.org; Mon, 07 Oct 2019 07:30:03 +0000 Received: by mail-qk1-x742.google.com with SMTP id x134so11707105qkb.0 for ; Mon, 07 Oct 2019 00:29:57 -0700 (PDT) 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=5/whrwnXmuipWLBmQ5DFzrwToiDCS8kW6Zb6tPW0PAM=; b=VlTtBxnDnz2gOXFcKHLxJrCmwuIHAFhvYEohGLPDScHToyjVcqP9Fnlnikxx2JB3sI Pgi0iyglqBz4t9T3eo9jCr2G4/WVkwDp6h6FSXkX1SLL3PwfbAbI8FoOg1w4QArLssUP /ARI7/r0DZ8BxPze494Co6Xr73xUw9TMpps7fXaYCH3dAtcFsIqQtxIEb2g5u1C5ncsf aGe3O0TOXxQld8+RvCS0xF0GA5oZXKPTe1WGp+nAjttefbShyeANE9d8y0OuatQZVGne a22PX/zouxEx1NbfOSj608JmefiMurh2Ff7Ewd+fufwmT6jevWEvOlEaQuMocUZ6o9I7 OIFQ== 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=5/whrwnXmuipWLBmQ5DFzrwToiDCS8kW6Zb6tPW0PAM=; b=EuTUaqZsyWi99VCKHdTOyYLUPrC3S4zH53BXRN75y6T1oc7z78Q59v/1dZXQUBBBHd Ussi5lpcwrxNVSxzKqhvkycWNMCx3VKnm09CY8BzAFcAq3/NdsbH2j9byZUJH19+xee1 uFNH64ypPl6XZx39zXLmQEzXGzCK7YkzwWUkgRPb+H0RyBdRFv6bq1HuGD+MVpTM1ZaT eO9ZyOUM29zNMNkZ2CHkX37gmEu4VNa3/x4us4anwpbFf1LqQRk4hPPMrf6SGF9iMNzY PTA14x0z320T5hQxD1DC+hHUZd7BDj6EXnzLb+05XNwV399MxHLzpR5XWDwgzvfrhw5i /fTA== X-Gm-Message-State: APjAAAX1QCGyHwacCXvyRGHwAyFqRaTzz1iRfnBlVig1vPXZsrLeDOaO dBb4d9p88R8a7UjBJVl+HN8RVhOpDqzn9Z6JZAVXJA== X-Google-Smtp-Source: APXvYqyvCiw7DR2qtcig/5oWesaQ40f5upQUYafN4az0Tkrn1yiR2sBersvbT4V5VzPn10V6DV6aC0V5uIkgr6uc2LQ= X-Received: by 2002:a37:985:: with SMTP id 127mr21743116qkj.43.1570433396036; Mon, 07 Oct 2019 00:29:56 -0700 (PDT) MIME-Version: 1.0 References: <20190927034338.15813-1-walter-zh.wu@mediatek.com> <1569594142.9045.24.camel@mtksdccf07> <1569818173.17361.19.camel@mtksdccf07> <1570018513.19702.36.camel@mtksdccf07> <1570069078.19702.57.camel@mtksdccf07> <1570095525.19702.59.camel@mtksdccf07> <1570110681.19702.64.camel@mtksdccf07> <1570164140.19702.97.camel@mtksdccf07> <1570176131.19702.105.camel@mtksdccf07> <1570182257.19702.109.camel@mtksdccf07> <1570190718.19702.125.camel@mtksdccf07> <1570418576.4686.30.camel@mtksdccf07> In-Reply-To: <1570418576.4686.30.camel@mtksdccf07> From: Dmitry Vyukov Date: Mon, 7 Oct 2019 09:29:44 +0200 Message-ID: Subject: Re: [PATCH] kasan: fix the missing underflow in memmove and memcpy with CONFIG_KASAN_GENERIC=y To: Walter Wu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191007_003001_192983_96212C73 X-CRM114-Status: GOOD ( 32.02 ) 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: wsd_upstream , linux-mediatek@lists.infradead.org, LKML , kasan-dev , Linux-MM , Alexander Potapenko , Matthias Brugger , Andrey Ryabinin , Linux ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Oct 7, 2019 at 5:23 AM Walter Wu wrote: > > > > > > "out-of-bounds" is the _least_ frequent KASAN bug type. So saying > > > > > > "out-of-bounds" has downsides of both approaches and won't prevent > > > > > > duplicate reports by syzbot... > > > > > > > > > > > maybe i should add your comment into the comment in get_bug_type? > > > > > > > > Yes, that's exactly what I meant above: > > > > > > > > "I would change get_bug_type() to return "slab-out-of-bounds" (as the > > > > most common OOB) in such case (with a comment)." > > > > > > > > ;) > > > > > > > > > The patchset help to produce KASAN report when size is negative size in > > > memory operation function. It is helpful for programmer to solve the > > > undefined behavior issue. Patch 1 based on Dmitry's suggestion and > > > review, patch 2 is a test in order to verify the patch 1. > > > > > > [1]https://bugzilla.kernel.org/show_bug.cgi?id=199341 > > > [2]https://lore.kernel.org/linux-arm-kernel/20190927034338.15813-1-walter-zh.wu@mediatek.com/ > > > > > > Walter Wu (2): > > > kasan: detect invalid size in memory operation function > > > kasan: add test for invalid size in memmove > > > > > > lib/test_kasan.c | 18 ++++++++++++++++++ > > > mm/kasan/common.c | 13 ++++++++----- > > > mm/kasan/generic.c | 5 +++++ > > > mm/kasan/generic_report.c | 10 ++++++++++ > > > mm/kasan/tags.c | 5 +++++ > > > mm/kasan/tags_report.c | 10 ++++++++++ > > > 6 files changed, 56 insertions(+), 5 deletions(-) > > > > > > > > > > > > > > > commit 0bc50c759a425fa0aafb7ef623aa1598b3542c67 > > > Author: Walter Wu > > > Date: Fri Oct 4 18:38:31 2019 +0800 > > > > > > kasan: detect invalid size in memory operation function > > > > > > It is an undefined behavior to pass a negative value to > > > memset()/memcpy()/memmove() > > > , so need to be detected by KASAN. > > > > > > If size is negative value, then it will be larger than ULONG_MAX/2, > > > so that we will qualify as out-of-bounds issue. > > > > > > KASAN report: > > > > > > BUG: KASAN: out-of-bounds in kmalloc_memmove_invalid_size+0x70/0xa0 > > > Read of size 18446744073709551608 at addr ffffff8069660904 by task > > > cat/72 > > > > > > CPU: 2 PID: 72 Comm: cat Not tainted > > > 5.4.0-rc1-next-20191004ajb-00001-gdb8af2f372b2-dirty #1 > > > Hardware name: linux,dummy-virt (DT) > > > Call trace: > > > dump_backtrace+0x0/0x288 > > > show_stack+0x14/0x20 > > > dump_stack+0x10c/0x164 > > > print_address_description.isra.9+0x68/0x378 > > > __kasan_report+0x164/0x1a0 > > > kasan_report+0xc/0x18 > > > check_memory_region+0x174/0x1d0 > > > memmove+0x34/0x88 > > > kmalloc_memmove_invalid_size+0x70/0xa0 > > > > > > [1] https://bugzilla.kernel.org/show_bug.cgi?id=199341 > > > > > > Signed-off-by: Walter Wu > > > Reported -by: Dmitry Vyukov > > > Suggested-by: Dmitry Vyukov > > > > > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > > > index 6814d6d6a023..6ef0abd27f06 100644 > > > --- a/mm/kasan/common.c > > > +++ b/mm/kasan/common.c > > > @@ -102,7 +102,8 @@ EXPORT_SYMBOL(__kasan_check_write); > > > #undef memset > > > void *memset(void *addr, int c, size_t len) > > > { > > > - check_memory_region((unsigned long)addr, len, true, _RET_IP_); > > > + if (!check_memory_region((unsigned long)addr, len, true, _RET_IP_)) > > > + return NULL; > > > > > > return __memset(addr, c, len); > > > } > > > @@ -110,8 +111,9 @@ void *memset(void *addr, int c, size_t len) > > > #undef memmove > > > void *memmove(void *dest, const void *src, size_t len) > > > { > > > - check_memory_region((unsigned long)src, len, false, _RET_IP_); > > > - check_memory_region((unsigned long)dest, len, true, _RET_IP_); > > > + if (!check_memory_region((unsigned long)src, len, false, _RET_IP_) || > > > + !check_memory_region((unsigned long)dest, len, true, _RET_IP_)) > > > + return NULL; > > > > > > return __memmove(dest, src, len); > > > } > > > @@ -119,8 +121,9 @@ void *memmove(void *dest, const void *src, size_t > > > len) > > > #undef memcpy > > > void *memcpy(void *dest, const void *src, size_t len) > > > { > > > - check_memory_region((unsigned long)src, len, false, _RET_IP_); > > > - check_memory_region((unsigned long)dest, len, true, _RET_IP_); > > > + if (!check_memory_region((unsigned long)src, len, false, _RET_IP_) || > > > + !check_memory_region((unsigned long)dest, len, true, _RET_IP_)) > > > + return NULL; > > > > > > return __memcpy(dest, src, len); > > > } > > > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > > > index 616f9dd82d12..02148a317d27 100644 > > > --- a/mm/kasan/generic.c > > > +++ b/mm/kasan/generic.c > > > @@ -173,6 +173,11 @@ static __always_inline bool > > > check_memory_region_inline(unsigned long addr, > > > if (unlikely(size == 0)) > > > return true; > > > > > > + if (unlikely((long)size < 0)) { > > > + kasan_report(addr, size, write, ret_ip); > > > + return false; > > > + } > > > + > > > if (unlikely((void *)addr < > > > kasan_shadow_to_mem((void *)KASAN_SHADOW_START))) { > > > kasan_report(addr, size, write, ret_ip); > > > diff --git a/mm/kasan/generic_report.c b/mm/kasan/generic_report.c > > > index 36c645939bc9..23951a453681 100644 > > > --- a/mm/kasan/generic_report.c > > > +++ b/mm/kasan/generic_report.c > > > @@ -107,6 +107,16 @@ static const char *get_wild_bug_type(struct > > > kasan_access_info *info) > > > > > > const char *get_bug_type(struct kasan_access_info *info) > > > { > > > + /* > > > + * if access_size < 0, then it will be larger than ULONG_MAX/2, > > > + * so that this can qualify as out-of-bounds. > > > + * out-of-bounds is the _least_ frequent KASAN bug type. So saying > > > + * out-of-bounds has downsides of both approaches and won't prevent > > > + * duplicate reports by syzbot. > > > + */ > > > + if ((long)info->access_size < 0) > > > + return "out-of-bounds"; > > > + > > > if (addr_has_shadow(info->access_addr)) > > > return get_shadow_bug_type(info); > > > return get_wild_bug_type(info); > > > diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c > > > index 0e987c9ca052..b829535a3ad7 100644 > > > --- a/mm/kasan/tags.c > > > +++ b/mm/kasan/tags.c > > > @@ -86,6 +86,11 @@ bool check_memory_region(unsigned long addr, size_t > > > size, bool write, > > > if (unlikely(size == 0)) > > > return true; > > > > > > + if (unlikely((long)size < 0)) { > > > + kasan_report(addr, size, write, ret_ip); > > > + return false; > > > + } > > > + > > > tag = get_tag((const void *)addr); > > > > > > /* > > > diff --git a/mm/kasan/tags_report.c b/mm/kasan/tags_report.c > > > index 969ae08f59d7..19b9e364b397 100644 > > > --- a/mm/kasan/tags_report.c > > > +++ b/mm/kasan/tags_report.c > > > @@ -36,6 +36,16 @@ > > > > > > const char *get_bug_type(struct kasan_access_info *info) > > > { > > > + /* > > > + * if access_size < 0, then it will be larger than ULONG_MAX/2, > > > + * so that this can qualify as out-of-bounds. > > > + * out-of-bounds is the _least_ frequent KASAN bug type. So saying > > > + * out-of-bounds has downsides of both approaches and won't prevent > > > + * duplicate reports by syzbot. > > > + */ > > > + if ((long)info->access_size < 0) > > > + return "out-of-bounds"; > > > > > > wait, no :) > > I meant we change it to heap-out-of-bounds and explain why we are > > saying this is a heap-out-of-bounds. > > The current comment effectively says we are doing non useful thing for > > no reason, it does not eliminate any of my questions as a reader of > > this code :) > > > Ok, the current comment may not enough to be understood why we use OOB > to represent size<0 bug. We can modify it as below :) > > If access_size < 0, then it has two reasons to be defined as > out-of-bounds. > 1) Casting negative numbers to size_t would indeed turn up as a "large" > size_t and its value will be larger than ULONG_MAX/2, so that this can > qualify as out-of-bounds. > 2) Don't generate new bug type in order to prevent duplicate reports by > some systems, e.g. syzbot." Looks good to me. I think it should provide enough hooks for future readers to understand why we do this. > > > + > > > #ifdef CONFIG_KASAN_SW_TAGS_IDENTIFY > > > struct kasan_alloc_meta *alloc_meta; > > > struct kmem_cache *cache; > > > > > > > > > > > > commit fb5cf7bd16e939d1feef229af0211a8616c9ea03 > > > Author: Walter Wu > > > Date: Fri Oct 4 18:32:03 2019 +0800 > > > > > > kasan: add test for invalid size in memmove > > > > > > Test size is negative vaule in memmove in order to verify > > > if it correctly produce KASAN report. > > > > > > Signed-off-by: Walter Wu > > > > > > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > > > index 49cc4d570a40..06942cf585cc 100644 > > > --- a/lib/test_kasan.c > > > +++ b/lib/test_kasan.c > > > @@ -283,6 +283,23 @@ static noinline void __init > > > kmalloc_oob_in_memset(void) > > > kfree(ptr); > > > } > > > > > > +static noinline void __init kmalloc_memmove_invalid_size(void) > > > +{ > > > + char *ptr; > > > + size_t size = 64; > > > + > > > + pr_info("invalid size in memmove\n"); > > > + ptr = kmalloc(size, GFP_KERNEL); > > > + if (!ptr) { > > > + pr_err("Allocation failed\n"); > > > + return; > > > + } > > > + > > > + memset((char *)ptr, 0, 64); > > > + memmove((char *)ptr, (char *)ptr + 4, -2); > > > + kfree(ptr); > > > +} > > > + > > > static noinline void __init kmalloc_uaf(void) > > > { > > > char *ptr; > > > @@ -773,6 +790,7 @@ static int __init kmalloc_tests_init(void) > > > kmalloc_oob_memset_4(); > > > kmalloc_oob_memset_8(); > > > kmalloc_oob_memset_16(); > > > + kmalloc_memmove_invalid_size(); > > > kmalloc_uaf(); > > > kmalloc_uaf_memset(); > > > kmalloc_uaf2(); > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel