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=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 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 CC1C9C54FCC for ; Tue, 21 Apr 2020 13:38:11 +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 9AA94206F4 for ; Tue, 21 Apr 2020 13:38:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FcY3MsTp"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="UTEX4+n2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9AA94206F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=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:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NOS3ypGemefi8sWLNDw/7229nv9MmOTBQ/b8dbGWH1U=; b=FcY3MsTpyAwVHZ oiweP8DxnOgG7U+Ns++DxnzVy0/sBEvm1LgQ79CsheyY9HvoQYxqjXo1GJZ+ePVZAU8aWZYqhRg0j cpHN++2vdbM0TD1TTyfVXgz/fnIOzmT8+RlFus3AAqnpQxsaiERk4b6AeiRQv8yWtWstHvsdLJj+B H93iegGCuB9M2RljDbphutmxsupnxZIcP/jv+XtfrAbdF3G6CrzoN9oHxLvZHC8Tt+7Q9SU1jiy5Y 42p8ePZSwZNj9rxZediRVfd2D3G5wxWD4AubeuS6FOlr0k9LoPqWZ+Ln0edVWvT7iMfCT5VLah3tK 6xonWsyOFBTAi95pLMzA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQt6B-0002aD-7Z; Tue, 21 Apr 2020 13:38:03 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQt67-0002Yl-Kn; Tue, 21 Apr 2020 13:38:01 +0000 X-UUID: 7aef3cae0bc74e8ebfbf641041b22f82-20200421 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=JX00X8S2zWSDA5/Zsgs0O/ncM6aJvIG88Eh4mjiOiX4=; b=UTEX4+n2pZQ0fF+O3YomMJTx5Chv4HrzbCXIH4djX0EtxWKEH0nnrPg/PkrPU8ht/SwiJIT0MmGZOUCbWQ8AD6mWxzrKWYedkpsHU7aQ3379tWU/sEGWrq8fmCOriTi+NVUEhlPVEuNzrPbOM7j7+msHHJjlTzkh/nctkzOcvLs=; X-UUID: 7aef3cae0bc74e8ebfbf641041b22f82-20200421 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 473077511; Tue, 21 Apr 2020 05:37:33 -0800 Received: from MTKMBS06N2.mediatek.inc (172.21.101.130) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 21 Apr 2020 06:37:51 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs06n2.mediatek.inc (172.21.101.130) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 21 Apr 2020 21:37:52 +0800 Received: from [172.21.84.99] (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 21 Apr 2020 21:37:48 +0800 Message-ID: <1587476272.5870.15.camel@mtksdccf07> Subject: Re: [PATCH] kasan: fix KASAN unit tests for tag-based KASAN From: Walter Wu To: Dmitry Vyukov Date: Tue, 21 Apr 2020 21:37:52 +0800 In-Reply-To: References: <20200421014007.6012-1-walter-zh.wu@mediatek.com> <1587472005.5870.7.camel@mtksdccf07> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-TM-SNTS-SMTP: BC3A44A52E9D8AE093BF388FD62DAE971AB1F492889557179C30B461B1F267482000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200421_063759_856973_E9EF013A X-CRM114-Status: GOOD ( 30.21 ) X-BeenThere: linux-mediatek@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 , Patricia Alfonso , Andrey Konovalov , Brendan Higgins , LKML , kasan-dev , Linux-MM , linux-mediatek@lists.infradead.org, Alexander Potapenko , David Gow , Matthias Brugger , Andrey Ryabinin , Andrew Morton , Linux ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Tue, 2020-04-21 at 15:01 +0200, 'Dmitry Vyukov' via kasan-dev wrote: > On Tue, Apr 21, 2020 at 2:26 PM Walter Wu wrote: > > > > Hi Dmitry, > > > > On Tue, 2020-04-21 at 13:56 +0200, Dmitry Vyukov wrote: > > > On Tue, Apr 21, 2020 at 3:40 AM Walter Wu wrote: > > > > > > > > When we use tag-based KASAN, then KASAN unit tests don't detect > > > > out-of-bounds memory access. Because with tag-based KASAN the state > > > > of each 16 aligned bytes of memory is encoded in one shadow byte > > > > and the shadow value is tag of pointer, so we need to read next > > > > shadow byte, the shadow value is not equal to tag of pointer, > > > > then tag-based KASAN will detect out-of-bounds memory access. > > > > > > > > Signed-off-by: Walter Wu > > > > Cc: Andrey Ryabinin > > > > Cc: Dmitry Vyukov > > > > Cc: Alexander Potapenko > > > > Cc: Matthias Brugger > > > > Cc: Andrey Konovalov > > > > Cc: Andrew Morton > > > > --- > > > > lib/test_kasan.c | 62 ++++++++++++++++++++++++++++++++++++++++++------ > > > > 1 file changed, 55 insertions(+), 7 deletions(-) > > > > > > > > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > > > > index e3087d90e00d..a164f6b47fe5 100644 > > > > --- a/lib/test_kasan.c > > > > +++ b/lib/test_kasan.c > > > > @@ -40,7 +40,12 @@ static noinline void __init kmalloc_oob_right(void) > > > > return; > > > > } > > > > > > Hi Walter, > > > > > > This would be great to have! > > > But I am concerned about these series that port KASAN tests to KUNIT: > > > https://lkml.org/lkml/2020/4/17/1144 > > > I suspect it will be one large merge conflict. Not sure what is the > > > proper way to resovle this. I've added authors to CC. > > > > > Yes, it should have conflicts. Thanks for your reminder. > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > ptr[size] = 'x'; > > > > +#else > > > > + ptr[size + 5] = 'x'; > > > > +#endif > > > > + > > > > > > For this particular snippet I think we can reduce amount of idef'ery > > > and amount of non-compiled code in each configuration with something > > > like: > > > > > > ptr[size + 5] = 'x'; > > > if (ENABLED(CONFIG_KASAN_GENERIC)) > > > ptr[size] = 'x'; > > > > > > One check runs always (it should pass in both configs, right?). The > > > > There is a problem, With generic KASAN it may trigger two KASAN reports. > > Why is this a problem? If there are 2, fine. KUNIT can check that if > we expect 2, there are indeed 2. > Sorry, I originally assume my patch doesn't include in KUNIT. so I think there is a problem. but I know your meaning. Can my patch upstream first? > > if we change it like: > > > > if (ENABLED(CONFIG_KASAN_GENERIC)) > > ptr[size] = 'x'; > > else > > ptr[size + 5] = 'x'; > > > > > only only in GENERIC, but it's C-level if rather than preprocessor. > > > KUNIT should make 2 bugs per test easily expressable (and testable). > > > > > > > > > > > > > > > > > > kfree(ptr); > > > > } > > > > > > > > @@ -92,7 +97,12 @@ static noinline void __init kmalloc_pagealloc_oob_right(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > ptr[size] = 0; > > > > +#else > > > > + ptr[size + 6] = 0; > > > > +#endif > > > > + > > > > kfree(ptr); > > > > } > > > > > > > > @@ -162,7 +172,11 @@ static noinline void __init kmalloc_oob_krealloc_more(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > ptr2[size2] = 'x'; > > > > +#else > > > > + ptr2[size2 + 13] = 'x'; > > > > +#endif > > > > kfree(ptr2); > > > > } > > > > > > > > @@ -180,7 +194,12 @@ static noinline void __init kmalloc_oob_krealloc_less(void) > > > > kfree(ptr1); > > > > return; > > > > } > > > > + > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > ptr2[size2] = 'x'; > > > > +#else > > > > + ptr2[size2 + 2] = 'x'; > > > > +#endif > > > > kfree(ptr2); > > > > } > > > > > > > > @@ -216,7 +235,11 @@ static noinline void __init kmalloc_oob_memset_2(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > memset(ptr+7, 0, 2); > > > > +#else > > > > + memset(ptr+15, 0, 2); > > > > +#endif > > > > kfree(ptr); > > > > } > > > > > > > > @@ -232,7 +255,11 @@ static noinline void __init kmalloc_oob_memset_4(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > memset(ptr+5, 0, 4); > > > > +#else > > > > + memset(ptr+15, 0, 4); > > > > +#endif > > > > kfree(ptr); > > > > } > > > > > > > > @@ -249,7 +276,11 @@ static noinline void __init kmalloc_oob_memset_8(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > memset(ptr+1, 0, 8); > > > > +#else > > > > + memset(ptr+15, 0, 8); > > > > +#endif > > > > kfree(ptr); > > > > } > > > > > > > > @@ -265,7 +296,11 @@ static noinline void __init kmalloc_oob_memset_16(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > memset(ptr+1, 0, 16); > > > > +#else > > > > + memset(ptr+15, 0, 16); > > > > +#endif > > > > kfree(ptr); > > > > } > > > > > > > > @@ -281,7 +316,11 @@ static noinline void __init kmalloc_oob_in_memset(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > memset(ptr, 0, size+5); > > > > +#else > > > > + memset(ptr, 0, size+7); > > > > +#endif > > > > kfree(ptr); > > > > } > > > > > > > > @@ -415,7 +454,11 @@ static noinline void __init kmem_cache_oob(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > *p = p[size]; > > > > +#else > > > > + *p = p[size + 8]; > > > > +#endif > > > > kmem_cache_free(cache, p); > > > > kmem_cache_destroy(cache); > > > > } > > > > @@ -497,6 +540,11 @@ static noinline void __init copy_user_test(void) > > > > char __user *usermem; > > > > size_t size = 10; > > > > int unused; > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > + size_t oob_size = 1; > > > > +#else > > > > + size_t oob_size = 7; > > > > +#endif > > > > > > > > kmem = kmalloc(size, GFP_KERNEL); > > > > if (!kmem) > > > > @@ -512,25 +560,25 @@ static noinline void __init copy_user_test(void) > > > > } > > > > > > > > pr_info("out-of-bounds in copy_from_user()\n"); > > > > - unused = copy_from_user(kmem, usermem, size + 1); > > > > + unused = copy_from_user(kmem, usermem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in copy_to_user()\n"); > > > > - unused = copy_to_user(usermem, kmem, size + 1); > > > > + unused = copy_to_user(usermem, kmem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in __copy_from_user()\n"); > > > > - unused = __copy_from_user(kmem, usermem, size + 1); > > > > + unused = __copy_from_user(kmem, usermem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in __copy_to_user()\n"); > > > > - unused = __copy_to_user(usermem, kmem, size + 1); > > > > + unused = __copy_to_user(usermem, kmem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in __copy_from_user_inatomic()\n"); > > > > - unused = __copy_from_user_inatomic(kmem, usermem, size + 1); > > > > + unused = __copy_from_user_inatomic(kmem, usermem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in __copy_to_user_inatomic()\n"); > > > > - unused = __copy_to_user_inatomic(usermem, kmem, size + 1); > > > > + unused = __copy_to_user_inatomic(usermem, kmem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in strncpy_from_user()\n"); > > > > - unused = strncpy_from_user(kmem, usermem, size + 1); > > > > + unused = strncpy_from_user(kmem, usermem, size + oob_size); > > > > > > > > vm_munmap((unsigned long)usermem, PAGE_SIZE); > > > > kfree(kmem); > > > > -- > > > > 2.18.0 > > > > > > > > -- > > > > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > > > > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > > > > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/20200421014007.6012-1-walter-zh.wu%40mediatek.com. > > > > -- > > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/1587472005.5870.7.camel%40mtksdccf07. > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 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 8BBA2C54FD0 for ; Tue, 21 Apr 2020 13:38:05 +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 5A8B62075E for ; Tue, 21 Apr 2020 13:38:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HUXMcdT/"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="UTEX4+n2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A8B62075E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.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:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tqIjLYZN2LW6szNmMfvklDejxyCoFtRONnA2aqEdIxI=; b=HUXMcdT/XSrHIz DmEhXU+pVa9AZ6C/GeQEuosHIzzitG9kL/E0bFYglOB+l3TmnFKIcqGreZMnzdtjobZ1fFhSdFPRg 10APmTdF1bDhmRpCzlbfoUM5VxvcZIGIRgWvu+D76UhR2Uga9dWdgLzFiyr0TTLn4SZnJlLlZ3AfK hwnJbffJ3hqbeWgJRFR6Qoq9t2XTKosfuRppZUYMwBMUHOgZDmg+AoREArvRyB/Jmt6NjqoQOfWFR BBL3RVGEfx2MfsW/9gn/SAoFn7/sr3pQS8qADxuDSwZoVpwjcW8v5wAPli3G8otzvBtf2PgeWx5fU cPw691cW13SHgyljmvEQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQt6C-0002b2-7l; Tue, 21 Apr 2020 13:38:04 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQt67-0002Yl-Kn; Tue, 21 Apr 2020 13:38:01 +0000 X-UUID: 7aef3cae0bc74e8ebfbf641041b22f82-20200421 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=JX00X8S2zWSDA5/Zsgs0O/ncM6aJvIG88Eh4mjiOiX4=; b=UTEX4+n2pZQ0fF+O3YomMJTx5Chv4HrzbCXIH4djX0EtxWKEH0nnrPg/PkrPU8ht/SwiJIT0MmGZOUCbWQ8AD6mWxzrKWYedkpsHU7aQ3379tWU/sEGWrq8fmCOriTi+NVUEhlPVEuNzrPbOM7j7+msHHJjlTzkh/nctkzOcvLs=; X-UUID: 7aef3cae0bc74e8ebfbf641041b22f82-20200421 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 473077511; Tue, 21 Apr 2020 05:37:33 -0800 Received: from MTKMBS06N2.mediatek.inc (172.21.101.130) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 21 Apr 2020 06:37:51 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs06n2.mediatek.inc (172.21.101.130) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 21 Apr 2020 21:37:52 +0800 Received: from [172.21.84.99] (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 21 Apr 2020 21:37:48 +0800 Message-ID: <1587476272.5870.15.camel@mtksdccf07> Subject: Re: [PATCH] kasan: fix KASAN unit tests for tag-based KASAN From: Walter Wu To: Dmitry Vyukov Date: Tue, 21 Apr 2020 21:37:52 +0800 In-Reply-To: References: <20200421014007.6012-1-walter-zh.wu@mediatek.com> <1587472005.5870.7.camel@mtksdccf07> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-TM-SNTS-SMTP: BC3A44A52E9D8AE093BF388FD62DAE971AB1F492889557179C30B461B1F267482000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200421_063759_856973_E9EF013A X-CRM114-Status: GOOD ( 30.21 ) 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 , Patricia Alfonso , Andrey Konovalov , Brendan Higgins , LKML , kasan-dev , Linux-MM , linux-mediatek@lists.infradead.org, Alexander Potapenko , David Gow , Matthias Brugger , Andrey Ryabinin , Andrew Morton , 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 Tue, 2020-04-21 at 15:01 +0200, 'Dmitry Vyukov' via kasan-dev wrote: > On Tue, Apr 21, 2020 at 2:26 PM Walter Wu wrote: > > > > Hi Dmitry, > > > > On Tue, 2020-04-21 at 13:56 +0200, Dmitry Vyukov wrote: > > > On Tue, Apr 21, 2020 at 3:40 AM Walter Wu wrote: > > > > > > > > When we use tag-based KASAN, then KASAN unit tests don't detect > > > > out-of-bounds memory access. Because with tag-based KASAN the state > > > > of each 16 aligned bytes of memory is encoded in one shadow byte > > > > and the shadow value is tag of pointer, so we need to read next > > > > shadow byte, the shadow value is not equal to tag of pointer, > > > > then tag-based KASAN will detect out-of-bounds memory access. > > > > > > > > Signed-off-by: Walter Wu > > > > Cc: Andrey Ryabinin > > > > Cc: Dmitry Vyukov > > > > Cc: Alexander Potapenko > > > > Cc: Matthias Brugger > > > > Cc: Andrey Konovalov > > > > Cc: Andrew Morton > > > > --- > > > > lib/test_kasan.c | 62 ++++++++++++++++++++++++++++++++++++++++++------ > > > > 1 file changed, 55 insertions(+), 7 deletions(-) > > > > > > > > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > > > > index e3087d90e00d..a164f6b47fe5 100644 > > > > --- a/lib/test_kasan.c > > > > +++ b/lib/test_kasan.c > > > > @@ -40,7 +40,12 @@ static noinline void __init kmalloc_oob_right(void) > > > > return; > > > > } > > > > > > Hi Walter, > > > > > > This would be great to have! > > > But I am concerned about these series that port KASAN tests to KUNIT: > > > https://lkml.org/lkml/2020/4/17/1144 > > > I suspect it will be one large merge conflict. Not sure what is the > > > proper way to resovle this. I've added authors to CC. > > > > > Yes, it should have conflicts. Thanks for your reminder. > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > ptr[size] = 'x'; > > > > +#else > > > > + ptr[size + 5] = 'x'; > > > > +#endif > > > > + > > > > > > For this particular snippet I think we can reduce amount of idef'ery > > > and amount of non-compiled code in each configuration with something > > > like: > > > > > > ptr[size + 5] = 'x'; > > > if (ENABLED(CONFIG_KASAN_GENERIC)) > > > ptr[size] = 'x'; > > > > > > One check runs always (it should pass in both configs, right?). The > > > > There is a problem, With generic KASAN it may trigger two KASAN reports. > > Why is this a problem? If there are 2, fine. KUNIT can check that if > we expect 2, there are indeed 2. > Sorry, I originally assume my patch doesn't include in KUNIT. so I think there is a problem. but I know your meaning. Can my patch upstream first? > > if we change it like: > > > > if (ENABLED(CONFIG_KASAN_GENERIC)) > > ptr[size] = 'x'; > > else > > ptr[size + 5] = 'x'; > > > > > only only in GENERIC, but it's C-level if rather than preprocessor. > > > KUNIT should make 2 bugs per test easily expressable (and testable). > > > > > > > > > > > > > > > > > > kfree(ptr); > > > > } > > > > > > > > @@ -92,7 +97,12 @@ static noinline void __init kmalloc_pagealloc_oob_right(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > ptr[size] = 0; > > > > +#else > > > > + ptr[size + 6] = 0; > > > > +#endif > > > > + > > > > kfree(ptr); > > > > } > > > > > > > > @@ -162,7 +172,11 @@ static noinline void __init kmalloc_oob_krealloc_more(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > ptr2[size2] = 'x'; > > > > +#else > > > > + ptr2[size2 + 13] = 'x'; > > > > +#endif > > > > kfree(ptr2); > > > > } > > > > > > > > @@ -180,7 +194,12 @@ static noinline void __init kmalloc_oob_krealloc_less(void) > > > > kfree(ptr1); > > > > return; > > > > } > > > > + > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > ptr2[size2] = 'x'; > > > > +#else > > > > + ptr2[size2 + 2] = 'x'; > > > > +#endif > > > > kfree(ptr2); > > > > } > > > > > > > > @@ -216,7 +235,11 @@ static noinline void __init kmalloc_oob_memset_2(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > memset(ptr+7, 0, 2); > > > > +#else > > > > + memset(ptr+15, 0, 2); > > > > +#endif > > > > kfree(ptr); > > > > } > > > > > > > > @@ -232,7 +255,11 @@ static noinline void __init kmalloc_oob_memset_4(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > memset(ptr+5, 0, 4); > > > > +#else > > > > + memset(ptr+15, 0, 4); > > > > +#endif > > > > kfree(ptr); > > > > } > > > > > > > > @@ -249,7 +276,11 @@ static noinline void __init kmalloc_oob_memset_8(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > memset(ptr+1, 0, 8); > > > > +#else > > > > + memset(ptr+15, 0, 8); > > > > +#endif > > > > kfree(ptr); > > > > } > > > > > > > > @@ -265,7 +296,11 @@ static noinline void __init kmalloc_oob_memset_16(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > memset(ptr+1, 0, 16); > > > > +#else > > > > + memset(ptr+15, 0, 16); > > > > +#endif > > > > kfree(ptr); > > > > } > > > > > > > > @@ -281,7 +316,11 @@ static noinline void __init kmalloc_oob_in_memset(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > memset(ptr, 0, size+5); > > > > +#else > > > > + memset(ptr, 0, size+7); > > > > +#endif > > > > kfree(ptr); > > > > } > > > > > > > > @@ -415,7 +454,11 @@ static noinline void __init kmem_cache_oob(void) > > > > return; > > > > } > > > > > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > *p = p[size]; > > > > +#else > > > > + *p = p[size + 8]; > > > > +#endif > > > > kmem_cache_free(cache, p); > > > > kmem_cache_destroy(cache); > > > > } > > > > @@ -497,6 +540,11 @@ static noinline void __init copy_user_test(void) > > > > char __user *usermem; > > > > size_t size = 10; > > > > int unused; > > > > +#ifdef CONFIG_KASAN_GENERIC > > > > + size_t oob_size = 1; > > > > +#else > > > > + size_t oob_size = 7; > > > > +#endif > > > > > > > > kmem = kmalloc(size, GFP_KERNEL); > > > > if (!kmem) > > > > @@ -512,25 +560,25 @@ static noinline void __init copy_user_test(void) > > > > } > > > > > > > > pr_info("out-of-bounds in copy_from_user()\n"); > > > > - unused = copy_from_user(kmem, usermem, size + 1); > > > > + unused = copy_from_user(kmem, usermem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in copy_to_user()\n"); > > > > - unused = copy_to_user(usermem, kmem, size + 1); > > > > + unused = copy_to_user(usermem, kmem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in __copy_from_user()\n"); > > > > - unused = __copy_from_user(kmem, usermem, size + 1); > > > > + unused = __copy_from_user(kmem, usermem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in __copy_to_user()\n"); > > > > - unused = __copy_to_user(usermem, kmem, size + 1); > > > > + unused = __copy_to_user(usermem, kmem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in __copy_from_user_inatomic()\n"); > > > > - unused = __copy_from_user_inatomic(kmem, usermem, size + 1); > > > > + unused = __copy_from_user_inatomic(kmem, usermem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in __copy_to_user_inatomic()\n"); > > > > - unused = __copy_to_user_inatomic(usermem, kmem, size + 1); > > > > + unused = __copy_to_user_inatomic(usermem, kmem, size + oob_size); > > > > > > > > pr_info("out-of-bounds in strncpy_from_user()\n"); > > > > - unused = strncpy_from_user(kmem, usermem, size + 1); > > > > + unused = strncpy_from_user(kmem, usermem, size + oob_size); > > > > > > > > vm_munmap((unsigned long)usermem, PAGE_SIZE); > > > > kfree(kmem); > > > > -- > > > > 2.18.0 > > > > > > > > -- > > > > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > > > > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > > > > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/20200421014007.6012-1-walter-zh.wu%40mediatek.com. > > > > -- > > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/1587472005.5870.7.camel%40mtksdccf07. > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 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 0F53BC54FC9 for ; Tue, 21 Apr 2020 13:38:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A2587206F4 for ; Tue, 21 Apr 2020 13:38:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="khjr1WSm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2587206F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 36F778E0005; Tue, 21 Apr 2020 09:38:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3217B8E0003; Tue, 21 Apr 2020 09:38:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2368B8E0005; Tue, 21 Apr 2020 09:38:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0245.hostedemail.com [216.40.44.245]) by kanga.kvack.org (Postfix) with ESMTP id 0BFFE8E0003 for ; Tue, 21 Apr 2020 09:38:01 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B85395820 for ; Tue, 21 Apr 2020 13:38:00 +0000 (UTC) X-FDA: 76731965520.07.mark00_28a8cad4b3a47 X-HE-Tag: mark00_28a8cad4b3a47 X-Filterd-Recvd-Size: 15733 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Tue, 21 Apr 2020 13:37:59 +0000 (UTC) X-UUID: 9b83d4e172dc4a88966709162332ba76-20200421 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=JX00X8S2zWSDA5/Zsgs0O/ncM6aJvIG88Eh4mjiOiX4=; b=khjr1WSmATNP1no5dEQwnHdRrZBZNY0SUGl8dhhrIPUgmiTMzo621t9+8dBjTliBTj44t8hb7w3qiH/qQJRMYe50Uc/Bm9T/gra8Jdwh+r3apRrgOPtpMvIBDtAgwLtcty+VWaZMievn9FYe897BVGOKQEh9MLpM/IgcuUBslkQ=; X-UUID: 9b83d4e172dc4a88966709162332ba76-20200421 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 2022916195; Tue, 21 Apr 2020 21:37:54 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs06n2.mediatek.inc (172.21.101.130) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 21 Apr 2020 21:37:52 +0800 Received: from [172.21.84.99] (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 21 Apr 2020 21:37:48 +0800 Message-ID: <1587476272.5870.15.camel@mtksdccf07> Subject: Re: [PATCH] kasan: fix KASAN unit tests for tag-based KASAN From: Walter Wu To: Dmitry Vyukov CC: David Gow , Brendan Higgins , Patricia Alfonso , Andrey Ryabinin , Alexander Potapenko , Matthias Brugger , "Andrey Konovalov" , Andrew Morton , kasan-dev , Linux-MM , LKML , "Linux ARM" , wsd_upstream , Date: Tue, 21 Apr 2020 21:37:52 +0800 In-Reply-To: References: <20200421014007.6012-1-walter-zh.wu@mediatek.com> <1587472005.5870.7.camel@mtksdccf07> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-TM-SNTS-SMTP: BC3A44A52E9D8AE093BF388FD62DAE971AB1F492889557179C30B461B1F267482000:8 X-MTK: N Content-Transfer-Encoding: base64 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: T24gVHVlLCAyMDIwLTA0LTIxIGF0IDE1OjAxICswMjAwLCAnRG1pdHJ5IFZ5dWtvdicgdmlhIGth c2FuLWRldiB3cm90ZToNCj4gT24gVHVlLCBBcHIgMjEsIDIwMjAgYXQgMjoyNiBQTSBXYWx0ZXIg V3UgPHdhbHRlci16aC53dUBtZWRpYXRlay5jb20+IHdyb3RlOg0KPiA+DQo+ID4gSGkgRG1pdHJ5 LA0KPiA+DQo+ID4gT24gVHVlLCAyMDIwLTA0LTIxIGF0IDEzOjU2ICswMjAwLCBEbWl0cnkgVnl1 a292IHdyb3RlOg0KPiA+ID4gT24gVHVlLCBBcHIgMjEsIDIwMjAgYXQgMzo0MCBBTSBXYWx0ZXIg V3UgPHdhbHRlci16aC53dUBtZWRpYXRlay5jb20+IHdyb3RlOg0KPiA+ID4gPg0KPiA+ID4gPiBX aGVuIHdlIHVzZSB0YWctYmFzZWQgS0FTQU4sIHRoZW4gS0FTQU4gdW5pdCB0ZXN0cyBkb24ndCBk ZXRlY3QNCj4gPiA+ID4gb3V0LW9mLWJvdW5kcyBtZW1vcnkgYWNjZXNzLiBCZWNhdXNlIHdpdGgg dGFnLWJhc2VkIEtBU0FOIHRoZSBzdGF0ZQ0KPiA+ID4gPiBvZiBlYWNoIDE2IGFsaWduZWQgYnl0 ZXMgb2YgbWVtb3J5IGlzIGVuY29kZWQgaW4gb25lIHNoYWRvdyBieXRlDQo+ID4gPiA+IGFuZCB0 aGUgc2hhZG93IHZhbHVlIGlzIHRhZyBvZiBwb2ludGVyLCBzbyB3ZSBuZWVkIHRvIHJlYWQgbmV4 dA0KPiA+ID4gPiBzaGFkb3cgYnl0ZSwgdGhlIHNoYWRvdyB2YWx1ZSBpcyBub3QgZXF1YWwgdG8g dGFnIG9mIHBvaW50ZXIsDQo+ID4gPiA+IHRoZW4gdGFnLWJhc2VkIEtBU0FOIHdpbGwgZGV0ZWN0 IG91dC1vZi1ib3VuZHMgbWVtb3J5IGFjY2Vzcy4NCj4gPiA+ID4NCj4gPiA+ID4gU2lnbmVkLW9m Zi1ieTogV2FsdGVyIFd1IDx3YWx0ZXItemgud3VAbWVkaWF0ZWsuY29tPg0KPiA+ID4gPiBDYzog QW5kcmV5IFJ5YWJpbmluIDxhcnlhYmluaW5AdmlydHVvenpvLmNvbT4NCj4gPiA+ID4gQ2M6IERt aXRyeSBWeXVrb3YgPGR2eXVrb3ZAZ29vZ2xlLmNvbT4NCj4gPiA+ID4gQ2M6IEFsZXhhbmRlciBQ b3RhcGVua28gPGdsaWRlckBnb29nbGUuY29tPg0KPiA+ID4gPiBDYzogTWF0dGhpYXMgQnJ1Z2dl ciA8bWF0dGhpYXMuYmdnQGdtYWlsLmNvbT4NCj4gPiA+ID4gQ2M6IEFuZHJleSBLb25vdmFsb3Yg PGFuZHJleWtudmxAZ29vZ2xlLmNvbT4NCj4gPiA+ID4gQ2M6IEFuZHJldyBNb3J0b24gPGFrcG1A bGludXgtZm91bmRhdGlvbi5vcmc+DQo+ID4gPiA+IC0tLQ0KPiA+ID4gPiAgbGliL3Rlc3Rfa2Fz YW4uYyB8IDYyICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LQ0KPiA+ID4gPiAgMSBmaWxlIGNoYW5nZWQsIDU1IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25z KC0pDQo+ID4gPiA+DQo+ID4gPiA+IGRpZmYgLS1naXQgYS9saWIvdGVzdF9rYXNhbi5jIGIvbGli L3Rlc3Rfa2FzYW4uYw0KPiA+ID4gPiBpbmRleCBlMzA4N2Q5MGUwMGQuLmExNjRmNmI0N2ZlNSAx MDA2NDQNCj4gPiA+ID4gLS0tIGEvbGliL3Rlc3Rfa2FzYW4uYw0KPiA+ID4gPiArKysgYi9saWIv dGVzdF9rYXNhbi5jDQo+ID4gPiA+IEBAIC00MCw3ICs0MCwxMiBAQCBzdGF0aWMgbm9pbmxpbmUg dm9pZCBfX2luaXQga21hbGxvY19vb2JfcmlnaHQodm9pZCkNCj4gPiA+ID4gICAgICAgICAgICAg ICAgIHJldHVybjsNCj4gPiA+ID4gICAgICAgICB9DQo+ID4gPg0KPiA+ID4gSGkgV2FsdGVyLA0K PiA+ID4NCj4gPiA+IFRoaXMgd291bGQgYmUgZ3JlYXQgdG8gaGF2ZSENCj4gPiA+IEJ1dCBJIGFt IGNvbmNlcm5lZCBhYm91dCB0aGVzZSBzZXJpZXMgdGhhdCBwb3J0IEtBU0FOIHRlc3RzIHRvIEtV TklUOg0KPiA+ID4gaHR0cHM6Ly9sa21sLm9yZy9sa21sLzIwMjAvNC8xNy8xMTQ0DQo+ID4gPiBJ IHN1c3BlY3QgaXQgd2lsbCBiZSBvbmUgbGFyZ2UgbWVyZ2UgY29uZmxpY3QuIE5vdCBzdXJlIHdo YXQgaXMgdGhlDQo+ID4gPiBwcm9wZXIgd2F5IHRvIHJlc292bGUgdGhpcy4gSSd2ZSBhZGRlZCBh dXRob3JzIHRvIENDLg0KPiA+ID4NCj4gPiBZZXMsIGl0IHNob3VsZCBoYXZlIGNvbmZsaWN0cy4g VGhhbmtzIGZvciB5b3VyIHJlbWluZGVyLg0KPiA+ID4NCj4gPiA+ID4gKyNpZmRlZiBDT05GSUdf S0FTQU5fR0VORVJJQw0KPiA+ID4gPiAgICAgICAgIHB0cltzaXplXSA9ICd4JzsNCj4gPiA+ID4g KyNlbHNlDQo+ID4gPiA+ICsgICAgICAgcHRyW3NpemUgKyA1XSA9ICd4JzsNCj4gPiA+ID4gKyNl bmRpZg0KPiA+ID4gPiArDQo+ID4gPg0KPiA+ID4gRm9yIHRoaXMgcGFydGljdWxhciBzbmlwcGV0 IEkgdGhpbmsgd2UgY2FuIHJlZHVjZSBhbW91bnQgb2YgaWRlZidlcnkNCj4gPiA+IGFuZCBhbW91 bnQgb2Ygbm9uLWNvbXBpbGVkIGNvZGUgaW4gZWFjaCBjb25maWd1cmF0aW9uIHdpdGggc29tZXRo aW5nDQo+ID4gPiBsaWtlOg0KPiA+ID4NCj4gPiA+ICAgcHRyW3NpemUgKyA1XSA9ICd4JzsNCj4g PiA+ICAgaWYgKEVOQUJMRUQoQ09ORklHX0tBU0FOX0dFTkVSSUMpKQ0KPiA+ID4gICAgICAgcHRy W3NpemVdID0gJ3gnOw0KPiA+ID4NCj4gPiA+IE9uZSBjaGVjayBydW5zIGFsd2F5cyAoaXQgc2hv dWxkIHBhc3MgaW4gYm90aCBjb25maWdzLCByaWdodD8pLiBUaGUNCj4gPg0KPiA+IFRoZXJlIGlz IGEgcHJvYmxlbSwgV2l0aCBnZW5lcmljIEtBU0FOIGl0IG1heSB0cmlnZ2VyIHR3byBLQVNBTiBy ZXBvcnRzLg0KPiANCj4gV2h5IGlzIHRoaXMgYSBwcm9ibGVtPyBJZiB0aGVyZSBhcmUgMiwgZmlu ZS4gS1VOSVQgY2FuIGNoZWNrIHRoYXQgaWYNCj4gd2UgZXhwZWN0IDIsIHRoZXJlIGFyZSBpbmRl ZWQgMi4NCj4gDQpTb3JyeSwgSSBvcmlnaW5hbGx5IGFzc3VtZSBteSBwYXRjaCBkb2Vzbid0IGlu Y2x1ZGUgaW4gS1VOSVQuIHNvIEkgdGhpbmsNCnRoZXJlIGlzIGEgcHJvYmxlbS4gYnV0IEkga25v dyB5b3VyIG1lYW5pbmcuIENhbiBteSBwYXRjaCB1cHN0cmVhbQ0KZmlyc3Q/DQoNCj4gPiBpZiB3 ZSBjaGFuZ2UgaXQgbGlrZToNCj4gPg0KPiA+IGlmIChFTkFCTEVEKENPTkZJR19LQVNBTl9HRU5F UklDKSkNCj4gPiAgICAgcHRyW3NpemVdID0gJ3gnOw0KPiA+IGVsc2UNCj4gPiAgICAgcHRyW3Np emUgKyA1XSA9ICd4JzsNCj4gPg0KPiA+ID4gb25seSBvbmx5IGluIEdFTkVSSUMsIGJ1dCBpdCdz IEMtbGV2ZWwgaWYgcmF0aGVyIHRoYW4gcHJlcHJvY2Vzc29yLg0KPiA+ID4gS1VOSVQgc2hvdWxk IG1ha2UgMiBidWdzIHBlciB0ZXN0IGVhc2lseSBleHByZXNzYWJsZSAoYW5kIHRlc3RhYmxlKS4N Cj4gPiA+DQo+ID4NCj4gPiA+DQo+ID4gPg0KPiA+ID4NCj4gPiA+ID4gICAgICAgICBrZnJlZShw dHIpOw0KPiA+ID4gPiAgfQ0KPiA+ID4gPg0KPiA+ID4gPiBAQCAtOTIsNyArOTcsMTIgQEAgc3Rh dGljIG5vaW5saW5lIHZvaWQgX19pbml0IGttYWxsb2NfcGFnZWFsbG9jX29vYl9yaWdodCh2b2lk KQ0KPiA+ID4gPiAgICAgICAgICAgICAgICAgcmV0dXJuOw0KPiA+ID4gPiAgICAgICAgIH0NCj4g PiA+ID4NCj4gPiA+ID4gKyNpZmRlZiBDT05GSUdfS0FTQU5fR0VORVJJQw0KPiA+ID4gPiAgICAg ICAgIHB0cltzaXplXSA9IDA7DQo+ID4gPiA+ICsjZWxzZQ0KPiA+ID4gPiArICAgICAgIHB0cltz aXplICsgNl0gPSAwOw0KPiA+ID4gPiArI2VuZGlmDQo+ID4gPiA+ICsNCj4gPiA+ID4gICAgICAg ICBrZnJlZShwdHIpOw0KPiA+ID4gPiAgfQ0KPiA+ID4gPg0KPiA+ID4gPiBAQCAtMTYyLDcgKzE3 MiwxMSBAQCBzdGF0aWMgbm9pbmxpbmUgdm9pZCBfX2luaXQga21hbGxvY19vb2Jfa3JlYWxsb2Nf bW9yZSh2b2lkKQ0KPiA+ID4gPiAgICAgICAgICAgICAgICAgcmV0dXJuOw0KPiA+ID4gPiAgICAg ICAgIH0NCj4gPiA+ID4NCj4gPiA+ID4gKyNpZmRlZiBDT05GSUdfS0FTQU5fR0VORVJJQw0KPiA+ ID4gPiAgICAgICAgIHB0cjJbc2l6ZTJdID0gJ3gnOw0KPiA+ID4gPiArI2Vsc2UNCj4gPiA+ID4g KyAgICAgICBwdHIyW3NpemUyICsgMTNdID0gJ3gnOw0KPiA+ID4gPiArI2VuZGlmDQo+ID4gPiA+ ICAgICAgICAga2ZyZWUocHRyMik7DQo+ID4gPiA+ICB9DQo+ID4gPiA+DQo+ID4gPiA+IEBAIC0x ODAsNyArMTk0LDEyIEBAIHN0YXRpYyBub2lubGluZSB2b2lkIF9faW5pdCBrbWFsbG9jX29vYl9r cmVhbGxvY19sZXNzKHZvaWQpDQo+ID4gPiA+ICAgICAgICAgICAgICAgICBrZnJlZShwdHIxKTsN Cj4gPiA+ID4gICAgICAgICAgICAgICAgIHJldHVybjsNCj4gPiA+ID4gICAgICAgICB9DQo+ID4g PiA+ICsNCj4gPiA+ID4gKyNpZmRlZiBDT05GSUdfS0FTQU5fR0VORVJJQw0KPiA+ID4gPiAgICAg ICAgIHB0cjJbc2l6ZTJdID0gJ3gnOw0KPiA+ID4gPiArI2Vsc2UNCj4gPiA+ID4gKyAgICAgICBw dHIyW3NpemUyICsgMl0gPSAneCc7DQo+ID4gPiA+ICsjZW5kaWYNCj4gPiA+ID4gICAgICAgICBr ZnJlZShwdHIyKTsNCj4gPiA+ID4gIH0NCj4gPiA+ID4NCj4gPiA+ID4gQEAgLTIxNiw3ICsyMzUs MTEgQEAgc3RhdGljIG5vaW5saW5lIHZvaWQgX19pbml0IGttYWxsb2Nfb29iX21lbXNldF8yKHZv aWQpDQo+ID4gPiA+ICAgICAgICAgICAgICAgICByZXR1cm47DQo+ID4gPiA+ICAgICAgICAgfQ0K PiA+ID4gPg0KPiA+ID4gPiArI2lmZGVmIENPTkZJR19LQVNBTl9HRU5FUklDDQo+ID4gPiA+ICAg ICAgICAgbWVtc2V0KHB0cis3LCAwLCAyKTsNCj4gPiA+ID4gKyNlbHNlDQo+ID4gPiA+ICsgICAg ICAgbWVtc2V0KHB0cisxNSwgMCwgMik7DQo+ID4gPiA+ICsjZW5kaWYNCj4gPiA+ID4gICAgICAg ICBrZnJlZShwdHIpOw0KPiA+ID4gPiAgfQ0KPiA+ID4gPg0KPiA+ID4gPiBAQCAtMjMyLDcgKzI1 NSwxMSBAQCBzdGF0aWMgbm9pbmxpbmUgdm9pZCBfX2luaXQga21hbGxvY19vb2JfbWVtc2V0XzQo dm9pZCkNCj4gPiA+ID4gICAgICAgICAgICAgICAgIHJldHVybjsNCj4gPiA+ID4gICAgICAgICB9 DQo+ID4gPiA+DQo+ID4gPiA+ICsjaWZkZWYgQ09ORklHX0tBU0FOX0dFTkVSSUMNCj4gPiA+ID4g ICAgICAgICBtZW1zZXQocHRyKzUsIDAsIDQpOw0KPiA+ID4gPiArI2Vsc2UNCj4gPiA+ID4gKyAg ICAgICBtZW1zZXQocHRyKzE1LCAwLCA0KTsNCj4gPiA+ID4gKyNlbmRpZg0KPiA+ID4gPiAgICAg ICAgIGtmcmVlKHB0cik7DQo+ID4gPiA+ICB9DQo+ID4gPiA+DQo+ID4gPiA+IEBAIC0yNDksNyAr Mjc2LDExIEBAIHN0YXRpYyBub2lubGluZSB2b2lkIF9faW5pdCBrbWFsbG9jX29vYl9tZW1zZXRf OCh2b2lkKQ0KPiA+ID4gPiAgICAgICAgICAgICAgICAgcmV0dXJuOw0KPiA+ID4gPiAgICAgICAg IH0NCj4gPiA+ID4NCj4gPiA+ID4gKyNpZmRlZiBDT05GSUdfS0FTQU5fR0VORVJJQw0KPiA+ID4g PiAgICAgICAgIG1lbXNldChwdHIrMSwgMCwgOCk7DQo+ID4gPiA+ICsjZWxzZQ0KPiA+ID4gPiAr ICAgICAgIG1lbXNldChwdHIrMTUsIDAsIDgpOw0KPiA+ID4gPiArI2VuZGlmDQo+ID4gPiA+ICAg ICAgICAga2ZyZWUocHRyKTsNCj4gPiA+ID4gIH0NCj4gPiA+ID4NCj4gPiA+ID4gQEAgLTI2NSw3 ICsyOTYsMTEgQEAgc3RhdGljIG5vaW5saW5lIHZvaWQgX19pbml0IGttYWxsb2Nfb29iX21lbXNl dF8xNih2b2lkKQ0KPiA+ID4gPiAgICAgICAgICAgICAgICAgcmV0dXJuOw0KPiA+ID4gPiAgICAg ICAgIH0NCj4gPiA+ID4NCj4gPiA+ID4gKyNpZmRlZiBDT05GSUdfS0FTQU5fR0VORVJJQw0KPiA+ ID4gPiAgICAgICAgIG1lbXNldChwdHIrMSwgMCwgMTYpOw0KPiA+ID4gPiArI2Vsc2UNCj4gPiA+ ID4gKyAgICAgICBtZW1zZXQocHRyKzE1LCAwLCAxNik7DQo+ID4gPiA+ICsjZW5kaWYNCj4gPiA+ ID4gICAgICAgICBrZnJlZShwdHIpOw0KPiA+ID4gPiAgfQ0KPiA+ID4gPg0KPiA+ID4gPiBAQCAt MjgxLDcgKzMxNiwxMSBAQCBzdGF0aWMgbm9pbmxpbmUgdm9pZCBfX2luaXQga21hbGxvY19vb2Jf aW5fbWVtc2V0KHZvaWQpDQo+ID4gPiA+ICAgICAgICAgICAgICAgICByZXR1cm47DQo+ID4gPiA+ ICAgICAgICAgfQ0KPiA+ID4gPg0KPiA+ID4gPiArI2lmZGVmIENPTkZJR19LQVNBTl9HRU5FUklD DQo+ID4gPiA+ICAgICAgICAgbWVtc2V0KHB0ciwgMCwgc2l6ZSs1KTsNCj4gPiA+ID4gKyNlbHNl DQo+ID4gPiA+ICsgICAgICAgbWVtc2V0KHB0ciwgMCwgc2l6ZSs3KTsNCj4gPiA+ID4gKyNlbmRp Zg0KPiA+ID4gPiAgICAgICAgIGtmcmVlKHB0cik7DQo+ID4gPiA+ICB9DQo+ID4gPiA+DQo+ID4g PiA+IEBAIC00MTUsNyArNDU0LDExIEBAIHN0YXRpYyBub2lubGluZSB2b2lkIF9faW5pdCBrbWVt X2NhY2hlX29vYih2b2lkKQ0KPiA+ID4gPiAgICAgICAgICAgICAgICAgcmV0dXJuOw0KPiA+ID4g PiAgICAgICAgIH0NCj4gPiA+ID4NCj4gPiA+ID4gKyNpZmRlZiBDT05GSUdfS0FTQU5fR0VORVJJ Qw0KPiA+ID4gPiAgICAgICAgICpwID0gcFtzaXplXTsNCj4gPiA+ID4gKyNlbHNlDQo+ID4gPiA+ ICsgICAgICAgKnAgPSBwW3NpemUgKyA4XTsNCj4gPiA+ID4gKyNlbmRpZg0KPiA+ID4gPiAgICAg ICAgIGttZW1fY2FjaGVfZnJlZShjYWNoZSwgcCk7DQo+ID4gPiA+ICAgICAgICAga21lbV9jYWNo ZV9kZXN0cm95KGNhY2hlKTsNCj4gPiA+ID4gIH0NCj4gPiA+ID4gQEAgLTQ5Nyw2ICs1NDAsMTEg QEAgc3RhdGljIG5vaW5saW5lIHZvaWQgX19pbml0IGNvcHlfdXNlcl90ZXN0KHZvaWQpDQo+ID4g PiA+ICAgICAgICAgY2hhciBfX3VzZXIgKnVzZXJtZW07DQo+ID4gPiA+ICAgICAgICAgc2l6ZV90 IHNpemUgPSAxMDsNCj4gPiA+ID4gICAgICAgICBpbnQgdW51c2VkOw0KPiA+ID4gPiArI2lmZGVm IENPTkZJR19LQVNBTl9HRU5FUklDDQo+ID4gPiA+ICsgICAgICAgc2l6ZV90IG9vYl9zaXplID0g MTsNCj4gPiA+ID4gKyNlbHNlDQo+ID4gPiA+ICsgICAgICAgc2l6ZV90IG9vYl9zaXplID0gNzsN Cj4gPiA+ID4gKyNlbmRpZg0KPiA+ID4gPg0KPiA+ID4gPiAgICAgICAgIGttZW0gPSBrbWFsbG9j KHNpemUsIEdGUF9LRVJORUwpOw0KPiA+ID4gPiAgICAgICAgIGlmICgha21lbSkNCj4gPiA+ID4g QEAgLTUxMiwyNSArNTYwLDI1IEBAIHN0YXRpYyBub2lubGluZSB2b2lkIF9faW5pdCBjb3B5X3Vz ZXJfdGVzdCh2b2lkKQ0KPiA+ID4gPiAgICAgICAgIH0NCj4gPiA+ID4NCj4gPiA+ID4gICAgICAg ICBwcl9pbmZvKCJvdXQtb2YtYm91bmRzIGluIGNvcHlfZnJvbV91c2VyKClcbiIpOw0KPiA+ID4g PiAtICAgICAgIHVudXNlZCA9IGNvcHlfZnJvbV91c2VyKGttZW0sIHVzZXJtZW0sIHNpemUgKyAx KTsNCj4gPiA+ID4gKyAgICAgICB1bnVzZWQgPSBjb3B5X2Zyb21fdXNlcihrbWVtLCB1c2VybWVt LCBzaXplICsgb29iX3NpemUpOw0KPiA+ID4gPg0KPiA+ID4gPiAgICAgICAgIHByX2luZm8oIm91 dC1vZi1ib3VuZHMgaW4gY29weV90b191c2VyKClcbiIpOw0KPiA+ID4gPiAtICAgICAgIHVudXNl ZCA9IGNvcHlfdG9fdXNlcih1c2VybWVtLCBrbWVtLCBzaXplICsgMSk7DQo+ID4gPiA+ICsgICAg ICAgdW51c2VkID0gY29weV90b191c2VyKHVzZXJtZW0sIGttZW0sIHNpemUgKyBvb2Jfc2l6ZSk7 DQo+ID4gPiA+DQo+ID4gPiA+ICAgICAgICAgcHJfaW5mbygib3V0LW9mLWJvdW5kcyBpbiBfX2Nv cHlfZnJvbV91c2VyKClcbiIpOw0KPiA+ID4gPiAtICAgICAgIHVudXNlZCA9IF9fY29weV9mcm9t X3VzZXIoa21lbSwgdXNlcm1lbSwgc2l6ZSArIDEpOw0KPiA+ID4gPiArICAgICAgIHVudXNlZCA9 IF9fY29weV9mcm9tX3VzZXIoa21lbSwgdXNlcm1lbSwgc2l6ZSArIG9vYl9zaXplKTsNCj4gPiA+ ID4NCj4gPiA+ID4gICAgICAgICBwcl9pbmZvKCJvdXQtb2YtYm91bmRzIGluIF9fY29weV90b191 c2VyKClcbiIpOw0KPiA+ID4gPiAtICAgICAgIHVudXNlZCA9IF9fY29weV90b191c2VyKHVzZXJt ZW0sIGttZW0sIHNpemUgKyAxKTsNCj4gPiA+ID4gKyAgICAgICB1bnVzZWQgPSBfX2NvcHlfdG9f dXNlcih1c2VybWVtLCBrbWVtLCBzaXplICsgb29iX3NpemUpOw0KPiA+ID4gPg0KPiA+ID4gPiAg ICAgICAgIHByX2luZm8oIm91dC1vZi1ib3VuZHMgaW4gX19jb3B5X2Zyb21fdXNlcl9pbmF0b21p YygpXG4iKTsNCj4gPiA+ID4gLSAgICAgICB1bnVzZWQgPSBfX2NvcHlfZnJvbV91c2VyX2luYXRv bWljKGttZW0sIHVzZXJtZW0sIHNpemUgKyAxKTsNCj4gPiA+ID4gKyAgICAgICB1bnVzZWQgPSBf X2NvcHlfZnJvbV91c2VyX2luYXRvbWljKGttZW0sIHVzZXJtZW0sIHNpemUgKyBvb2Jfc2l6ZSk7 DQo+ID4gPiA+DQo+ID4gPiA+ICAgICAgICAgcHJfaW5mbygib3V0LW9mLWJvdW5kcyBpbiBfX2Nv cHlfdG9fdXNlcl9pbmF0b21pYygpXG4iKTsNCj4gPiA+ID4gLSAgICAgICB1bnVzZWQgPSBfX2Nv cHlfdG9fdXNlcl9pbmF0b21pYyh1c2VybWVtLCBrbWVtLCBzaXplICsgMSk7DQo+ID4gPiA+ICsg ICAgICAgdW51c2VkID0gX19jb3B5X3RvX3VzZXJfaW5hdG9taWModXNlcm1lbSwga21lbSwgc2l6 ZSArIG9vYl9zaXplKTsNCj4gPiA+ID4NCj4gPiA+ID4gICAgICAgICBwcl9pbmZvKCJvdXQtb2Yt Ym91bmRzIGluIHN0cm5jcHlfZnJvbV91c2VyKClcbiIpOw0KPiA+ID4gPiAtICAgICAgIHVudXNl ZCA9IHN0cm5jcHlfZnJvbV91c2VyKGttZW0sIHVzZXJtZW0sIHNpemUgKyAxKTsNCj4gPiA+ID4g KyAgICAgICB1bnVzZWQgPSBzdHJuY3B5X2Zyb21fdXNlcihrbWVtLCB1c2VybWVtLCBzaXplICsg b29iX3NpemUpOw0KPiA+ID4gPg0KPiA+ID4gPiAgICAgICAgIHZtX211bm1hcCgodW5zaWduZWQg bG9uZyl1c2VybWVtLCBQQUdFX1NJWkUpOw0KPiA+ID4gPiAgICAgICAgIGtmcmVlKGttZW0pOw0K PiA+ID4gPiAtLQ0KPiA+ID4gPiAyLjE4LjANCj4gPiA+ID4NCj4gPiA+ID4gLS0NCj4gPiA+ID4g WW91IHJlY2VpdmVkIHRoaXMgbWVzc2FnZSBiZWNhdXNlIHlvdSBhcmUgc3Vic2NyaWJlZCB0byB0 aGUgR29vZ2xlIEdyb3VwcyAia2FzYW4tZGV2IiBncm91cC4NCj4gPiA+ID4gVG8gdW5zdWJzY3Jp YmUgZnJvbSB0aGlzIGdyb3VwIGFuZCBzdG9wIHJlY2VpdmluZyBlbWFpbHMgZnJvbSBpdCwgc2Vu ZCBhbiBlbWFpbCB0byBrYXNhbi1kZXYrdW5zdWJzY3JpYmVAZ29vZ2xlZ3JvdXBzLmNvbS4NCj4g PiA+ID4gVG8gdmlldyB0aGlzIGRpc2N1c3Npb24gb24gdGhlIHdlYiB2aXNpdCBodHRwczovL2dy b3Vwcy5nb29nbGUuY29tL2QvbXNnaWQva2FzYW4tZGV2LzIwMjAwNDIxMDE0MDA3LjYwMTItMS13 YWx0ZXItemgud3UlNDBtZWRpYXRlay5jb20uDQo+ID4NCj4gPiAtLQ0KPiA+IFlvdSByZWNlaXZl ZCB0aGlzIG1lc3NhZ2UgYmVjYXVzZSB5b3UgYXJlIHN1YnNjcmliZWQgdG8gdGhlIEdvb2dsZSBH cm91cHMgImthc2FuLWRldiIgZ3JvdXAuDQo+ID4gVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGdy b3VwIGFuZCBzdG9wIHJlY2VpdmluZyBlbWFpbHMgZnJvbSBpdCwgc2VuZCBhbiBlbWFpbCB0byBr YXNhbi1kZXYrdW5zdWJzY3JpYmVAZ29vZ2xlZ3JvdXBzLmNvbS4NCj4gPiBUbyB2aWV3IHRoaXMg ZGlzY3Vzc2lvbiBvbiB0aGUgd2ViIHZpc2l0IGh0dHBzOi8vZ3JvdXBzLmdvb2dsZS5jb20vZC9t c2dpZC9rYXNhbi1kZXYvMTU4NzQ3MjAwNS41ODcwLjcuY2FtZWwlNDBtdGtzZGNjZjA3Lg0KPiAN Cg0K