From mboxrd@z Thu Jan 1 00:00:00 1970 From: Walter Wu Subject: Re: [PATCH] kasan: fix the missing underflow in memmove and memcpy with CONFIG_KASAN_GENERIC=y Date: Thu, 3 Oct 2019 17:38:45 +0800 Message-ID: <1570095525.19702.59.camel@mtksdccf07> 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> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Dmitry Vyukov Cc: Andrey Ryabinin , Alexander Potapenko , Matthias Brugger , LKML , kasan-dev , Linux-MM , Linux ARM , linux-mediatek@lists.infradead.org, wsd_upstream List-Id: linux-mediatek@lists.infradead.org On Thu, 2019-10-03 at 08:26 +0200, Dmitry Vyukov wrote: > On Thu, Oct 3, 2019 at 4:18 AM Walter Wu wrote: > > > > On Wed, 2019-10-02 at 15:57 +0200, Dmitry Vyukov wrote: > > > On Wed, Oct 2, 2019 at 2:15 PM Walter Wu wrote: > > > > > > > > On Mon, 2019-09-30 at 12:36 +0800, Walter Wu wrote: > > > > > On Fri, 2019-09-27 at 21:41 +0200, Dmitry Vyukov wrote: > > > > > > On Fri, Sep 27, 2019 at 4:22 PM Walter Wu wrote: > > > > > > > > > > > > > > On Fri, 2019-09-27 at 15:07 +0200, Dmitry Vyukov wrote: > > > > > > > > On Fri, Sep 27, 2019 at 5:43 AM Walter Wu wrote: > > > > > > > > > > > > > > > > > > memmove() and memcpy() have missing underflow issues. > > > > > > > > > When -7 <= size < 0, then KASAN will miss to catch the underflow issue. > > > > > > > > > It looks like shadow start address and shadow end address is the same, > > > > > > > > > so it does not actually check anything. > > > > > > > > > > > > > > > > > > The following test is indeed not caught by KASAN: > > > > > > > > > > > > > > > > > > char *p = kmalloc(64, GFP_KERNEL); > > > > > > > > > memset((char *)p, 0, 64); > > > > > > > > > memmove((char *)p, (char *)p + 4, -2); > > > > > > > > > kfree((char*)p); > > > > > > > > > > > > > > > > > > It should be checked here: > > > > > > > > > > > > > > > > > > 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_); > > > > > > > > > > > > > > > > > > return __memmove(dest, src, len); > > > > > > > > > } > > > > > > > > > > > > > > > > > > We fix the shadow end address which is calculated, then generic KASAN > > > > > > > > > get the right shadow end address and detect this underflow issue. > > > > > > > > > > > > > > > > > > [1] https://bugzilla.kernel.org/show_bug.cgi?id=199341 > > > > > > > > > > > > > > > > > > Signed-off-by: Walter Wu > > > > > > > > > Reported-by: Dmitry Vyukov > > > > > > > > > --- > > > > > > > > > lib/test_kasan.c | 36 ++++++++++++++++++++++++++++++++++++ > > > > > > > > > mm/kasan/generic.c | 8 ++++++-- > > > > > > > > > 2 files changed, 42 insertions(+), 2 deletions(-) > > > > > > > > > > > > > > > > > > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > > > > > > > > > index b63b367a94e8..8bd014852556 100644 > > > > > > > > > --- a/lib/test_kasan.c > > > > > > > > > +++ b/lib/test_kasan.c > > > > > > > > > @@ -280,6 +280,40 @@ static noinline void __init kmalloc_oob_in_memset(void) > > > > > > > > > kfree(ptr); > > > > > > > > > } > > > > > > > > > > > > > > > > > > +static noinline void __init kmalloc_oob_in_memmove_underflow(void) > > > > > > > > > +{ > > > > > > > > > + char *ptr; > > > > > > > > > + size_t size = 64; > > > > > > > > > + > > > > > > > > > + pr_info("underflow out-of-bounds 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_oob_in_memmove_overflow(void) > > > > > > > > > +{ > > > > > > > > > + char *ptr; > > > > > > > > > + size_t size = 64; > > > > > > > > > + > > > > > > > > > + pr_info("overflow out-of-bounds in memmove\n"); > > > > > > > > > + ptr = kmalloc(size, GFP_KERNEL); > > > > > > > > > + if (!ptr) { > > > > > > > > > + pr_err("Allocation failed\n"); > > > > > > > > > + return; > > > > > > > > > + } > > > > > > > > > + > > > > > > > > > + memset((char *)ptr, 0, 64); > > > > > > > > > + memmove((char *)ptr + size, (char *)ptr, 2); > > > > > > > > > + kfree(ptr); > > > > > > > > > +} > > > > > > > > > + > > > > > > > > > static noinline void __init kmalloc_uaf(void) > > > > > > > > > { > > > > > > > > > char *ptr; > > > > > > > > > @@ -734,6 +768,8 @@ static int __init kmalloc_tests_init(void) > > > > > > > > > kmalloc_oob_memset_4(); > > > > > > > > > kmalloc_oob_memset_8(); > > > > > > > > > kmalloc_oob_memset_16(); > > > > > > > > > + kmalloc_oob_in_memmove_underflow(); > > > > > > > > > + kmalloc_oob_in_memmove_overflow(); > > > > > > > > > kmalloc_uaf(); > > > > > > > > > kmalloc_uaf_memset(); > > > > > > > > > kmalloc_uaf2(); > > > > > > > > > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > > > > > > > > > index 616f9dd82d12..34ca23d59e67 100644 > > > > > > > > > --- a/mm/kasan/generic.c > > > > > > > > > +++ b/mm/kasan/generic.c > > > > > > > > > @@ -131,9 +131,13 @@ static __always_inline bool memory_is_poisoned_n(unsigned long addr, > > > > > > > > > size_t size) > > > > > > > > > { > > > > > > > > > unsigned long ret; > > > > > > > > > + void *shadow_start = kasan_mem_to_shadow((void *)addr); > > > > > > > > > + void *shadow_end = kasan_mem_to_shadow((void *)addr + size - 1) + 1; > > > > > > > > > > > > > > > > > > - ret = memory_is_nonzero(kasan_mem_to_shadow((void *)addr), > > > > > > > > > - kasan_mem_to_shadow((void *)addr + size - 1) + 1); > > > > > > > > > + if ((long)size < 0) > > > > > > > > > + shadow_end = kasan_mem_to_shadow((void *)addr + size); > > > > > > > > > > > > > > > > Hi Walter, > > > > > > > > > > > > > > > > Thanks for working on this. > > > > > > > > > > > > > > > > If size<0, does it make sense to continue at all? We will still check > > > > > > > > 1PB of shadow memory? What happens when we pass such huge range to > > > > > > > > memory_is_nonzero? > > > > > > > > Perhaps it's better to produce an error and bail out immediately if size<0? > > > > > > > > > > > > > > I agree with what you said. when size<0, it is indeed an unreasonable > > > > > > > behavior, it should be blocked from continuing to do. > > > > > > > > > > > > > > > > > > > > > > Also, what's the failure mode of the tests? Didn't they badly corrupt > > > > > > > > memory? We tried to keep tests such that they produce the KASAN > > > > > > > > reports, but don't badly corrupt memory b/c/ we need to run all of > > > > > > > > them. > > > > > > > > > > > > > > Maybe we should first produce KASAN reports and then go to execute > > > > > > > memmove() or do nothing? It looks like it’s doing the following.or? > > > > > > > > > > > > > > void *memmove(void *dest, const void *src, size_t len) > > > > > > > { > > > > > > > + if (long(len) <= 0) > > > > > > > > > > > > /\/\/\/\/\/\ > > > > > > > > > > > > This check needs to be inside of check_memory_region, otherwise we > > > > > > will have similar problems in all other places that use > > > > > > check_memory_region. > > > > > Thanks for your reminder. > > > > > > > > > > bool check_memory_region(unsigned long addr, size_t size, bool write, > > > > > unsigned long ret_ip) > > > > > { > > > > > + if (long(size) < 0) { > > > > > + kasan_report_invalid_size(src, dest, len, _RET_IP_); > > > > > + return false; > > > > > + } > > > > > + > > > > > return check_memory_region_inline(addr, size, write, ret_ip); > > > > > } > > > > > > > > > > > But check_memory_region already returns a bool, so we could check that > > > > > > bool and return early. > > > > > > > > > > When size<0, we should only show one KASAN report, and should we only > > > > > limit to return when size<0 is true? If yse, then __memmove() will do > > > > > nothing. > > > > > > > > > > > > > > > void *memmove(void *dest, const void *src, size_t len) > > > > > { > > > > > - check_memory_region((unsigned long)src, len, false, _RET_IP_); > > > > > + if(!check_memory_region((unsigned long)src, len, false, > > > > > _RET_IP_) > > > > > + && long(size) < 0) > > > > > + return; > > > > > + > > > > > check_memory_region((unsigned long)dest, len, true, _RET_IP_); > > > > > > > > > > return __memmove(dest, src, len); > > > > > > > > > > > > > > > Hi Dmitry, > > > > > > > > What do you think the following code is better than the above one. > > > > In memmmove/memset/memcpy, they need to determine whether size < 0 is > > > > true. we directly determine whether size is negative in memmove and > > > > return early. it avoid to generate repeated KASAN report. Is it better? > > > > > > > > void *memmove(void *dest, const void *src, size_t len) > > > > { > > > > + if (long(size) < 0) { > > > > + kasan_report_invalid_size(src, dest, len, _RET_IP_); > > > > + return; > > > > + } > > > > + > > > > check_memory_region((unsigned long)src, len, false, _RET_IP_); > > > > check_memory_region((unsigned long)dest, len, true, _RET_IP_); > > > > > > > > > > > > check_memory_region() still has to check whether the size is negative. > > > > but memmove/memset/memcpy generate invalid size KASAN report will not be > > > > there. > > > > > > > > > If check_memory_region() will do the check, why do we need to > > > duplicate it inside of memmove and all other range functions? > > > > > Yes, I know it has duplication, but if we don't have to determine size<0 > > in memmove, then all check_memory_region return false will do nothing, > > But they will produce a KASAN report, right? They are asked to check > if 18446744073709551614 bytes are good. 18446744073709551614 bytes > can't be good. > > > > it includes other memory corruption behaviors, this is my original > > concern. > > > > > I would do: > > > > > > void *memmove(void *dest, const void *src, size_t len) > > > { > > > if (check_memory_region((unsigned long)src, len, false, _RET_IP_)) > > > return; > > if check_memory_region return TRUE is to do nothing, but it is no memory > > corruption? Should it return early when check_memory_region return a > > FALSE? > > Maybe. I just meant the overall idea: check_memory_region should > detect that 18446744073709551614 bytes are bad, print an error, return > an indication that bytes were bad, memmove should return early if the > range is bad. > ok, i will send new patch. Thanks for your review. > > > > This avoids duplicating the check, adds minimal amount of code to > > > range functions and avoids adding kasan_report_invalid_size. > > Thanks for your suggestion. > > We originally want to show complete information(destination address, > > source address, and its length), but add minimal amount of code into > > kasan_report(), it should be good. > > > > > > -- > > 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/1570069078.19702.57.camel%40mtksdccf07. 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=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,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 C48D1C10F14 for ; Thu, 3 Oct 2019 09:54:02 +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 8DF20217D7 for ; Thu, 3 Oct 2019 09:54: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="EvwSh9uy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DF20217D7 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=hYj7dE7t70EJ5VX5N4iCv9wAjp/7Vfwt/FGACU3xmag=; b=EvwSh9uy6bSHdh ygbKgosAgnhH+rg1NRPIEXLdcPtmdi450tDGdjpqrr8vRb7p6HSXH5OMqCNRTwwQec9A+qetyfrXG lzjpy6TSE+JCw4orN3eGtOofYHMrOnpZth7IMGGPmRA2c5tCcqo5zWaJ1hnno0l3P/BbTPw9pFvbg G+0pR651vp3WROso9tuy5B+7V3US5Lf1N0zACDeL77bhKo2U4Bik+wiNmpHF+J4UCkJMWFX4YXwiS a5kl922RTmASa2BG6Qzz2Vw7meQrz0XE/Y9EB7kMcLHoULFYtGxH5P/yUszf4THnpsBv8IiuDWJ5N Tnw2mOtWGLQuZamSABeQ==; 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 1iFxo9-0000TE-Sa; Thu, 03 Oct 2019 09:54:01 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iFxo5-0000Sg-Ty; Thu, 03 Oct 2019 09:54:00 +0000 X-UUID: 6cdf23f2a27245188eddbc6009abb306-20191003 X-UUID: 6cdf23f2a27245188eddbc6009abb306-20191003 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1289522676; Thu, 03 Oct 2019 01:53:52 -0800 Received: from MTKMBS07N2.mediatek.inc (172.21.101.141) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 3 Oct 2019 02:53:51 -0700 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 3 Oct 2019 17:38:43 +0800 Received: from [172.21.84.99] (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Thu, 3 Oct 2019 17:38:44 +0800 Message-ID: <1570095525.19702.59.camel@mtksdccf07> Subject: Re: [PATCH] kasan: fix the missing underflow in memmove and memcpy with CONFIG_KASAN_GENERIC=y From: Walter Wu To: Dmitry Vyukov Date: Thu, 3 Oct 2019 17:38:45 +0800 In-Reply-To: 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> 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-20191003_025357_972440_FF444A13 X-CRM114-Status: GOOD ( 45.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 , linux-mediatek@lists.infradead.org, LKML , kasan-dev , Linux-MM , Alexander Potapenko , Matthias Brugger , Andrey Ryabinin , Linux ARM Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gVGh1LCAyMDE5LTEwLTAzIGF0IDA4OjI2ICswMjAwLCBEbWl0cnkgVnl1a292IHdyb3RlOgo+ IE9uIFRodSwgT2N0IDMsIDIwMTkgYXQgNDoxOCBBTSBXYWx0ZXIgV3UgPHdhbHRlci16aC53dUBt ZWRpYXRlay5jb20+IHdyb3RlOgo+ID4KPiA+IE9uIFdlZCwgMjAxOS0xMC0wMiBhdCAxNTo1NyAr MDIwMCwgRG1pdHJ5IFZ5dWtvdiB3cm90ZToKPiA+ID4gT24gV2VkLCBPY3QgMiwgMjAxOSBhdCAy OjE1IFBNIFdhbHRlciBXdSA8d2FsdGVyLXpoLnd1QG1lZGlhdGVrLmNvbT4gd3JvdGU6Cj4gPiA+ ID4KPiA+ID4gPiBPbiBNb24sIDIwMTktMDktMzAgYXQgMTI6MzYgKzA4MDAsIFdhbHRlciBXdSB3 cm90ZToKPiA+ID4gPiA+IE9uIEZyaSwgMjAxOS0wOS0yNyBhdCAyMTo0MSArMDIwMCwgRG1pdHJ5 IFZ5dWtvdiB3cm90ZToKPiA+ID4gPiA+ID4gT24gRnJpLCBTZXAgMjcsIDIwMTkgYXQgNDoyMiBQ TSBXYWx0ZXIgV3UgPHdhbHRlci16aC53dUBtZWRpYXRlay5jb20+IHdyb3RlOgo+ID4gPiA+ID4g PiA+Cj4gPiA+ID4gPiA+ID4gT24gRnJpLCAyMDE5LTA5LTI3IGF0IDE1OjA3ICswMjAwLCBEbWl0 cnkgVnl1a292IHdyb3RlOgo+ID4gPiA+ID4gPiA+ID4gT24gRnJpLCBTZXAgMjcsIDIwMTkgYXQg NTo0MyBBTSBXYWx0ZXIgV3UgPHdhbHRlci16aC53dUBtZWRpYXRlay5jb20+IHdyb3RlOgo+ID4g PiA+ID4gPiA+ID4gPgo+ID4gPiA+ID4gPiA+ID4gPiBtZW1tb3ZlKCkgYW5kIG1lbWNweSgpIGhh dmUgbWlzc2luZyB1bmRlcmZsb3cgaXNzdWVzLgo+ID4gPiA+ID4gPiA+ID4gPiBXaGVuIC03IDw9 IHNpemUgPCAwLCB0aGVuIEtBU0FOIHdpbGwgbWlzcyB0byBjYXRjaCB0aGUgdW5kZXJmbG93IGlz c3VlLgo+ID4gPiA+ID4gPiA+ID4gPiBJdCBsb29rcyBsaWtlIHNoYWRvdyBzdGFydCBhZGRyZXNz IGFuZCBzaGFkb3cgZW5kIGFkZHJlc3MgaXMgdGhlIHNhbWUsCj4gPiA+ID4gPiA+ID4gPiA+IHNv IGl0IGRvZXMgbm90IGFjdHVhbGx5IGNoZWNrIGFueXRoaW5nLgo+ID4gPiA+ID4gPiA+ID4gPgo+ ID4gPiA+ID4gPiA+ID4gPiBUaGUgZm9sbG93aW5nIHRlc3QgaXMgaW5kZWVkIG5vdCBjYXVnaHQg YnkgS0FTQU46Cj4gPiA+ID4gPiA+ID4gPiA+Cj4gPiA+ID4gPiA+ID4gPiA+ICAgICAgICAgY2hh ciAqcCA9IGttYWxsb2MoNjQsIEdGUF9LRVJORUwpOwo+ID4gPiA+ID4gPiA+ID4gPiAgICAgICAg IG1lbXNldCgoY2hhciAqKXAsIDAsIDY0KTsKPiA+ID4gPiA+ID4gPiA+ID4gICAgICAgICBtZW1t b3ZlKChjaGFyICopcCwgKGNoYXIgKilwICsgNCwgLTIpOwo+ID4gPiA+ID4gPiA+ID4gPiAgICAg ICAgIGtmcmVlKChjaGFyKilwKTsKPiA+ID4gPiA+ID4gPiA+ID4KPiA+ID4gPiA+ID4gPiA+ID4g SXQgc2hvdWxkIGJlIGNoZWNrZWQgaGVyZToKPiA+ID4gPiA+ID4gPiA+ID4KPiA+ID4gPiA+ID4g PiA+ID4gdm9pZCAqbWVtbW92ZSh2b2lkICpkZXN0LCBjb25zdCB2b2lkICpzcmMsIHNpemVfdCBs ZW4pCj4gPiA+ID4gPiA+ID4gPiA+IHsKPiA+ID4gPiA+ID4gPiA+ID4gICAgICAgICBjaGVja19t ZW1vcnlfcmVnaW9uKCh1bnNpZ25lZCBsb25nKXNyYywgbGVuLCBmYWxzZSwgX1JFVF9JUF8pOwo+ ID4gPiA+ID4gPiA+ID4gPiAgICAgICAgIGNoZWNrX21lbW9yeV9yZWdpb24oKHVuc2lnbmVkIGxv bmcpZGVzdCwgbGVuLCB0cnVlLCBfUkVUX0lQXyk7Cj4gPiA+ID4gPiA+ID4gPiA+Cj4gPiA+ID4g PiA+ID4gPiA+ICAgICAgICAgcmV0dXJuIF9fbWVtbW92ZShkZXN0LCBzcmMsIGxlbik7Cj4gPiA+ ID4gPiA+ID4gPiA+IH0KPiA+ID4gPiA+ID4gPiA+ID4KPiA+ID4gPiA+ID4gPiA+ID4gV2UgZml4 IHRoZSBzaGFkb3cgZW5kIGFkZHJlc3Mgd2hpY2ggaXMgY2FsY3VsYXRlZCwgdGhlbiBnZW5lcmlj IEtBU0FOCj4gPiA+ID4gPiA+ID4gPiA+IGdldCB0aGUgcmlnaHQgc2hhZG93IGVuZCBhZGRyZXNz IGFuZCBkZXRlY3QgdGhpcyB1bmRlcmZsb3cgaXNzdWUuCj4gPiA+ID4gPiA+ID4gPiA+Cj4gPiA+ ID4gPiA+ID4gPiA+IFsxXSBodHRwczovL2J1Z3ppbGxhLmtlcm5lbC5vcmcvc2hvd19idWcuY2dp P2lkPTE5OTM0MQo+ID4gPiA+ID4gPiA+ID4gPgo+ID4gPiA+ID4gPiA+ID4gPiBTaWduZWQtb2Zm LWJ5OiBXYWx0ZXIgV3UgPHdhbHRlci16aC53dUBtZWRpYXRlay5jb20+Cj4gPiA+ID4gPiA+ID4g PiA+IFJlcG9ydGVkLWJ5OiBEbWl0cnkgVnl1a292IDxkdnl1a292QGdvb2dsZS5jb20+Cj4gPiA+ ID4gPiA+ID4gPiA+IC0tLQo+ID4gPiA+ID4gPiA+ID4gPiAgbGliL3Rlc3Rfa2FzYW4uYyAgIHwg MzYgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCj4gPiA+ID4gPiA+ID4gPiA+ ICBtbS9rYXNhbi9nZW5lcmljLmMgfCAgOCArKysrKystLQo+ID4gPiA+ID4gPiA+ID4gPiAgMiBm aWxlcyBjaGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQo+ID4gPiA+ID4g PiA+ID4gPgo+ID4gPiA+ID4gPiA+ID4gPiBkaWZmIC0tZ2l0IGEvbGliL3Rlc3Rfa2FzYW4uYyBi L2xpYi90ZXN0X2thc2FuLmMKPiA+ID4gPiA+ID4gPiA+ID4gaW5kZXggYjYzYjM2N2E5NGU4Li44 YmQwMTQ4NTI1NTYgMTAwNjQ0Cj4gPiA+ID4gPiA+ID4gPiA+IC0tLSBhL2xpYi90ZXN0X2thc2Fu LmMKPiA+ID4gPiA+ID4gPiA+ID4gKysrIGIvbGliL3Rlc3Rfa2FzYW4uYwo+ID4gPiA+ID4gPiA+ ID4gPiBAQCAtMjgwLDYgKzI4MCw0MCBAQCBzdGF0aWMgbm9pbmxpbmUgdm9pZCBfX2luaXQga21h bGxvY19vb2JfaW5fbWVtc2V0KHZvaWQpCj4gPiA+ID4gPiA+ID4gPiA+ICAgICAgICAga2ZyZWUo cHRyKTsKPiA+ID4gPiA+ID4gPiA+ID4gIH0KPiA+ID4gPiA+ID4gPiA+ID4KPiA+ID4gPiA+ID4g PiA+ID4gK3N0YXRpYyBub2lubGluZSB2b2lkIF9faW5pdCBrbWFsbG9jX29vYl9pbl9tZW1tb3Zl X3VuZGVyZmxvdyh2b2lkKQo+ID4gPiA+ID4gPiA+ID4gPiArewo+ID4gPiA+ID4gPiA+ID4gPiAr ICAgICAgIGNoYXIgKnB0cjsKPiA+ID4gPiA+ID4gPiA+ID4gKyAgICAgICBzaXplX3Qgc2l6ZSA9 IDY0Owo+ID4gPiA+ID4gPiA+ID4gPiArCj4gPiA+ID4gPiA+ID4gPiA+ICsgICAgICAgcHJfaW5m bygidW5kZXJmbG93IG91dC1vZi1ib3VuZHMgaW4gbWVtbW92ZVxuIik7Cj4gPiA+ID4gPiA+ID4g PiA+ICsgICAgICAgcHRyID0ga21hbGxvYyhzaXplLCBHRlBfS0VSTkVMKTsKPiA+ID4gPiA+ID4g PiA+ID4gKyAgICAgICBpZiAoIXB0cikgewo+ID4gPiA+ID4gPiA+ID4gPiArICAgICAgICAgICAg ICAgcHJfZXJyKCJBbGxvY2F0aW9uIGZhaWxlZFxuIik7Cj4gPiA+ID4gPiA+ID4gPiA+ICsgICAg ICAgICAgICAgICByZXR1cm47Cj4gPiA+ID4gPiA+ID4gPiA+ICsgICAgICAgfQo+ID4gPiA+ID4g PiA+ID4gPiArCj4gPiA+ID4gPiA+ID4gPiA+ICsgICAgICAgbWVtc2V0KChjaGFyICopcHRyLCAw LCA2NCk7Cj4gPiA+ID4gPiA+ID4gPiA+ICsgICAgICAgbWVtbW92ZSgoY2hhciAqKXB0ciwgKGNo YXIgKilwdHIgKyA0LCAtMik7Cj4gPiA+ID4gPiA+ID4gPiA+ICsgICAgICAga2ZyZWUocHRyKTsK PiA+ID4gPiA+ID4gPiA+ID4gK30KPiA+ID4gPiA+ID4gPiA+ID4gKwo+ID4gPiA+ID4gPiA+ID4g PiArc3RhdGljIG5vaW5saW5lIHZvaWQgX19pbml0IGttYWxsb2Nfb29iX2luX21lbW1vdmVfb3Zl cmZsb3codm9pZCkKPiA+ID4gPiA+ID4gPiA+ID4gK3sKPiA+ID4gPiA+ID4gPiA+ID4gKyAgICAg ICBjaGFyICpwdHI7Cj4gPiA+ID4gPiA+ID4gPiA+ICsgICAgICAgc2l6ZV90IHNpemUgPSA2NDsK PiA+ID4gPiA+ID4gPiA+ID4gKwo+ID4gPiA+ID4gPiA+ID4gPiArICAgICAgIHByX2luZm8oIm92 ZXJmbG93IG91dC1vZi1ib3VuZHMgaW4gbWVtbW92ZVxuIik7Cj4gPiA+ID4gPiA+ID4gPiA+ICsg ICAgICAgcHRyID0ga21hbGxvYyhzaXplLCBHRlBfS0VSTkVMKTsKPiA+ID4gPiA+ID4gPiA+ID4g KyAgICAgICBpZiAoIXB0cikgewo+ID4gPiA+ID4gPiA+ID4gPiArICAgICAgICAgICAgICAgcHJf ZXJyKCJBbGxvY2F0aW9uIGZhaWxlZFxuIik7Cj4gPiA+ID4gPiA+ID4gPiA+ICsgICAgICAgICAg ICAgICByZXR1cm47Cj4gPiA+ID4gPiA+ID4gPiA+ICsgICAgICAgfQo+ID4gPiA+ID4gPiA+ID4g PiArCj4gPiA+ID4gPiA+ID4gPiA+ICsgICAgICAgbWVtc2V0KChjaGFyICopcHRyLCAwLCA2NCk7 Cj4gPiA+ID4gPiA+ID4gPiA+ICsgICAgICAgbWVtbW92ZSgoY2hhciAqKXB0ciArIHNpemUsIChj aGFyICopcHRyLCAyKTsKPiA+ID4gPiA+ID4gPiA+ID4gKyAgICAgICBrZnJlZShwdHIpOwo+ID4g PiA+ID4gPiA+ID4gPiArfQo+ID4gPiA+ID4gPiA+ID4gPiArCj4gPiA+ID4gPiA+ID4gPiA+ICBz dGF0aWMgbm9pbmxpbmUgdm9pZCBfX2luaXQga21hbGxvY191YWYodm9pZCkKPiA+ID4gPiA+ID4g PiA+ID4gIHsKPiA+ID4gPiA+ID4gPiA+ID4gICAgICAgICBjaGFyICpwdHI7Cj4gPiA+ID4gPiA+ ID4gPiA+IEBAIC03MzQsNiArNzY4LDggQEAgc3RhdGljIGludCBfX2luaXQga21hbGxvY190ZXN0 c19pbml0KHZvaWQpCj4gPiA+ID4gPiA+ID4gPiA+ICAgICAgICAga21hbGxvY19vb2JfbWVtc2V0 XzQoKTsKPiA+ID4gPiA+ID4gPiA+ID4gICAgICAgICBrbWFsbG9jX29vYl9tZW1zZXRfOCgpOwo+ ID4gPiA+ID4gPiA+ID4gPiAgICAgICAgIGttYWxsb2Nfb29iX21lbXNldF8xNigpOwo+ID4gPiA+ ID4gPiA+ID4gPiArICAgICAgIGttYWxsb2Nfb29iX2luX21lbW1vdmVfdW5kZXJmbG93KCk7Cj4g PiA+ID4gPiA+ID4gPiA+ICsgICAgICAga21hbGxvY19vb2JfaW5fbWVtbW92ZV9vdmVyZmxvdygp Owo+ID4gPiA+ID4gPiA+ID4gPiAgICAgICAgIGttYWxsb2NfdWFmKCk7Cj4gPiA+ID4gPiA+ID4g PiA+ICAgICAgICAga21hbGxvY191YWZfbWVtc2V0KCk7Cj4gPiA+ID4gPiA+ID4gPiA+ICAgICAg ICAga21hbGxvY191YWYyKCk7Cj4gPiA+ID4gPiA+ID4gPiA+IGRpZmYgLS1naXQgYS9tbS9rYXNh bi9nZW5lcmljLmMgYi9tbS9rYXNhbi9nZW5lcmljLmMKPiA+ID4gPiA+ID4gPiA+ID4gaW5kZXgg NjE2ZjlkZDgyZDEyLi4zNGNhMjNkNTllNjcgMTAwNjQ0Cj4gPiA+ID4gPiA+ID4gPiA+IC0tLSBh L21tL2thc2FuL2dlbmVyaWMuYwo+ID4gPiA+ID4gPiA+ID4gPiArKysgYi9tbS9rYXNhbi9nZW5l cmljLmMKPiA+ID4gPiA+ID4gPiA+ID4gQEAgLTEzMSw5ICsxMzEsMTMgQEAgc3RhdGljIF9fYWx3 YXlzX2lubGluZSBib29sIG1lbW9yeV9pc19wb2lzb25lZF9uKHVuc2lnbmVkIGxvbmcgYWRkciwK PiA+ID4gPiA+ID4gPiA+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc2l6ZV90IHNpemUpCj4gPiA+ID4gPiA+ID4gPiA+ICB7Cj4gPiA+ID4gPiA+ID4g PiA+ICAgICAgICAgdW5zaWduZWQgbG9uZyByZXQ7Cj4gPiA+ID4gPiA+ID4gPiA+ICsgICAgICAg dm9pZCAqc2hhZG93X3N0YXJ0ID0ga2FzYW5fbWVtX3RvX3NoYWRvdygodm9pZCAqKWFkZHIpOwo+ ID4gPiA+ID4gPiA+ID4gPiArICAgICAgIHZvaWQgKnNoYWRvd19lbmQgPSBrYXNhbl9tZW1fdG9f c2hhZG93KCh2b2lkICopYWRkciArIHNpemUgLSAxKSArIDE7Cj4gPiA+ID4gPiA+ID4gPiA+Cj4g PiA+ID4gPiA+ID4gPiA+IC0gICAgICAgcmV0ID0gbWVtb3J5X2lzX25vbnplcm8oa2FzYW5fbWVt X3RvX3NoYWRvdygodm9pZCAqKWFkZHIpLAo+ID4gPiA+ID4gPiA+ID4gPiAtICAgICAgICAgICAg ICAgICAgICAgICBrYXNhbl9tZW1fdG9fc2hhZG93KCh2b2lkICopYWRkciArIHNpemUgLSAxKSAr IDEpOwo+ID4gPiA+ID4gPiA+ID4gPiArICAgICAgIGlmICgobG9uZylzaXplIDwgMCkKPiA+ID4g PiA+ID4gPiA+ID4gKyAgICAgICAgICAgICAgIHNoYWRvd19lbmQgPSBrYXNhbl9tZW1fdG9fc2hh ZG93KCh2b2lkICopYWRkciArIHNpemUpOwo+ID4gPiA+ID4gPiA+ID4KPiA+ID4gPiA+ID4gPiA+ IEhpIFdhbHRlciwKPiA+ID4gPiA+ID4gPiA+Cj4gPiA+ID4gPiA+ID4gPiBUaGFua3MgZm9yIHdv cmtpbmcgb24gdGhpcy4KPiA+ID4gPiA+ID4gPiA+Cj4gPiA+ID4gPiA+ID4gPiBJZiBzaXplPDAs IGRvZXMgaXQgbWFrZSBzZW5zZSB0byBjb250aW51ZSBhdCBhbGw/IFdlIHdpbGwgc3RpbGwgY2hl Y2sKPiA+ID4gPiA+ID4gPiA+IDFQQiBvZiBzaGFkb3cgbWVtb3J5PyBXaGF0IGhhcHBlbnMgd2hl biB3ZSBwYXNzIHN1Y2ggaHVnZSByYW5nZSB0bwo+ID4gPiA+ID4gPiA+ID4gbWVtb3J5X2lzX25v bnplcm8/Cj4gPiA+ID4gPiA+ID4gPiBQZXJoYXBzIGl0J3MgYmV0dGVyIHRvIHByb2R1Y2UgYW4g ZXJyb3IgYW5kIGJhaWwgb3V0IGltbWVkaWF0ZWx5IGlmIHNpemU8MD8KPiA+ID4gPiA+ID4gPgo+ ID4gPiA+ID4gPiA+IEkgYWdyZWUgd2l0aCB3aGF0IHlvdSBzYWlkLiB3aGVuIHNpemU8MCwgaXQg aXMgaW5kZWVkIGFuIHVucmVhc29uYWJsZQo+ID4gPiA+ID4gPiA+IGJlaGF2aW9yLCBpdCBzaG91 bGQgYmUgYmxvY2tlZCBmcm9tIGNvbnRpbnVpbmcgdG8gZG8uCj4gPiA+ID4gPiA+ID4KPiA+ID4g PiA+ID4gPgo+ID4gPiA+ID4gPiA+ID4gQWxzbywgd2hhdCdzIHRoZSBmYWlsdXJlIG1vZGUgb2Yg dGhlIHRlc3RzPyBEaWRuJ3QgdGhleSBiYWRseSBjb3JydXB0Cj4gPiA+ID4gPiA+ID4gPiBtZW1v cnk/IFdlIHRyaWVkIHRvIGtlZXAgdGVzdHMgc3VjaCB0aGF0IHRoZXkgcHJvZHVjZSB0aGUgS0FT QU4KPiA+ID4gPiA+ID4gPiA+IHJlcG9ydHMsIGJ1dCBkb24ndCBiYWRseSBjb3JydXB0IG1lbW9y eSBiL2MvIHdlIG5lZWQgdG8gcnVuIGFsbCBvZgo+ID4gPiA+ID4gPiA+ID4gdGhlbS4KPiA+ID4g PiA+ID4gPgo+ID4gPiA+ID4gPiA+IE1heWJlIHdlIHNob3VsZCBmaXJzdCBwcm9kdWNlIEtBU0FO IHJlcG9ydHMgYW5kIHRoZW4gZ28gdG8gZXhlY3V0ZQo+ID4gPiA+ID4gPiA+IG1lbW1vdmUoKSBv ciBkbyBub3RoaW5nPyBJdCBsb29rcyBsaWtlIGl04oCZcyBkb2luZyB0aGUgZm9sbG93aW5nLm9y Pwo+ID4gPiA+ID4gPiA+Cj4gPiA+ID4gPiA+ID4gdm9pZCAqbWVtbW92ZSh2b2lkICpkZXN0LCBj b25zdCB2b2lkICpzcmMsIHNpemVfdCBsZW4pCj4gPiA+ID4gPiA+ID4gIHsKPiA+ID4gPiA+ID4g PiArICAgICAgIGlmIChsb25nKGxlbikgPD0gMCkKPiA+ID4gPiA+ID4KPiA+ID4gPiA+ID4gL1wv XC9cL1wvXC9cCj4gPiA+ID4gPiA+Cj4gPiA+ID4gPiA+IFRoaXMgY2hlY2sgbmVlZHMgdG8gYmUg aW5zaWRlIG9mIGNoZWNrX21lbW9yeV9yZWdpb24sIG90aGVyd2lzZSB3ZQo+ID4gPiA+ID4gPiB3 aWxsIGhhdmUgc2ltaWxhciBwcm9ibGVtcyBpbiBhbGwgb3RoZXIgcGxhY2VzIHRoYXQgdXNlCj4g PiA+ID4gPiA+IGNoZWNrX21lbW9yeV9yZWdpb24uCj4gPiA+ID4gPiBUaGFua3MgZm9yIHlvdXIg cmVtaW5kZXIuCj4gPiA+ID4gPgo+ID4gPiA+ID4gIGJvb2wgY2hlY2tfbWVtb3J5X3JlZ2lvbih1 bnNpZ25lZCBsb25nIGFkZHIsIHNpemVfdCBzaXplLCBib29sIHdyaXRlLAo+ID4gPiA+ID4gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIHJldF9pcCkKPiA+ID4g PiA+ICB7Cj4gPiA+ID4gPiArICAgICAgIGlmIChsb25nKHNpemUpIDwgMCkgewo+ID4gPiA+ID4g KyAgICAgICAgICAgICAgIGthc2FuX3JlcG9ydF9pbnZhbGlkX3NpemUoc3JjLCBkZXN0LCBsZW4s IF9SRVRfSVBfKTsKPiA+ID4gPiA+ICsgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cj4gPiA+ ID4gPiArICAgICAgIH0KPiA+ID4gPiA+ICsKPiA+ID4gPiA+ICAgICAgICAgcmV0dXJuIGNoZWNr X21lbW9yeV9yZWdpb25faW5saW5lKGFkZHIsIHNpemUsIHdyaXRlLCByZXRfaXApOwo+ID4gPiA+ ID4gIH0KPiA+ID4gPiA+Cj4gPiA+ID4gPiA+IEJ1dCBjaGVja19tZW1vcnlfcmVnaW9uIGFscmVh ZHkgcmV0dXJucyBhIGJvb2wsIHNvIHdlIGNvdWxkIGNoZWNrIHRoYXQKPiA+ID4gPiA+ID4gYm9v bCBhbmQgcmV0dXJuIGVhcmx5Lgo+ID4gPiA+ID4KPiA+ID4gPiA+IFdoZW4gc2l6ZTwwLCB3ZSBz aG91bGQgb25seSBzaG93IG9uZSBLQVNBTiByZXBvcnQsIGFuZCBzaG91bGQgd2Ugb25seQo+ID4g PiA+ID4gbGltaXQgdG8gcmV0dXJuIHdoZW4gc2l6ZTwwIGlzIHRydWU/IElmIHlzZSwgdGhlbiBf X21lbW1vdmUoKSB3aWxsIGRvCj4gPiA+ID4gPiBub3RoaW5nLgo+ID4gPiA+ID4KPiA+ID4gPiA+ Cj4gPiA+ID4gPiAgdm9pZCAqbWVtbW92ZSh2b2lkICpkZXN0LCBjb25zdCB2b2lkICpzcmMsIHNp emVfdCBsZW4pCj4gPiA+ID4gPiAgewo+ID4gPiA+ID4gLSAgICAgICBjaGVja19tZW1vcnlfcmVn aW9uKCh1bnNpZ25lZCBsb25nKXNyYywgbGVuLCBmYWxzZSwgX1JFVF9JUF8pOwo+ID4gPiA+ID4g KyAgICAgICBpZighY2hlY2tfbWVtb3J5X3JlZ2lvbigodW5zaWduZWQgbG9uZylzcmMsIGxlbiwg ZmFsc2UsCj4gPiA+ID4gPiBfUkVUX0lQXykKPiA+ID4gPiA+ICsgICAgICAgICAgICAgICAmJiBs b25nKHNpemUpIDwgMCkKPiA+ID4gPiA+ICsgICAgICAgICAgICAgICByZXR1cm47Cj4gPiA+ID4g PiArCj4gPiA+ID4gPiAgICAgICAgIGNoZWNrX21lbW9yeV9yZWdpb24oKHVuc2lnbmVkIGxvbmcp ZGVzdCwgbGVuLCB0cnVlLCBfUkVUX0lQXyk7Cj4gPiA+ID4gPgo+ID4gPiA+ID4gICAgICAgICBy ZXR1cm4gX19tZW1tb3ZlKGRlc3QsIHNyYywgbGVuKTsKPiA+ID4gPiA+Cj4gPiA+ID4gPiA+Cj4g PiA+ID4gSGkgRG1pdHJ5LAo+ID4gPiA+Cj4gPiA+ID4gV2hhdCBkbyB5b3UgdGhpbmsgdGhlIGZv bGxvd2luZyBjb2RlIGlzIGJldHRlciB0aGFuIHRoZSBhYm92ZSBvbmUuCj4gPiA+ID4gSW4gbWVt bW1vdmUvbWVtc2V0L21lbWNweSwgdGhleSBuZWVkIHRvIGRldGVybWluZSB3aGV0aGVyIHNpemUg PCAwIGlzCj4gPiA+ID4gdHJ1ZS4gd2UgZGlyZWN0bHkgZGV0ZXJtaW5lIHdoZXRoZXIgc2l6ZSBp cyBuZWdhdGl2ZSBpbiBtZW1tb3ZlIGFuZAo+ID4gPiA+IHJldHVybiBlYXJseS4gaXQgYXZvaWQg dG8gZ2VuZXJhdGUgcmVwZWF0ZWQgS0FTQU4gcmVwb3J0LiBJcyBpdCBiZXR0ZXI/Cj4gPiA+ID4K PiA+ID4gPiB2b2lkICptZW1tb3ZlKHZvaWQgKmRlc3QsIGNvbnN0IHZvaWQgKnNyYywgc2l6ZV90 IGxlbikKPiA+ID4gPiB7Cj4gPiA+ID4gKyAgICAgICBpZiAobG9uZyhzaXplKSA8IDApIHsKPiA+ ID4gPiArICAgICAgICAgICAgICAga2FzYW5fcmVwb3J0X2ludmFsaWRfc2l6ZShzcmMsIGRlc3Qs IGxlbiwgX1JFVF9JUF8pOwo+ID4gPiA+ICsgICAgICAgICAgICAgICByZXR1cm47Cj4gPiA+ID4g KyAgICAgICB9Cj4gPiA+ID4gKwo+ID4gPiA+ICAgICAgICAgY2hlY2tfbWVtb3J5X3JlZ2lvbigo dW5zaWduZWQgbG9uZylzcmMsIGxlbiwgZmFsc2UsIF9SRVRfSVBfKTsKPiA+ID4gPiAgICAgICAg IGNoZWNrX21lbW9yeV9yZWdpb24oKHVuc2lnbmVkIGxvbmcpZGVzdCwgbGVuLCB0cnVlLCBfUkVU X0lQXyk7Cj4gPiA+ID4KPiA+ID4gPgo+ID4gPiA+IGNoZWNrX21lbW9yeV9yZWdpb24oKSBzdGls bCBoYXMgdG8gY2hlY2sgd2hldGhlciB0aGUgc2l6ZSBpcyBuZWdhdGl2ZS4KPiA+ID4gPiBidXQg bWVtbW92ZS9tZW1zZXQvbWVtY3B5IGdlbmVyYXRlIGludmFsaWQgc2l6ZSBLQVNBTiByZXBvcnQg d2lsbCBub3QgYmUKPiA+ID4gPiB0aGVyZS4KPiA+ID4KPiA+ID4KPiA+ID4gSWYgY2hlY2tfbWVt b3J5X3JlZ2lvbigpIHdpbGwgZG8gdGhlIGNoZWNrLCB3aHkgZG8gd2UgbmVlZCB0bwo+ID4gPiBk dXBsaWNhdGUgaXQgaW5zaWRlIG9mIG1lbW1vdmUgYW5kIGFsbCBvdGhlciByYW5nZSBmdW5jdGlv bnM/Cj4gPiA+Cj4gPiBZZXMsIEkga25vdyBpdCBoYXMgZHVwbGljYXRpb24sIGJ1dCBpZiB3ZSBk b24ndCBoYXZlIHRvIGRldGVybWluZSBzaXplPDAKPiA+IGluIG1lbW1vdmUsIHRoZW4gYWxsIGNo ZWNrX21lbW9yeV9yZWdpb24gcmV0dXJuIGZhbHNlIHdpbGwgZG8gbm90aGluZywKPiAKPiBCdXQg dGhleSB3aWxsIHByb2R1Y2UgYSBLQVNBTiByZXBvcnQsIHJpZ2h0PyBUaGV5IGFyZSBhc2tlZCB0 byBjaGVjawo+IGlmIDE4NDQ2NzQ0MDczNzA5NTUxNjE0IGJ5dGVzIGFyZSBnb29kLiAxODQ0Njc0 NDA3MzcwOTU1MTYxNCBieXRlcwo+IGNhbid0IGJlIGdvb2QuCj4gCj4gCj4gPiBpdCBpbmNsdWRl cyBvdGhlciBtZW1vcnkgY29ycnVwdGlvbiBiZWhhdmlvcnMsIHRoaXMgaXMgbXkgb3JpZ2luYWwK PiA+IGNvbmNlcm4uCj4gPgo+ID4gPiBJIHdvdWxkIGRvOgo+ID4gPgo+ID4gPiB2b2lkICptZW1t b3ZlKHZvaWQgKmRlc3QsIGNvbnN0IHZvaWQgKnNyYywgc2l6ZV90IGxlbikKPiA+ID4gewo+ID4g PiAgICAgICAgIGlmIChjaGVja19tZW1vcnlfcmVnaW9uKCh1bnNpZ25lZCBsb25nKXNyYywgbGVu LCBmYWxzZSwgX1JFVF9JUF8pKQo+ID4gPiAgICAgICAgICAgICAgICAgcmV0dXJuOwo+ID4gaWYg Y2hlY2tfbWVtb3J5X3JlZ2lvbiByZXR1cm4gVFJVRSBpcyB0byBkbyBub3RoaW5nLCBidXQgaXQg aXMgbm8gbWVtb3J5Cj4gPiBjb3JydXB0aW9uPyBTaG91bGQgaXQgcmV0dXJuIGVhcmx5IHdoZW4g Y2hlY2tfbWVtb3J5X3JlZ2lvbiByZXR1cm4gYQo+ID4gRkFMU0U/Cj4gCj4gTWF5YmUuIEkganVz dCBtZWFudCB0aGUgb3ZlcmFsbCBpZGVhOiBjaGVja19tZW1vcnlfcmVnaW9uIHNob3VsZAo+IGRl dGVjdCB0aGF0IDE4NDQ2NzQ0MDczNzA5NTUxNjE0IGJ5dGVzIGFyZSBiYWQsIHByaW50IGFuIGVy cm9yLCByZXR1cm4KPiBhbiBpbmRpY2F0aW9uIHRoYXQgYnl0ZXMgd2VyZSBiYWQsIG1lbW1vdmUg c2hvdWxkIHJldHVybiBlYXJseSBpZiB0aGUKPiByYW5nZSBpcyBiYWQuCj4gCm9rLCBpIHdpbGwg c2VuZCBuZXcgcGF0Y2guClRoYW5rcyBmb3IgeW91ciByZXZpZXcuCgo+IAo+ID4gPiBUaGlzIGF2 b2lkcyBkdXBsaWNhdGluZyB0aGUgY2hlY2ssIGFkZHMgbWluaW1hbCBhbW91bnQgb2YgY29kZSB0 bwo+ID4gPiByYW5nZSBmdW5jdGlvbnMgYW5kIGF2b2lkcyBhZGRpbmcga2FzYW5fcmVwb3J0X2lu dmFsaWRfc2l6ZS4KPiA+IFRoYW5rcyBmb3IgeW91ciBzdWdnZXN0aW9uLgo+ID4gV2Ugb3JpZ2lu YWxseSB3YW50IHRvIHNob3cgY29tcGxldGUgaW5mb3JtYXRpb24oZGVzdGluYXRpb24gYWRkcmVz cywKPiA+IHNvdXJjZSBhZGRyZXNzLCBhbmQgaXRzIGxlbmd0aCksIGJ1dCBhZGQgbWluaW1hbCBh bW91bnQgb2YgY29kZSBpbnRvCj4gPiBrYXNhbl9yZXBvcnQoKSwgaXQgc2hvdWxkIGJlIGdvb2Qu Cj4gPgo+ID4KPiA+IC0tCj4gPiBZb3UgcmVjZWl2ZWQgdGhpcyBtZXNzYWdlIGJlY2F1c2UgeW91 IGFyZSBzdWJzY3JpYmVkIHRvIHRoZSBHb29nbGUgR3JvdXBzICJrYXNhbi1kZXYiIGdyb3VwLgo+ ID4gVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGdyb3VwIGFuZCBzdG9wIHJlY2VpdmluZyBlbWFp bHMgZnJvbSBpdCwgc2VuZCBhbiBlbWFpbCB0byBrYXNhbi1kZXYrdW5zdWJzY3JpYmVAZ29vZ2xl Z3JvdXBzLmNvbS4KPiA+IFRvIHZpZXcgdGhpcyBkaXNjdXNzaW9uIG9uIHRoZSB3ZWIgdmlzaXQg aHR0cHM6Ly9ncm91cHMuZ29vZ2xlLmNvbS9kL21zZ2lkL2thc2FuLWRldi8xNTcwMDY5MDc4LjE5 NzAyLjU3LmNhbWVsJTQwbXRrc2RjY2YwNy4KCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgt YXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3Jn L21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= 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=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,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 42418C10F14 for ; Thu, 3 Oct 2019 09:38:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E2290218DE for ; Thu, 3 Oct 2019 09:38:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2290218DE 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 8C3B56B0005; Thu, 3 Oct 2019 05:38:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 873E38E0005; Thu, 3 Oct 2019 05:38:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 73C108E0003; Thu, 3 Oct 2019 05:38:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0005.hostedemail.com [216.40.44.5]) by kanga.kvack.org (Postfix) with ESMTP id 5291D6B0005 for ; Thu, 3 Oct 2019 05:38:52 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id D4F246107 for ; Thu, 3 Oct 2019 09:38:51 +0000 (UTC) X-FDA: 76001974062.10.rock77_4d228fe09d10d X-HE-Tag: rock77_4d228fe09d10d X-Filterd-Recvd-Size: 14138 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Thu, 3 Oct 2019 09:38:49 +0000 (UTC) X-UUID: 83d216c888f543e887d8043adfa60921-20191003 X-UUID: 83d216c888f543e887d8043adfa60921-20191003 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 1843083875; Thu, 03 Oct 2019 17:38:46 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 3 Oct 2019 17:38:43 +0800 Received: from [172.21.84.99] (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Thu, 3 Oct 2019 17:38:44 +0800 Message-ID: <1570095525.19702.59.camel@mtksdccf07> Subject: Re: [PATCH] kasan: fix the missing underflow in memmove and memcpy with CONFIG_KASAN_GENERIC=y From: Walter Wu To: Dmitry Vyukov CC: Andrey Ryabinin , Alexander Potapenko , Matthias Brugger , LKML , kasan-dev , Linux-MM , Linux ARM , , wsd_upstream Date: Thu, 3 Oct 2019 17:38:45 +0800 In-Reply-To: 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> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, 2019-10-03 at 08:26 +0200, Dmitry Vyukov wrote: > On Thu, Oct 3, 2019 at 4:18 AM Walter Wu wr= ote: > > > > On Wed, 2019-10-02 at 15:57 +0200, Dmitry Vyukov wrote: > > > On Wed, Oct 2, 2019 at 2:15 PM Walter Wu wrote: > > > > > > > > On Mon, 2019-09-30 at 12:36 +0800, Walter Wu wrote: > > > > > On Fri, 2019-09-27 at 21:41 +0200, Dmitry Vyukov wrote: > > > > > > On Fri, Sep 27, 2019 at 4:22 PM Walter Wu wrote: > > > > > > > > > > > > > > On Fri, 2019-09-27 at 15:07 +0200, Dmitry Vyukov wrote: > > > > > > > > On Fri, Sep 27, 2019 at 5:43 AM Walter Wu wrote: > > > > > > > > > > > > > > > > > > memmove() and memcpy() have missing underflow issues. > > > > > > > > > When -7 <=3D size < 0, then KASAN will miss to catch th= e underflow issue. > > > > > > > > > It looks like shadow start address and shadow end addre= ss is the same, > > > > > > > > > so it does not actually check anything. > > > > > > > > > > > > > > > > > > The following test is indeed not caught by KASAN: > > > > > > > > > > > > > > > > > > char *p =3D kmalloc(64, GFP_KERNEL); > > > > > > > > > memset((char *)p, 0, 64); > > > > > > > > > memmove((char *)p, (char *)p + 4, -2); > > > > > > > > > kfree((char*)p); > > > > > > > > > > > > > > > > > > It should be checked here: > > > > > > > > > > > > > > > > > > void *memmove(void *dest, const void *src, size_t len) > > > > > > > > > { > > > > > > > > > check_memory_region((unsigned long)src, len, fa= lse, _RET_IP_); > > > > > > > > > check_memory_region((unsigned long)dest, len, t= rue, _RET_IP_); > > > > > > > > > > > > > > > > > > return __memmove(dest, src, len); > > > > > > > > > } > > > > > > > > > > > > > > > > > > We fix the shadow end address which is calculated, then= generic KASAN > > > > > > > > > get the right shadow end address and detect this underf= low issue. > > > > > > > > > > > > > > > > > > [1] https://bugzilla.kernel.org/show_bug.cgi?id=3D19934= 1 > > > > > > > > > > > > > > > > > > Signed-off-by: Walter Wu > > > > > > > > > Reported-by: Dmitry Vyukov > > > > > > > > > --- > > > > > > > > > lib/test_kasan.c | 36 ++++++++++++++++++++++++++++++= ++++++ > > > > > > > > > mm/kasan/generic.c | 8 ++++++-- > > > > > > > > > 2 files changed, 42 insertions(+), 2 deletions(-) > > > > > > > > > > > > > > > > > > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > > > > > > > > > index b63b367a94e8..8bd014852556 100644 > > > > > > > > > --- a/lib/test_kasan.c > > > > > > > > > +++ b/lib/test_kasan.c > > > > > > > > > @@ -280,6 +280,40 @@ static noinline void __init kmallo= c_oob_in_memset(void) > > > > > > > > > kfree(ptr); > > > > > > > > > } > > > > > > > > > > > > > > > > > > +static noinline void __init kmalloc_oob_in_memmove_und= erflow(void) > > > > > > > > > +{ > > > > > > > > > + char *ptr; > > > > > > > > > + size_t size =3D 64; > > > > > > > > > + > > > > > > > > > + pr_info("underflow out-of-bounds in memmove\n")= ; > > > > > > > > > + ptr =3D 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_oob_in_memmove_ove= rflow(void) > > > > > > > > > +{ > > > > > > > > > + char *ptr; > > > > > > > > > + size_t size =3D 64; > > > > > > > > > + > > > > > > > > > + pr_info("overflow out-of-bounds in memmove\n"); > > > > > > > > > + ptr =3D kmalloc(size, GFP_KERNEL); > > > > > > > > > + if (!ptr) { > > > > > > > > > + pr_err("Allocation failed\n"); > > > > > > > > > + return; > > > > > > > > > + } > > > > > > > > > + > > > > > > > > > + memset((char *)ptr, 0, 64); > > > > > > > > > + memmove((char *)ptr + size, (char *)ptr, 2); > > > > > > > > > + kfree(ptr); > > > > > > > > > +} > > > > > > > > > + > > > > > > > > > static noinline void __init kmalloc_uaf(void) > > > > > > > > > { > > > > > > > > > char *ptr; > > > > > > > > > @@ -734,6 +768,8 @@ static int __init kmalloc_tests_ini= t(void) > > > > > > > > > kmalloc_oob_memset_4(); > > > > > > > > > kmalloc_oob_memset_8(); > > > > > > > > > kmalloc_oob_memset_16(); > > > > > > > > > + kmalloc_oob_in_memmove_underflow(); > > > > > > > > > + kmalloc_oob_in_memmove_overflow(); > > > > > > > > > kmalloc_uaf(); > > > > > > > > > kmalloc_uaf_memset(); > > > > > > > > > kmalloc_uaf2(); > > > > > > > > > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > > > > > > > > > index 616f9dd82d12..34ca23d59e67 100644 > > > > > > > > > --- a/mm/kasan/generic.c > > > > > > > > > +++ b/mm/kasan/generic.c > > > > > > > > > @@ -131,9 +131,13 @@ static __always_inline bool memory= _is_poisoned_n(unsigned long addr, > > > > > > > > > size_t = size) > > > > > > > > > { > > > > > > > > > unsigned long ret; > > > > > > > > > + void *shadow_start =3D kasan_mem_to_shadow((voi= d *)addr); > > > > > > > > > + void *shadow_end =3D kasan_mem_to_shadow((void = *)addr + size - 1) + 1; > > > > > > > > > > > > > > > > > > - ret =3D memory_is_nonzero(kasan_mem_to_shadow((= void *)addr), > > > > > > > > > - kasan_mem_to_shadow((void *)add= r + size - 1) + 1); > > > > > > > > > + if ((long)size < 0) > > > > > > > > > + shadow_end =3D kasan_mem_to_shadow((voi= d *)addr + size); > > > > > > > > > > > > > > > > Hi Walter, > > > > > > > > > > > > > > > > Thanks for working on this. > > > > > > > > > > > > > > > > If size<0, does it make sense to continue at all? We will= still check > > > > > > > > 1PB of shadow memory? What happens when we pass such huge= range to > > > > > > > > memory_is_nonzero? > > > > > > > > Perhaps it's better to produce an error and bail out imme= diately if size<0? > > > > > > > > > > > > > > I agree with what you said. when size<0, it is indeed an un= reasonable > > > > > > > behavior, it should be blocked from continuing to do. > > > > > > > > > > > > > > > > > > > > > > Also, what's the failure mode of the tests? Didn't they b= adly corrupt > > > > > > > > memory? We tried to keep tests such that they produce the= KASAN > > > > > > > > reports, but don't badly corrupt memory b/c/ we need to r= un all of > > > > > > > > them. > > > > > > > > > > > > > > Maybe we should first produce KASAN reports and then go to = execute > > > > > > > memmove() or do nothing? It looks like it=E2=80=99s doing t= he following.or? > > > > > > > > > > > > > > void *memmove(void *dest, const void *src, size_t len) > > > > > > > { > > > > > > > + if (long(len) <=3D 0) > > > > > > > > > > > > /\/\/\/\/\/\ > > > > > > > > > > > > This check needs to be inside of check_memory_region, otherwi= se we > > > > > > will have similar problems in all other places that use > > > > > > check_memory_region. > > > > > Thanks for your reminder. > > > > > > > > > > bool check_memory_region(unsigned long addr, size_t size, bool= write, > > > > > unsigned long ret_ip) > > > > > { > > > > > + if (long(size) < 0) { > > > > > + kasan_report_invalid_size(src, dest, len, _RET_= IP_); > > > > > + return false; > > > > > + } > > > > > + > > > > > return check_memory_region_inline(addr, size, write, re= t_ip); > > > > > } > > > > > > > > > > > But check_memory_region already returns a bool, so we could c= heck that > > > > > > bool and return early. > > > > > > > > > > When size<0, we should only show one KASAN report, and should w= e only > > > > > limit to return when size<0 is true? If yse, then __memmove() w= ill do > > > > > nothing. > > > > > > > > > > > > > > > void *memmove(void *dest, const void *src, size_t len) > > > > > { > > > > > - check_memory_region((unsigned long)src, len, false, _RE= T_IP_); > > > > > + if(!check_memory_region((unsigned long)src, len, false, > > > > > _RET_IP_) > > > > > + && long(size) < 0) > > > > > + return; > > > > > + > > > > > check_memory_region((unsigned long)dest, len, true, _RE= T_IP_); > > > > > > > > > > return __memmove(dest, src, len); > > > > > > > > > > > > > > > Hi Dmitry, > > > > > > > > What do you think the following code is better than the above one= . > > > > In memmmove/memset/memcpy, they need to determine whether size < = 0 is > > > > true. we directly determine whether size is negative in memmove a= nd > > > > return early. it avoid to generate repeated KASAN report. Is it b= etter? > > > > > > > > void *memmove(void *dest, const void *src, size_t len) > > > > { > > > > + if (long(size) < 0) { > > > > + kasan_report_invalid_size(src, dest, len, _RET_IP= _); > > > > + return; > > > > + } > > > > + > > > > check_memory_region((unsigned long)src, len, false, _RET_= IP_); > > > > check_memory_region((unsigned long)dest, len, true, _RET_= IP_); > > > > > > > > > > > > check_memory_region() still has to check whether the size is nega= tive. > > > > but memmove/memset/memcpy generate invalid size KASAN report will= not be > > > > there. > > > > > > > > > If check_memory_region() will do the check, why do we need to > > > duplicate it inside of memmove and all other range functions? > > > > > Yes, I know it has duplication, but if we don't have to determine siz= e<0 > > in memmove, then all check_memory_region return false will do nothing= , >=20 > But they will produce a KASAN report, right? They are asked to check > if 18446744073709551614 bytes are good. 18446744073709551614 bytes > can't be good. >=20 >=20 > > it includes other memory corruption behaviors, this is my original > > concern. > > > > > I would do: > > > > > > void *memmove(void *dest, const void *src, size_t len) > > > { > > > if (check_memory_region((unsigned long)src, len, false, _RE= T_IP_)) > > > return; > > if check_memory_region return TRUE is to do nothing, but it is no mem= ory > > corruption? Should it return early when check_memory_region return a > > FALSE? >=20 > Maybe. I just meant the overall idea: check_memory_region should > detect that 18446744073709551614 bytes are bad, print an error, return > an indication that bytes were bad, memmove should return early if the > range is bad. >=20 ok, i will send new patch. Thanks for your review. >=20 > > > This avoids duplicating the check, adds minimal amount of code to > > > range functions and avoids adding kasan_report_invalid_size. > > Thanks for your suggestion. > > We originally want to show complete information(destination address, > > source address, and its length), but add minimal amount of code into > > kasan_report(), it should be good. > > > > > > -- > > You received this message because you are subscribed to the Google Gr= oups "kasan-dev" group. > > To unsubscribe from this group and stop receiving emails from it, sen= d an email to kasan-dev+unsubscribe@googlegroups.com. > > To view this discussion on the web visit https://groups.google.com/d/= msgid/kasan-dev/1570069078.19702.57.camel%40mtksdccf07.