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 0BA09C54FC9 for ; Tue, 21 Apr 2020 12:27:03 +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 D4D022076A for ; Tue, 21 Apr 2020 12:27:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZFDo3sfc"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="lEquWGR2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4D022076A 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=gLodGhak4+JNjexTc59zINZKrci3SG/Zl8Ytwqt4rl0=; b=ZFDo3sfcUBX89K +CBbfdvw9BYBhAagIb39dRMMKOu279OQiYUzod80x0HRdAZPA5rQh5KPzn58SijWJxByCQchwi9iF SpkyVT3fhqnTaeRqe5eNsA+GWocj8caB5+ld075CYZ8qVxhAZhpupZqDxVpWsWWyILfDD2MXM/WH/ yyZsyrJZ5g59RozWwr2y8ItMU1ZVpg+kdbgIaydLVUKqYKe6tCaIWYS5QTMAFVUyrbRxzQhF0yXRE rQ9/Pgx8+qtLIaofbuqfu23xfXo+rYrGEId7ZyHWvVD80szjHIm96uAl9Tcfn3CFgSLgCvoNExODb s2AjHF8lu6EBZtGzEaYA==; 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 1jQrzL-0004xa-Sa; Tue, 21 Apr 2020 12:26:55 +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 1jQrzI-0004wT-J5; Tue, 21 Apr 2020 12:26:54 +0000 X-UUID: bd162b77e0404cfcab170746baf88541-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=1drU5b9UZyhoKKcmaKClDLCSPZ1nRiiu5qjvWITjXi0=; b=lEquWGR2Wtcbl61rqMhz6tUbCkoNWZJwNa6AGg5nQVtvMdvtRfaAqpGpvD7SfR2QwJA3Ec6sr2JgbiP5IGYOMvzHQ5kJJcwn7s9jDBG2TV6N8rIkjbnnqFIt4hfOH2WdvQFmmyiirNWCKNVFXMOLRbVx0GklxfA73KTitBAloIM=; X-UUID: bd162b77e0404cfcab170746baf88541-20200421 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1357675389; Tue, 21 Apr 2020 04:26:28 -0800 Received: from MTKMBS06N1.mediatek.inc (172.21.101.129) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 21 Apr 2020 05:26:45 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs06n1.mediatek.inc (172.21.101.129) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 21 Apr 2020 20:26:42 +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 20:26:42 +0800 Message-ID: <1587472005.5870.7.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 20:26:45 +0800 In-Reply-To: References: <20200421014007.6012-1-walter-zh.wu@mediatek.com> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200421_052652_643840_F05BFFD6 X-CRM114-Status: GOOD ( 27.34 ) 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 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. 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. _______________________________________________ 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 9CE72C54FD0 for ; Tue, 21 Apr 2020 12:27:01 +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 6FA2E2075E for ; Tue, 21 Apr 2020 12:27:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="l4AS9DbZ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="lEquWGR2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6FA2E2075E 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=Y74OSv8jiAa1sYrG4DveHO7FbuQMdNZHFQfUa4+WGWM=; b=l4AS9DbZZEDMgo 9oCUWz7N+sikuxbzUCzg+2XUcvhuFAqJc3qd+ErBccdFDNEk8QmqJEKfKzlTsf66QAiuaEMKWpPMl hr70/Ry1XWXI9ZjR74gtPCAgHLC3q3kvatP0LJvJzQO+PoGUciFlunHiC/gQj7L84Eg1wVa7xF/zT RB7Qk1J9+xv1+xoKyBDpBhnj0O+V+q8igwDIdH6Un1GazwB8o/BiRKutZe8luNHlgXUkfgC46wHOc sS0pisj349x0Pk7NlmvoOVX64+PD1/PK8fvWm5RVCJs72aR/gUaTf/ReJE5GotRYLCFg1X4YEcuQq CHlM7CEKIRBJc2tyi7YQ==; 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 1jQrzN-0004yI-Qg; Tue, 21 Apr 2020 12:26:57 +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 1jQrzI-0004wT-J5; Tue, 21 Apr 2020 12:26:54 +0000 X-UUID: bd162b77e0404cfcab170746baf88541-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=1drU5b9UZyhoKKcmaKClDLCSPZ1nRiiu5qjvWITjXi0=; b=lEquWGR2Wtcbl61rqMhz6tUbCkoNWZJwNa6AGg5nQVtvMdvtRfaAqpGpvD7SfR2QwJA3Ec6sr2JgbiP5IGYOMvzHQ5kJJcwn7s9jDBG2TV6N8rIkjbnnqFIt4hfOH2WdvQFmmyiirNWCKNVFXMOLRbVx0GklxfA73KTitBAloIM=; X-UUID: bd162b77e0404cfcab170746baf88541-20200421 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1357675389; Tue, 21 Apr 2020 04:26:28 -0800 Received: from MTKMBS06N1.mediatek.inc (172.21.101.129) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 21 Apr 2020 05:26:45 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs06n1.mediatek.inc (172.21.101.129) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 21 Apr 2020 20:26:42 +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 20:26:42 +0800 Message-ID: <1587472005.5870.7.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 20:26:45 +0800 In-Reply-To: References: <20200421014007.6012-1-walter-zh.wu@mediatek.com> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200421_052652_643840_F05BFFD6 X-CRM114-Status: GOOD ( 27.34 ) 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 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. 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. _______________________________________________ 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 5882EC54FD0 for ; Tue, 21 Apr 2020 12:26:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EC6272075E for ; Tue, 21 Apr 2020 12:26:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="ZpZ8SUhs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC6272075E 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 79E838E0006; Tue, 21 Apr 2020 08:26:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74EBC8E0003; Tue, 21 Apr 2020 08:26:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 664748E0006; Tue, 21 Apr 2020 08:26:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0160.hostedemail.com [216.40.44.160]) by kanga.kvack.org (Postfix) with ESMTP id 4F6408E0003 for ; Tue, 21 Apr 2020 08:26:51 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 02451824805A for ; Tue, 21 Apr 2020 12:26:51 +0000 (UTC) X-FDA: 76731786222.03.queen53_168c9fbd1324 X-HE-Tag: queen53_168c9fbd1324 X-Filterd-Recvd-Size: 13159 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by imf11.hostedemail.com (Postfix) with ESMTP for ; Tue, 21 Apr 2020 12:26:49 +0000 (UTC) X-UUID: f2df5e8bcb1642a8b8be13b48baa09d9-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=1drU5b9UZyhoKKcmaKClDLCSPZ1nRiiu5qjvWITjXi0=; b=ZpZ8SUhsDDxCrbn08NSGH7kvr1+trGLhML7MVqUfbAH8EU5RYsKSJMHrKKvAPmSX1GD+J2oDwcm55pAFXPPfA5ndAx1VWJOTEDExcusKtgtN0TCsNcX6qEgAjtSkBjAHKIH3DWAQ4IM273kNNjc/olasDdm+BahQa2rOVOpPLy4=; X-UUID: f2df5e8bcb1642a8b8be13b48baa09d9-20200421 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 419430501; Tue, 21 Apr 2020 20:26:46 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs06n1.mediatek.inc (172.21.101.129) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 21 Apr 2020 20:26:42 +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 20:26:42 +0800 Message-ID: <1587472005.5870.7.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 20:26:45 +0800 In-Reply-To: References: <20200421014007.6012-1-walter-zh.wu@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 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: SGkgRG1pdHJ5LA0KDQpPbiBUdWUsIDIwMjAtMDQtMjEgYXQgMTM6NTYgKzAyMDAsIERtaXRyeSBW eXVrb3Ygd3JvdGU6DQo+IE9uIFR1ZSwgQXByIDIxLCAyMDIwIGF0IDM6NDAgQU0gV2FsdGVyIFd1 IDx3YWx0ZXItemgud3VAbWVkaWF0ZWsuY29tPiB3cm90ZToNCj4gPg0KPiA+IFdoZW4gd2UgdXNl IHRhZy1iYXNlZCBLQVNBTiwgdGhlbiBLQVNBTiB1bml0IHRlc3RzIGRvbid0IGRldGVjdA0KPiA+ IG91dC1vZi1ib3VuZHMgbWVtb3J5IGFjY2Vzcy4gQmVjYXVzZSB3aXRoIHRhZy1iYXNlZCBLQVNB TiB0aGUgc3RhdGUNCj4gPiBvZiBlYWNoIDE2IGFsaWduZWQgYnl0ZXMgb2YgbWVtb3J5IGlzIGVu Y29kZWQgaW4gb25lIHNoYWRvdyBieXRlDQo+ID4gYW5kIHRoZSBzaGFkb3cgdmFsdWUgaXMgdGFn IG9mIHBvaW50ZXIsIHNvIHdlIG5lZWQgdG8gcmVhZCBuZXh0DQo+ID4gc2hhZG93IGJ5dGUsIHRo ZSBzaGFkb3cgdmFsdWUgaXMgbm90IGVxdWFsIHRvIHRhZyBvZiBwb2ludGVyLA0KPiA+IHRoZW4g dGFnLWJhc2VkIEtBU0FOIHdpbGwgZGV0ZWN0IG91dC1vZi1ib3VuZHMgbWVtb3J5IGFjY2Vzcy4N Cj4gPg0KPiA+IFNpZ25lZC1vZmYtYnk6IFdhbHRlciBXdSA8d2FsdGVyLXpoLnd1QG1lZGlhdGVr LmNvbT4NCj4gPiBDYzogQW5kcmV5IFJ5YWJpbmluIDxhcnlhYmluaW5AdmlydHVvenpvLmNvbT4N Cj4gPiBDYzogRG1pdHJ5IFZ5dWtvdiA8ZHZ5dWtvdkBnb29nbGUuY29tPg0KPiA+IENjOiBBbGV4 YW5kZXIgUG90YXBlbmtvIDxnbGlkZXJAZ29vZ2xlLmNvbT4NCj4gPiBDYzogTWF0dGhpYXMgQnJ1 Z2dlciA8bWF0dGhpYXMuYmdnQGdtYWlsLmNvbT4NCj4gPiBDYzogQW5kcmV5IEtvbm92YWxvdiA8 YW5kcmV5a252bEBnb29nbGUuY29tPg0KPiA+IENjOiBBbmRyZXcgTW9ydG9uIDxha3BtQGxpbnV4 LWZvdW5kYXRpb24ub3JnPg0KPiA+IC0tLQ0KPiA+ICBsaWIvdGVzdF9rYXNhbi5jIHwgNjIgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tDQo+ID4gIDEgZmls ZSBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQ0KPiA+DQo+ID4gZGlm ZiAtLWdpdCBhL2xpYi90ZXN0X2thc2FuLmMgYi9saWIvdGVzdF9rYXNhbi5jDQo+ID4gaW5kZXgg ZTMwODdkOTBlMDBkLi5hMTY0ZjZiNDdmZTUgMTAwNjQ0DQo+ID4gLS0tIGEvbGliL3Rlc3Rfa2Fz YW4uYw0KPiA+ICsrKyBiL2xpYi90ZXN0X2thc2FuLmMNCj4gPiBAQCAtNDAsNyArNDAsMTIgQEAg c3RhdGljIG5vaW5saW5lIHZvaWQgX19pbml0IGttYWxsb2Nfb29iX3JpZ2h0KHZvaWQpDQo+ID4g ICAgICAgICAgICAgICAgIHJldHVybjsNCj4gPiAgICAgICAgIH0NCj4gDQo+IEhpIFdhbHRlciwN Cj4gDQo+IFRoaXMgd291bGQgYmUgZ3JlYXQgdG8gaGF2ZSENCj4gQnV0IEkgYW0gY29uY2VybmVk IGFib3V0IHRoZXNlIHNlcmllcyB0aGF0IHBvcnQgS0FTQU4gdGVzdHMgdG8gS1VOSVQ6DQo+IGh0 dHBzOi8vbGttbC5vcmcvbGttbC8yMDIwLzQvMTcvMTE0NA0KPiBJIHN1c3BlY3QgaXQgd2lsbCBi ZSBvbmUgbGFyZ2UgbWVyZ2UgY29uZmxpY3QuIE5vdCBzdXJlIHdoYXQgaXMgdGhlDQo+IHByb3Bl ciB3YXkgdG8gcmVzb3ZsZSB0aGlzLiBJJ3ZlIGFkZGVkIGF1dGhvcnMgdG8gQ0MuDQo+IA0KWWVz LCBpdCBzaG91bGQgaGF2ZSBjb25mbGljdHMuIFRoYW5rcyBmb3IgeW91ciByZW1pbmRlci4NCj4g DQo+ID4gKyNpZmRlZiBDT05GSUdfS0FTQU5fR0VORVJJQw0KPiA+ICAgICAgICAgcHRyW3NpemVd ID0gJ3gnOw0KPiA+ICsjZWxzZQ0KPiA+ICsgICAgICAgcHRyW3NpemUgKyA1XSA9ICd4JzsNCj4g PiArI2VuZGlmDQo+ID4gKw0KPiANCj4gRm9yIHRoaXMgcGFydGljdWxhciBzbmlwcGV0IEkgdGhp bmsgd2UgY2FuIHJlZHVjZSBhbW91bnQgb2YgaWRlZidlcnkNCj4gYW5kIGFtb3VudCBvZiBub24t Y29tcGlsZWQgY29kZSBpbiBlYWNoIGNvbmZpZ3VyYXRpb24gd2l0aCBzb21ldGhpbmcNCj4gbGlr ZToNCj4gDQo+ICAgcHRyW3NpemUgKyA1XSA9ICd4JzsNCj4gICBpZiAoRU5BQkxFRChDT05GSUdf S0FTQU5fR0VORVJJQykpDQo+ICAgICAgIHB0cltzaXplXSA9ICd4JzsNCj4gDQo+IE9uZSBjaGVj ayBydW5zIGFsd2F5cyAoaXQgc2hvdWxkIHBhc3MgaW4gYm90aCBjb25maWdzLCByaWdodD8pLiBU aGUNCg0KVGhlcmUgaXMgYSBwcm9ibGVtLCBXaXRoIGdlbmVyaWMgS0FTQU4gaXQgbWF5IHRyaWdn ZXIgdHdvIEtBU0FOIHJlcG9ydHMuDQppZiB3ZSBjaGFuZ2UgaXQgbGlrZToNCiANCmlmIChFTkFC TEVEKENPTkZJR19LQVNBTl9HRU5FUklDKSkNCiAgICBwdHJbc2l6ZV0gPSAneCc7DQplbHNlDQog ICAgcHRyW3NpemUgKyA1XSA9ICd4JzsNCg0KPiBvbmx5IG9ubHkgaW4gR0VORVJJQywgYnV0IGl0 J3MgQy1sZXZlbCBpZiByYXRoZXIgdGhhbiBwcmVwcm9jZXNzb3IuDQo+IEtVTklUIHNob3VsZCBt YWtlIDIgYnVncyBwZXIgdGVzdCBlYXNpbHkgZXhwcmVzc2FibGUgKGFuZCB0ZXN0YWJsZSkuDQo+ IA0KDQo+IA0KPiANCj4gDQo+ID4gICAgICAgICBrZnJlZShwdHIpOw0KPiA+ICB9DQo+ID4NCj4g PiBAQCAtOTIsNyArOTcsMTIgQEAgc3RhdGljIG5vaW5saW5lIHZvaWQgX19pbml0IGttYWxsb2Nf cGFnZWFsbG9jX29vYl9yaWdodCh2b2lkKQ0KPiA+ICAgICAgICAgICAgICAgICByZXR1cm47DQo+ ID4gICAgICAgICB9DQo+ID4NCj4gPiArI2lmZGVmIENPTkZJR19LQVNBTl9HRU5FUklDDQo+ID4g ICAgICAgICBwdHJbc2l6ZV0gPSAwOw0KPiA+ICsjZWxzZQ0KPiA+ICsgICAgICAgcHRyW3NpemUg KyA2XSA9IDA7DQo+ID4gKyNlbmRpZg0KPiA+ICsNCj4gPiAgICAgICAgIGtmcmVlKHB0cik7DQo+ ID4gIH0NCj4gPg0KPiA+IEBAIC0xNjIsNyArMTcyLDExIEBAIHN0YXRpYyBub2lubGluZSB2b2lk IF9faW5pdCBrbWFsbG9jX29vYl9rcmVhbGxvY19tb3JlKHZvaWQpDQo+ID4gICAgICAgICAgICAg ICAgIHJldHVybjsNCj4gPiAgICAgICAgIH0NCj4gPg0KPiA+ICsjaWZkZWYgQ09ORklHX0tBU0FO X0dFTkVSSUMNCj4gPiAgICAgICAgIHB0cjJbc2l6ZTJdID0gJ3gnOw0KPiA+ICsjZWxzZQ0KPiA+ ICsgICAgICAgcHRyMltzaXplMiArIDEzXSA9ICd4JzsNCj4gPiArI2VuZGlmDQo+ID4gICAgICAg ICBrZnJlZShwdHIyKTsNCj4gPiAgfQ0KPiA+DQo+ID4gQEAgLTE4MCw3ICsxOTQsMTIgQEAgc3Rh dGljIG5vaW5saW5lIHZvaWQgX19pbml0IGttYWxsb2Nfb29iX2tyZWFsbG9jX2xlc3Modm9pZCkN Cj4gPiAgICAgICAgICAgICAgICAga2ZyZWUocHRyMSk7DQo+ID4gICAgICAgICAgICAgICAgIHJl dHVybjsNCj4gPiAgICAgICAgIH0NCj4gPiArDQo+ID4gKyNpZmRlZiBDT05GSUdfS0FTQU5fR0VO RVJJQw0KPiA+ICAgICAgICAgcHRyMltzaXplMl0gPSAneCc7DQo+ID4gKyNlbHNlDQo+ID4gKyAg ICAgICBwdHIyW3NpemUyICsgMl0gPSAneCc7DQo+ID4gKyNlbmRpZg0KPiA+ICAgICAgICAga2Zy ZWUocHRyMik7DQo+ID4gIH0NCj4gPg0KPiA+IEBAIC0yMTYsNyArMjM1LDExIEBAIHN0YXRpYyBu b2lubGluZSB2b2lkIF9faW5pdCBrbWFsbG9jX29vYl9tZW1zZXRfMih2b2lkKQ0KPiA+ICAgICAg ICAgICAgICAgICByZXR1cm47DQo+ID4gICAgICAgICB9DQo+ID4NCj4gPiArI2lmZGVmIENPTkZJ R19LQVNBTl9HRU5FUklDDQo+ID4gICAgICAgICBtZW1zZXQocHRyKzcsIDAsIDIpOw0KPiA+ICsj ZWxzZQ0KPiA+ICsgICAgICAgbWVtc2V0KHB0cisxNSwgMCwgMik7DQo+ID4gKyNlbmRpZg0KPiA+ ICAgICAgICAga2ZyZWUocHRyKTsNCj4gPiAgfQ0KPiA+DQo+ID4gQEAgLTIzMiw3ICsyNTUsMTEg QEAgc3RhdGljIG5vaW5saW5lIHZvaWQgX19pbml0IGttYWxsb2Nfb29iX21lbXNldF80KHZvaWQp DQo+ID4gICAgICAgICAgICAgICAgIHJldHVybjsNCj4gPiAgICAgICAgIH0NCj4gPg0KPiA+ICsj aWZkZWYgQ09ORklHX0tBU0FOX0dFTkVSSUMNCj4gPiAgICAgICAgIG1lbXNldChwdHIrNSwgMCwg NCk7DQo+ID4gKyNlbHNlDQo+ID4gKyAgICAgICBtZW1zZXQocHRyKzE1LCAwLCA0KTsNCj4gPiAr I2VuZGlmDQo+ID4gICAgICAgICBrZnJlZShwdHIpOw0KPiA+ICB9DQo+ID4NCj4gPiBAQCAtMjQ5 LDcgKzI3NiwxMSBAQCBzdGF0aWMgbm9pbmxpbmUgdm9pZCBfX2luaXQga21hbGxvY19vb2JfbWVt c2V0Xzgodm9pZCkNCj4gPiAgICAgICAgICAgICAgICAgcmV0dXJuOw0KPiA+ICAgICAgICAgfQ0K PiA+DQo+ID4gKyNpZmRlZiBDT05GSUdfS0FTQU5fR0VORVJJQw0KPiA+ICAgICAgICAgbWVtc2V0 KHB0cisxLCAwLCA4KTsNCj4gPiArI2Vsc2UNCj4gPiArICAgICAgIG1lbXNldChwdHIrMTUsIDAs IDgpOw0KPiA+ICsjZW5kaWYNCj4gPiAgICAgICAgIGtmcmVlKHB0cik7DQo+ID4gIH0NCj4gPg0K PiA+IEBAIC0yNjUsNyArMjk2LDExIEBAIHN0YXRpYyBub2lubGluZSB2b2lkIF9faW5pdCBrbWFs bG9jX29vYl9tZW1zZXRfMTYodm9pZCkNCj4gPiAgICAgICAgICAgICAgICAgcmV0dXJuOw0KPiA+ ICAgICAgICAgfQ0KPiA+DQo+ID4gKyNpZmRlZiBDT05GSUdfS0FTQU5fR0VORVJJQw0KPiA+ICAg ICAgICAgbWVtc2V0KHB0cisxLCAwLCAxNik7DQo+ID4gKyNlbHNlDQo+ID4gKyAgICAgICBtZW1z ZXQocHRyKzE1LCAwLCAxNik7DQo+ID4gKyNlbmRpZg0KPiA+ICAgICAgICAga2ZyZWUocHRyKTsN Cj4gPiAgfQ0KPiA+DQo+ID4gQEAgLTI4MSw3ICszMTYsMTEgQEAgc3RhdGljIG5vaW5saW5lIHZv aWQgX19pbml0IGttYWxsb2Nfb29iX2luX21lbXNldCh2b2lkKQ0KPiA+ICAgICAgICAgICAgICAg ICByZXR1cm47DQo+ID4gICAgICAgICB9DQo+ID4NCj4gPiArI2lmZGVmIENPTkZJR19LQVNBTl9H RU5FUklDDQo+ID4gICAgICAgICBtZW1zZXQocHRyLCAwLCBzaXplKzUpOw0KPiA+ICsjZWxzZQ0K PiA+ICsgICAgICAgbWVtc2V0KHB0ciwgMCwgc2l6ZSs3KTsNCj4gPiArI2VuZGlmDQo+ID4gICAg ICAgICBrZnJlZShwdHIpOw0KPiA+ICB9DQo+ID4NCj4gPiBAQCAtNDE1LDcgKzQ1NCwxMSBAQCBz dGF0aWMgbm9pbmxpbmUgdm9pZCBfX2luaXQga21lbV9jYWNoZV9vb2Iodm9pZCkNCj4gPiAgICAg ICAgICAgICAgICAgcmV0dXJuOw0KPiA+ICAgICAgICAgfQ0KPiA+DQo+ID4gKyNpZmRlZiBDT05G SUdfS0FTQU5fR0VORVJJQw0KPiA+ICAgICAgICAgKnAgPSBwW3NpemVdOw0KPiA+ICsjZWxzZQ0K PiA+ICsgICAgICAgKnAgPSBwW3NpemUgKyA4XTsNCj4gPiArI2VuZGlmDQo+ID4gICAgICAgICBr bWVtX2NhY2hlX2ZyZWUoY2FjaGUsIHApOw0KPiA+ICAgICAgICAga21lbV9jYWNoZV9kZXN0cm95 KGNhY2hlKTsNCj4gPiAgfQ0KPiA+IEBAIC00OTcsNiArNTQwLDExIEBAIHN0YXRpYyBub2lubGlu ZSB2b2lkIF9faW5pdCBjb3B5X3VzZXJfdGVzdCh2b2lkKQ0KPiA+ICAgICAgICAgY2hhciBfX3Vz ZXIgKnVzZXJtZW07DQo+ID4gICAgICAgICBzaXplX3Qgc2l6ZSA9IDEwOw0KPiA+ICAgICAgICAg aW50IHVudXNlZDsNCj4gPiArI2lmZGVmIENPTkZJR19LQVNBTl9HRU5FUklDDQo+ID4gKyAgICAg ICBzaXplX3Qgb29iX3NpemUgPSAxOw0KPiA+ICsjZWxzZQ0KPiA+ICsgICAgICAgc2l6ZV90IG9v Yl9zaXplID0gNzsNCj4gPiArI2VuZGlmDQo+ID4NCj4gPiAgICAgICAgIGttZW0gPSBrbWFsbG9j KHNpemUsIEdGUF9LRVJORUwpOw0KPiA+ICAgICAgICAgaWYgKCFrbWVtKQ0KPiA+IEBAIC01MTIs MjUgKzU2MCwyNSBAQCBzdGF0aWMgbm9pbmxpbmUgdm9pZCBfX2luaXQgY29weV91c2VyX3Rlc3Qo dm9pZCkNCj4gPiAgICAgICAgIH0NCj4gPg0KPiA+ICAgICAgICAgcHJfaW5mbygib3V0LW9mLWJv dW5kcyBpbiBjb3B5X2Zyb21fdXNlcigpXG4iKTsNCj4gPiAtICAgICAgIHVudXNlZCA9IGNvcHlf ZnJvbV91c2VyKGttZW0sIHVzZXJtZW0sIHNpemUgKyAxKTsNCj4gPiArICAgICAgIHVudXNlZCA9 IGNvcHlfZnJvbV91c2VyKGttZW0sIHVzZXJtZW0sIHNpemUgKyBvb2Jfc2l6ZSk7DQo+ID4NCj4g PiAgICAgICAgIHByX2luZm8oIm91dC1vZi1ib3VuZHMgaW4gY29weV90b191c2VyKClcbiIpOw0K PiA+IC0gICAgICAgdW51c2VkID0gY29weV90b191c2VyKHVzZXJtZW0sIGttZW0sIHNpemUgKyAx KTsNCj4gPiArICAgICAgIHVudXNlZCA9IGNvcHlfdG9fdXNlcih1c2VybWVtLCBrbWVtLCBzaXpl ICsgb29iX3NpemUpOw0KPiA+DQo+ID4gICAgICAgICBwcl9pbmZvKCJvdXQtb2YtYm91bmRzIGlu IF9fY29weV9mcm9tX3VzZXIoKVxuIik7DQo+ID4gLSAgICAgICB1bnVzZWQgPSBfX2NvcHlfZnJv bV91c2VyKGttZW0sIHVzZXJtZW0sIHNpemUgKyAxKTsNCj4gPiArICAgICAgIHVudXNlZCA9IF9f Y29weV9mcm9tX3VzZXIoa21lbSwgdXNlcm1lbSwgc2l6ZSArIG9vYl9zaXplKTsNCj4gPg0KPiA+ ICAgICAgICAgcHJfaW5mbygib3V0LW9mLWJvdW5kcyBpbiBfX2NvcHlfdG9fdXNlcigpXG4iKTsN Cj4gPiAtICAgICAgIHVudXNlZCA9IF9fY29weV90b191c2VyKHVzZXJtZW0sIGttZW0sIHNpemUg KyAxKTsNCj4gPiArICAgICAgIHVudXNlZCA9IF9fY29weV90b191c2VyKHVzZXJtZW0sIGttZW0s IHNpemUgKyBvb2Jfc2l6ZSk7DQo+ID4NCj4gPiAgICAgICAgIHByX2luZm8oIm91dC1vZi1ib3Vu ZHMgaW4gX19jb3B5X2Zyb21fdXNlcl9pbmF0b21pYygpXG4iKTsNCj4gPiAtICAgICAgIHVudXNl ZCA9IF9fY29weV9mcm9tX3VzZXJfaW5hdG9taWMoa21lbSwgdXNlcm1lbSwgc2l6ZSArIDEpOw0K PiA+ICsgICAgICAgdW51c2VkID0gX19jb3B5X2Zyb21fdXNlcl9pbmF0b21pYyhrbWVtLCB1c2Vy bWVtLCBzaXplICsgb29iX3NpemUpOw0KPiA+DQo+ID4gICAgICAgICBwcl9pbmZvKCJvdXQtb2Yt Ym91bmRzIGluIF9fY29weV90b191c2VyX2luYXRvbWljKClcbiIpOw0KPiA+IC0gICAgICAgdW51 c2VkID0gX19jb3B5X3RvX3VzZXJfaW5hdG9taWModXNlcm1lbSwga21lbSwgc2l6ZSArIDEpOw0K PiA+ICsgICAgICAgdW51c2VkID0gX19jb3B5X3RvX3VzZXJfaW5hdG9taWModXNlcm1lbSwga21l bSwgc2l6ZSArIG9vYl9zaXplKTsNCj4gPg0KPiA+ICAgICAgICAgcHJfaW5mbygib3V0LW9mLWJv dW5kcyBpbiBzdHJuY3B5X2Zyb21fdXNlcigpXG4iKTsNCj4gPiAtICAgICAgIHVudXNlZCA9IHN0 cm5jcHlfZnJvbV91c2VyKGttZW0sIHVzZXJtZW0sIHNpemUgKyAxKTsNCj4gPiArICAgICAgIHVu dXNlZCA9IHN0cm5jcHlfZnJvbV91c2VyKGttZW0sIHVzZXJtZW0sIHNpemUgKyBvb2Jfc2l6ZSk7 DQo+ID4NCj4gPiAgICAgICAgIHZtX211bm1hcCgodW5zaWduZWQgbG9uZyl1c2VybWVtLCBQQUdF X1NJWkUpOw0KPiA+ICAgICAgICAga2ZyZWUoa21lbSk7DQo+ID4gLS0NCj4gPiAyLjE4LjANCj4g Pg0KPiA+IC0tDQo+ID4gWW91IHJlY2VpdmVkIHRoaXMgbWVzc2FnZSBiZWNhdXNlIHlvdSBhcmUg c3Vic2NyaWJlZCB0byB0aGUgR29vZ2xlIEdyb3VwcyAia2FzYW4tZGV2IiBncm91cC4NCj4gPiBU byB1bnN1YnNjcmliZSBmcm9tIHRoaXMgZ3JvdXAgYW5kIHN0b3AgcmVjZWl2aW5nIGVtYWlscyBm cm9tIGl0LCBzZW5kIGFuIGVtYWlsIHRvIGthc2FuLWRldit1bnN1YnNjcmliZUBnb29nbGVncm91 cHMuY29tLg0KPiA+IFRvIHZpZXcgdGhpcyBkaXNjdXNzaW9uIG9uIHRoZSB3ZWIgdmlzaXQgaHR0 cHM6Ly9ncm91cHMuZ29vZ2xlLmNvbS9kL21zZ2lkL2thc2FuLWRldi8yMDIwMDQyMTAxNDAwNy42 MDEyLTEtd2FsdGVyLXpoLnd1JTQwbWVkaWF0ZWsuY29tLg0KDQo=