From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) by sourceware.org (Postfix) with ESMTPS id 125AA385DC27 for ; Tue, 25 Jan 2022 22:50:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 125AA385DC27 Received: by mail-il1-x131.google.com with SMTP id 15so3852715ilg.8 for ; Tue, 25 Jan 2022 14:50:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to; bh=NWxROCxMwFzFlLJZi8d/rw+J6E9ePhHVb61yPyI6GIY=; b=DeWmZk7JpiSjrjG532VuNQgUAUDjFise4E8/Qd18rOpeZE4ZL5u+R3oyzTGfhm0+mR +EAZkgpHcENNcJFcBEfNFBR3LVWfLa/2nB2G3YndyYFW5f+Hg5RJzlzz50Wr1GZjyogj 8rE4/ok0umL5EwGN+CYaSUjDE6kHjDsNCwVRo2aje3iExdCOT62nRb89cFeRgXu3IwlO +CBz8u3C4rdX7N8+4DZfrGktzF8+YYje1HIIG6IHM/AtVpZsIhsxnN384GB0z+fs5H60 0KvluxeVjLq13XaEC70uqxWXyt9L7rpKtrHelckbVPaJpX12Ug2BWeSMJhByl+d8ZwmJ KR7Q== X-Gm-Message-State: AOAM530XBnILavaB0oClgI3Yz7kmucCVs+XVQ9SfRAaSBYeRB51UvDWa 6tGoTN3wFFfzqw1MZ7wHhDv2jDnYaCo= X-Google-Smtp-Source: ABdhPJzHzH2qXkRwkKeKQuGkCmXP5PgQEOrGiOQkI7LBm7gV+m9ODZ8XEjiTrt3WRsH+STjlPoHP5g== X-Received: by 2002:a92:c567:: with SMTP id b7mr13429354ilj.20.1643151027359; Tue, 25 Jan 2022 14:50:27 -0800 (PST) Received: from [192.168.0.41] (97-118-100-142.hlrn.qwest.net. [97.118.100.142]) by smtp.gmail.com with ESMTPSA id j2sm9540215ilu.2.2022.01.25.14.50.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 Jan 2022 14:50:26 -0800 (PST) Content-Type: multipart/mixed; boundary="------------v8BDCxRXwhUoeQxALEsPG8Jb" Message-ID: <3ad704bb-a061-1dc2-3b6d-8343f70a3c92@gmail.com> Date: Tue, 25 Jan 2022 15:50:26 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: [PATCH v3 5/5] avoid -Wuse-after-free [BZ #26779] Content-Language: en-US To: Carlos O'Donell , libc-alpha@sourceware.org References: <53f20975-a2c9-674d-2a43-b1b323ee545c@gmail.com> <50baa5fb-c1ee-f7dc-b7d6-cf4587782062@gmail.com> From: Martin Sebor In-Reply-To: X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jan 2022 22:50:30 -0000 This is a multi-part message in MIME format. --------------v8BDCxRXwhUoeQxALEsPG8Jb Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 1/25/22 10:49, Carlos O'Donell wrote: > On 1/24/22 19:58, Martin Sebor via Libc-alpha wrote: >> On 1/24/22 17:52, Martin Sebor wrote: >>> This is a repost of the original patch but broken down by source >>> file and with some suppression done by #pragma GCC diagnostic >>> instead of conversion to intptr_t.  It also adds fixes for >>> the same problem in the test suite that I overlooked before. >> >> The attached patch suppresses the -Wuse-after-free instance in >> the testsuite. >> >>> >>> On 1/15/22 17:21, Martin Sebor wrote: >>>> GCC 12 features a couple of new warnings designed to detect uses >>>> of pointers made invalid by the pointees lifetimes having ended. >>>> Building Glibc with the enhanced GCC exposes a few such uses, >>>> mostly after successful calls to realloc.  The attached patch >>>> avoids the new warnings by converting the pointers to uintptr_t >>>> first and using the converted integers instead. >>>> >>>> The patch suppresses all instances of the warning at the strictest >>>> setting (-Wuse-after-free=3), which includes even uses in equality >>>> expressions.  The default setting approved for GCC 12 is >>>> -Wuse-after-free=2, which doesn't warn on such uses to accommodate >>>> the pointer-adjustment-after-realloc idiom.  At the default setting, >>>> the changes to ldconfig.c and setenv are not necessary. >>>> >>>> Martin >>> > > This patch is not ready. > > Some tests are going to do invalid things to test specific behaviour and we need > to possibly suppress those warnings. The malloc tests look correct. > > The support/tst-support-open-dev-null-range.c doesn't look correct, please send v3 > of just this *whole* patch as a new patch. I'll review again. Okay, I've moved the free() call after the FAIL_EXIT. I've also suppressed the same warning in a few more tests that I missed before. Martin > >> diff --git a/malloc/tst-malloc-backtrace.c b/malloc/tst-malloc-backtrace.c >> index ea66da23ef..8a3f4a0b55 100644 >> --- a/malloc/tst-malloc-backtrace.c >> +++ b/malloc/tst-malloc-backtrace.c >> @@ -20,6 +20,7 @@ >> #include >> >> #include >> +#include > > OK. Add header required for DIAG_* macros. > >> >> #define SIZE 4096 >> >> @@ -29,7 +30,15 @@ __attribute__((noinline)) >> call_free (void *ptr) >> { >> free (ptr); >> +#if __GNUC_PREREQ (12, 0) >> + /* Ignore a valid warning about using a pointer made indeterminate >> + by a prior call to malloc(). */ >> + DIAG_IGNORE_NEEDS_COMMENT (12, "-Wuse-after-free"); >> +#endif >> *(size_t *)(ptr - sizeof (size_t)) = 1; >> +#if __GNUC_PREREQ (12, 0) >> + DIAG_POP_NEEDS_COMMENT; >> +#endif > > OK. Specifically testing use-after-free write to chunk to corrupt memory. > >> } >> >> int >> diff --git a/malloc/tst-malloc-check.c b/malloc/tst-malloc-check.c >> index 46938c0dbb..eb46cf3bbb 100644 >> --- a/malloc/tst-malloc-check.c >> +++ b/malloc/tst-malloc-check.c > > OK. Already includes libc-diag.h. > >> @@ -86,7 +86,15 @@ do_test (void) >> merror ("errno is not set correctly."); >> DIAG_POP_NEEDS_COMMENT; >> >> +#if __GNUC_PREREQ (12, 0) >> + /* Ignore a valid warning about using a pointer made indeterminate >> + by a prior call to realloc(). */ >> + DIAG_IGNORE_NEEDS_COMMENT (12, "-Wuse-after-free"); >> +#endif >> free (p); >> +#if __GNUC_PREREQ (12, 0) >> + DIAG_POP_NEEDS_COMMENT; >> +#endif > > OK. Previous realloc made p indeterminate. > >> >> p = malloc (512); >> if (p == NULL) >> @@ -104,7 +112,15 @@ do_test (void) >> merror ("errno is not set correctly."); >> DIAG_POP_NEEDS_COMMENT; >> >> +#if __GNUC_PREREQ (12, 0) >> + /* Ignore a valid warning about using a pointer made indeterminate >> + by a prior call to realloc(). */ >> + DIAG_IGNORE_NEEDS_COMMENT (12, "-Wuse-after-free"); >> +#endif >> free (p); >> +#if __GNUC_PREREQ (12, 0) >> + DIAG_POP_NEEDS_COMMENT; >> +#endif > > OK. Likewise. > >> free (q); >> >> return errors != 0; >> diff --git a/malloc/tst-malloc-too-large.c b/malloc/tst-malloc-too-large.c >> index e23aa08e4f..dac3c8086c 100644 >> --- a/malloc/tst-malloc-too-large.c >> +++ b/malloc/tst-malloc-too-large.c > > OK. Already includes libc-diag.h. > >> @@ -95,7 +95,15 @@ test_large_allocations (size_t size) >> DIAG_POP_NEEDS_COMMENT; >> #endif >> TEST_VERIFY (errno == ENOMEM); >> +#if __GNUC_PREREQ (12, 0) >> + /* Ignore a warning about using a pointer made indeterminate by >> + a prior call to realloc(). */ >> + DIAG_IGNORE_NEEDS_COMMENT (12, "-Wuse-after-free"); >> +#endif >> free (ptr_to_realloc); >> +#if __GNUC_PREREQ (12, 0) >> + DIAG_POP_NEEDS_COMMENT; >> +#endif > > OK. > >> >> for (size_t nmemb = 1; nmemb <= 8; nmemb *= 2) >> if ((size % nmemb) == 0) >> @@ -113,14 +121,30 @@ test_large_allocations (size_t size) >> test_setup (); >> TEST_VERIFY (reallocarray (ptr_to_realloc, nmemb, size / nmemb) == NULL); >> TEST_VERIFY (errno == ENOMEM); >> +#if __GNUC_PREREQ (12, 0) >> + /* Ignore a warning about using a pointer made indeterminate by >> + a prior call to realloc(). */ >> + DIAG_IGNORE_NEEDS_COMMENT (12, "-Wuse-after-free"); >> +#endif >> free (ptr_to_realloc); >> +#if __GNUC_PREREQ (12, 0) >> + DIAG_POP_NEEDS_COMMENT; >> +#endif > > OK. > >> >> ptr_to_realloc = malloc (16); >> TEST_VERIFY_EXIT (ptr_to_realloc != NULL); >> test_setup (); >> TEST_VERIFY (reallocarray (ptr_to_realloc, size / nmemb, nmemb) == NULL); >> TEST_VERIFY (errno == ENOMEM); >> +#if __GNUC_PREREQ (12, 0) >> + /* Ignore a warning about using a pointer made indeterminate by >> + a prior call to realloc(). */ >> + DIAG_IGNORE_NEEDS_COMMENT (12, "-Wuse-after-free"); >> +#endif >> free (ptr_to_realloc); >> +#if __GNUC_PREREQ (12, 0) >> + DIAG_POP_NEEDS_COMMENT; >> +#endif > > OK. > >> } >> else >> break; >> diff --git a/support/tst-support-open-dev-null-range.c b/support/tst-support-open-dev-null-range.c >> index 3ed3177d57..e7526597ce 100644 >> --- a/support/tst-support-open-dev-null-range.c >> +++ b/support/tst-support-open-dev-null-range.c >> @@ -26,6 +26,8 @@ >> #include >> #include >> >> +#include > > OK. New macros required. > >> + >> #ifndef PATH_MAX >> # define PATH_MAX 1024 >> #endif >> @@ -41,8 +43,18 @@ check_path (int fd) >> = readlink (proc_fd_path, file_path, sizeof (file_path)); >> free (proc_fd_path); >> if (file_path_length < 0) >> - FAIL_EXIT1 ("readlink (%s, %p, %zu)", proc_fd_path, file_path, >> - sizeof (file_path)); >> + { >> +#if __GNUC_PREREQ (12, 0) >> + /* Ignore a valid warning about using a pointer made indeterminate >> + by a prior call to free(). */ >> + DIAG_IGNORE_NEEDS_COMMENT (12, "-Wuse-after-free"); >> +#endif >> + FAIL_EXIT1 ("readlink (%s, %p, %zu)", proc_fd_path, file_path, >> + sizeof (file_path)); >> +#if __GNUC_PREREQ (12, 0) >> + DIAG_POP_NEEDS_COMMENT; >> +#endif >> + } > > We should move free (proc_fd_path) to after the check to correct the use-after-free. > >> file_path[file_path_length] = '\0'; >> TEST_COMPARE_STRING (file_path, "/dev/null"); >> } > > --------------v8BDCxRXwhUoeQxALEsPG8Jb Content-Type: text/x-patch; charset=UTF-8; name="glibc-26779-5.diff" Content-Disposition: attachment; filename="glibc-26779-5.diff" Content-Transfer-Encoding: base64 Y29tbWl0IGMyM2NmN2ZmNzg0MTg2YjgwOTRiOTdhNDdhODQ0NTgwODE0NWE2OWMKQXV0aG9y OiBNYXJ0aW4gU2Vib3IgPG1zZWJvckByZWRoYXQuY29tPgpEYXRlOiAgIFR1ZSBKYW4gMjUg MTU6Mzk6MzggMjAyMiAtMDcwMAoKICAgIEF2b2lkIC1XdXNlLWFmdGVyLWZyZWUgaW4gdGVz dHMuCgpkaWZmIC0tZ2l0IGEvbWFsbG9jL3RzdC1tYWxsb2MtYmFja3RyYWNlLmMgYi9tYWxs b2MvdHN0LW1hbGxvYy1iYWNrdHJhY2UuYwppbmRleCBlYTY2ZGEyM2VmLi42NWUxYTFmZmJj IDEwMDY0NAotLS0gYS9tYWxsb2MvdHN0LW1hbGxvYy1iYWNrdHJhY2UuYworKysgYi9tYWxs b2MvdHN0LW1hbGxvYy1iYWNrdHJhY2UuYwpAQCAtMjAsNiArMjAsNyBAQAogI2luY2x1ZGUg PHN0ZGxpYi5oPgogCiAjaW5jbHVkZSA8c3VwcG9ydC9zdXBwb3J0Lmg+CisjaW5jbHVkZSA8 bGliYy1kaWFnLmg+CiAKICNkZWZpbmUgU0laRSA0MDk2CiAKQEAgLTI5LDcgKzMwLDE1IEBA IF9fYXR0cmlidXRlX18oKG5vaW5saW5lKSkKIGNhbGxfZnJlZSAodm9pZCAqcHRyKQogewog ICBmcmVlIChwdHIpOworI2lmIF9fR05VQ19QUkVSRVEgKDEyLCAwKQorICAvKiBJZ25vcmUg YSB2YWxpZCB3YXJuaW5nIGFib3V0IHVzaW5nIGEgcG9pbnRlciBtYWRlIGluZGV0ZXJtaW5h dGUKKyAgICAgYnkgYSBwcmlvciBjYWxsIHRvIGZyZWUoKS4gICovCisgIERJQUdfSUdOT1JF X05FRURTX0NPTU1FTlQgKDEyLCAiLVd1c2UtYWZ0ZXItZnJlZSIpOworI2VuZGlmCiAgICoo c2l6ZV90ICopKHB0ciAtIHNpemVvZiAoc2l6ZV90KSkgPSAxOworI2lmIF9fR05VQ19QUkVS RVEgKDEyLCAwKQorICBESUFHX1BPUF9ORUVEU19DT01NRU5UOworI2VuZGlmCiB9CiAKIGlu dApkaWZmIC0tZ2l0IGEvbWFsbG9jL3RzdC1tYWxsb2MtY2hlY2suYyBiL21hbGxvYy90c3Qt bWFsbG9jLWNoZWNrLmMKaW5kZXggNDY5MzhjMGRiYi4uZWI0NmNmM2JiYiAxMDA2NDQKLS0t IGEvbWFsbG9jL3RzdC1tYWxsb2MtY2hlY2suYworKysgYi9tYWxsb2MvdHN0LW1hbGxvYy1j aGVjay5jCkBAIC04Niw3ICs4NiwxNSBAQCBkb190ZXN0ICh2b2lkKQogICAgIG1lcnJvciAo ImVycm5vIGlzIG5vdCBzZXQgY29ycmVjdGx5LiIpOwogICBESUFHX1BPUF9ORUVEU19DT01N RU5UOwogCisjaWYgX19HTlVDX1BSRVJFUSAoMTIsIDApCisgIC8qIElnbm9yZSBhIHZhbGlk IHdhcm5pbmcgYWJvdXQgdXNpbmcgYSBwb2ludGVyIG1hZGUgaW5kZXRlcm1pbmF0ZQorICAg ICBieSBhIHByaW9yIGNhbGwgdG8gcmVhbGxvYygpLiAgKi8KKyAgRElBR19JR05PUkVfTkVF RFNfQ09NTUVOVCAoMTIsICItV3VzZS1hZnRlci1mcmVlIik7CisjZW5kaWYKICAgZnJlZSAo cCk7CisjaWYgX19HTlVDX1BSRVJFUSAoMTIsIDApCisgIERJQUdfUE9QX05FRURTX0NPTU1F TlQ7CisjZW5kaWYKIAogICBwID0gbWFsbG9jICg1MTIpOwogICBpZiAocCA9PSBOVUxMKQpA QCAtMTA0LDcgKzExMiwxNSBAQCBkb190ZXN0ICh2b2lkKQogICAgIG1lcnJvciAoImVycm5v IGlzIG5vdCBzZXQgY29ycmVjdGx5LiIpOwogICBESUFHX1BPUF9ORUVEU19DT01NRU5UOwog CisjaWYgX19HTlVDX1BSRVJFUSAoMTIsIDApCisgIC8qIElnbm9yZSBhIHZhbGlkIHdhcm5p bmcgYWJvdXQgdXNpbmcgYSBwb2ludGVyIG1hZGUgaW5kZXRlcm1pbmF0ZQorICAgICBieSBh IHByaW9yIGNhbGwgdG8gcmVhbGxvYygpLiAgKi8KKyAgRElBR19JR05PUkVfTkVFRFNfQ09N TUVOVCAoMTIsICItV3VzZS1hZnRlci1mcmVlIik7CisjZW5kaWYKICAgZnJlZSAocCk7Cisj aWYgX19HTlVDX1BSRVJFUSAoMTIsIDApCisgIERJQUdfUE9QX05FRURTX0NPTU1FTlQ7Cisj ZW5kaWYKICAgZnJlZSAocSk7CiAKICAgcmV0dXJuIGVycm9ycyAhPSAwOwpkaWZmIC0tZ2l0 IGEvbWFsbG9jL3RzdC1tYWxsb2MtdG9vLWxhcmdlLmMgYi9tYWxsb2MvdHN0LW1hbGxvYy10 b28tbGFyZ2UuYwppbmRleCBlMjNhYTA4ZTRmLi5kYWMzYzgwODZjIDEwMDY0NAotLS0gYS9t YWxsb2MvdHN0LW1hbGxvYy10b28tbGFyZ2UuYworKysgYi9tYWxsb2MvdHN0LW1hbGxvYy10 b28tbGFyZ2UuYwpAQCAtOTUsNyArOTUsMTUgQEAgdGVzdF9sYXJnZV9hbGxvY2F0aW9ucyAo c2l6ZV90IHNpemUpCiAgIERJQUdfUE9QX05FRURTX0NPTU1FTlQ7CiAjZW5kaWYKICAgVEVT VF9WRVJJRlkgKGVycm5vID09IEVOT01FTSk7CisjaWYgX19HTlVDX1BSRVJFUSAoMTIsIDAp CisgIC8qIElnbm9yZSBhIHdhcm5pbmcgYWJvdXQgdXNpbmcgYSBwb2ludGVyIG1hZGUgaW5k ZXRlcm1pbmF0ZSBieQorICAgICBhIHByaW9yIGNhbGwgdG8gcmVhbGxvYygpLiAgKi8KKyAg RElBR19JR05PUkVfTkVFRFNfQ09NTUVOVCAoMTIsICItV3VzZS1hZnRlci1mcmVlIik7Cisj ZW5kaWYKICAgZnJlZSAocHRyX3RvX3JlYWxsb2MpOworI2lmIF9fR05VQ19QUkVSRVEgKDEy LCAwKQorICBESUFHX1BPUF9ORUVEU19DT01NRU5UOworI2VuZGlmCiAKICAgZm9yIChzaXpl X3Qgbm1lbWIgPSAxOyBubWVtYiA8PSA4OyBubWVtYiAqPSAyKQogICAgIGlmICgoc2l6ZSAl IG5tZW1iKSA9PSAwKQpAQCAtMTEzLDE0ICsxMjEsMzAgQEAgdGVzdF9sYXJnZV9hbGxvY2F0 aW9ucyAoc2l6ZV90IHNpemUpCiAgICAgICAgIHRlc3Rfc2V0dXAgKCk7CiAgICAgICAgIFRF U1RfVkVSSUZZIChyZWFsbG9jYXJyYXkgKHB0cl90b19yZWFsbG9jLCBubWVtYiwgc2l6ZSAv IG5tZW1iKSA9PSBOVUxMKTsKICAgICAgICAgVEVTVF9WRVJJRlkgKGVycm5vID09IEVOT01F TSk7CisjaWYgX19HTlVDX1BSRVJFUSAoMTIsIDApCisgIC8qIElnbm9yZSBhIHdhcm5pbmcg YWJvdXQgdXNpbmcgYSBwb2ludGVyIG1hZGUgaW5kZXRlcm1pbmF0ZSBieQorICAgICBhIHBy aW9yIGNhbGwgdG8gcmVhbGxvYygpLiAgKi8KKyAgRElBR19JR05PUkVfTkVFRFNfQ09NTUVO VCAoMTIsICItV3VzZS1hZnRlci1mcmVlIik7CisjZW5kaWYKICAgICAgICAgZnJlZSAocHRy X3RvX3JlYWxsb2MpOworI2lmIF9fR05VQ19QUkVSRVEgKDEyLCAwKQorICBESUFHX1BPUF9O RUVEU19DT01NRU5UOworI2VuZGlmCiAKICAgICAgICAgcHRyX3RvX3JlYWxsb2MgPSBtYWxs b2MgKDE2KTsKICAgICAgICAgVEVTVF9WRVJJRllfRVhJVCAocHRyX3RvX3JlYWxsb2MgIT0g TlVMTCk7CiAgICAgICAgIHRlc3Rfc2V0dXAgKCk7CiAgICAgICAgIFRFU1RfVkVSSUZZIChy ZWFsbG9jYXJyYXkgKHB0cl90b19yZWFsbG9jLCBzaXplIC8gbm1lbWIsIG5tZW1iKSA9PSBO VUxMKTsKICAgICAgICAgVEVTVF9WRVJJRlkgKGVycm5vID09IEVOT01FTSk7CisjaWYgX19H TlVDX1BSRVJFUSAoMTIsIDApCisgIC8qIElnbm9yZSBhIHdhcm5pbmcgYWJvdXQgdXNpbmcg YSBwb2ludGVyIG1hZGUgaW5kZXRlcm1pbmF0ZSBieQorICAgICBhIHByaW9yIGNhbGwgdG8g cmVhbGxvYygpLiAgKi8KKyAgRElBR19JR05PUkVfTkVFRFNfQ09NTUVOVCAoMTIsICItV3Vz ZS1hZnRlci1mcmVlIik7CisjZW5kaWYKICAgICAgICAgZnJlZSAocHRyX3RvX3JlYWxsb2Mp OworI2lmIF9fR05VQ19QUkVSRVEgKDEyLCAwKQorICBESUFHX1BPUF9ORUVEU19DT01NRU5U OworI2VuZGlmCiAgICAgICB9CiAgICAgZWxzZQogICAgICAgYnJlYWs7CmRpZmYgLS1naXQg YS9tYWxsb2MvdHN0LW9ic3RhY2suYyBiL21hbGxvYy90c3Qtb2JzdGFjay5jCmluZGV4IDE4 YWY4ZWE2MmYuLmQ4MGY0NzFmYTAgMTAwNjQ0Ci0tLSBhL21hbGxvYy90c3Qtb2JzdGFjay5j CisrKyBiL21hbGxvYy90c3Qtb2JzdGFjay5jCkBAIC0yMCw4ICsyMCw4IEBAIHZlcmJvc2Vf bWFsbG9jIChzaXplX3Qgc2l6ZSkKIHN0YXRpYyB2b2lkCiB2ZXJib3NlX2ZyZWUgKHZvaWQg KmJ1ZikKIHsKLSAgZnJlZSAoYnVmKTsKICAgcHJpbnRmICgiZnJlZSAoJXApXG4iLCBidWYp OworICBmcmVlIChidWYpOwogfQogCiBzdGF0aWMgaW50CmRpZmYgLS1naXQgYS9tYWxsb2Mv dHN0LXJlYWxsb2MuYyBiL21hbGxvYy90c3QtcmVhbGxvYy5jCmluZGV4IDgzZjE2NTUxNmEu LjhjZTU5ZjI2MDIgMTAwNjQ0Ci0tLSBhL21hbGxvYy90c3QtcmVhbGxvYy5jCisrKyBiL21h bGxvYy90c3QtcmVhbGxvYy5jCkBAIC0xMzgsOCArMTM4LDE2IEBAIGRvX3Rlc3QgKHZvaWQp CiAgIGlmIChvayA9PSAwKQogICAgIG1lcnJvciAoImZpcnN0IDE2IGJ5dGVzIHdlcmUgbm90 IGNvcnJlY3QgYWZ0ZXIgZmFpbGVkIHJlYWxsb2MiKTsKIAorI2lmIF9fR05VQ19QUkVSRVEg KDEyLCAwKQorICAvKiBJZ25vcmUgYSB2YWxpZCB3YXJuaW5nIGFib3V0IHVzaW5nIGEgcG9p bnRlciBtYWRlIGluZGV0ZXJtaW5hdGUKKyAgICAgYnkgYSBwcmlvciBjYWxsIHRvIHJlYWxs b2MoKS4gICovCisgIERJQUdfSUdOT1JFX05FRURTX0NPTU1FTlQgKDEyLCAiLVd1c2UtYWZ0 ZXItZnJlZSIpOworI2VuZGlmCiAgIC8qIHJlYWxsb2MgKHAsIDApIGZyZWVzIHAgKEM4OSkg YW5kIHJldHVybnMgTlVMTCAoZ2xpYmMpLiAgKi8KICAgcCA9IHJlYWxsb2MgKHAsIDApOwor I2lmIF9fR05VQ19QUkVSRVEgKDEyLCAwKQorICBESUFHX1BPUF9ORUVEU19DT01NRU5UOwor I2VuZGlmCiAgIGlmIChwICE9IE5VTEwpCiAgICAgbWVycm9yICgicmVhbGxvYyAocCwgMCkg cmV0dXJuZWQgbm9uLU5VTEwuIik7CiAKZGlmZiAtLWdpdCBhL3N1cHBvcnQvdHN0LXN1cHBv cnQtb3Blbi1kZXYtbnVsbC1yYW5nZS5jIGIvc3VwcG9ydC90c3Qtc3VwcG9ydC1vcGVuLWRl di1udWxsLXJhbmdlLmMKaW5kZXggM2VkMzE3N2Q1Ny4uNjkwYjlkMzBiNyAxMDA2NDQKLS0t IGEvc3VwcG9ydC90c3Qtc3VwcG9ydC1vcGVuLWRldi1udWxsLXJhbmdlLmMKKysrIGIvc3Vw cG9ydC90c3Qtc3VwcG9ydC1vcGVuLWRldi1udWxsLXJhbmdlLmMKQEAgLTM5LDEwICszOSwx MSBAQCBjaGVja19wYXRoIChpbnQgZmQpCiAgIGNoYXIgZmlsZV9wYXRoW1BBVEhfTUFYXTsK ICAgc3NpemVfdCBmaWxlX3BhdGhfbGVuZ3RoCiAgICAgPSByZWFkbGluayAocHJvY19mZF9w YXRoLCBmaWxlX3BhdGgsIHNpemVvZiAoZmlsZV9wYXRoKSk7Ci0gIGZyZWUgKHByb2NfZmRf cGF0aCk7CiAgIGlmIChmaWxlX3BhdGhfbGVuZ3RoIDwgMCkKICAgICBGQUlMX0VYSVQxICgi cmVhZGxpbmsgKCVzLCAlcCwgJXp1KSIsIHByb2NfZmRfcGF0aCwgZmlsZV9wYXRoLAogCQlz aXplb2YgKGZpbGVfcGF0aCkpOworCisgIGZyZWUgKHByb2NfZmRfcGF0aCk7CiAgIGZpbGVf cGF0aFtmaWxlX3BhdGhfbGVuZ3RoXSA9ICdcMCc7CiAgIFRFU1RfQ09NUEFSRV9TVFJJTkcg KGZpbGVfcGF0aCwgIi9kZXYvbnVsbCIpOwogfQo= --------------v8BDCxRXwhUoeQxALEsPG8Jb--