From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Pip Cet Newsgroups: gmane.emacs.devel Subject: Re: MPS: Crash while completing symbol with corfu Date: Wed, 03 Jul 2024 14:19:02 +0000 Message-ID: References: <87y16lbh10.fsf@localhost> <86v81pduw3.fsf@gnu.org> <87sewt87ni.fsf@localhost> <4aK6qyh6gPCldT2u0rLYOuIk7a5Coo8yNf71tkkBOlUh0yk3nU8yjRAZygm9rIzK3kOcyq_IAatIKS2buH7tgA2PwHIOgLTiqQRSoypoOfY=@protonmail.com> <871q4cja54.fsf@localhost> <871q4b6d2v.fsf@localhost> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_nSFKfMvQqoTyFYWzebYPZy4dEDDDdWArVdEYUnmjGM" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28456"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , =?utf-8?Q?Gerd_M=C3=B6llmann?= , emacs-devel@gnu.org, eller.helmut@gmail.com To: Ihor Radchenko Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Jul 03 17:24:44 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sP1qd-000759-3N for ged-emacs-devel@m.gmane-mx.org; Wed, 03 Jul 2024 17:24:43 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP1pg-0003Pa-Mm; Wed, 03 Jul 2024 11:23:44 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP0pQ-0001Zl-JD for emacs-devel@gnu.org; Wed, 03 Jul 2024 10:19:24 -0400 Original-Received: from mail-40134.protonmail.ch ([185.70.40.134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP0pM-0001DC-Ux; Wed, 03 Jul 2024 10:19:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1720016357; x=1720275557; bh=+4+b8oRZQ0ijedgGoRpfOS7njVundo8GvBlec9iNVrY=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=S49Xw8P/0rR6h8mStrPylEHIv4eOu6kOpc5qS4ws1CkIjKvlxIKuccuu03wBMyBTq pNNuzyf1ekPyMa3JZdae3VIaewgdaDigJSBh2ecscKGXOqVIKW3AsY/JKQamaBsVNA 9rRP31SEvE1ghnqVRoAAQ7ot6pdNZkmRjTb3VlcPi2D8A/5m1BfpoEP756HrgEqdfH HBRaMjQl/qcS+wU35Yyyi81kM3K+1ILXzVvs3npz3hYMOAi6+NMK0uhKfP7N1DnKCT irC+i3ZZiZz6nSIKsMLMWHKKuFhY+rLiQQdd85RO4/WZO8wUcZ+I18Jqt/WgGE3c7J gQIdeCcDLtR3g== In-Reply-To: <871q4b6d2v.fsf@localhost> Feedback-ID: 112775352:user:proton X-Pm-Message-ID: 4bda10ee0918bbc36dbe4b440186c4d131994295 Received-SPF: pass client-ip=185.70.40.134; envelope-from=pipcet@protonmail.com; helo=mail-40134.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 03 Jul 2024 11:23:41 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:321259 Archived-At: This is a multi-part message in MIME format. --b1_nSFKfMvQqoTyFYWzebYPZy4dEDDDdWArVdEYUnmjGM Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Tuesday, July 2nd, 2024 at 15:14, Ihor Radchenko w= rote: > Pip Cet pipcet@protonmail.com writes: >=20 > > Oops, turns out you shouldn't double free just to be sure. > >=20 > > Can you try the attached patch? I was able to trigger your bug by runni= ng > >=20 > > ./emacs -Q --eval "(while t (menu-bar-mode 'toggle) (sit-for 0.1))" > >=20 > > The change is in menu_destroy_callback, which passed through the wrong = pointer. >=20 >=20 > No immediate crashes now. > I will keep this session running, with your patches installed. Thanks! Here's what I'm testing now, FWIW. Eli, is this sufficiently isolated from the non-MPS case? We use some trivi= al wrapper macros which become non-trivial in the MPS case, and we always u= se a slightly more verbose glib function to register handlers (and, in the = MPS case, a cleanup handler). Pip --b1_nSFKfMvQqoTyFYWzebYPZy4dEDDDdWArVdEYUnmjGM Content-Type: text/x-patch; name=0001-Fix-GTK-related-MPS-crashes.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-Fix-GTK-related-MPS-crashes.patch RnJvbSBiZTNlZDU3MWU0ZTFkNjlkMjllMWU0ZjUxY2Y4MDQzMmIxNzZlZmYwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaXAgQ2V0IDxwaXBjZXRAcHJvdG9ubWFpbC5jb20+CkRhdGU6 IFdlZCwgMyBKdWwgMjAyNCAxMzo0Mzo1OSArMDAwMApTdWJqZWN0OiBbUEFUQ0hdIEZpeCBHVEst cmVsYXRlZCBNUFMgY3Jhc2hlcwoKKiBzcmMvZ3RrdXRpbC5jIChmcmVlX2dsaWJfdXNlcl9kYXRh KTogTmV3IGZ1bmN0aW9uLgooeGdfbGlzdF9pbnNlcnQsIHhnX2xpc3RfcmVtb3ZlKTogQ29uZGl0 aW9uYWxpemUgb24gIUhBVkVfTVBTLgoocXR0aXBfY2IsIHhnX2NyZWF0ZV9mcmFtZV93aWRnZXRz KQooeGdfY3JlYXRlX2ZyYW1lX291dGVyX3dpZGdldHMsIGNyZWF0ZV9kaWFsb2cpCihtYWtlX2Ns X2RhdGEsIHVucmVmX2NsX2RhdGEsIHhnX21hcmtfZGF0YSkKKG1lbnVpdGVtX2hpZ2hsaWdodF9j YWxsYmFjaywgeGdfY3JlYXRlX29uZV9tZW51aXRlbSkKKGNyZWF0ZV9tZW51cywgeGdfdXBkYXRl X21lbnVfaXRlbSwgeGdfbW9kaWZ5X21lbnViYXJfd2lkZ2V0cykKKGRyYXdfcGFnZSwgeGdfcHJp bnRfZnJhbWVzX2RpYWxvZywgeGdfY3JlYXRlX3Rvb2xiYXIpCih4Z19pbV9jb250ZXh0X2NvbW1p dCwgeGdfd2lkZ2V0X3N0eWxlX3VwZGF0ZWQpCih0Yl9zaXplX2NiKTogQWRqdXN0IHRvIHVzZSBg Z2V0X2dsaWJfdXNlcl9kYXRhJyBhbmQKYGdfc2lnbmFsX2Nvbm5lY3RfZGF0YScuCih4Z19pbml0 aWFsaXplKTogUmVtb3ZlIGxpbmtlZCBsaXN0IGlmIEhBVkVfTVBTLgoqIHNyYy9ndGt1dGlsLmgg KGdsaWJfdXNlcl9kYXRhLCBnZXRfZ2xpYl91c2VyX2RhdGEpOiBOZXcgaGVscGVyIG1hY3Jvcy4K KiBzcmMveG1lbnUuYyAobWVudWJhcl9zZWxlY3Rpb25fY2FsbGJhY2spCihwb3B1cF9zZWxlY3Rp b25fY2FsbGJhY2spOiBBZGp1c3QgdG8gdXNlIGBnZXRfZ2xpYl91c2VyX2RhdGEnLgotLS0KIHNy Yy9ndGt1dGlsLmMgfCAxNDcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0KIHNyYy9ndGt1dGlsLmggfCAgMjEgKysrKysrKysKIHNyYy94bWVudS5jICAg fCAgIDYgKystCiAzIGZpbGVzIGNoYW5nZWQsIDEzNSBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZ3RrdXRpbC5jIGIvc3JjL2d0a3V0aWwuYwppbmRleCBl MGJhZTZiZjFhZS4uYTE3MDcwNDBlNzUgMTAwNjQ0Ci0tLSBhL3NyYy9ndGt1dGlsLmMKKysrIGIv c3JjL2d0a3V0aWwuYwpAQCAtMTQ4LDYgKzE0OCwxNyBAQCAjZGVmaW5lIFRCX0lORk9fS0VZICJ4 Z19mcmFtZV90Yl9pbmZvIgogc3RhdGljIEd0a1dpZGdldCAqeGdfZ2V0X3dpZGdldF9mcm9tX21h cCAocHRyZGlmZl90IGlkeCwgRGlzcGxheSAqZHB5KTsKIAogDAorI2lmZGVmIEhBVkVfTVBTCit2 b2lkIGZyZWVfZ2xpYl91c2VyX2RhdGEgKGdwb2ludGVyIGRhdGEsIEdDbG9zdXJlICpjbG9zdXJl KQoreworICBpZ2NfeGZyZWUgKGRhdGEpOworfQorI2Vsc2UKK3ZvaWQgZnJlZV9nbGliX3VzZXJf ZGF0YSAoZ3BvaW50ZXIgZGF0YSwgR0Nsb3N1cmUgKmNsb3N1cmUpCit7CisgIHJldHVybjsKK30K KyNlbmRpZgogCiAjaWZkZWYgSEFWRV9HVEszCiBzdGF0aWMgdm9pZApAQCAtNjE4LDYgKzYyOSw3 IEBAIHhnX3NldF9jdXJzb3IgKEd0a1dpZGdldCAqdywgR2RrQ3Vyc29yICpjdXJzb3IpCiAgICAg Z2RrX3dpbmRvd19zZXRfY3Vyc29yIChHREtfV0lORE9XIChjaGlsZHJlbi0+ZGF0YSksIGN1cnNv cik7CiB9CiAKKyNpZm5kZWYgSEFWRV9NUFMKIC8qIEluc2VydCBOT0RFIGludG8gbGlua2VkIExJ U1QuICAqLwogCiBzdGF0aWMgdm9pZApAQCAtNjQ4LDYgKzY2MCw3IEBAIHhnX2xpc3RfcmVtb3Zl ICh4Z19saXN0X25vZGUgKmxpc3QsIHhnX2xpc3Rfbm9kZSAqbm9kZSkKICAgICAgIGlmIChub2Rl LT5uZXh0KSBub2RlLT5uZXh0LT5wcmV2ID0gbm9kZS0+cHJldjsKICAgICB9CiB9CisjZW5kaWYK IAogLyogQWxsb2NhdGUgYW5kIHJldHVybiBhIHV0ZjggdmVyc2lvbiBvZiBTVFIuICBJZiBTVFIg aXMgYWxyZWFkeQogICAgdXRmOCBvciBOVUxMLCBqdXN0IHJldHVybiBhIGNvcHkgb2YgU1RSLgpA QCAtODI4LDcgKzg0MSw3IEBAIGhpZXJhcmNoeV9jaF9jYiAoR3RrV2lkZ2V0ICp3aWRnZXQsCiAg ICAgICAgICAgICAgICAgIEd0a1dpZGdldCAqcHJldmlvdXNfdG9wbGV2ZWwsCiAgICAgICAgICAg ICAgICAgIGdwb2ludGVyICAgdXNlcl9kYXRhKQogewotICBzdHJ1Y3QgZnJhbWUgKmYgPSB1c2Vy X2RhdGE7CisgIHN0cnVjdCBmcmFtZSAqZiA9IGdldF9nbGliX3VzZXJfZGF0YSAodXNlcl9kYXRh LCBzdHJ1Y3QgZnJhbWUpOwogICB4cF9vdXRwdXQgKnggPSBmLT5vdXRwdXRfZGF0YS54cDsKICAg R3RrV2lkZ2V0ICp0b3AgPSBndGtfd2lkZ2V0X2dldF90b3BsZXZlbCAoeC0+dHRpcF9sYmwpOwog CkBAIC04NTAsNyArODYzLDcgQEAgcXR0aXBfY2IgKEd0a1dpZGdldCAgKndpZGdldCwKICAgICAg ICAgICBHdGtUb29sdGlwICp0b29sdGlwLAogICAgICAgICAgIGdwb2ludGVyICAgIHVzZXJfZGF0 YSkKIHsKLSAgc3RydWN0IGZyYW1lICpmID0gdXNlcl9kYXRhOworICBzdHJ1Y3QgZnJhbWUgKmYg PSBnZXRfZ2xpYl91c2VyX2RhdGEgKHVzZXJfZGF0YSwgc3RydWN0IGZyYW1lKTsKICAgeHBfb3V0 cHV0ICp4ID0gZi0+b3V0cHV0X2RhdGEueHA7CiAgIGlmICh4LT50dGlwX3dpZGdldCA9PSBOVUxM KQogICAgIHsKQEAgLTg4Miw4ICs4OTUsMTEgQEAgcXR0aXBfY2IgKEd0a1dpZGdldCAgKndpZGdl dCwKICAgICAgIGd0a193aWRnZXRfcmVhbGl6ZSAoR1RLX1dJREdFVCAoeC0+dHRpcF93aW5kb3cp KTsKICAgICAgIGd0a193aWRnZXRfcmVhbGl6ZSAoeC0+dHRpcF9sYmwpOwogCi0gICAgICBnX3Np Z25hbF9jb25uZWN0ICh4LT50dGlwX2xibCwgImhpZXJhcmNoeS1jaGFuZ2VkIiwKLSAgICAgICAg ICAgICAgICAgICAgICAgIEdfQ0FMTEJBQ0sgKGhpZXJhcmNoeV9jaF9jYiksIGYpOworICAgICAg Z19zaWduYWxfY29ubmVjdF9kYXRhICh4LT50dGlwX2xibCwgImhpZXJhcmNoeS1jaGFuZ2VkIiwK KwkJCSAgICAgR19DQUxMQkFDSyAoaGllcmFyY2h5X2NoX2NiKSwKKwkJCSAgICAgZ2xpYl91c2Vy X2RhdGEgKGYpLAorCQkJICAgICBmcmVlX2dsaWJfdXNlcl9kYXRhLAorCQkJICAgICBHX0NPTk5F Q1RfREVGQVVMVCk7CiAgICAgfQogCiAgIHJldHVybiBGQUxTRTsKQEAgLTE1NTYsOCArMTU3Miwx MSBAQCB4Z19jcmVhdGVfZnJhbWVfd2lkZ2V0cyAoc3RydWN0IGZyYW1lICpmKQogCiAgIGd0a193 aWRnZXRfc2V0X2FwcF9wYWludGFibGUgKHd0b3AsIGYtPmFscGhhX2JhY2tncm91bmQgIT0gMS4w KTsKICNpZiBHVEtfQ0hFQ0tfVkVSU0lPTiAoMywgMTAsIDApCi0gIGdfc2lnbmFsX2Nvbm5lY3Qg KEdfT0JKRUNUICh3dG9wKSwgInN0eWxlLXVwZGF0ZWQiLAotCQkgICAgR19DQUxMQkFDSyAoeGdf d2lkZ2V0X3N0eWxlX3VwZGF0ZWQpLCBmKTsKKyAgZ19zaWduYWxfY29ubmVjdF9kYXRhIChHX09C SkVDVCAod3RvcCksICJzdHlsZS11cGRhdGVkIiwKKwkJCSBHX0NBTExCQUNLICh4Z193aWRnZXRf c3R5bGVfdXBkYXRlZCksCisJCQkgZ2xpYl91c2VyX2RhdGEgKGYpLAorCQkJIGZyZWVfZ2xpYl91 c2VyX2RhdGEsCisJCQkgR19DT05ORUNUX0RFRkFVTFQpOwogI2VuZGlmCiAKICAgLyogZ3RrX3dp bmRvd19zZXRfaGFzX3Jlc2l6ZV9ncmlwIGlzIGEgR3RrKyAzLjAgZnVuY3Rpb24gYnV0IFVidW50 dQpAQCAtMTY0Niw4ICsxNjY1LDExIEBAIHhnX2NyZWF0ZV9mcmFtZV93aWRnZXRzIChzdHJ1Y3Qg ZnJhbWUgKmYpCiAjaWZuZGVmIEhBVkVfUEdUSwogICAvKiBBZGQgY2FsbGJhY2sgdG8gZG8gbm90 aGluZyBvbiBXTV9ERUxFVEVfV0lORE9XLiAgVGhlIGRlZmF1bHQgaW4KICAgICAgR1RLIGlzIHRv IGRlc3Ryb3kgdGhlIHdpZGdldC4gIFdlIHdhbnQgRW1hY3MgdG8gZG8gdGhhdCBpbnN0ZWFkLiAg Ki8KLSAgZ19zaWduYWxfY29ubmVjdCAoR19PQkpFQ1QgKHd0b3ApLCAiZGVsZXRlLWV2ZW50IiwK LSAgICAgICAgICAgICAgICAgICAgR19DQUxMQkFDSyAoZGVsZXRlX2NiKSwgZik7CisgIGdfc2ln bmFsX2Nvbm5lY3RfZGF0YSAoR19PQkpFQ1QgKHd0b3ApLCAiZGVsZXRlLWV2ZW50IiwKKwkJCSBH X0NBTExCQUNLIChkZWxldGVfY2IpLAorCQkJIGdsaWJfdXNlcl9kYXRhIChmKSwKKwkJCSBmcmVl X2dsaWJfdXNlcl9kYXRhLAorCQkJIEdfQ09OTkVDVF9ERUZBVUxUKTsKICNlbmRpZgogCiAgIC8q IENvbnZlcnQgb3VyIGdlb21ldHJ5IHBhcmFtZXRlcnMgaW50byBhIGdlb21ldHJ5IHN0cmluZwpA QCAtMTczNSwxNCArMTc1NywxOCBAQCB4Z19jcmVhdGVfZnJhbWVfd2lkZ2V0cyAoc3RydWN0IGZy YW1lICpmKQogICBmLT5vdXRwdXRfZGF0YS54cC0+dHRpcF93aW5kb3cgPSAwOwogI2lmbmRlZiBI QVZFX1BHVEsKICAgZ3RrX3dpZGdldF9zZXRfdG9vbHRpcF90ZXh0ICh3dG9wLCAiRHVtbXkgdGV4 dCIpOwotICBnX3NpZ25hbF9jb25uZWN0ICh3dG9wLCAicXVlcnktdG9vbHRpcCIsIEdfQ0FMTEJB Q0sgKHF0dGlwX2NiKSwgZik7CisgIGdfc2lnbmFsX2Nvbm5lY3RfZGF0YSAod3RvcCwgInF1ZXJ5 LXRvb2x0aXAiLCBHX0NBTExCQUNLIChxdHRpcF9jYiksCisJCQkgZ2xpYl91c2VyX2RhdGEgKGYp LCBmcmVlX2dsaWJfdXNlcl9kYXRhLAorCQkJIEdfQ09OTkVDVF9ERUZBVUxUKTsKIAogICBpbWMg PSBndGtfaW1fbXVsdGljb250ZXh0X25ldyAoKTsKICAgZ19vYmplY3RfcmVmIChpbWMpOwogICBn dGtfaW1fY29udGV4dF9zZXRfdXNlX3ByZWVkaXQgKGltYywgVFJVRSk7CiAKLSAgZ19zaWduYWxf Y29ubmVjdCAoR19PQkpFQ1QgKGltYyksICJjb21taXQiLAotCQkgICAgR19DQUxMQkFDSyAoeGdf aW1fY29udGV4dF9jb21taXQpLCBmKTsKKyAgZ19zaWduYWxfY29ubmVjdF9kYXRhIChHX09CSkVD VCAoaW1jKSwgImNvbW1pdCIsCisJCQkgR19DQUxMQkFDSyAoeGdfaW1fY29udGV4dF9jb21taXQp LAorCQkJIGdsaWJfdXNlcl9kYXRhIChmKSwgZnJlZV9nbGliX3VzZXJfZGF0YSwKKwkJCSBHX0NP Tk5FQ1RfREVGQVVMVCk7CiAgIGdfc2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUIChpbWMpLCAicHJl ZWRpdC1jaGFuZ2VkIiwKIAkJICAgIEdfQ0FMTEJBQ0sgKHhnX2ltX2NvbnRleHRfcHJlZWRpdF9j aGFuZ2VkKSwgTlVMTCk7CiAgIGdfc2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUIChpbWMpLCAicHJl ZWRpdC1lbmQiLApAQCAtMTg1Myw3ICsxODc5LDkgQEAgeGdfY3JlYXRlX2ZyYW1lX291dGVyX3dp ZGdldHMgKHN0cnVjdCBmcmFtZSAqZikKICAgZi0+b3V0cHV0X2RhdGEueHAtPnR0aXBfd2luZG93 ID0gMDsKICNpZm5kZWYgSEFWRV9QR1RLCiAgIGd0a193aWRnZXRfc2V0X3Rvb2x0aXBfdGV4dCAo d3RvcCwgIkR1bW15IHRleHQiKTsKLSAgZ19zaWduYWxfY29ubmVjdCAod3RvcCwgInF1ZXJ5LXRv b2x0aXAiLCBHX0NBTExCQUNLIChxdHRpcF9jYiksIGYpOworICBnX3NpZ25hbF9jb25uZWN0X2Rh dGEgKHd0b3AsICJxdWVyeS10b29sdGlwIiwgR19DQUxMQkFDSyAocXR0aXBfY2IpLAorCQkJIGds aWJfdXNlcl9kYXRhIChmKSwgZnJlZV9nbGliX3VzZXJfZGF0YSwKKwkJCSBHX0NPTk5FQ1RfREVG QVVMVCk7CiAjZW5kaWYKIAogICB7CkBAIC0yMzcxLDggKzIzOTksMTEgQEAgY3JlYXRlX2RpYWxv ZyAod2lkZ2V0X3ZhbHVlICp3diwKICAgICAgICAgICBpZiAoISBpdGVtLT5lbmFibGVkKQogICAg ICAgICAgICAgZ3RrX3dpZGdldF9zZXRfc2Vuc2l0aXZlICh3LCBGQUxTRSk7CiAgICAgICAgICAg aWYgKHNlbGVjdF9jYikKLSAgICAgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUICh3 KSwgImNsaWNrZWQiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZWN0X2NiLCBp dGVtLT5jYWxsX2RhdGEpOworICAgICAgICAgICAgZ19zaWduYWxfY29ubmVjdF9kYXRhIChHX09C SkVDVCAodyksICJjbGlja2VkIiwKKwkJCQkgICBzZWxlY3RfY2IsCisJCQkJICAgZ2xpYl91c2Vy X2RhdGEgKGl0ZW0tPmNhbGxfZGF0YSksCisJCQkJICAgZnJlZV9nbGliX3VzZXJfZGF0YSwKKwkJ CQkgICBHX0NPTk5FQ1RfREVGQVVMVCk7CiAKICAgICAgICAgICBndGtfYm94X3BhY2tfc3RhcnQg KGN1cl9ib3gsIHcsIFRSVUUsIFRSVUUsIGJ1dHRvbl9zcGFjaW5nKTsKICAgICAgICAgICBpZiAo KytidXR0b25fbnIgPT0gbGVmdF9idXR0b25zKQpAQCAtMjk0Niw2ICsyOTc3LDcgQEAgeGdfZ2V0 X2ZvbnQgKHN0cnVjdCBmcmFtZSAqZiwgY29uc3QgY2hhciAqZGVmYXVsdF9uYW1lKQogI2RlZmlu ZSBNRU5VX0lURU1fTkFNRSAiZW1hY3MtbWVudWl0ZW0iCiAKIAorI2lmbmRlZiBIQVZFX01QUwog LyogTGlua2VkIGxpc3Qgb2YgYWxsIGFsbG9jYXRlZCBzdHJ1Y3QgeGdfbWVudV9jYl9kYXRhLiAg VXNlZCBmb3IgbWFya2luZwogICAgZHVyaW5nIEdDLiAgVGhlIG5leHQgbWVtYmVyIHBvaW50cyB0 byB0aGUgaXRlbXMuICAqLwogc3RhdGljIHhnX2xpc3Rfbm9kZSB4Z19tZW51X2NiX2xpc3Q7CkBA IC0yOTUzLDYgKzI5ODUsNyBAQCAjZGVmaW5lIE1FTlVfSVRFTV9OQU1FICJlbWFjcy1tZW51aXRl bSIKIC8qIExpbmtlZCBsaXN0IG9mIGFsbCBhbGxvY2F0ZWQgc3RydWN0IHhnX21lbnVfaXRlbV9j Yl9kYXRhLiAgVXNlZCBmb3IgbWFya2luZwogICAgZHVyaW5nIEdDLiAgVGhlIG5leHQgbWVtYmVy IHBvaW50cyB0byB0aGUgaXRlbXMuICAqLwogc3RhdGljIHhnX2xpc3Rfbm9kZSB4Z19tZW51X2l0 ZW1fY2JfbGlzdDsKKyNlbmRpZgogCiAvKiBBbGxvY2F0ZSBhbmQgaW5pdGlhbGl6ZSBDTF9EQVRB IGlmIE5VTEwsIG90aGVyd2lzZSBpbmNyZWFzZSByZWZfY291bnQuCiAgICBGIGlzIHRoZSBmcmFt ZSBDTF9EQVRBIHdpbGwgYmUgaW5pdGlhbGl6ZWQgZm9yLgpAQCAtMjk2OSwxNCArMzAwMiwyMCBA QCBtYWtlX2NsX2RhdGEgKHhnX21lbnVfY2JfZGF0YSAqY2xfZGF0YSwgc3RydWN0IGZyYW1lICpm LCBHQ2FsbGJhY2sgaGlnaGxpZ2h0X2NiKQogewogICBpZiAoISBjbF9kYXRhKQogICAgIHsKKyNp Zm5kZWYgSEFWRV9NUFMKICAgICAgIGNsX2RhdGEgPSB4bWFsbG9jIChzaXplb2YgKmNsX2RhdGEp OworI2Vsc2UKKyAgICAgIGNsX2RhdGEgPSBpZ2NfeHphbGxvY19hbWJpZyAoc2l6ZW9mICpjbF9k YXRhKTsKKyNlbmRpZgogICAgICAgY2xfZGF0YS0+ZiA9IGY7CiAgICAgICBjbF9kYXRhLT5tZW51 X2Jhcl92ZWN0b3IgPSBmLT5tZW51X2Jhcl92ZWN0b3I7CiAgICAgICBjbF9kYXRhLT5tZW51X2Jh cl9pdGVtc191c2VkID0gZi0+bWVudV9iYXJfaXRlbXNfdXNlZDsKICAgICAgIGNsX2RhdGEtPmhp Z2hsaWdodF9jYiA9IGhpZ2hsaWdodF9jYjsKICAgICAgIGNsX2RhdGEtPnJlZl9jb3VudCA9IDA7 CiAKKyNpZm5kZWYgSEFWRV9NUFMKICAgICAgIHhnX2xpc3RfaW5zZXJ0ICgmeGdfbWVudV9jYl9s aXN0LCAmY2xfZGF0YS0+cHRycyk7CisjZW5kaWYKICAgICB9CiAKICAgY2xfZGF0YS0+cmVmX2Nv dW50Kys7CkBAIC0zMDIwLDggKzMwNTksMTIgQEAgdW5yZWZfY2xfZGF0YSAoeGdfbWVudV9jYl9k YXRhICpjbF9kYXRhKQogICAgICAgY2xfZGF0YS0+cmVmX2NvdW50LS07CiAgICAgICBpZiAoY2xf ZGF0YS0+cmVmX2NvdW50ID09IDApCiAgICAgICAgIHsKKyNpZm5kZWYgSEFWRV9NUFMKICAgICAg ICAgICB4Z19saXN0X3JlbW92ZSAoJnhnX21lbnVfY2JfbGlzdCwgJmNsX2RhdGEtPnB0cnMpOwog ICAgICAgICAgIHhmcmVlIChjbF9kYXRhKTsKKyNlbHNlCisJICBpZ2NfeGZyZWUgKGNsX2RhdGEp OworI2VuZGlmCiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0zMDgyLDExICszMTI1LDE2IEBAIHhn X21hcmtfZGF0YSAodm9pZCkKIHN0YXRpYyB2b2lkCiBtZW51aXRlbV9kZXN0cm95X2NhbGxiYWNr IChHdGtXaWRnZXQgKncsIGdwb2ludGVyIGNsaWVudF9kYXRhKQogewotICBpZiAoY2xpZW50X2Rh dGEpCisgIHhnX21lbnVfaXRlbV9jYl9kYXRhICpkYXRhID0KKyAgICBnZXRfZ2xpYl91c2VyX2Rh dGEgKGNsaWVudF9kYXRhLCB4Z19tZW51X2l0ZW1fY2JfZGF0YSk7CisgIGlmIChkYXRhKQogICAg IHsKLSAgICAgIHhnX21lbnVfaXRlbV9jYl9kYXRhICpkYXRhID0gY2xpZW50X2RhdGE7CisjaWZu ZGVmIEhBVkVfTVBTCiAgICAgICB4Z19saXN0X3JlbW92ZSAoJnhnX21lbnVfaXRlbV9jYl9saXN0 LCAmZGF0YS0+cHRycyk7CiAgICAgICB4ZnJlZSAoZGF0YSk7CisjZWxzZQorICAgICAgaWdjX3hm cmVlIChkYXRhKTsKKyNlbmRpZgogICAgIH0KIH0KIApAQCAtMzEyOSw3ICszMTc3LDcgQEAgbWVu dWl0ZW1faGlnaGxpZ2h0X2NhbGxiYWNrIChHdGtXaWRnZXQgKncsCiBzdGF0aWMgdm9pZAogbWVu dV9kZXN0cm95X2NhbGxiYWNrIChHdGtXaWRnZXQgKncsIGdwb2ludGVyIGNsaWVudF9kYXRhKQog ewotICB1bnJlZl9jbF9kYXRhIChjbGllbnRfZGF0YSk7CisgIHVucmVmX2NsX2RhdGEgKGdldF9n bGliX3VzZXJfZGF0YSAoY2xpZW50X2RhdGEsIHhnX21lbnVfY2JfZGF0YSkpOwogfQogCiAvKiBN YWtlIGEgR1RLIHdpZGdldCB0aGF0IGNvbnRhaW5zIGJvdGggVVRGOF9MQUJFTCBhbmQgVVRGOF9L RVkgKGJvdGgKQEAgLTMyNjgsMTkgKzMzMTYsMjUgQEAgeGdfY3JlYXRlX29uZV9tZW51aXRlbSAo d2lkZ2V0X3ZhbHVlICppdGVtLAogICBpZiAodXRmOF9sYWJlbCkgZ19mcmVlICh1dGY4X2xhYmVs KTsKICAgaWYgKHV0Zjhfa2V5KSBnX2ZyZWUgKHV0Zjhfa2V5KTsKIAorI2lmZGVmIEhBVkVfTVBT CisgIGNiX2RhdGEgPSBpZ2NfeHphbGxvY19hbWJpZyAoc2l6ZW9mICpjYl9kYXRhKTsKKyNlbHNl CiAgIGNiX2RhdGEgPSB4bWFsbG9jIChzaXplb2YgKmNiX2RhdGEpOwogCiAgIHhnX2xpc3RfaW5z ZXJ0ICgmeGdfbWVudV9pdGVtX2NiX2xpc3QsICZjYl9kYXRhLT5wdHJzKTsKKyNlbmRpZgogCiAg IGNiX2RhdGEtPnNlbGVjdF9pZCA9IDA7CiAgIGNiX2RhdGEtPmhlbHAgPSBpdGVtLT5oZWxwOwog ICBjYl9kYXRhLT5jbF9kYXRhID0gY2xfZGF0YTsKICAgY2JfZGF0YS0+Y2FsbF9kYXRhID0gaXRl bS0+Y2FsbF9kYXRhOwogCi0gIGdfc2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUICh3KSwKLSAgICAg ICAgICAgICAgICAgICAgImRlc3Ryb3kiLAotICAgICAgICAgICAgICAgICAgICBHX0NBTExCQUNL IChtZW51aXRlbV9kZXN0cm95X2NhbGxiYWNrKSwKLSAgICAgICAgICAgICAgICAgICAgY2JfZGF0 YSk7CisgIGdfc2lnbmFsX2Nvbm5lY3RfZGF0YSAoR19PQkpFQ1QgKHcpLAorCQkJICJkZXN0cm95 IiwKKwkJCSBHX0NBTExCQUNLIChtZW51aXRlbV9kZXN0cm95X2NhbGxiYWNrKSwKKwkJCSBnbGli X3VzZXJfZGF0YSAoY2JfZGF0YSksCisJCQkgZnJlZV9nbGliX3VzZXJfZGF0YSwKKwkJCSBHX0NP Tk5FQ1RfREVGQVVMVCk7CiAKICAgLyogUHV0IGNiX2RhdGEgaW4gd2lkZ2V0LCBzbyB3ZSBjYW4g Z2V0IGF0IGl0IHdoZW4gbW9kaWZ5aW5nIG1lbnViYXIgICovCiAgIGdfb2JqZWN0X3NldF9kYXRh IChHX09CSkVDVCAodyksIFhHX0lURU1fREFUQSwgY2JfZGF0YSk7CkBAIC0zMjkwLDcgKzMzNDQs MTAgQEAgeGdfY3JlYXRlX29uZV9tZW51aXRlbSAod2lkZ2V0X3ZhbHVlICppdGVtLAogICAgIHsK ICAgICAgIGlmIChzZWxlY3RfY2IpCiAgICAgICAgIGNiX2RhdGEtPnNlbGVjdF9pZAotICAgICAg ICAgID0gZ19zaWduYWxfY29ubmVjdCAoR19PQkpFQ1QgKHcpLCAiYWN0aXZhdGUiLCBzZWxlY3Rf Y2IsIGNiX2RhdGEpOworICAgICAgICAgID0gZ19zaWduYWxfY29ubmVjdF9kYXRhIChHX09CSkVD VCAodyksICJhY3RpdmF0ZSIsIHNlbGVjdF9jYiwKKwkJCQkgICBnbGliX3VzZXJfZGF0YSAoY2Jf ZGF0YSksCisJCQkJICAgZnJlZV9nbGliX3VzZXJfZGF0YSwKKwkJCQkgICBHX0NPTk5FQ1RfREVG QVVMVCk7CiAgICAgfQogCiAgIHJldHVybiB3OwpAQCAtMzM3OCw4ICszNDM1LDEwIEBAIGNyZWF0 ZV9tZW51cyAod2lkZ2V0X3ZhbHVlICpkYXRhLAogI2VuZGlmCiAKICNpZmRlZiBIQVZFX1BHVEsK LQkgIGdfc2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUICh3bWVudSksICJidXR0b24tcHJlc3MtZXZl bnQiLAotCQkJICAgIEdfQ0FMTEJBQ0sgKG1lbnVfYmFyX2J1dHRvbl9wcmVzc2VkX2NiKSwgZik7 CisJICBnX3NpZ25hbF9jb25uZWN0X2RhdGEgKEdfT0JKRUNUICh3bWVudSksICJidXR0b24tcHJl c3MtZXZlbnQiLAorCQkJICAgIEdfQ0FMTEJBQ0sgKG1lbnVfYmFyX2J1dHRvbl9wcmVzc2VkX2Ni KSwKKwkJCSAgICBnbGliX3VzZXJfZGF0YSAoZiksIGZyZWVfZ2xpYl91c2VyX2RhdGEsCisJCQkg ICAgR19DT05ORUNUX0RFRkFVTFQpOwogI2VuZGlmCiAgICAgICAgICAgLyogU2V0IHdpZHRoIG9m IG1lbnUgYmFyIHRvIGEgc21hbGwgdmFsdWUgc28gaXQgZG9lc24ndCBlbmxhcmdlCiAgICAgICAg ICAgICAgYSBzbWFsbCBpbml0aWFsIGZyYW1lIHNpemUuICBUaGUgd2lkdGggd2lsbCBiZSBzZXQg dG8gdGhlCkBAIC0zMzkxLDggKzM0NTAsMTAgQEAgY3JlYXRlX21lbnVzICh3aWRnZXRfdmFsdWUg KmRhdGEsCiAgICAgICAvKiBQdXQgY2xfZGF0YSBvbiB0aGUgdG9wIG1lbnUgZm9yIGVhc2llciBh Y2Nlc3MuICAqLwogICAgICAgY2xfZGF0YSA9IG1ha2VfY2xfZGF0YSAoY2xfZGF0YSwgZiwgaGln aGxpZ2h0X2NiKTsKICAgICAgIGdfb2JqZWN0X3NldF9kYXRhIChHX09CSkVDVCAod21lbnUpLCBY R19GUkFNRV9EQVRBLCAoZ3BvaW50ZXIpY2xfZGF0YSk7Ci0gICAgICBnX3NpZ25hbF9jb25uZWN0 IChHX09CSkVDVCAod21lbnUpLCAiZGVzdHJveSIsCi0gICAgICAgICAgICAgICAgICAgICAgICBH X0NBTExCQUNLIChtZW51X2Rlc3Ryb3lfY2FsbGJhY2spLCBjbF9kYXRhKTsKKyAgICAgIGdfc2ln bmFsX2Nvbm5lY3RfZGF0YSAoR19PQkpFQ1QgKHdtZW51KSwgImRlc3Ryb3kiLAorCQkJICAgICBH X0NBTExCQUNLIChtZW51X2Rlc3Ryb3lfY2FsbGJhY2spLAorCQkJICAgICBnbGliX3VzZXJfZGF0 YSAoY2xfZGF0YSksIGZyZWVfZ2xpYl91c2VyX2RhdGEsCisJCQkgICAgIEdfQ09OTkVDVF9ERUZB VUxUKTsKIAogICAgICAgaWYgKG5hbWUpCiAgICAgICAgIGd0a193aWRnZXRfc2V0X25hbWUgKHdt ZW51LCBuYW1lKTsKQEAgLTM4NjQsOCArMzkyNSwxMSBAQCB4Z191cGRhdGVfbWVudV9pdGVtICh3 aWRnZXRfdmFsdWUgKnZhbCwKICAgICAgICAgICAvKiBUaGlzIGl0ZW0gc2hhbGwgaGF2ZSBhIHNl bGVjdCBjYWxsYmFjay4gICovCiAgICAgICAgICAgaWYgKCEgY2JfZGF0YS0+c2VsZWN0X2lkKQog ICAgICAgICAgICAgY2JfZGF0YS0+c2VsZWN0X2lkCi0gICAgICAgICAgICAgID0gZ19zaWduYWxf Y29ubmVjdCAoR19PQkpFQ1QgKHcpLCAiYWN0aXZhdGUiLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGVjdF9jYiwgY2JfZGF0YSk7CisgICAgICAgICAgICAgID0gZ19zaWdu YWxfY29ubmVjdF9kYXRhIChHX09CSkVDVCAodyksICJhY3RpdmF0ZSIsCisJCQkJICAgICAgIHNl bGVjdF9jYiwKKwkJCQkgICAgICAgZ2xpYl91c2VyX2RhdGEgKGNiX2RhdGEpLAorCQkJCSAgICAg ICBmcmVlX2dsaWJfdXNlcl9kYXRhLAorCQkJCSAgICAgICBHX0NPTk5FQ1RfREVGQVVMVCk7CiAg ICAgICAgIH0KICAgICAgIGVsc2UgaWYgKGNiX2RhdGEtPnNlbGVjdF9pZCkKICAgICAgICAgewpA QCAtNDExMSw3ICs0MTc1LDcgQEAgeGdfbW9kaWZ5X21lbnViYXJfd2lkZ2V0cyAoR3RrV2lkZ2V0 ICptZW51YmFyLCBzdHJ1Y3QgZnJhbWUgKmYsCiBtZW51YmFyX21hcF9jYiAoR3RrV2lkZ2V0ICp3 LCBncG9pbnRlciB1c2VyX2RhdGEpCiB7CiAgIEd0a1JlcXVpc2l0aW9uIHJlcTsKLSAgc3RydWN0 IGZyYW1lICpmID0gdXNlcl9kYXRhOworICBzdHJ1Y3QgZnJhbWUgKmYgPSBnZXRfZ2xpYl91c2Vy X2RhdGEgKHVzZXJfZGF0YSwgc3RydWN0IGZyYW1lKTsKICAgZ3RrX3dpZGdldF9nZXRfcHJlZmVy cmVkX3NpemUgKHcsIE5VTEwsICZyZXEpOwogICByZXEuaGVpZ2h0ICo9IHhnX2dldF9zY2FsZSAo Zik7CiAgIGlmIChGUkFNRV9NRU5VQkFSX0hFSUdIVCAoZikgIT0gcmVxLmhlaWdodCkKQEAgLTQx NDMsNyArNDIwNyw5IEBAIHhnX3VwZGF0ZV9mcmFtZV9tZW51YmFyIChzdHJ1Y3QgZnJhbWUgKmYp CiAgICAgICAgICAgICAgICAgICAgICAgRkFMU0UsIEZBTFNFLCAwKTsKICAgZ3RrX2JveF9yZW9y ZGVyX2NoaWxkIChHVEtfQk9YICh4LT52Ym94X3dpZGdldCksIHgtPm1lbnViYXJfd2lkZ2V0LCAw KTsKIAotICBnX3NpZ25hbF9jb25uZWN0ICh4LT5tZW51YmFyX3dpZGdldCwgIm1hcCIsIEdfQ0FM TEJBQ0sgKG1lbnViYXJfbWFwX2NiKSwgZik7CisgIGdfc2lnbmFsX2Nvbm5lY3RfZGF0YSAoeC0+ bWVudWJhcl93aWRnZXQsICJtYXAiLCBHX0NBTExCQUNLIChtZW51YmFyX21hcF9jYiksCisJCQkg Z2xpYl91c2VyX2RhdGEgKGYpLCBmcmVlX2dsaWJfdXNlcl9kYXRhLAorCQkJIEdfQ09OTkVDVF9E RUZBVUxUKTsKICAgZ3RrX3dpZGdldF9zaG93X2FsbCAoeC0+bWVudWJhcl93aWRnZXQpOwogICBn dGtfd2lkZ2V0X2dldF9wcmVmZXJyZWRfc2l6ZSAoeC0+bWVudWJhcl93aWRnZXQsIE5VTEwsICZy ZXEpOwogICByZXEuaGVpZ2h0ICo9IHNjYWxlOwpAQCAtNTIyMyw3ICs1Mjg5LDcgQEAgI2RlZmlu ZSBHRVRTRVRVUChmKSBtYWtlX2Zsb2F0IChmIChwYWdlX3NldHVwLCBHVEtfVU5JVF9QT0lOVFMp KQogZHJhd19wYWdlIChHdGtQcmludE9wZXJhdGlvbiAqb3BlcmF0aW9uLCBHdGtQcmludENvbnRl eHQgKmNvbnRleHQsCiAJICAgZ2ludCBwYWdlX25yLCBncG9pbnRlciB1c2VyX2RhdGEpCiB7Ci0g IExpc3BfT2JqZWN0IGZyYW1lcyA9ICooKExpc3BfT2JqZWN0ICopIHVzZXJfZGF0YSk7CisgIExp c3BfT2JqZWN0IGZyYW1lcyA9ICpnZXRfZ2xpYl91c2VyX2RhdGEgKHVzZXJfZGF0YSwgTGlzcF9P YmplY3QpOwogICBzdHJ1Y3QgZnJhbWUgKmYgPSBYRlJBTUUgKEZudGggKG1ha2VfZml4bnVtIChw YWdlX25yKSwgZnJhbWVzKSk7CiAgIGNhaXJvX3QgKmNyID0gZ3RrX3ByaW50X2NvbnRleHRfZ2V0 X2NhaXJvX2NvbnRleHQgKGNvbnRleHQpOwogCkBAIC01MjQ2LDcgKzUzMTIsMTAgQEAgeGdfcHJp bnRfZnJhbWVzX2RpYWxvZyAoTGlzcF9PYmplY3QgZnJhbWVzKQogICBpZiAocGFnZV9zZXR1cCAh PSBOVUxMKQogICAgIGd0a19wcmludF9vcGVyYXRpb25fc2V0X2RlZmF1bHRfcGFnZV9zZXR1cCAo cHJpbnQsIHBhZ2Vfc2V0dXApOwogICBndGtfcHJpbnRfb3BlcmF0aW9uX3NldF9uX3BhZ2VzIChw cmludCwgbGlzdF9sZW5ndGggKGZyYW1lcykpOwotICBnX3NpZ25hbF9jb25uZWN0IChwcmludCwg ImRyYXctcGFnZSIsIEdfQ0FMTEJBQ0sgKGRyYXdfcGFnZSksICZmcmFtZXMpOworICBMaXNwX09i amVjdCAqZnJhbWVzX3B0ciA9ICZmcmFtZXM7CisgIGdfc2lnbmFsX2Nvbm5lY3RfZGF0YSAocHJp bnQsICJkcmF3LXBhZ2UiLCBHX0NBTExCQUNLIChkcmF3X3BhZ2UpLAorCQkJIGdsaWJfdXNlcl9k YXRhIChmcmFtZXNfcHRyKSwgZnJlZV9nbGliX3VzZXJfZGF0YSwKKwkJCSBHX0NPTk5FQ1RfREVG QVVMVCk7CiAgIHJlcyA9IGd0a19wcmludF9vcGVyYXRpb25fcnVuIChwcmludCwgR1RLX1BSSU5U X09QRVJBVElPTl9BQ1RJT05fUFJJTlRfRElBTE9HLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgTlVMTCwgTlVMTCk7CiAgIGlmIChyZXMgPT0gR1RLX1BSSU5UX09QRVJBVElPTl9S RVNVTFRfQVBQTFkpCkBAIC01NDc4LDcgKzU1NDcsNyBAQCB0Yl9zaXplX2NiIChHdGtXaWRnZXQg ICAgKndpZGdldCwKICAgLyogV2hlbiB0b29sIGJhciBpcyBjcmVhdGVkIGl0IGhhcyBvbmUgcHJl ZmVycmVkIHNpemUuICBCdXQgd2hlbiBzaXplIGlzCiAgICAgIGFsbG9jYXRlZCBiZXR3ZWVuIHdp ZGdldHMsIGl0IG1heSBnZXQgYW5vdGhlci4gIFNvIHdlIG11c3QgdXBkYXRlCiAgICAgIHNpemUg aGludHMgaWYgdG9vbCBiYXIgc2l6ZSBjaGFuZ2VzLiAgU2VlbiBvbiBGZWRvcmEgMTggYXQgbGVh c3QuICAqLwotICBzdHJ1Y3QgZnJhbWUgKmYgPSB1c2VyX2RhdGE7CisgIHN0cnVjdCBmcmFtZSAq ZiA9IGdldF9nbGliX3VzZXJfZGF0YSAodXNlcl9kYXRhLCBzdHJ1Y3QgZnJhbWUpOwogCiAgIGlm ICh4Z191cGRhdGVfdG9vbF9iYXJfc2l6ZXMgKGYpKQogICAgIGFkanVzdF9mcmFtZV9zaXplIChm LCAtMSwgLTEsIDIsIGZhbHNlLCBRdG9vbF9iYXJfbGluZXMpOwpAQCAtNTUyMSw4ICs1NTkwLDEw IEBAIHhnX2NyZWF0ZV90b29sX2JhciAoc3RydWN0IGZyYW1lICpmKQogICBndGtfdG9vbGJhcl9z ZXRfc3R5bGUgKEdUS19UT09MQkFSICh4LT50b29sYmFyX3dpZGdldCksIEdUS19UT09MQkFSX0lD T05TKTsKICAgZ3RrX29yaWVudGFibGVfc2V0X29yaWVudGF0aW9uIChHVEtfT1JJRU5UQUJMRSAo eC0+dG9vbGJhcl93aWRnZXQpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdU S19PUklFTlRBVElPTl9IT1JJWk9OVEFMKTsKLSAgZ19zaWduYWxfY29ubmVjdCAoeC0+dG9vbGJh cl93aWRnZXQsICJzaXplLWFsbG9jYXRlIiwKLSAgICAgICAgICAgICAgICAgICAgR19DQUxMQkFD SyAodGJfc2l6ZV9jYiksIGYpOworICBnX3NpZ25hbF9jb25uZWN0X2RhdGEgKHgtPnRvb2xiYXJf d2lkZ2V0LCAic2l6ZS1hbGxvY2F0ZSIsCisJCQkgR19DQUxMQkFDSyAodGJfc2l6ZV9jYiksCisJ CQkgZ2xpYl91c2VyX2RhdGEgKGYpLCBmcmVlX2dsaWJfdXNlcl9kYXRhLAorCQkJIEdfQ09OTkVD VF9ERUZBVUxUKTsKICNpZmRlZiBIQVZFX0dUSzMKICAgZ3N0eSA9IGd0a193aWRnZXRfZ2V0X3N0 eWxlX2NvbnRleHQgKHgtPnRvb2xiYXJfd2lkZ2V0KTsKICAgZ3RrX3N0eWxlX2NvbnRleHRfYWRk X2NsYXNzIChnc3R5LCAicHJpbWFyeS10b29sYmFyIik7CkBAIC02MjM0LDggKzYzMDUsMTAgQEAg eGdfaW5pdGlhbGl6ZSAodm9pZCkKIAogICBnZHB5X2RlZiA9IE5VTEw7CiAgIHhnX2lnbm9yZV9n dGtfc2Nyb2xsYmFyID0gMDsKKyNpZm5kZWYgSEFWRV9NUFMKICAgeGdfbWVudV9jYl9saXN0LnBy ZXYgPSB4Z19tZW51X2NiX2xpc3QubmV4dCA9CiAgICAgeGdfbWVudV9pdGVtX2NiX2xpc3QucHJl diA9IHhnX21lbnVfaXRlbV9jYl9saXN0Lm5leHQgPSAwOworI2VuZGlmCiAKICNpZiBkZWZpbmVk IEhBVkVfUEdUSyB8fCAhZGVmaW5lZCBIQVZFX0dUSzMKICAgaWRfdG9fd2lkZ2V0Lm1heF9zaXpl ID0gaWRfdG9fd2lkZ2V0LnVzZWQgPSAwOwpAQCAtNjMzNyw3ICs2NDEwLDcgQEAgeGdfdmlydHVh bF9tb2RzX3RvX3ggKHN0cnVjdCB4X2Rpc3BsYXlfaW5mbyAqZHB5aW5mbywgZ3VpbnQgdmlydHVh bCkKIHhnX2ltX2NvbnRleHRfY29tbWl0IChHdGtJTUNvbnRleHQgKmltYywgZ2NoYXIgKnN0ciwK IAkJICAgICAgZ3BvaW50ZXIgdXNlcl9kYXRhKQogewotICBzdHJ1Y3QgZnJhbWUgKmYgPSB1c2Vy X2RhdGE7CisgIHN0cnVjdCBmcmFtZSAqZiA9IGdldF9nbGliX3VzZXJfZGF0YSAodXNlcl9kYXRh LCBzdHJ1Y3QgZnJhbWUpOwogICBzdHJ1Y3QgaW5wdXRfZXZlbnQgaWU7CiAjaWZkZWYgSEFWRV9Y SU5QVVQyCiAgIHN0cnVjdCB4aV9kZXZpY2VfdCAqc291cmNlOwpAQCAtNjcwOCw3ICs2NzgxLDcg QEAgeGdfZmlsdGVyX2tleSAoc3RydWN0IGZyYW1lICpmcmFtZSwgWEV2ZW50ICp4a2V5KQogc3Rh dGljIHZvaWQKIHhnX3dpZGdldF9zdHlsZV91cGRhdGVkIChHdGtXaWRnZXQgKndpZGdldCwgZ3Bv aW50ZXIgdXNlcl9kYXRhKQogewotICBzdHJ1Y3QgZnJhbWUgKmYgPSB1c2VyX2RhdGE7CisgIHN0 cnVjdCBmcmFtZSAqZiA9IGdldF9nbGliX3VzZXJfZGF0YSAodXNlcl9kYXRhLCBzdHJ1Y3QgZnJh bWUpOwogCiAgIGlmIChmLT5hbHBoYV9iYWNrZ3JvdW5kIDwgMS4wKQogICAgIHsKZGlmZiAtLWdp dCBhL3NyYy9ndGt1dGlsLmggYi9zcmMvZ3RrdXRpbC5oCmluZGV4IGI2ODkwNTNiNGI4Li5hYzFi OTYxZTVhMyAxMDA2NDQKLS0tIGEvc3JjL2d0a3V0aWwuaAorKysgYi9zcmMvZ3RrdXRpbC5oCkBA IC0zMyw2ICszMywyNyBAQCAjZGVmaW5lIEVWRU5UIEdka0V2ZW50CiAjZGVmaW5lIEVWRU5UIFhF dmVudAogI2VuZGlmCiAKKy8qIEhlbHBlciBtYWNyb3MgZm9yIGdsaWIgY2FsbGJhY2tzLiAgT24g TVBTIGJ1aWxkcywgd2UgbmVlZCB0byBwaW4KKyAgIChwb2ludGVycyB0bykgdGhlIG9iamVjdHMs IHdoaWNoIHJlcXVpcmVzIGFuIGV4dHJhIGxheWVyIG9mCisgICBpbmRpcmVjdGlvbi4gKi8KKwor I2lmZGVmIEhBVkVfTVBTCisjZGVmaW5lIGdsaWJfdXNlcl9kYXRhKG8pICh7CQkJCVwKKyAgICAg IGdwb2ludGVyIHAgPSBpZ2NfeHphbGxvY19hbWJpZyAoc2l6ZW9mIChvKSk7CVwKKyAgICAgIG1l bWNweSAocCwgJihvKSwgc2l6ZW9mIChvKSk7CQkJXAorICAgICAgcDsJCQkJCQlcCisgICAgfSkK KworI2RlZmluZSBnZXRfZ2xpYl91c2VyX2RhdGEodXNlcl9kYXRhLCB0eXBlKQlcCisgICgqKHR5 cGUgKiopKHVzZXJfZGF0YSkpCisKKyNlbHNlCisjZGVmaW5lIGdsaWJfdXNlcl9kYXRhKG8pICgo Z3BvaW50ZXIpKG8pKQorI2RlZmluZSBnZXRfZ2xpYl91c2VyX2RhdGEodXNlcl9kYXRhLCB0eXBl KQlcCisgICgodHlwZSAqKSh1c2VyX2RhdGEpKQorI2VuZGlmCitleHRlcm4gdm9pZCBmcmVlX2ds aWJfdXNlcl9kYXRhIChncG9pbnRlciBkYXRhLCBHQ2xvc3VyZSAqY2xvc3VyZSk7CisKIC8qIE1p bmltdW0gYW5kIG1heGltdW0gdmFsdWVzIHVzZWQgZm9yIEdUSyBzY3JvbGwgYmFycyAgKi8KIAog I2RlZmluZSBYR19TQl9NSU4gMQpkaWZmIC0tZ2l0IGEvc3JjL3htZW51LmMgYi9zcmMveG1lbnUu YwppbmRleCA2ZGQ3YjNmMzdhMC4uNDVkZWYyZmIxZWEgMTAwNjQ0Ci0tLSBhL3NyYy94bWVudS5j CisrKyBiL3NyYy94bWVudS5jCkBAIC03OTMsNyArNzkzLDggQEAgbWVudV9oaWdobGlnaHRfY2Fs bGJhY2sgKFdpZGdldCB3aWRnZXQsIExXTElCX0lEIGlkLCB2b2lkICpjYWxsX2RhdGEpCiBzdGF0 aWMgdm9pZAogbWVudWJhcl9zZWxlY3Rpb25fY2FsbGJhY2sgKEd0a1dpZGdldCAqd2lkZ2V0LCBn cG9pbnRlciBjbGllbnRfZGF0YSkKIHsKLSAgeGdfbWVudV9pdGVtX2NiX2RhdGEgKmNiX2RhdGEg PSBjbGllbnRfZGF0YTsKKyAgeGdfbWVudV9pdGVtX2NiX2RhdGEgKmNiX2RhdGEgPQorICAgIGdl dF9nbGliX3VzZXJfZGF0YSAoY2xpZW50X2RhdGEsIHhnX21lbnVfaXRlbV9jYl9kYXRhKTsKIAog ICBpZiAoeGdfY3JhenlfY2FsbGJhY2tfYWJvcnQpCiAgICAgcmV0dXJuOwpAQCAtMTQ3OCw3ICsx NDc5LDggQEAgbWVudV9wb3NpdGlvbl9mdW5jIChHdGtNZW51ICptZW51LCBnaW50ICp4LCBnaW50 ICp5LCBnYm9vbGVhbiAqcHVzaF9pbiwgZ3BvaW50ZXIKIHN0YXRpYyB2b2lkCiBwb3B1cF9zZWxl Y3Rpb25fY2FsbGJhY2sgKEd0a1dpZGdldCAqd2lkZ2V0LCBncG9pbnRlciBjbGllbnRfZGF0YSkK IHsKLSAgeGdfbWVudV9pdGVtX2NiX2RhdGEgKmNiX2RhdGEgPSBjbGllbnRfZGF0YTsKKyAgeGdf bWVudV9pdGVtX2NiX2RhdGEgKmNiX2RhdGEgPQorICAgIGdldF9nbGliX3VzZXJfZGF0YSAoY2xp ZW50X2RhdGEsIHhnX21lbnVfaXRlbV9jYl9kYXRhKTsKIAogICBpZiAoeGdfY3JhenlfY2FsbGJh Y2tfYWJvcnQpIHJldHVybjsKICAgaWYgKGNiX2RhdGEpIG1lbnVfaXRlbV9zZWxlY3Rpb24gPSBj Yl9kYXRhLT5jYWxsX2RhdGE7Ci0tIAoyLjQ1LjIKCg== --b1_nSFKfMvQqoTyFYWzebYPZy4dEDDDdWArVdEYUnmjGM--