Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xQjV7-00000000Kj2-3lMz for pgsql-hackers@arkaria.postgresql.org; Tue, 10 Nov 2026 10:54:55 +0000 Received: from localhost ([127.0.0.1]:49446 helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.98.2) (envelope-from ) id 1xQjV6-000000052qM-0fjJ for pgsql-hackers@arkaria.postgresql.org; Tue, 10 Nov 2026 10:54:52 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]:56292) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xQjV5-000000052qD-1dvL for pgsql-hackers@lists.postgresql.org; Tue, 10 Nov 2026 10:54:52 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.98.2) (envelope-from ) id 1xQjV0-00000000Dc4-2Wlj for pgsql-hackers@lists.postgresql.org; Tue, 10 Nov 2026 10:54:49 +0000 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-49412eb1474so1180168f8f.3 for ; Tue, 10 Nov 2026 02:54:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cybertec.at; s=google; t=1794308083; x=1794912883; darn=lists.postgresql.org; h=message-id:date:content-type:mime-version:comments:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=WJ4VW6o9w100l0YbNuGGOrJOOCFSVU5bSpg+FPCaesM=; b=H9H2T504FCFbB9v2JRgtHwwUeTQV2+yd8zRi53xa8Vx3MUQaX//PmnoetePZZ9DfKg qZR0IOd2vjAZNxKSr2Sn4GDSYvoouRxH5qZaBDEMpeedxvNDwr31LGz9rbRJkABELOiG 2794RLXf8TBs8w26RegchnMlBlprEcFhfHGxj25tPWr+2veEyc5+8TBZ1aNabOSY6e9N I3I1Kffi7l8PMGJwb6YkPfMJwf4/ml96WvJW0ZAE9RoWMcXYMhmz9xoXcxVRixvPH7dx zaV/aZzy2PsArT5z17DUFxSQyLojSzEEUDlQJPxNqqLHe3gABrrox6AlUsvtxzhOsvl7 Z1XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794308083; x=1794912883; h=message-id:date:content-type:mime-version:comments:references :in-reply-to:subject:cc:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=WJ4VW6o9w100l0YbNuGGOrJOOCFSVU5bSpg+FPCaesM=; b=qktWkWniGqgCObAOXXTOBWCPFxKYhXVbbqk+QJofzrZ9XicZp2ekz4bsCUKje/WTdb O90MX2xuUxjsCLHW+80upPkW6wOiOUZ8Hjs/7UQwe6aiKQ7NbV+nOPe6DCWBNlkYh7KJ 6YmuVLP1GQao84DqvIpA4fWTh0DM0P3rcmDl7rdYEbcBm21WtZxNPp+zO24pLA4pTse7 eYq1BMdHTBo3LtHOyg2Mul385AbfxW/EZgP/1xRMpNw9Kb+8j+qQXcif5ygSlQeNSRsU bRAyDqdOYfiMU3LnOc4FeQNKqoe3WBHt6yDdXrgUdfhxKEzGKoyE5RC6aZr/fTpvAu3O nMXw== X-Forwarded-Encrypted: i=1; AL+hErFNdpegHoN55CdEkwyoh+sMAV1niNN397case9MOPrHPgWC144A1T96BQNPn6b5mE+qQqW+JSDmx3Ud3xTp@lists.postgresql.org X-Gm-Message-State: APuU4Z+49H5XHQVebigD2TZTRI+yJbFv6XfKiJa29bI17huky3YJ1OTm yJITkzqk9dgbeWJQQIiToOIsSSyvzwJ9hXxnTc24+lERDf/GnTXR/1MVBiLHZUhu9a0= X-Gm-Gg: AYBFou2IeaO7iAKZvoZ0Ao/IIV1edPr6siPXcVnaWv1NsBpI3HPrZYYJFfx6Diye31u v6sjVgUfEEajsYyn5zpNi6DzYjmvStMDP4b7sYpCYs522UZxTilmMKQeXumTkTVNHvMKmfY0/gm MG5nOhEna44txmFP/1OLr3g/jjRVssqRiRPJYh3slCWFME+spOEedjl/qJZWofRNtJSEKPjk/f+ +J/9J1F3FKT+FXgqSGqe4O21PGRDyOvyopWnuHwxE76gbzYm1IXVG9XIGyYtxFU/k/6ju3oWvr3 xFxFoxzyNbTo+TWMkwfj3rgc179S2kUsk5uJ/5+rNOzC7X1eFTZnkS/UnWieydTe7VAy8aSq2Lr GiqzHG/VskWYUZMDbD0XNlioHOYhTNptZ5uAXgvoa4OmG8FzBymuU+2LK3fKVUXkSIzhJ6X+pao 5D05R+mDGQnRte5qg+koTgk40o7paQmWFTwZIqgo7OCr+KfzCeNsin0gCSYMZF9pceh66SUJ6bQ 0k5QdPOTRza/W/0NhUKoxwTbpoD8I1QxnZVBn1UBaok3iOIY9C6EHGqeldHXWhj5Y/+Cdh5uRwB Kow0hUHPgdjZPZef1zWyEDlgyajnEJh9a0/kF++B X-Received: by 2002:a05:6000:25c4:b0:48d:f39b:83de with SMTP id ffacd0b85a97d-4982c2d037amr4391760f8f.3.1794308083018; Tue, 10 Nov 2026 02:54:43 -0800 (PST) Received: from chrudos (109-81-170-200.rct.o2.cz. [109.81.170.200]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4983600bc9asm4086702f8f.29.2026.11.10.02.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2026 02:54:41 -0800 (PST) From: Antonin Houska To: Manu Cc: shihao zhong , pgsql-hackers@lists.postgresql.org Subject: Re: REPACK enhancements In-reply-to: <163579.1790787537@localhost> References: <179004809718.4166269.6878292164216131831@gmail.com> <28303.1790158015@localhost> <163579.1790787537@localhost> Comments: In-reply-to Antonin Houska message dated "Wed, 30 Sep 2026 18:58:57 +0200." X-Mailer: MH-E 8.6+git; nmh 1.8; Emacs 31.1.50 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Date: Tue, 10 Nov 2026 11:54:40 +0100 Message-ID: <88740.1794308080@chrudos> List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --=-=-= Content-Type: text/plain Antonin Houska wrote: > Antonin Houska wrote: > > The next version is attached. > > > Manu wrote: > > > > > 3. 0008: assertion failure in compute_new_xmax_infomask() > > > > > > TRAP: failed Assert("TransactionIdIsCurrentTransactionId(add_to_xmax) || !TransactionIdIsValid(GetTopTransactionIdIfAny())"), File: "heapam.c", Line: 5564 > > > > > > It fails in the replay after AccessExclusiveLock, called from > > > rebuild_relation_finish_concurrent(), in heap_update() of a replayed > > > UPDATE. So REPACK already has an XID of its own at that point. > > > > I don't know at the moment when the XID could get assigned. I need to do some > > investigation. > > This is still on my TODO list, I'm afraid I couldn't reproduce this problem yet. For now I commented the assertion out and added a comment on possible solutions. Besides that, I rebased the patch and fixed splitting into diffs (some changes done in v04-0008 belonged to other diffs of v04 as well). Also, 0001 is now a new diff, removing an unused function argument. -- Antonin Houska Web: https://www.cybertec-postgresql.com --=-=-= Content-Type: application/mbox Content-Disposition: attachment; filename=v05-0001-Remove-OldHeap-argument-from-build_new_indexes.patch Content-Transfer-Encoding: base64 RnJvbSBhZWUxODExMzQ3ZDU2MDNiODk0YWVjNDk1ZGJlYTdjN2FjZjUxNmMzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmluIEhvdXNrYSA8YWhAY3liZXJ0ZWMuYXQ+CkRhdGU6 IFR1ZSwgMTAgTm92IDIwMjYgMTE6NDQ6MzggKzAxMDAKU3ViamVjdDogW1BBVENIIDEvOV0gUmVt b3ZlIE9sZEhlYXAgYXJndW1lbnQgZnJvbSBidWlsZF9uZXdfaW5kZXhlcygpLgoKVGhpcyBwYXRj aCBmaXhlcyBhbiBvdmVyc2lnaHQgaW4gdGhlIHByZXZpb3VzIHdvcmsgb24gUkVQQUNLIChDT05D VVJSRU5UTFkpLgotLS0KIHNyYy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFjay5jIHwgMTIgKysrKysr LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFjay5jIGIvc3JjL2JhY2tlbmQv Y29tbWFuZHMvcmVwYWNrLmMKaW5kZXggYzJhMjdiN2FkMDUuLmYyYzI3ZGQwNzI0IDEwMDY0NAot LS0gYS9zcmMvYmFja2VuZC9jb21tYW5kcy9yZXBhY2suYworKysgYi9zcmMvYmFja2VuZC9jb21t YW5kcy9yZXBhY2suYwpAQCAtMjEyLDcgKzIxMiw3IEBAIHN0YXRpYyB2b2lkIHJlYnVpbGRfcmVs YXRpb25fZmluaXNoX2NvbmN1cnJlbnQoUmVsYXRpb24gTmV3SGVhcCwgUmVsYXRpb24gT2xkSGVh CiAJCQkJCQkJCQkJCSAgIE9pZCBpZGVudElkeCwKIAkJCQkJCQkJCQkJICAgVHJhbnNhY3Rpb25J ZCBmcm96ZW5YaWQsCiAJCQkJCQkJCQkJCSAgIE11bHRpWGFjdElkIGN1dG9mZk11bHRpKTsKLXN0 YXRpYyBMaXN0ICpidWlsZF9uZXdfaW5kZXhlcyhSZWxhdGlvbiBOZXdIZWFwLCBSZWxhdGlvbiBP bGRIZWFwLCBMaXN0ICpPbGRJbmRleGVzKTsKK3N0YXRpYyBMaXN0ICpidWlsZF9uZXdfaW5kZXhl cyhSZWxhdGlvbiBOZXdIZWFwLCBMaXN0ICpPbGRJbmRleGVzKTsKIHN0YXRpYyB2b2lkIGNvcHlf aW5kZXhfY29uc3RyYWludHMoUmVsYXRpb24gb2xkX2luZGV4LCBPaWQgbmV3X2luZGV4X2lkLAog CQkJCQkJCQkgICBPaWQgbmV3X2hlYXBfaWQpOwogc3RhdGljIHZvaWQgY29weV9hdHRyaWJ1dGVf ZGVmYXVsdHMoT2lkIG9sZF9oZWFwX29pZCwgT2lkIG5ld19oZWFwX29pZCk7CkBAIC0zNDYwLDcg KzM0NjAsNyBAQCByZWJ1aWxkX3JlbGF0aW9uX2ZpbmlzaF9jb25jdXJyZW50KFJlbGF0aW9uIE5l d0hlYXAsIFJlbGF0aW9uIE9sZEhlYXAsCiAJICogYXJlIG5vdCBuZWNlc3NhcmlseSBkYW5nZXJv dXMsIGJ1dCBjYW4gbWFrZSB1c2VyIGNvbmZ1c2VkIGlmIHRoZQogCSAqIGNoYW5nZXMgdGhleSBk byBnZXQgbG9zdCBkdWUgdG8gUkVQQUNLLikKIAkgKi8KLQlpbmRfb2lkc19uZXcgPSBidWlsZF9u ZXdfaW5kZXhlcyhOZXdIZWFwLCBPbGRIZWFwLCBpbmRfb2lkc19vbGQpOworCWluZF9vaWRzX25l dyA9IGJ1aWxkX25ld19pbmRleGVzKE5ld0hlYXAsIGluZF9vaWRzX29sZCk7CiAKIAkvKgogCSAq IFRoZSBpZGVudGl0eSBpbmRleCBpbiB0aGUgbmV3IHJlbGF0aW9uIGFwcGVhcnMgaW4gdGhlIHNh bWUgcmVsYXRpdmUKQEAgLTM2MzAsMTcgKzM2MzAsMTcgQEAgcmVidWlsZF9yZWxhdGlvbl9maW5p c2hfY29uY3VycmVudChSZWxhdGlvbiBOZXdIZWFwLCBSZWxhdGlvbiBPbGRIZWFwLAogfQogCiAv KgotICogQnVpbGQgaW5kZXhlcyBvbiBOZXdIZWFwIGFjY29yZGluZyB0byB0aG9zZSBvbiBPbGRI ZWFwLgorICogQnVpbGQgaW5kZXhlcyBvbiBOZXdIZWFwIGFjY29yZGluZyB0byB0aG9zZSBvbiB0 aGUgb2xkIGhlYXAuCiAgKgotICogT2xkSW5kZXhlcyBpcyB0aGUgbGlzdCBvZiBpbmRleCBPSURz IG9uIE9sZEhlYXAuIFRoZSBjb250YWluZWQgaW5kZXhlcyBlbmQKLSAqIHVwIGxvY2tlZCB1c2lu ZyBTaGFyZVVwZGF0ZUV4Y2x1c2l2ZUxvY2suCisgKiBPbGRJbmRleGVzIGlzIHRoZSBsaXN0IG9m IGluZGV4IE9JRHMgb24gdGhlIG9sZCBoZWFwLiBUaGUgY29udGFpbmVkIGluZGV4ZXMKKyAqIGVu ZCB1cCBsb2NrZWQgdXNpbmcgU2hhcmVVcGRhdGVFeGNsdXNpdmVMb2NrLgogICoKICAqIEEgbGlz dCBvZiBPSURzIG9mIHRoZSBjb3JyZXNwb25kaW5nIGluZGV4ZXMgY3JlYXRlZCBvbiBOZXdIZWFw IGlzCiAgKiByZXR1cm5lZC4gVGhlIG9yZGVyIG9mIGl0ZW1zIGRvZXMgbWF0Y2gsIHNvIHdlIGNh biB1c2UgdGhlc2UgYXJyYXlzIHRvIHN3YXAKICAqIGluZGV4IHN0b3JhZ2UuCiAgKi8KIHN0YXRp YyBMaXN0ICoKLWJ1aWxkX25ld19pbmRleGVzKFJlbGF0aW9uIE5ld0hlYXAsIFJlbGF0aW9uIE9s ZEhlYXAsIExpc3QgKk9sZEluZGV4ZXMpCitidWlsZF9uZXdfaW5kZXhlcyhSZWxhdGlvbiBOZXdI ZWFwLCBMaXN0ICpPbGRJbmRleGVzKQogewogCUxpc3QJICAgKnJlc3VsdCA9IE5JTDsKIAotLSAK Mi41MS4wCgo= --=-=-= Content-Type: application/mbox Content-Disposition: attachment; filename=v05-0002-Use-tuple-slot-to-pass-tuples-for-rewriting.patch Content-Transfer-Encoding: base64 RnJvbSBhMWMzZWI1ZjRjMzg2Nzg4MjU3ODY2OGE5ZjQxMTVlNWU1MzdmMTU2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmluIEhvdXNrYSA8YWhAY3liZXJ0ZWMuYXQ+CkRhdGU6 IFR1ZSwgMTAgTm92IDIwMjYgMTE6NDQ6MzggKzAxMDAKU3ViamVjdDogW1BBVENIIDIvOV0gVXNl IHR1cGxlIHNsb3QgdG8gcGFzcyB0dXBsZXMgZm9yIHJld3JpdGluZy4KClRoaXMgcGF0Y2ggdHJp ZXMgdG8gYWRvcHQgdGhlIHByZWZlcmFibGUgd2F5IG9mIGhhbmRsaW5nIHR1cGxlcywgaS5lLiBw YXNzIHRoZQpjb250YWluaW5nIHR1cGxlIHNsb3QgcmF0aGVyIHRoYW4gdGhlIGFjdHVhbCB0dXBs ZS4gVGhlIG1vdGl2YXRpb24gaXMgdGhhdApoZWFwX2luc2VydF9mb3JfcmVwYWNrKCkgd2lsbCBu ZWVkIGEgc2xvdCBpbiB0aGUgbmVhciBmdXR1cmUsIGluIG9yZGVyIHRvIGNhbGwKRXhlY0luc2Vy dEluZGV4VHVwbGVzKCkuIEFsc28sIGluIG9yZGVyIHRvIHNldCB2YWx1ZXMgb2YgZHJvcHBlZCBh dHRyaWJ1dGVzIHRvCnRvIE5VTEwsIGl0IHNlZW1zIG1vcmUgY29tcGFjdCB0byBwYXNzIGEgdHVw bGUgc2xvdCBhcyBhIHdvcmtzcGFjZSB0aGFuIHR3bwphcnJheXMgKG9uZSBmb3IgdmFsdWVzIGFu ZCBvbmUgZm9yIG51bGxzKS4KLS0tCiBzcmMvYmFja2VuZC9hY2Nlc3MvaGVhcC9oZWFwYW1faGFu ZGxlci5jIHwgMTk5ICsrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTEw IGluc2VydGlvbnMoKyksIDg5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5k L2FjY2Vzcy9oZWFwL2hlYXBhbV9oYW5kbGVyLmMgYi9zcmMvYmFja2VuZC9hY2Nlc3MvaGVhcC9o ZWFwYW1faGFuZGxlci5jCmluZGV4IDA1YTgxZTQ1NTdhLi4yMzhhY2FlOTNkYSAxMDA2NDQKLS0t IGEvc3JjL2JhY2tlbmQvYWNjZXNzL2hlYXAvaGVhcGFtX2hhbmRsZXIuYworKysgYi9zcmMvYmFj a2VuZC9hY2Nlc3MvaGVhcC9oZWFwYW1faGFuZGxlci5jCkBAIC00OCwxNCArNDgsMTMgQEAKICNp bmNsdWRlICJ1dGlscy9yZWwuaCIKICNpbmNsdWRlICJ1dGlscy90dXBsZXNvcnQuaCIKIAotc3Rh dGljIHZvaWQgcmVmb3JtX2FuZF9yZXdyaXRlX3R1cGxlKEhlYXBUdXBsZSB0dXBsZSwKLQkJCQkJ CQkJCSBSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBOZXdIZWFwLAotCQkJCQkJCQkJIERhdHVt ICp2YWx1ZXMsIGJvb2wgKmlzbnVsbCwgUmV3cml0ZVN0YXRlIHJ3c3RhdGUpOwotc3RhdGljIHZv aWQgaGVhcF9pbnNlcnRfZm9yX3JlcGFjayhIZWFwVHVwbGUgdHVwbGUsIFJlbGF0aW9uIE9sZEhl YXAsCi0JCQkJCQkJCSAgIFJlbGF0aW9uIE5ld0hlYXAsIERhdHVtICp2YWx1ZXMsIGJvb2wgKmlz bnVsbCwKLQkJCQkJCQkJICAgQnVsa0luc2VydFN0YXRlIGJpc3RhdGUpOwotc3RhdGljIEhlYXBU dXBsZSByZWZvcm1fdHVwbGUoSGVhcFR1cGxlIHR1cGxlLCBSZWxhdGlvbiBPbGRIZWFwLAotCQkJ CQkJCSAgUmVsYXRpb24gTmV3SGVhcCwgRGF0dW0gKnZhbHVlcywgYm9vbCAqaXNudWxsKTsKK3N0 YXRpYyB2b2lkIHJlZm9ybV9hbmRfcmV3cml0ZV90dXBsZShUdXBsZVRhYmxlU2xvdCAqc3JjLCBU dXBsZVRhYmxlU2xvdCAqcmVmb3JtLAorCQkJCQkJCQkJIFJld3JpdGVTdGF0ZSByd3N0YXRlKTsK K3N0YXRpYyB2b2lkIGhlYXBfaW5zZXJ0X2Zvcl9yZXBhY2soUmVsYXRpb24gcmVsLCBUdXBsZVRh YmxlU2xvdCAqc3JjLAorCQkJCQkJCQkgICBUdXBsZVRhYmxlU2xvdCAqcmVmb3JtLAorCQkJCQkJ CQkgICBCdWxrSW5zZXJ0U3RhdGVEYXRhICpiaXN0YXRlKTsKK3N0YXRpYyBib29sIHR1cGxlX25l ZWRzX3JlZm9ybShIZWFwVHVwbGUgdHVwbGUsIFR1cGxlRGVzYyB0dXBEZXNjKTsKK3N0YXRpYyB2 b2lkIGNsZWFyX2Ryb3BwZWRfYXR0cmlidXRlcyhIZWFwVHVwbGUgdHVwbGUsIFR1cGxlVGFibGVT bG90ICpyZWZvcm0pOwogCiBzdGF0aWMgYm9vbCBTYW1wbGVIZWFwVHVwbGVWaXNpYmxlKFRhYmxl U2NhbkRlc2Mgc2NhbiwgQnVmZmVyIGJ1ZmZlciwKIAkJCQkJCQkJICAgSGVhcFR1cGxlIHR1cGxl LApAQCAtNjAzLDExICs2MDIsOCBAQCBoZWFwYW1fcmVsYXRpb25fY29weV9mb3JfY2x1c3RlcihS ZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBOZXdIZWFwLAogCWJvb2wJCWlzX3N5c3RlbV9jYXRh bG9nOwogCVR1cGxlc29ydHN0YXRlICp0dXBsZXNvcnQ7CiAJVHVwbGVEZXNjCW9sZFR1cERlc2Mg PSBSZWxhdGlvbkdldERlc2NyKE9sZEhlYXApOwotCVR1cGxlRGVzYwluZXdUdXBEZXNjID0gUmVs YXRpb25HZXREZXNjcihOZXdIZWFwKTsKIAlUdXBsZVRhYmxlU2xvdCAqc2xvdDsKLQlpbnQJCQlu YXR0czsKLQlEYXR1bQkgICAqdmFsdWVzOwotCWJvb2wJICAgKmlzbnVsbDsKKwlUdXBsZVRhYmxl U2xvdCAqcmVmb3JtX3Nsb3Q7CiAJQnVmZmVySGVhcFR1cGxlVGFibGVTbG90ICpoc2xvdDsKIAlC bG9ja051bWJlciBwcmV2X2NibG9jayA9IEludmFsaWRCbG9ja051bWJlcjsKIAlib29sCQljb25j dXJyZW50ID0gc25hcHNob3QgIT0gTlVMTDsKQEAgLTYyMSwxMSArNjE3LDYgQEAgaGVhcGFtX3Jl bGF0aW9uX2NvcHlfZm9yX2NsdXN0ZXIoUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gTmV3SGVh cCwKIAkgKi8KIAlBc3NlcnQoUmVsYXRpb25HZXRUYXJnZXRCbG9jayhOZXdIZWFwKSA9PSBJbnZh bGlkQmxvY2tOdW1iZXIpOwogCi0JLyogUHJlYWxsb2NhdGUgdmFsdWVzL2lzbnVsbCBhcnJheXMg Ki8KLQluYXR0cyA9IG5ld1R1cERlc2MtPm5hdHRzOwotCXZhbHVlcyA9IHBhbGxvY19hcnJheShE YXR1bSwgbmF0dHMpOwotCWlzbnVsbCA9IHBhbGxvY19hcnJheShib29sLCBuYXR0cyk7Ci0KIAkv KgogCSAqIEluIG5vbi1jb25jdXJyZW50IG1vZGUsIGluaXRpYWxpemUgdGhlIHJld3JpdGUgb3Bl cmF0aW9uLiAgVGhpcyBpcyBub3QKIAkgKiBuZWVkZWQgaW4gY29uY3VycmVudCBtb2RlLgpAQCAt NjkxLDYgKzY4Miw4IEBAIGhlYXBhbV9yZWxhdGlvbl9jb3B5X2Zvcl9jbHVzdGVyKFJlbGF0aW9u IE9sZEhlYXAsIFJlbGF0aW9uIE5ld0hlYXAsCiAKIAlzbG90ID0gdGFibGVfc2xvdF9jcmVhdGUo T2xkSGVhcCwgTlVMTCk7CiAJaHNsb3QgPSAoQnVmZmVySGVhcFR1cGxlVGFibGVTbG90ICopIHNs b3Q7CisJcmVmb3JtX3Nsb3QgPSBNYWtlU2luZ2xlVHVwbGVUYWJsZVNsb3QoUmVsYXRpb25HZXRE ZXNjcihPbGRIZWFwKSwKKwkJCQkJCQkJCQkgICAmVFRTT3BzVmlydHVhbCk7CiAKIAkvKgogCSAq IFNjYW4gdGhyb3VnaCB0aGUgT2xkSGVhcCwgZWl0aGVyIGluIE9sZEluZGV4IG9yZGVyIG9yIHNl cXVlbnRpYWxseTsKQEAgLTg2OCwxMSArODYxLDkgQEAgaGVhcGFtX3JlbGF0aW9uX2NvcHlfZm9y X2NsdXN0ZXIoUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gTmV3SGVhcCwKIAkJCWludDY0CQlj dF92YWxbMl07CiAKIAkJCWlmICghY29uY3VycmVudCkKLQkJCQlyZWZvcm1fYW5kX3Jld3JpdGVf dHVwbGUodHVwbGUsIE9sZEhlYXAsIE5ld0hlYXAsCi0JCQkJCQkJCQkJIHZhbHVlcywgaXNudWxs LCByd3N0YXRlKTsKKwkJCQlyZWZvcm1fYW5kX3Jld3JpdGVfdHVwbGUoc2xvdCwgcmVmb3JtX3Ns b3QsIHJ3c3RhdGUpOwogCQkJZWxzZQotCQkJCWhlYXBfaW5zZXJ0X2Zvcl9yZXBhY2sodHVwbGUs IE9sZEhlYXAsIE5ld0hlYXAsCi0JCQkJCQkJCQkgICB2YWx1ZXMsIGlzbnVsbCwgYmlzdGF0ZSk7 CisJCQkJaGVhcF9pbnNlcnRfZm9yX3JlcGFjayhOZXdIZWFwLCBzbG90LCByZWZvcm1fc2xvdCwg YmlzdGF0ZSk7CiAKIAkJCS8qCiAJCQkgKiBJbiBpbmRleHNjYW4gbW9kZSBhbmQgYWxzbyBWQUNV VU0gRlVMTCwgcmVwb3J0IGluY3JlYXNlIGluCkBAIC04ODgsOCArODc5LDcgQEAgaGVhcGFtX3Jl bGF0aW9uX2NvcHlfZm9yX2NsdXN0ZXIoUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gTmV3SGVh cCwKIAkJaW5kZXhfZW5kc2NhbihpbmRleFNjYW4pOwogCWlmICh0YWJsZVNjYW4gIT0gTlVMTCkK IAkJdGFibGVfZW5kc2Nhbih0YWJsZVNjYW4pOwotCWlmIChzbG90KQotCQlFeGVjRHJvcFNpbmds ZVR1cGxlVGFibGVTbG90KHNsb3QpOworCUV4ZWNEcm9wU2luZ2xlVHVwbGVUYWJsZVNsb3Qoc2xv dCk7CiAKIAkvKgogCSAqIEluIHNjYW4tYW5kLXNvcnQgbW9kZSwgY29tcGxldGUgdGhlIHNvcnQs IHRoZW4gcmVhZCBvdXQgYWxsIGxpdmUgdHVwbGVzCkBAIC05MDksNiArODk5LDggQEAgaGVhcGFt X3JlbGF0aW9uX2NvcHlfZm9yX2NsdXN0ZXIoUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gTmV3 SGVhcCwKIAkJcGdzdGF0X3Byb2dyZXNzX3VwZGF0ZV9wYXJhbShQUk9HUkVTU19SRVBBQ0tfUEhB U0UsCiAJCQkJCQkJCQkgUFJPR1JFU1NfUkVQQUNLX1BIQVNFX1dSSVRFX05FV19IRUFQKTsKIAor CQlzbG90ID0gTWFrZVNpbmdsZVR1cGxlVGFibGVTbG90KFJlbGF0aW9uR2V0RGVzY3IoT2xkSGVh cCksCisJCQkJCQkJCQkJJlRUU09wc0hlYXBUdXBsZSk7CiAJCWZvciAoOzspCiAJCXsKIAkJCUhl YXBUdXBsZQl0dXBsZTsKQEAgLTkxOSwzMyArOTExLDM2IEBAIGhlYXBhbV9yZWxhdGlvbl9jb3B5 X2Zvcl9jbHVzdGVyKFJlbGF0aW9uIE9sZEhlYXAsIFJlbGF0aW9uIE5ld0hlYXAsCiAJCQlpZiAo dHVwbGUgPT0gTlVMTCkKIAkJCQlicmVhazsKIAorCQkJLyoKKwkJCSAqIFhYWCBJZGVhbGx5IHdl IHNob3VsZCB1c2UgdHVwbGVzb3J0X2dldHR1cGxlc2xvdCgpIGFib3ZlLCBidXQKKwkJCSAqIGl0 IHJldHJpZXZlcyBtaW5pbWFsIHR1cGxlcyBhbmQgdHVwbGVzb3J0X3B1dHR1cGxlc2xvdCgpIGNh bm5vdAorCQkJICogZ2V0IHRoZSB0dXBsZSBkZXNjcmlwdG9yIGZyb20gdHVwbGVzb3J0IGNyZWF0 ZWQgYnkKKwkJCSAqIHR1cGxlc29ydF9iZWdpbl9jbHVzdGVyKCkuCisJCQkgKi8KKwkJCUV4ZWNT dG9yZUhlYXBUdXBsZSh0dXBsZSwgc2xvdCwgZmFsc2UpOworCiAJCQluX3R1cGxlcyArPSAxOwog CQkJaWYgKCFjb25jdXJyZW50KQotCQkJCXJlZm9ybV9hbmRfcmV3cml0ZV90dXBsZSh0dXBsZSwK LQkJCQkJCQkJCQkgT2xkSGVhcCwgTmV3SGVhcCwKLQkJCQkJCQkJCQkgdmFsdWVzLCBpc251bGws Ci0JCQkJCQkJCQkJIHJ3c3RhdGUpOworCQkJCXJlZm9ybV9hbmRfcmV3cml0ZV90dXBsZShzbG90 LCByZWZvcm1fc2xvdCwgcndzdGF0ZSk7CiAJCQllbHNlCi0JCQkJaGVhcF9pbnNlcnRfZm9yX3Jl cGFjayh0dXBsZSwgT2xkSGVhcCwgTmV3SGVhcCwKLQkJCQkJCQkJCSAgIHZhbHVlcywgaXNudWxs LCBiaXN0YXRlKTsKKwkJCQloZWFwX2luc2VydF9mb3JfcmVwYWNrKE5ld0hlYXAsIHNsb3QsIHJl Zm9ybV9zbG90LCBiaXN0YXRlKTsKIAogCQkJLyogUmVwb3J0IG5fdHVwbGVzICovCiAJCQlwZ3N0 YXRfcHJvZ3Jlc3NfdXBkYXRlX3BhcmFtKFBST0dSRVNTX1JFUEFDS19IRUFQX1RVUExFU19JTlNF UlRFRCwKIAkJCQkJCQkJCQkgbl90dXBsZXMpOwogCQl9CiAKKwkJRXhlY0Ryb3BTaW5nbGVUdXBs ZVRhYmxlU2xvdChzbG90KTsKIAkJdHVwbGVzb3J0X2VuZCh0dXBsZXNvcnQpOwogCX0KIAorCUV4 ZWNEcm9wU2luZ2xlVHVwbGVUYWJsZVNsb3QocmVmb3JtX3Nsb3QpOworCiAJLyogV3JpdGUgb3V0 IGFueSByZW1haW5pbmcgdHVwbGVzLCBhbmQgZnN5bmMgaWYgbmVlZGVkICovCiAJaWYgKHJ3c3Rh dGUpCiAJCWVuZF9oZWFwX3Jld3JpdGUocndzdGF0ZSk7CiAJaWYgKGJpc3RhdGUpCiAJCUZyZWVC dWxrSW5zZXJ0U3RhdGUoYmlzdGF0ZSk7Ci0KLQkvKiBDbGVhbiB1cCAqLwotCXBmcmVlKHZhbHVl cyk7Ci0JcGZyZWUoaXNudWxsKTsKIH0KIAogLyoKQEAgLTIzMzcsMjEgKzIzMzIsNDUgQEAgaGVh cGFtX3NjYW5fc2FtcGxlX25leHRfdHVwbGUoVGFibGVTY2FuRGVzYyBzY2FuLCBTYW1wbGVTY2Fu U3RhdGUgKnNjYW5zdGF0ZSwKICAqIGN1cnJlbnRseSBvbmx5IGtub3duIHRvIGhhcHBlbiBhcyBh biBhZnRlci1lZmZlY3Qgb2YgQUxURVIgVEFCTEUKICAqIFNFVCBXSVRIT1VUIE9JRFMuCiAgKgot ICogU28sIHdlIG11c3QgcmVjb25zdHJ1Y3QgdGhlIHR1cGxlIGZyb20gY29tcG9uZW50IERhdHVt cy4KKyAqIFNvLCB3ZSBtdXN0IHJlY29uc3RydWN0IHRoZSB0dXBsZSBmcm9tIGNvbXBvbmVudCBE YXR1bXMuICdyZWZvcm0nIHNsb3QKKyAqIGlzIGEgd29ya3NwYWNlIGZvciB0aGlzIHJlY29uc3Ry dWN0aW9uLgogICovCiBzdGF0aWMgdm9pZAotcmVmb3JtX2FuZF9yZXdyaXRlX3R1cGxlKEhlYXBU dXBsZSB0dXBsZSwKLQkJCQkJCSBSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBOZXdIZWFwLAot CQkJCQkJIERhdHVtICp2YWx1ZXMsIGJvb2wgKmlzbnVsbCwgUmV3cml0ZVN0YXRlIHJ3c3RhdGUp CityZWZvcm1fYW5kX3Jld3JpdGVfdHVwbGUoVHVwbGVUYWJsZVNsb3QgKnNyYywgVHVwbGVUYWJs ZVNsb3QgKnJlZm9ybSwKKwkJCQkJCSBSZXdyaXRlU3RhdGUgcndzdGF0ZSkKIHsKLQlIZWFwVHVw bGUJbmV3dHVwbGU7CisJSGVhcFR1cGxlCXR1cGxlLAorCQkJCW5ld3R1cGxlOworCWJvb2wJCXNo b3VsZEZyZWUsCisJCQkJc2hvdWxkRnJlZU5ldzsKIAotCW5ld3R1cGxlID0gcmVmb3JtX3R1cGxl KHR1cGxlLCBPbGRIZWFwLCBOZXdIZWFwLCB2YWx1ZXMsIGlzbnVsbCk7CisJLyoKKwkgKiBUaGUg b2xkIHR1cGxlIHdpbGwgbm90IGJlIG1vZGlmaWVkLCBzbyBkbyBub3QgcmVxdWVzdCBtYXRlcmlh bGl6YXRpb24uCisJICogKEEgY29weSBjYW4gYmUgY3JlYXRlZCBmb3Igc3BlY2lmaWMgc2xvdCB0 eXBlIHRob3VnaCwgZS5nLgorCSAqIFRUU09wc01pbmltYWxUdXBsZS4pCisJICovCisJdHVwbGUg PSBFeGVjRmV0Y2hTbG90SGVhcFR1cGxlKHNyYywgZmFsc2UsICZzaG91bGRGcmVlKTsKKwlpZiAo dHVwbGVfbmVlZHNfcmVmb3JtKHR1cGxlLCBzcmMtPnR0c190dXBsZURlc2NyaXB0b3IpKQorCXsK KwkJY2xlYXJfZHJvcHBlZF9hdHRyaWJ1dGVzKHR1cGxlLCByZWZvcm0pOworCisJCS8qIE5vIG5l ZWQgdG8gbWF0ZXJpYWxpemUsIGNvcHkgd2lsbCBiZSBjcmVhdGVkIGFueXdheS4gKi8KKwkJQXNz ZXJ0KFRUU19JU19WSVJUVUFMKHJlZm9ybSkpOworCQluZXd0dXBsZSA9IEV4ZWNGZXRjaFNsb3RI ZWFwVHVwbGUocmVmb3JtLCBmYWxzZSwgJnNob3VsZEZyZWVOZXcpOworCX0KKwllbHNlCisJewor CQluZXd0dXBsZSA9IGhlYXBfY29weXR1cGxlKHR1cGxlKTsKKwkJc2hvdWxkRnJlZU5ldyA9IHRy dWU7CisJfQogCiAJLyogVGhlIGhlYXAgcmV3cml0ZSBtb2R1bGUgZG9lcyB0aGUgcmVzdCAqLwog CXJld3JpdGVfaGVhcF90dXBsZShyd3N0YXRlLCB0dXBsZSwgbmV3dHVwbGUpOwogCi0JaGVhcF9m cmVldHVwbGUobmV3dHVwbGUpOworCWlmIChzaG91bGRGcmVlKQorCQloZWFwX2ZyZWV0dXBsZSh0 dXBsZSk7CisJaWYgKHNob3VsZEZyZWVOZXcpCisJCWhlYXBfZnJlZXR1cGxlKG5ld3R1cGxlKTsK IH0KIAogLyoKQEAgLTIzNjMsNiArMjM4Miw5IEBAIHJlZm9ybV9hbmRfcmV3cml0ZV90dXBsZShI ZWFwVHVwbGUgdHVwbGUsCiAgKiBpbmZvcm1hdGlvbikuIFRodXMgd2UgbXVzdCB1c2UgaGVhcF9p bnNlcnQoKSBib3RoIGR1cmluZyB0aGUKICAqIGNhdGNoLXVwIGFuZCBoZXJlLgogICoKKyAqICdy ZWZvcm0nIGlzIGEgc2xvdCB0byB1c2UgZm9yIHR1cGxlICJyZWZvcm1pbmciLCB0eXBpY2FsbHkg dG8gZ2V0IHNldAorICogdmFsdWVzIG9mIGRyb3BwZWQgY29sdW1ucyB0byBOVUxMLgorICoKICAq IFdlIHBhc3MgdGhlIE5PX0xPR0lDQUwgZmxhZyB0byBoZWFwX2luc2VydCgpIGluIG9yZGVyIHRv IHNraXAgbG9naWNhbAogICogZGVjb2Rpbmc6IGFzIHNvb24gYXMgUkVQQUNLIENPTkNVUlJFTlRM WSBzd2FwcyB0aGUgcmVsYXRpb24gZmlsZXMsIGl0IGRyb3BzCiAgKiB0aGlzIHJlbGF0aW9uLCBz byBubyBsb2dpY2FsIHJlcGxpY2F0aW9uIHN1YnNjcmlwdGlvbiBzaG91bGQgbmVlZCB0aGUgZGF0 YS4KQEAgLTIzNzEsNzYgKzIzOTMsNzUgQEAgcmVmb3JtX2FuZF9yZXdyaXRlX3R1cGxlKEhlYXBU dXBsZSB0dXBsZSwKICAqIGNhc2UuCiAgKi8KIHN0YXRpYyB2b2lkCi1oZWFwX2luc2VydF9mb3Jf cmVwYWNrKEhlYXBUdXBsZSB0dXBsZSwgUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gTmV3SGVh cCwKLQkJCQkJICAgRGF0dW0gKnZhbHVlcywgYm9vbCAqaXNudWxsLCBCdWxrSW5zZXJ0U3RhdGUg YmlzdGF0ZSkKK2hlYXBfaW5zZXJ0X2Zvcl9yZXBhY2soUmVsYXRpb24gcmVsLCBUdXBsZVRhYmxl U2xvdCAqc3JjLAorCQkJCQkgICBUdXBsZVRhYmxlU2xvdCAqcmVmb3JtLCBCdWxrSW5zZXJ0U3Rh dGVEYXRhICpiaXN0YXRlKQogewotCUhlYXBUdXBsZQluZXd0dXBsZTsKKwlIZWFwVHVwbGUJdHVw bGU7CisJYm9vbAkJc2hvdWxkRnJlZTsKKwlUdXBsZVRhYmxlU2xvdCAqc2xvdDsKIAotCW5ld3R1 cGxlID0gcmVmb3JtX3R1cGxlKHR1cGxlLCBPbGRIZWFwLCBOZXdIZWFwLCB2YWx1ZXMsIGlzbnVs bCk7CisJdHVwbGUgPSBFeGVjRmV0Y2hTbG90SGVhcFR1cGxlKHNyYywgZmFsc2UsICZzaG91bGRG cmVlKTsKIAotCWhlYXBfaW5zZXJ0KE5ld0hlYXAsIG5ld3R1cGxlLCBHZXRDdXJyZW50Q29tbWFu ZElkKHRydWUpLAotCQkJCUhFQVBfSU5TRVJUX05PX0xPR0lDQUwsIGJpc3RhdGUpOworCS8qCisJ ICogVGhlIHNvdXJjZSBzbG90IGlzIG5vdCBleHBlY3RlZCB0byBjcmVhdGUgYSBjb3B5IG9mIHRo ZSB0dXBsZS4KKwkgKi8KKwlBc3NlcnQoVFRTX0lTX0JVRkZFUlRVUExFKHNyYykpOworCUFzc2Vy dCghc2hvdWxkRnJlZSk7CisKKwlpZiAodHVwbGVfbmVlZHNfcmVmb3JtKHR1cGxlLCBzcmMtPnR0 c190dXBsZURlc2NyaXB0b3IpKQorCXsKKwkJY2xlYXJfZHJvcHBlZF9hdHRyaWJ1dGVzKHR1cGxl LCByZWZvcm0pOworCQlzbG90ID0gcmVmb3JtOworCX0KKwllbHNlCisJCXNsb3QgPSBzcmM7CiAK LQloZWFwX2ZyZWV0dXBsZShuZXd0dXBsZSk7CisJdGFibGVfdHVwbGVfaW5zZXJ0KHJlbCwgc2xv dCwgR2V0Q3VycmVudENvbW1hbmRJZCh0cnVlKSwKKwkJCQkJICAgVEFCTEVfSU5TRVJUX05PX0xP R0lDQUwsIGJpc3RhdGUpOwogfQogCi0vKgotICogU3Vicm91dGluZSBmb3IgcmVmb3JtX2FuZF9y ZXdyaXRlX3R1cGxlIGFuZCBoZWFwX2luc2VydF9mb3JfcmVwYWNrLgotICoKLSAqIERlZm9ybSB0 aGUgZ2l2ZW4gdHVwbGUsIHNldCB2YWx1ZXMgb2YgZHJvcHBlZCBjb2x1bW5zIHRvIE5VTEwsIGFu ZCBmaWxsIGluCi0gKiBhbnkgdmFsdWVzIGZyb20gYXR0bWlzc2luZ3ZhbDsgdGhlbiBmb3JtIGEg bmV3IHR1cGxlIGFuZCByZXR1cm4gaXQuICBJZiBubwotICogYXR0cmlidXRlcyBuZWVkIHRvIGJl IGNoYW5nZWQsIGEgY29weSBvZiB0aGUgb3JpZ2luYWwgdHVwbGUgaXMgcmV0dXJuZWQuCi0gKiBD YWxsZXIgaXMgcmVzcG9uc2libGUgZm9yIGZyZWVpbmcgdGhlIHJldHVybmVkIHR1cGxlLgotICoK LSAqIFhYWCB0aGlzIGNvZGluZyBhc3N1bWVzIHRoYXQgYm90aCByZWxhdGlvbnMgaGF2ZSB0aGUg c2FtZSB0dXBsZWRlc2MuCi0gKi8KLXN0YXRpYyBIZWFwVHVwbGUKLXJlZm9ybV90dXBsZShIZWFw VHVwbGUgdHVwbGUsIFJlbGF0aW9uIE9sZEhlYXAsIFJlbGF0aW9uIE5ld0hlYXAsCi0JCQkgRGF0 dW0gKnZhbHVlcywgYm9vbCAqaXNudWxsKQorc3RhdGljIGJvb2wKK3R1cGxlX25lZWRzX3JlZm9y bShIZWFwVHVwbGUgdHVwbGUsIFR1cGxlRGVzYyB0dXBEZXNjKQogewotCVR1cGxlRGVzYwlvbGRU dXBEZXNjID0gUmVsYXRpb25HZXREZXNjcihPbGRIZWFwKTsKLQlUdXBsZURlc2MJbmV3VHVwRGVz YyA9IFJlbGF0aW9uR2V0RGVzY3IoTmV3SGVhcCk7Ci0JYm9vbAkJbmVlZHNfcmVmb3JtID0gZmFs c2U7Ci0KIAkvKgogCSAqIEEgc2hvcnQgdHVwbGUgbWlnaHQgcmVxdWlyZSB2YWx1ZXMgZnJvbSBh dHRtaXNzaW5nIHZhbCwgc28gYWN0aXZhdGUgdGhlCiAJICogY29kaW5nIHVuY29uZGl0aW9uYWxs eSBpbiB0aGF0IGNhc2UuICBUaGUgdmFsdWUgbWlnaHQgbGVnaXRpbWFsbHkgYmUKIAkgKiBOVUxM IG90aGVyd2lzZSwgc28gdGhpcyBpcyBzbGlnaHRseSB3YXN0ZWZ1bCwgYnV0IGl0IHByb2JhYmx5 IGJlYXRzCiAJICogaGF2aW5nIHRvIHRlc3QgZWFjaCBhdHRyaWJ1dGUgZm9yIHByZXNlbmNlIG9m IGF0dG1pc3Npbmd2YWwgZWFjaCB0aW1lLgogCSAqLwotCWlmIChIZWFwVHVwbGVIZWFkZXJHZXRO YXR0cyh0dXBsZS0+dF9kYXRhKSA8IG5ld1R1cERlc2MtPm5hdHRzKQotCQluZWVkc19yZWZvcm0g PSB0cnVlOworCWlmIChIZWFwVHVwbGVIZWFkZXJHZXROYXR0cyh0dXBsZS0+dF9kYXRhKSA8IHR1 cERlc2MtPm5hdHRzKQorCQlyZXR1cm4gdHJ1ZTsKIAotCS8qCi0JICogSWYgdGhlIGNvbHVtbiBo YXMgYmVlbiBkcm9wcGVkIGJ1dCBhIHZhbHVlIGlzIHN0aWxsIHByZXNlbnQsIHdlIGNhbgotCSAq IG9wdGltaXplIHN0b3JhZ2Ugbm93IGJ5IGdldHRpbmcgcmlkIG9mIGl0LgotCSAqLwotCWlmICgh bmVlZHNfcmVmb3JtKQorCS8qIERvZXMgaXQgaGF2ZSBkcm9wcGVkIGF0dHJpYnV0ZXM/ICovCisJ Zm9yIChpbnQgaSA9IDA7IGkgPCB0dXBEZXNjLT5uYXR0czsgaSsrKQogCXsKLQkJZm9yIChpbnQg aSA9IDA7IGkgPCBuZXdUdXBEZXNjLT5uYXR0czsgaSsrKQotCQl7Ci0JCQlpZiAoVHVwbGVEZXNj Q29tcGFjdEF0dHIobmV3VHVwRGVzYywgaSktPmF0dGlzZHJvcHBlZCAmJgotCQkJCSFoZWFwX2F0 dGlzbnVsbCh0dXBsZSwgaSArIDEsIG5ld1R1cERlc2MpKQotCQkJewotCQkJCW5lZWRzX3JlZm9y bSA9IHRydWU7Ci0JCQkJYnJlYWs7Ci0JCQl9Ci0JCX0KKwkJaWYgKFR1cGxlRGVzY0NvbXBhY3RB dHRyKHR1cERlc2MsIGkpLT5hdHRpc2Ryb3BwZWQgJiYKKwkJCSFoZWFwX2F0dGlzbnVsbCh0dXBs ZSwgaSArIDEsIHR1cERlc2MpKQorCQkJcmV0dXJuIHRydWU7CiAJfQogCi0JLyogU2tpcCB3b3Jr IGlmIG5vIGNoYW5nZXMgYXJlIG5lZWRlZCAqLwotCWlmICghbmVlZHNfcmVmb3JtKQotCQlyZXR1 cm4gaGVhcF9jb3B5dHVwbGUodHVwbGUpOworCXJldHVybiBmYWxzZTsKK30KIAotCWhlYXBfZGVm b3JtX3R1cGxlKHR1cGxlLCBvbGRUdXBEZXNjLCB2YWx1ZXMsIGlzbnVsbCk7CisvKgorICogU3Vi cm91dGluZSBmb3IgcmVmb3JtX2FuZF9yZXdyaXRlX3R1cGxlIGFuZCBoZWFwX2luc2VydF9mb3Jf cmVwYWNrLgorICoKKyAqIFNldCB2YWx1ZXMgb2YgZHJvcHBlZCBjb2x1bW5zIHRvIE5VTEwsCisg Ki8KK3N0YXRpYyB2b2lkCitjbGVhcl9kcm9wcGVkX2F0dHJpYnV0ZXMoSGVhcFR1cGxlIHR1cGxl LCBUdXBsZVRhYmxlU2xvdCAqcmVmb3JtKQoreworCVR1cGxlRGVzYwl0dXBEZXNjID0gcmVmb3Jt LT50dHNfdHVwbGVEZXNjcmlwdG9yOworCisJLyogQXNzdW1pbmcgJ3JlZm9ybScgaXMgdmlydHVh bCwgdGhpcyBkZWZvcm1zIHRoZSB0dXBsZS4gKi8KKwlBc3NlcnQoVFRTX0lTX1ZJUlRVQUwocmVm b3JtKSk7CisJRXhlY0ZvcmNlU3RvcmVIZWFwVHVwbGUodHVwbGUsIHJlZm9ybSwgZmFsc2UpOwog Ci0JZm9yIChpbnQgaSA9IDA7IGkgPCBuZXdUdXBEZXNjLT5uYXR0czsgaSsrKQorCWZvciAoaW50 IGkgPSAwOyBpIDwgdHVwRGVzYy0+bmF0dHM7IGkrKykKIAl7Ci0JCWlmIChUdXBsZURlc2NDb21w YWN0QXR0cihuZXdUdXBEZXNjLCBpKS0+YXR0aXNkcm9wcGVkKQotCQkJaXNudWxsW2ldID0gdHJ1 ZTsKKwkJaWYgKFR1cGxlRGVzY0NvbXBhY3RBdHRyKHR1cERlc2MsIGkpLT5hdHRpc2Ryb3BwZWQp CisJCQlyZWZvcm0tPnR0c19pc251bGxbaV0gPSB0cnVlOwogCX0KLQotCXJldHVybiBoZWFwX2Zv cm1fdHVwbGUobmV3VHVwRGVzYywgdmFsdWVzLCBpc251bGwpOwogfQogCiAvKgotLSAKMi41MS4w Cgo= --=-=-= Content-Type: application/mbox Content-Disposition: attachment; filename=v05-0003-Move-functions-to-repack.c.patch Content-Transfer-Encoding: base64 RnJvbSA4ZjliZWZjOTc3MDQ3NGI5YmZkMjI1NGM2NDljMTE2YjI4YzAxMjUxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmluIEhvdXNrYSA8YWhAY3liZXJ0ZWMuYXQ+CkRhdGU6 IFR1ZSwgMTAgTm92IDIwMjYgMTE6NDQ6MzkgKzAxMDAKU3ViamVjdDogW1BBVENIIDMvOV0gTW92 ZSBmdW5jdGlvbnMgdG8gcmVwYWNrLmMuCgpJbiB0aGUgbmV4dCBwYXRjaGVzLCB0aGUgZnVuY3Rp b25zIHdpbGwgYmUgY2FsbGVkIGZyb20gb3RoZXIgbW9kdWxlcy4gVXNlIGEKc2VwYXJhdGUgZGlm ZiBmb3IgdGhlIG1vdmUgc28gdGhhdCB0aGUgZm9sbG93aW5nIGRpZmZzIGFyZSBhIGJpdCBlYXNp ZXIgdG8KcmVhZC4KLS0tCiBzcmMvYmFja2VuZC9hY2Nlc3MvaGVhcC9oZWFwYW1faGFuZGxlci5j IHwgOTcgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBzcmMvYmFja2VuZC9jb21tYW5kcy9yZXBh Y2suYyAgICAgICAgICAgIHwgOTEgKysrKysrKysrKysrKysrKysrKysrKwogc3JjL2luY2x1ZGUv Y29tbWFuZHMvcmVwYWNrLmggICAgICAgICAgICB8ICA3ICsrCiAzIGZpbGVzIGNoYW5nZWQsIDk5 IGluc2VydGlvbnMoKyksIDk2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5k L2FjY2Vzcy9oZWFwL2hlYXBhbV9oYW5kbGVyLmMgYi9zcmMvYmFja2VuZC9hY2Nlc3MvaGVhcC9o ZWFwYW1faGFuZGxlci5jCmluZGV4IDIzOGFjYWU5M2RhLi4zM2E3YWNlMjc1YiAxMDA2NDQKLS0t IGEvc3JjL2JhY2tlbmQvYWNjZXNzL2hlYXAvaGVhcGFtX2hhbmRsZXIuYworKysgYi9zcmMvYmFj a2VuZC9hY2Nlc3MvaGVhcC9oZWFwYW1faGFuZGxlci5jCkBAIC0zNCw2ICszNCw3IEBACiAjaW5j bHVkZSAiY2F0YWxvZy9zdG9yYWdlLmgiCiAjaW5jbHVkZSAiY2F0YWxvZy9zdG9yYWdlX3hsb2cu aCIKICNpbmNsdWRlICJjb21tYW5kcy9wcm9ncmVzcy5oIgorI2luY2x1ZGUgImNvbW1hbmRzL3Jl cGFjay5oIgogI2luY2x1ZGUgImV4ZWN1dG9yL2V4ZWN1dG9yLmgiCiAjaW5jbHVkZSAibWlzY2Fk bWluLmgiCiAjaW5jbHVkZSAicGdzdGF0LmgiCkBAIC01MCwxMSArNTEsNiBAQAogCiBzdGF0aWMg dm9pZCByZWZvcm1fYW5kX3Jld3JpdGVfdHVwbGUoVHVwbGVUYWJsZVNsb3QgKnNyYywgVHVwbGVU YWJsZVNsb3QgKnJlZm9ybSwKIAkJCQkJCQkJCSBSZXdyaXRlU3RhdGUgcndzdGF0ZSk7Ci1zdGF0 aWMgdm9pZCBoZWFwX2luc2VydF9mb3JfcmVwYWNrKFJlbGF0aW9uIHJlbCwgVHVwbGVUYWJsZVNs b3QgKnNyYywKLQkJCQkJCQkJICAgVHVwbGVUYWJsZVNsb3QgKnJlZm9ybSwKLQkJCQkJCQkJICAg QnVsa0luc2VydFN0YXRlRGF0YSAqYmlzdGF0ZSk7Ci1zdGF0aWMgYm9vbCB0dXBsZV9uZWVkc19y ZWZvcm0oSGVhcFR1cGxlIHR1cGxlLCBUdXBsZURlc2MgdHVwRGVzYyk7Ci1zdGF0aWMgdm9pZCBj bGVhcl9kcm9wcGVkX2F0dHJpYnV0ZXMoSGVhcFR1cGxlIHR1cGxlLCBUdXBsZVRhYmxlU2xvdCAq cmVmb3JtKTsKIAogc3RhdGljIGJvb2wgU2FtcGxlSGVhcFR1cGxlVmlzaWJsZShUYWJsZVNjYW5E ZXNjIHNjYW4sIEJ1ZmZlciBidWZmZXIsCiAJCQkJCQkJCSAgIEhlYXBUdXBsZSB0dXBsZSwKQEAg LTIzNzMsOTcgKzIzNjksNiBAQCByZWZvcm1fYW5kX3Jld3JpdGVfdHVwbGUoVHVwbGVUYWJsZVNs b3QgKnNyYywgVHVwbGVUYWJsZVNsb3QgKnJlZm9ybSwKIAkJaGVhcF9mcmVldHVwbGUobmV3dHVw bGUpOwogfQogCi0vKgotICogSW5zZXJ0IHR1cGxlIHdoZW4gcHJvY2Vzc2luZyBSRVBBQ0sgQ09O Q1VSUkVOVExZLgotICoKLSAqIHJld3JpdGVoZWFwLmMgaXMgbm90IHVzZWQgaW4gdGhlIENPTkNV UlJFTlRMWSBjYXNlIGJlY2F1c2UgaXQnZCBiZQotICogZGlmZmljdWx0IHRvIGRvIHRoZSBzYW1l IGluIHRoZSBjYXRjaC11cCBwaGFzZSAoYXMgdGhlIGxvZ2ljYWwKLSAqIGRlY29kaW5nIGRvZXMg bm90IHByb3ZpZGUgdXMgd2l0aCBzdWZmaWNpZW50IHZpc2liaWxpdHkKLSAqIGluZm9ybWF0aW9u KS4gVGh1cyB3ZSBtdXN0IHVzZSBoZWFwX2luc2VydCgpIGJvdGggZHVyaW5nIHRoZQotICogY2F0 Y2gtdXAgYW5kIGhlcmUuCi0gKgotICogJ3JlZm9ybScgaXMgYSBzbG90IHRvIHVzZSBmb3IgdHVw bGUgInJlZm9ybWluZyIsIHR5cGljYWxseSB0byBnZXQgc2V0Ci0gKiB2YWx1ZXMgb2YgZHJvcHBl ZCBjb2x1bW5zIHRvIE5VTEwuCi0gKgotICogV2UgcGFzcyB0aGUgTk9fTE9HSUNBTCBmbGFnIHRv IGhlYXBfaW5zZXJ0KCkgaW4gb3JkZXIgdG8gc2tpcCBsb2dpY2FsCi0gKiBkZWNvZGluZzogYXMg c29vbiBhcyBSRVBBQ0sgQ09OQ1VSUkVOVExZIHN3YXBzIHRoZSByZWxhdGlvbiBmaWxlcywgaXQg ZHJvcHMKLSAqIHRoaXMgcmVsYXRpb24sIHNvIG5vIGxvZ2ljYWwgcmVwbGljYXRpb24gc3Vic2Ny aXB0aW9uIHNob3VsZCBuZWVkIHRoZSBkYXRhLgotICoKLSAqIEJ1bGtJbnNlcnRTdGF0ZSBpcyB1 c2VkIGJlY2F1c2UgbWFueSB0dXBsZXMgYXJlIGluc2VydGVkIGluIHRoZSB0eXBpY2FsCi0gKiBj YXNlLgotICovCi1zdGF0aWMgdm9pZAotaGVhcF9pbnNlcnRfZm9yX3JlcGFjayhSZWxhdGlvbiBy ZWwsIFR1cGxlVGFibGVTbG90ICpzcmMsCi0JCQkJCSAgIFR1cGxlVGFibGVTbG90ICpyZWZvcm0s IEJ1bGtJbnNlcnRTdGF0ZURhdGEgKmJpc3RhdGUpCi17Ci0JSGVhcFR1cGxlCXR1cGxlOwotCWJv b2wJCXNob3VsZEZyZWU7Ci0JVHVwbGVUYWJsZVNsb3QgKnNsb3Q7Ci0KLQl0dXBsZSA9IEV4ZWNG ZXRjaFNsb3RIZWFwVHVwbGUoc3JjLCBmYWxzZSwgJnNob3VsZEZyZWUpOwotCi0JLyoKLQkgKiBU aGUgc291cmNlIHNsb3QgaXMgbm90IGV4cGVjdGVkIHRvIGNyZWF0ZSBhIGNvcHkgb2YgdGhlIHR1 cGxlLgotCSAqLwotCUFzc2VydChUVFNfSVNfQlVGRkVSVFVQTEUoc3JjKSk7Ci0JQXNzZXJ0KCFz aG91bGRGcmVlKTsKLQotCWlmICh0dXBsZV9uZWVkc19yZWZvcm0odHVwbGUsIHNyYy0+dHRzX3R1 cGxlRGVzY3JpcHRvcikpCi0JewotCQljbGVhcl9kcm9wcGVkX2F0dHJpYnV0ZXModHVwbGUsIHJl Zm9ybSk7Ci0JCXNsb3QgPSByZWZvcm07Ci0JfQotCWVsc2UKLQkJc2xvdCA9IHNyYzsKLQotCXRh YmxlX3R1cGxlX2luc2VydChyZWwsIHNsb3QsIEdldEN1cnJlbnRDb21tYW5kSWQodHJ1ZSksCi0J CQkJCSAgIFRBQkxFX0lOU0VSVF9OT19MT0dJQ0FMLCBiaXN0YXRlKTsKLX0KLQotc3RhdGljIGJv b2wKLXR1cGxlX25lZWRzX3JlZm9ybShIZWFwVHVwbGUgdHVwbGUsIFR1cGxlRGVzYyB0dXBEZXNj KQotewotCS8qCi0JICogQSBzaG9ydCB0dXBsZSBtaWdodCByZXF1aXJlIHZhbHVlcyBmcm9tIGF0 dG1pc3NpbmcgdmFsLCBzbyBhY3RpdmF0ZSB0aGUKLQkgKiBjb2RpbmcgdW5jb25kaXRpb25hbGx5 IGluIHRoYXQgY2FzZS4gIFRoZSB2YWx1ZSBtaWdodCBsZWdpdGltYWxseSBiZQotCSAqIE5VTEwg b3RoZXJ3aXNlLCBzbyB0aGlzIGlzIHNsaWdodGx5IHdhc3RlZnVsLCBidXQgaXQgcHJvYmFibHkg YmVhdHMKLQkgKiBoYXZpbmcgdG8gdGVzdCBlYWNoIGF0dHJpYnV0ZSBmb3IgcHJlc2VuY2Ugb2Yg YXR0bWlzc2luZ3ZhbCBlYWNoIHRpbWUuCi0JICovCi0JaWYgKEhlYXBUdXBsZUhlYWRlckdldE5h dHRzKHR1cGxlLT50X2RhdGEpIDwgdHVwRGVzYy0+bmF0dHMpCi0JCXJldHVybiB0cnVlOwotCi0J LyogRG9lcyBpdCBoYXZlIGRyb3BwZWQgYXR0cmlidXRlcz8gKi8KLQlmb3IgKGludCBpID0gMDsg aSA8IHR1cERlc2MtPm5hdHRzOyBpKyspCi0JewotCQlpZiAoVHVwbGVEZXNjQ29tcGFjdEF0dHIo dHVwRGVzYywgaSktPmF0dGlzZHJvcHBlZCAmJgotCQkJIWhlYXBfYXR0aXNudWxsKHR1cGxlLCBp ICsgMSwgdHVwRGVzYykpCi0JCQlyZXR1cm4gdHJ1ZTsKLQl9Ci0KLQlyZXR1cm4gZmFsc2U7Ci19 Ci0KLS8qCi0gKiBTdWJyb3V0aW5lIGZvciByZWZvcm1fYW5kX3Jld3JpdGVfdHVwbGUgYW5kIGhl YXBfaW5zZXJ0X2Zvcl9yZXBhY2suCi0gKgotICogU2V0IHZhbHVlcyBvZiBkcm9wcGVkIGNvbHVt bnMgdG8gTlVMTCwKLSAqLwotc3RhdGljIHZvaWQKLWNsZWFyX2Ryb3BwZWRfYXR0cmlidXRlcyhI ZWFwVHVwbGUgdHVwbGUsIFR1cGxlVGFibGVTbG90ICpyZWZvcm0pCi17Ci0JVHVwbGVEZXNjCXR1 cERlc2MgPSByZWZvcm0tPnR0c190dXBsZURlc2NyaXB0b3I7Ci0KLQkvKiBBc3N1bWluZyAncmVm b3JtJyBpcyB2aXJ0dWFsLCB0aGlzIGRlZm9ybXMgdGhlIHR1cGxlLiAqLwotCUFzc2VydChUVFNf SVNfVklSVFVBTChyZWZvcm0pKTsKLQlFeGVjRm9yY2VTdG9yZUhlYXBUdXBsZSh0dXBsZSwgcmVm b3JtLCBmYWxzZSk7Ci0KLQlmb3IgKGludCBpID0gMDsgaSA8IHR1cERlc2MtPm5hdHRzOyBpKysp Ci0JewotCQlpZiAoVHVwbGVEZXNjQ29tcGFjdEF0dHIodHVwRGVzYywgaSktPmF0dGlzZHJvcHBl ZCkKLQkJCXJlZm9ybS0+dHRzX2lzbnVsbFtpXSA9IHRydWU7Ci0JfQotfQotCiAvKgogICogQ2hl Y2sgdmlzaWJpbGl0eSBvZiB0aGUgdHVwbGUuCiAgKi8KZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5k L2NvbW1hbmRzL3JlcGFjay5jIGIvc3JjL2JhY2tlbmQvY29tbWFuZHMvcmVwYWNrLmMKaW5kZXgg ZjJjMjdkZDA3MjQuLjQxZTcwNTVlMjliIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9jb21tYW5k cy9yZXBhY2suYworKysgYi9zcmMvYmFja2VuZC9jb21tYW5kcy9yZXBhY2suYwpAQCAtMTM4Niw2 ICsxMzg2LDk3IEBAIG1ha2VfbmV3X2hlYXAoT2lkIE9JRE9sZEhlYXAsIE9pZCBOZXdUYWJsZVNw YWNlLCBPaWQgTmV3QWNjZXNzTWV0aG9kLAogCXJldHVybiBPSUROZXdIZWFwOwogfQogCisvKgor ICogSW5zZXJ0IHR1cGxlIHdoZW4gcHJvY2Vzc2luZyBSRVBBQ0sgQ09OQ1VSUkVOVExZLgorICoK KyAqIHJld3JpdGVoZWFwLmMgaXMgbm90IHVzZWQgaW4gdGhlIENPTkNVUlJFTlRMWSBjYXNlIGJl Y2F1c2UgaXQnZCBiZQorICogZGlmZmljdWx0IHRvIGRvIHRoZSBzYW1lIGluIHRoZSBjYXRjaC11 cCBwaGFzZSAoYXMgdGhlIGxvZ2ljYWwKKyAqIGRlY29kaW5nIGRvZXMgbm90IHByb3ZpZGUgdXMg d2l0aCBzdWZmaWNpZW50IHZpc2liaWxpdHkKKyAqIGluZm9ybWF0aW9uKS4gVGh1cyB3ZSBtdXN0 IHVzZSBoZWFwX2luc2VydCgpIGJvdGggZHVyaW5nIHRoZQorICogY2F0Y2gtdXAgYW5kIGhlcmUu CisgKgorICogJ3JlZm9ybScgaXMgYSBzbG90IHRvIHVzZSBmb3IgdHVwbGUgInJlZm9ybWluZyIs IHR5cGljYWxseSB0byBnZXQgc2V0CisgKiB2YWx1ZXMgb2YgZHJvcHBlZCBjb2x1bW5zIHRvIE5V TEwuCisgKgorICogV2UgcGFzcyB0aGUgTk9fTE9HSUNBTCBmbGFnIHRvIGhlYXBfaW5zZXJ0KCkg aW4gb3JkZXIgdG8gc2tpcCBsb2dpY2FsCisgKiBkZWNvZGluZzogYXMgc29vbiBhcyBSRVBBQ0sg Q09OQ1VSUkVOVExZIHN3YXBzIHRoZSByZWxhdGlvbiBmaWxlcywgaXQgZHJvcHMKKyAqIHRoaXMg cmVsYXRpb24sIHNvIG5vIGxvZ2ljYWwgcmVwbGljYXRpb24gc3Vic2NyaXB0aW9uIHNob3VsZCBu ZWVkIHRoZSBkYXRhLgorICoKKyAqIEJ1bGtJbnNlcnRTdGF0ZSBpcyB1c2VkIGJlY2F1c2UgbWFu eSB0dXBsZXMgYXJlIGluc2VydGVkIGluIHRoZSB0eXBpY2FsCisgKiBjYXNlLgorICovCit2b2lk CitoZWFwX2luc2VydF9mb3JfcmVwYWNrKFJlbGF0aW9uIHJlbCwgVHVwbGVUYWJsZVNsb3QgKnNy YywKKwkJCQkJICAgVHVwbGVUYWJsZVNsb3QgKnJlZm9ybSwgQnVsa0luc2VydFN0YXRlRGF0YSAq YmlzdGF0ZSkKK3sKKwlIZWFwVHVwbGUJdHVwbGU7CisJYm9vbAkJc2hvdWxkRnJlZTsKKwlUdXBs ZVRhYmxlU2xvdCAqc2xvdDsKKworCXR1cGxlID0gRXhlY0ZldGNoU2xvdEhlYXBUdXBsZShzcmMs IGZhbHNlLCAmc2hvdWxkRnJlZSk7CisKKwkvKgorCSAqIFRoZSBzb3VyY2Ugc2xvdCBpcyBub3Qg ZXhwZWN0ZWQgdG8gY3JlYXRlIGEgY29weSBvZiB0aGUgdHVwbGUuCisJICovCisJQXNzZXJ0KFRU U19JU19CVUZGRVJUVVBMRShzcmMpKTsKKwlBc3NlcnQoIXNob3VsZEZyZWUpOworCisJaWYgKHR1 cGxlX25lZWRzX3JlZm9ybSh0dXBsZSwgc3JjLT50dHNfdHVwbGVEZXNjcmlwdG9yKSkKKwl7CisJ CWNsZWFyX2Ryb3BwZWRfYXR0cmlidXRlcyh0dXBsZSwgcmVmb3JtKTsKKwkJc2xvdCA9IHJlZm9y bTsKKwl9CisJZWxzZQorCQlzbG90ID0gc3JjOworCisJdGFibGVfdHVwbGVfaW5zZXJ0KHJlbCwg c2xvdCwgR2V0Q3VycmVudENvbW1hbmRJZCh0cnVlKSwKKwkJCQkJICAgVEFCTEVfSU5TRVJUX05P X0xPR0lDQUwsIGJpc3RhdGUpOworfQorCitib29sCit0dXBsZV9uZWVkc19yZWZvcm0oSGVhcFR1 cGxlIHR1cGxlLCBUdXBsZURlc2MgdHVwRGVzYykKK3sKKwkvKgorCSAqIEEgc2hvcnQgdHVwbGUg bWlnaHQgcmVxdWlyZSB2YWx1ZXMgZnJvbSBhdHRtaXNzaW5nIHZhbCwgc28gYWN0aXZhdGUgdGhl CisJICogY29kaW5nIHVuY29uZGl0aW9uYWxseSBpbiB0aGF0IGNhc2UuICBUaGUgdmFsdWUgbWln aHQgbGVnaXRpbWFsbHkgYmUKKwkgKiBOVUxMIG90aGVyd2lzZSwgc28gdGhpcyBpcyBzbGlnaHRs eSB3YXN0ZWZ1bCwgYnV0IGl0IHByb2JhYmx5IGJlYXRzCisJICogaGF2aW5nIHRvIHRlc3QgZWFj aCBhdHRyaWJ1dGUgZm9yIHByZXNlbmNlIG9mIGF0dG1pc3Npbmd2YWwgZWFjaCB0aW1lLgorCSAq LworCWlmIChIZWFwVHVwbGVIZWFkZXJHZXROYXR0cyh0dXBsZS0+dF9kYXRhKSA8IHR1cERlc2Mt Pm5hdHRzKQorCQlyZXR1cm4gdHJ1ZTsKKworCS8qIERvZXMgaXQgaGF2ZSBkcm9wcGVkIGF0dHJp YnV0ZXM/ICovCisJZm9yIChpbnQgaSA9IDA7IGkgPCB0dXBEZXNjLT5uYXR0czsgaSsrKQorCXsK KwkJaWYgKFR1cGxlRGVzY0NvbXBhY3RBdHRyKHR1cERlc2MsIGkpLT5hdHRpc2Ryb3BwZWQgJiYK KwkJCSFoZWFwX2F0dGlzbnVsbCh0dXBsZSwgaSArIDEsIHR1cERlc2MpKQorCQkJcmV0dXJuIHRy dWU7CisJfQorCisJcmV0dXJuIGZhbHNlOworfQorCisvKgorICogU3Vicm91dGluZSBmb3IgcmVm b3JtX2FuZF9yZXdyaXRlX3R1cGxlIGFuZCBoZWFwX2luc2VydF9mb3JfcmVwYWNrLgorICoKKyAq IFNldCB2YWx1ZXMgb2YgZHJvcHBlZCBjb2x1bW5zIHRvIE5VTEwsCisgKi8KK3ZvaWQKK2NsZWFy X2Ryb3BwZWRfYXR0cmlidXRlcyhIZWFwVHVwbGUgdHVwbGUsIFR1cGxlVGFibGVTbG90ICpyZWZv cm0pCit7CisJVHVwbGVEZXNjCXR1cERlc2MgPSByZWZvcm0tPnR0c190dXBsZURlc2NyaXB0b3I7 CisKKwkvKiBBc3N1bWluZyAncmVmb3JtJyBpcyB2aXJ0dWFsLCB0aGlzIGRlZm9ybXMgdGhlIHR1 cGxlLiAqLworCUFzc2VydChUVFNfSVNfVklSVFVBTChyZWZvcm0pKTsKKwlFeGVjRm9yY2VTdG9y ZUhlYXBUdXBsZSh0dXBsZSwgcmVmb3JtLCBmYWxzZSk7CisKKwlmb3IgKGludCBpID0gMDsgaSA8 IHR1cERlc2MtPm5hdHRzOyBpKyspCisJeworCQlpZiAoVHVwbGVEZXNjQ29tcGFjdEF0dHIodHVw RGVzYywgaSktPmF0dGlzZHJvcHBlZCkKKwkJCXJlZm9ybS0+dHRzX2lzbnVsbFtpXSA9IHRydWU7 CisJfQorfQorCiAvKgogICogRG8gdGhlIHBoeXNpY2FsIGNvcHlpbmcgb2YgdGFibGUgZGF0YS4K ICAqCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9jb21tYW5kcy9yZXBhY2suaCBiL3NyYy9pbmNs dWRlL2NvbW1hbmRzL3JlcGFjay5oCmluZGV4IDQ1ZTU0NDBhMzExLi4yNzEwNWMxMDU5MSAxMDA2 NDQKLS0tIGEvc3JjL2luY2x1ZGUvY29tbWFuZHMvcmVwYWNrLmgKKysrIGIvc3JjL2luY2x1ZGUv Y29tbWFuZHMvcmVwYWNrLmgKQEAgLTE1LDYgKzE1LDggQEAKIAogI2luY2x1ZGUgPHNpZ25hbC5o PgogCisjaW5jbHVkZSAiYWNjZXNzL2hpby5oIgorI2luY2x1ZGUgIm5vZGVzL2V4ZWNub2Rlcy5o IgogI2luY2x1ZGUgIm5vZGVzL3BhcnNlbm9kZXMuaCIKICNpbmNsdWRlICJwYXJzZXIvcGFyc2Vf bm9kZS5oIgogI2luY2x1ZGUgInN0b3JhZ2UvbG9ja2RlZnMuaCIKQEAgLTQ4LDYgKzUwLDExIEBA IGV4dGVybiB2b2lkIG1hcmtfaW5kZXhfY2x1c3RlcmVkKFJlbGF0aW9uIHJlbCwgT2lkIGluZGV4 T2lkLCBib29sIGlzX2ludGVybmFsKTsKIAogZXh0ZXJuIE9pZAltYWtlX25ld19oZWFwKE9pZCBP SURPbGRIZWFwLCBPaWQgTmV3VGFibGVTcGFjZSwgT2lkIE5ld0FjY2Vzc01ldGhvZCwKIAkJCQkJ CSAgY2hhciByZWxwZXJzaXN0ZW5jZSwgTE9DS01PREUgbG9ja21vZGUpOworZXh0ZXJuIHZvaWQg aGVhcF9pbnNlcnRfZm9yX3JlcGFjayhSZWxhdGlvbiByZWwsIFR1cGxlVGFibGVTbG90ICpzcmMs CisJCQkJCQkJCSAgIFR1cGxlVGFibGVTbG90ICpyZWZvcm0sCisJCQkJCQkJCSAgIEJ1bGtJbnNl cnRTdGF0ZURhdGEgKmJpc3RhdGUpOworZXh0ZXJuIGJvb2wgdHVwbGVfbmVlZHNfcmVmb3JtKEhl YXBUdXBsZSB0dXBsZSwgVHVwbGVEZXNjIHR1cERlc2MpOworZXh0ZXJuIHZvaWQgY2xlYXJfZHJv cHBlZF9hdHRyaWJ1dGVzKEhlYXBUdXBsZSB0dXBsZSwgVHVwbGVUYWJsZVNsb3QgKnJlZm9ybSk7 CiBleHRlcm4gdm9pZCBmaW5pc2hfaGVhcF9zd2FwKE9pZCBPSURPbGRIZWFwLCBPaWQgT0lETmV3 SGVhcCwKIAkJCQkJCQkgYm9vbCBpc19zeXN0ZW1fY2F0YWxvZywKIAkJCQkJCQkgYm9vbCBzd2Fw X3RvYXN0X2J5X2NvbnRlbnQsCi0tIAoyLjUxLjAKCg== --=-=-= Content-Type: application/mbox Content-Disposition: attachment; filename=v05-0004-Introduce-RepackDest-structure.patch Content-Transfer-Encoding: base64 RnJvbSA2NjAyYjUzNzdmMTRlMzFkNjJkYjhjZmI5ZTk4OTNiMzUyMmRiZDc2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmluIEhvdXNrYSA8YWhAY3liZXJ0ZWMuYXQ+CkRhdGU6 IFR1ZSwgMTAgTm92IDIwMjYgMTE6NDQ6MzkgKzAxMDAKU3ViamVjdDogW1BBVENIIDQvOV0gSW50 cm9kdWNlIFJlcGFja0Rlc3Qgc3RydWN0dXJlLgoKVGhpcyBpcyBmb3IgQ2hhbmdlQ29udGV4dCB0 byBoYW5kbGUgaW5zZXJ0aW9ucyBpbnRvIHR3byByZWxhdGlvbnM6IGJlc2lkZXMgdGhlCm5ldyBy ZWxhdGlvbiAod2hvc2UgZmlsZSB3aWxsIGV2ZW50dWFsbHkgYmUgdXNlZCBieSB0aGUgUkVQQUNL ZWQgcmVsYXRpb24pLCBhbgoiYXV4aWxpYXJ5IHJlbGF0aW9uIiBpcyBuZWVkZWQgc29tZXRpbWVz LCBpbiBvcmRlciB0byBnZXQgdGhlIGRhdGEgc29ydGVkLiBUaGUKY29uY2VwdCBpcyBpbnRyb2R1 Y2VkIGFuZCBleHBsYWluZWQgbGF0ZXIgaW4gdGhlIHBhdGNoIHNlcmllcy4KLS0tCiBzcmMvYmFj a2VuZC9jb21tYW5kcy9yZXBhY2suYyAgICB8IDIzNSArKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tCiBzcmMvaW5jbHVkZS9jb21tYW5kcy9yZXBhY2suaCAgICB8ICA1MiArKysrKysrCiBz cmMvdG9vbHMvcGdpbmRlbnQvdHlwZWRlZnMubGlzdCB8ICAgMSArCiAzIGZpbGVzIGNoYW5nZWQs IDE2NyBpbnNlcnRpb25zKCspLCAxMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2Jh Y2tlbmQvY29tbWFuZHMvcmVwYWNrLmMgYi9zcmMvYmFja2VuZC9jb21tYW5kcy9yZXBhY2suYwpp bmRleCA0MWU3MDU1ZTI5Yi4uNWZkOGI4ZjYzOWMgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2Nv bW1hbmRzL3JlcGFjay5jCisrKyBiL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFjay5jCkBAIC05 NSw0NiArOTUsNiBAQCB0eXBlZGVmIHN0cnVjdAogCU9pZAkJCWluZGV4T2lkOwogfSBSZWxUb0Ns dXN0ZXI7CiAKLS8qCi0gKiBUaGUgZmlyc3QgZmlsZSBleHBvcnRlZCBieSB0aGUgZGVjb2Rpbmcg d29ya2VyIG11c3QgY29udGFpbiBhIHNuYXBzaG90LCB0aGUKLSAqIGZvbGxvd2luZyBvbmVzIGNv bnRhaW4gdGhlIGRhdGEgY2hhbmdlcy4KLSAqLwotI2RlZmluZSBXT1JLRVJfRklMRV9TTkFQU0hP VAkwCi0KLS8qCi0gKiBJbmZvcm1hdGlvbiBuZWVkZWQgdG8gYXBwbHkgY29uY3VycmVudCBkYXRh IGNoYW5nZXMuCi0gKi8KLXR5cGVkZWYgc3RydWN0IENoYW5nZUNvbnRleHQKLXsKLQkvKiBUaGUg cmVsYXRpb24gdGhlIGNoYW5nZXMgYXJlIGFwcGxpZWQgdG8uICovCi0JUmVsYXRpb24JY2NfcmVs OwotCi0JLyogTmVlZGVkIHRvIHVwZGF0ZSBpbmRleGVzIG9mIGNjX3JlbC4gKi8KLQlSZXN1bHRS ZWxJbmZvICpjY19ycmk7Ci0JRVN0YXRlCSAgICpjY19lc3RhdGU7Ci0KLQkvKgotCSAqIFRoZSB0 dXBsZSBkZXNjcmlwdG9yIHRvIGRlZm9ybSBkZWNvZGVkIHR1cGxlcyB3aXRoOyBpdCBtdXN0IGhh dmUgdGhlCi0JICogYXR0bWlzc2luZ3ZhbCB2YWx1ZXMgZnJvbSB0aGUgcmVsYXRpb24gYmVpbmcg cmVwYWNrZWQuCi0JICovCi0JVHVwbGVEZXNjCWNjX3R1cGRlc2M7Ci0KLQkvKgotCSAqIEV4aXN0 aW5nIHR1cGxlcyB0byBVUERBVEUgYW5kIERFTEVURSBhcmUgbG9jYXRlZCB2aWEgdGhpcyBpbmRl eC4gV2UKLQkgKiBrZWVwIHRoZSBzY2Fua2V5IGluIHBhcnRpYWxseSBpbml0aWFsaXplZCBzdGF0 ZSB0byBhdm9pZCByZXBlYXRlZCB3b3JrLgotCSAqIHNrX2FyZ3VtZW50IGlzIGNvbXBsZXRlZCBv biB0aGUgZmx5LgotCSAqLwotCVJlbGF0aW9uCWNjX2lkZW50X2luZGV4OwotCVNjYW5LZXkJCWNj X2lkZW50X2tleTsKLQlpbnQJCQljY19pZGVudF9rZXlfbmVudHJpZXM7Ci0KLQkvKiBUaGUgbGF0 ZXN0IGNvbHVtbiB3ZSBuZWVkIHRvIGRlZm9ybSB0byBoYXZlIHRoZSB0dXBsZSBpZGVudGl0eSAq LwotCUF0dHJOdW1iZXIJY2NfbGFzdF9rZXlfYXR0bm87Ci0KLQkvKiBTZXF1ZW50aWFsIG51bWJl ciBvZiB0aGUgZmlsZSBjb250YWluaW5nIHRoZSBjaGFuZ2VzLiAqLwotCWludAkJCWNjX2ZpbGVf c2VxOwotfSBDaGFuZ2VDb250ZXh0OwotCiAvKgogICogQmFja2VuZC1sb2NhbCBpbmZvcm1hdGlv biB0byBjb250cm9sIHRoZSBkZWNvZGluZyB3b3JrZXIuCiAgKi8KQEAgLTE4MywyMiArMTQzLDE5 IEBAIHN0YXRpYyBib29sIHJlcGFja19pc19wZXJtaXR0ZWRfZm9yX3JlbGF0aW9uKFJlcGFja0Nv bW1hbmQgY21kLAogCQkJCQkJCQkJCQkgT2lkIHJlbGlkLCBPaWQgdXNlcmlkLAogCQkJCQkJCQkJ CQkgYm9vbCBhbHJlYWR5X2xvY2tlZCk7CiAKLXN0YXRpYyB2b2lkIGFwcGx5X2NvbmN1cnJlbnRf Y2hhbmdlcyhCdWZGaWxlICpmaWxlLCBDaGFuZ2VDb250ZXh0ICpjaGdjeHQpOwotc3RhdGljIHZv aWQgYXBwbHlfY29uY3VycmVudF9pbnNlcnQoUmVsYXRpb24gcmVsLCBUdXBsZVRhYmxlU2xvdCAq c2xvdCwKLQkJCQkJCQkJCUNoYW5nZUNvbnRleHQgKmNoZ2N4dCk7Ci1zdGF0aWMgdm9pZCBhcHBs eV9jb25jdXJyZW50X3VwZGF0ZShSZWxhdGlvbiByZWwsIFR1cGxlVGFibGVTbG90ICpzcGlsbGVk X3R1cGxlLAotCQkJCQkJCQkJVHVwbGVUYWJsZVNsb3QgKm9uZGlza190dXBsZSwKLQkJCQkJCQkJ CUNoYW5nZUNvbnRleHQgKmNoZ2N4dCk7CitzdGF0aWMgdm9pZCBhcHBseV9jb25jdXJyZW50X2No YW5nZXMoQ2hhbmdlQ29udGV4dCAqY2hnY3h0KTsKK3N0YXRpYyB2b2lkIGFwcGx5X2NvbmN1cnJl bnRfaW5zZXJ0KFJlcGFja0Rlc3QgKmRlc3QsIFR1cGxlVGFibGVTbG90ICpzbG90KTsKK3N0YXRp YyB2b2lkIGFwcGx5X2NvbmN1cnJlbnRfdXBkYXRlKFJlcGFja0Rlc3QgKmRlc3QsCisJCQkJCQkJ CQlUdXBsZVRhYmxlU2xvdCAqc3BpbGxlZF90dXBsZSwKKwkJCQkJCQkJCVR1cGxlVGFibGVTbG90 ICpvbmRpc2tfdHVwbGUpOwogc3RhdGljIHZvaWQgYXBwbHlfY29uY3VycmVudF9kZWxldGUoUmVs YXRpb24gcmVsLCBUdXBsZVRhYmxlU2xvdCAqc2xvdCk7CiBzdGF0aWMgdm9pZCByZXN0b3JlX3R1 cGxlKEJ1ZkZpbGUgKmZpbGUsIFJlbGF0aW9uIHJlbGF0aW9uLAogCQkJCQkJICBUdXBsZVRhYmxl U2xvdCAqc2xvdCk7CiBzdGF0aWMgdm9pZCBwcmVwYXJlX2NvbmN1cnJlbnRfdXBkYXRlKFR1cGxl VGFibGVTbG90ICpkZXN0LAogCQkJCQkJCQkJICBUdXBsZVRhYmxlU2xvdCAqc3JjKTsKLXN0YXRp YyBib29sIGZpbmRfdGFyZ2V0X3R1cGxlKFJlbGF0aW9uIHJlbCwgQ2hhbmdlQ29udGV4dCAqY2hn Y3h0LAotCQkJCQkJCSAgVHVwbGVUYWJsZVNsb3QgKmxvY2F0b3IsCitzdGF0aWMgYm9vbCBmaW5k X3RhcmdldF90dXBsZShSZXBhY2tEZXN0ICpkZXN0LCBUdXBsZVRhYmxlU2xvdCAqbG9jYXRvciwK IAkJCQkJCQkgIFR1cGxlVGFibGVTbG90ICpyZXRyaWV2ZWQpOwotc3RhdGljIGJvb2wgaWRlbnRp dHlfa2V5X2VxdWFsKENoYW5nZUNvbnRleHQgKmNoZ2N4dCwKLQkJCQkJCQkgICBUdXBsZVRhYmxl U2xvdCAqbG9jYXRvciwKK3N0YXRpYyBib29sIGlkZW50aXR5X2tleV9lcXVhbChSZXBhY2tEZXN0 ICpkZXN0LCBUdXBsZVRhYmxlU2xvdCAqbG9jYXRvciwKIAkJCQkJCQkgICBUdXBsZVRhYmxlU2xv dCAqY2FuZGlkYXRlKTsKIHN0YXRpYyB2b2lkIHByb2Nlc3NfY29uY3VycmVudF9jaGFuZ2VzKFhM b2dSZWNQdHIgZW5kX29mX3dhbCwKIAkJCQkJCQkJCSAgIENoYW5nZUNvbnRleHQgKmNoZ2N4dCwK QEAgLTIwOCw2ICsxNjUsOSBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplX2NoYW5nZV9jb250ZXh0 KENoYW5nZUNvbnRleHQgKmNoZ2N4dCwKIAkJCQkJCQkJCSAgUmVsYXRpb24gdGd0X3JlbGF0aW9u LAogCQkJCQkJCQkJICBPaWQgaWRlbnRfaW5kZXhfaWQpOwogc3RhdGljIHZvaWQgcmVsZWFzZV9j aGFuZ2VfY29udGV4dChDaGFuZ2VDb250ZXh0ICpjaGdjeHQpOworc3RhdGljIHZvaWQgaW5pdGlh bGl6ZV9jaGFuZ2VfZGVzdChSZXBhY2tEZXN0ICpkZXN0LCBSZWxhdGlvbiByZWxhdGlvbiwKKwkJ CQkJCQkJICAgT2lkIGlkZW50X2luZGV4X2lkKTsKK3N0YXRpYyB2b2lkIHJlbGVhc2VfY2hhbmdl X2Rlc3QoUmVwYWNrRGVzdCAqZGVzdCk7CiBzdGF0aWMgdm9pZCByZWJ1aWxkX3JlbGF0aW9uX2Zp bmlzaF9jb25jdXJyZW50KFJlbGF0aW9uIE5ld0hlYXAsIFJlbGF0aW9uIE9sZEhlYXAsCiAJCQkJ CQkJCQkJCSAgIE9pZCBpZGVudElkeCwKIAkJCQkJCQkJCQkJICAgVHJhbnNhY3Rpb25JZCBmcm96 ZW5YaWQsCkBAIC0yODM2LDE4ICsyNzk2LDMxIEBAIFJlcGFja0NvbW1hbmRBc1N0cmluZyhSZXBh Y2tDb21tYW5kIGNtZCkKIH0KIAogLyoKLSAqIEFwcGx5IGFsbCB0aGUgY2hhbmdlcyBzdG9yZWQg aW4gJ2ZpbGUnLgorICogQXBwbHkgYWxsIHRoZSBjaGFuZ2VzIHByb3ZpZGVkIGJ5IGRlY29kaW5n IHdvcmtlci4KICAqLwogc3RhdGljIHZvaWQKLWFwcGx5X2NvbmN1cnJlbnRfY2hhbmdlcyhCdWZG aWxlICpmaWxlLCBDaGFuZ2VDb250ZXh0ICpjaGdjeHQpCithcHBseV9jb25jdXJyZW50X2NoYW5n ZXMoQ2hhbmdlQ29udGV4dCAqY2hnY3h0KQogewogCUNvbmN1cnJlbnRDaGFuZ2VLaW5kIGtpbmQg PSAnXDAnOwotCVJlbGF0aW9uCXJlbCA9IGNoZ2N4dC0+Y2NfcmVsOworCVJlcGFja0Rlc3QgKmRl c3Q7CisJUmVsYXRpb24JcmVsOwogCVR1cGxlVGFibGVTbG90ICpzcGlsbGVkX3R1cGxlOwogCVR1 cGxlVGFibGVTbG90ICpvbGRfdXBkYXRlX3R1cGxlOwogCVR1cGxlVGFibGVTbG90ICpvbmRpc2tf dHVwbGU7CiAJYm9vbAkJaGF2ZV9vbGRfdHVwbGUgPSBmYWxzZTsKIAlNZW1vcnlDb250ZXh0IG9s ZGN4dDsKKwlEZWNvZGluZ1dvcmtlclNoYXJlZCAqc2hhcmVkOworCWNoYXIJCWZuYW1lW01BWFBH UEFUSF07CisJQnVmRmlsZSAgICAqZmlsZTsKKworCWRlc3QgPSAmY2hnY3h0LT5jY19kZXN0Owor CXJlbCA9IGRlc3QtPnJlbDsKKworCXNoYXJlZCA9IChEZWNvZGluZ1dvcmtlclNoYXJlZCAqKSBk c21fc2VnbWVudF9hZGRyZXNzKGRlY29kaW5nX3dvcmtlci0+c2VnKTsKKworCS8qIE9wZW4gdGhl IGZpbGUgY29udGFpbmluZyB0aGUgY2hhbmdlcy4gKi8KKwlEZWNvZGluZ1dvcmtlckZpbGVOYW1l KGZuYW1lLCBzaGFyZWQtPnJlbGlkLCBjaGdjeHQtPmNjX2ZpbGVfc2VxKTsKKwlmaWxlID0gQnVm RmlsZU9wZW5GaWxlU2V0KCZzaGFyZWQtPnNmcy5mcywgZm5hbWUsIE9fUkRPTkxZLCBmYWxzZSk7 CiAKIAkvKgogCSAqIFNldCB1cCB0aGUgdHVwbGUgdGFibGUgc2xvdHMgZm9yIHRoZSBvcGVyYXRp b25zLgpAQCAtMjg3MCw3ICsyODQzLDcgQEAgYXBwbHlfY29uY3VycmVudF9jaGFuZ2VzKEJ1ZkZp bGUgKmZpbGUsIENoYW5nZUNvbnRleHQgKmNoZ2N4dCkKIAlvbmRpc2tfdHVwbGUgPSBNYWtlU2lu Z2xlVHVwbGVUYWJsZVNsb3QoUmVsYXRpb25HZXREZXNjcihyZWwpLAogCQkJCQkJCQkJCQl0YWJs ZV9zbG90X2NhbGxiYWNrcyhyZWwpKTsKIAotCW9sZGN4dCA9IE1lbW9yeUNvbnRleHRTd2l0Y2hU byhHZXRQZXJUdXBsZU1lbW9yeUNvbnRleHQoY2hnY3h0LT5jY19lc3RhdGUpKTsKKwlvbGRjeHQg PSBNZW1vcnlDb250ZXh0U3dpdGNoVG8oR2V0UGVyVHVwbGVNZW1vcnlDb250ZXh0KGRlc3QtPmVz dGF0ZSkpOwogCiAJd2hpbGUgKHRydWUpCiAJewpAQCAtMjkxOSwxNCArMjg5MiwxNCBAQCBhcHBs eV9jb25jdXJyZW50X2NoYW5nZXMoQnVmRmlsZSAqZmlsZSwgQ2hhbmdlQ29udGV4dCAqY2hnY3h0 KQogCiAJCWlmIChraW5kID09IENIQU5HRV9JTlNFUlQpCiAJCXsKLQkJCWFwcGx5X2NvbmN1cnJl bnRfaW5zZXJ0KHJlbCwgc3BpbGxlZF90dXBsZSwgY2hnY3h0KTsKKwkJCWFwcGx5X2NvbmN1cnJl bnRfaW5zZXJ0KGRlc3QsIHNwaWxsZWRfdHVwbGUpOwogCQl9CiAJCWVsc2UgaWYgKGtpbmQgPT0g Q0hBTkdFX0RFTEVURSkKIAkJewogCQkJYm9vbAkJZm91bmQ7CiAKIAkJCS8qIEZpbmQgdGhlIHR1 cGxlIHRvIGJlIGRlbGV0ZWQgKi8KLQkJCWZvdW5kID0gZmluZF90YXJnZXRfdHVwbGUocmVsLCBj aGdjeHQsIHNwaWxsZWRfdHVwbGUsIG9uZGlza190dXBsZSk7CisJCQlmb3VuZCA9IGZpbmRfdGFy Z2V0X3R1cGxlKGRlc3QsIHNwaWxsZWRfdHVwbGUsIG9uZGlza190dXBsZSk7CiAJCQlpZiAoIWZv dW5kKQogCQkJCWVsb2coRVJST1IsICJjb3VsZCBub3QgZmluZCB0YXJnZXQgdHVwbGUiKTsKIAkJ CWFwcGx5X2NvbmN1cnJlbnRfZGVsZXRlKHJlbCwgb25kaXNrX3R1cGxlKTsKQEAgLTI5NDIsNyAr MjkxNSw3IEBAIGFwcGx5X2NvbmN1cnJlbnRfY2hhbmdlcyhCdWZGaWxlICpmaWxlLCBDaGFuZ2VD b250ZXh0ICpjaGdjeHQpCiAJCQkJa2V5ID0gc3BpbGxlZF90dXBsZTsKIAogCQkJLyogRmluZCB0 aGUgdHVwbGUgdG8gYmUgdXBkYXRlZCBvciBkZWxldGVkLiAqLwotCQkJZm91bmQgPSBmaW5kX3Rh cmdldF90dXBsZShyZWwsIGNoZ2N4dCwga2V5LCBvbmRpc2tfdHVwbGUpOworCQkJZm91bmQgPSBm aW5kX3RhcmdldF90dXBsZShkZXN0LCBrZXksIG9uZGlza190dXBsZSk7CiAJCQlpZiAoIWZvdW5k KQogCQkJCWVsb2coRVJST1IsICJjb3VsZCBub3QgZmluZCB0YXJnZXQgdHVwbGUiKTsKIApAQCAt Mjk1Myw3ICsyOTI2LDcgQEAgYXBwbHlfY29uY3VycmVudF9jaGFuZ2VzKEJ1ZkZpbGUgKmZpbGUs IENoYW5nZUNvbnRleHQgKmNoZ2N4dCkKIAkJCSAqLwogCQkJcHJlcGFyZV9jb25jdXJyZW50X3Vw ZGF0ZShzcGlsbGVkX3R1cGxlLCBvbmRpc2tfdHVwbGUpOwogCi0JCQlhcHBseV9jb25jdXJyZW50 X3VwZGF0ZShyZWwsIHNwaWxsZWRfdHVwbGUsIG9uZGlza190dXBsZSwgY2hnY3h0KTsKKwkJCWFw cGx5X2NvbmN1cnJlbnRfdXBkYXRlKGRlc3QsIHNwaWxsZWRfdHVwbGUsIG9uZGlza190dXBsZSk7 CiAKIAkJCUV4ZWNDbGVhclR1cGxlKG9sZF91cGRhdGVfdHVwbGUpOwogCQkJaGF2ZV9vbGRfdHVw bGUgPSBmYWxzZTsKQEAgLTI5NjEsNyArMjkzNCw3IEBAIGFwcGx5X2NvbmN1cnJlbnRfY2hhbmdl cyhCdWZGaWxlICpmaWxlLCBDaGFuZ2VDb250ZXh0ICpjaGdjeHQpCiAJCWVsc2UKIAkJCWVsb2co RVJST1IsICJ1bnJlY29nbml6ZWQga2luZCBvZiBjaGFuZ2U6ICVkIiwga2luZCk7CiAKLQkJUmVz ZXRQZXJUdXBsZUV4cHJDb250ZXh0KGNoZ2N4dC0+Y2NfZXN0YXRlKTsKKwkJUmVzZXRQZXJUdXBs ZUV4cHJDb250ZXh0KGRlc3QtPmVzdGF0ZSk7CiAJfQogCiAJLyogQ2xlYW51cC4gKi8KQEAgLTI5 NzAsNiArMjk0Myw4IEBAIGFwcGx5X2NvbmN1cnJlbnRfY2hhbmdlcyhCdWZGaWxlICpmaWxlLCBD aGFuZ2VDb250ZXh0ICpjaGdjeHQpCiAJRXhlY0Ryb3BTaW5nbGVUdXBsZVRhYmxlU2xvdChvbGRf dXBkYXRlX3R1cGxlKTsKIAogCU1lbW9yeUNvbnRleHRTd2l0Y2hUbyhvbGRjeHQpOworCisJQnVm RmlsZUNsb3NlKGZpbGUpOwogfQogCiAvKgpAQCAtMjk3NywxNiArMjk1MiwxNSBAQCBhcHBseV9j b25jdXJyZW50X2NoYW5nZXMoQnVmRmlsZSAqZmlsZSwgQ2hhbmdlQ29udGV4dCAqY2hnY3h0KQog ICogdGFibGUuCiAgKi8KIHN0YXRpYyB2b2lkCi1hcHBseV9jb25jdXJyZW50X2luc2VydChSZWxh dGlvbiByZWwsIFR1cGxlVGFibGVTbG90ICpzbG90LAotCQkJCQkJQ2hhbmdlQ29udGV4dCAqY2hn Y3h0KQorYXBwbHlfY29uY3VycmVudF9pbnNlcnQoUmVwYWNrRGVzdCAqZGVzdCwgVHVwbGVUYWJs ZVNsb3QgKnNsb3QpCiB7CiAJLyogUHV0IHRoZSB0dXBsZSBpbiB0aGUgdGFibGUsIGJ1dCBtYWtl IHN1cmUgaXQgd29uJ3QgYmUgZGVjb2RlZCAqLwotCXRhYmxlX3R1cGxlX2luc2VydChyZWwsIHNs b3QsIEdldEN1cnJlbnRDb21tYW5kSWQodHJ1ZSksCisJdGFibGVfdHVwbGVfaW5zZXJ0KGRlc3Qt PnJlbCwgc2xvdCwgR2V0Q3VycmVudENvbW1hbmRJZCh0cnVlKSwKIAkJCQkJICAgVEFCTEVfSU5T RVJUX05PX0xPR0lDQUwsIE5VTEwpOwogCiAJLyogVXBkYXRlIGluZGV4ZXMgd2l0aCB0aGlzIG5l dyB0dXBsZS4gKi8KLQlFeGVjSW5zZXJ0SW5kZXhUdXBsZXMoY2hnY3h0LT5jY19ycmksCi0JCQkJ CQkgIGNoZ2N4dC0+Y2NfZXN0YXRlLAorCUV4ZWNJbnNlcnRJbmRleFR1cGxlcyhkZXN0LT5ycmks CisJCQkJCQkgIGRlc3QtPmVzdGF0ZSwKIAkJCQkJCSAgMCwKIAkJCQkJCSAgc2xvdCwKIAkJCQkJ CSAgTklMLCBOVUxMKTsKQEAgLTI5OTgsMTAgKzI5NzIsMTAgQEAgYXBwbHlfY29uY3VycmVudF9p bnNlcnQoUmVsYXRpb24gcmVsLCBUdXBsZVRhYmxlU2xvdCAqc2xvdCwKICAqIHRhYmxlLgogICov CiBzdGF0aWMgdm9pZAotYXBwbHlfY29uY3VycmVudF91cGRhdGUoUmVsYXRpb24gcmVsLCBUdXBs ZVRhYmxlU2xvdCAqc3BpbGxlZF90dXBsZSwKLQkJCQkJCVR1cGxlVGFibGVTbG90ICpvbmRpc2tf dHVwbGUsCi0JCQkJCQlDaGFuZ2VDb250ZXh0ICpjaGdjeHQpCithcHBseV9jb25jdXJyZW50X3Vw ZGF0ZShSZXBhY2tEZXN0ICpkZXN0LCBUdXBsZVRhYmxlU2xvdCAqc3BpbGxlZF90dXBsZSwKKwkJ CQkJCVR1cGxlVGFibGVTbG90ICpvbmRpc2tfdHVwbGUpCiB7CisJUmVsYXRpb24JcmVsID0gZGVz dC0+cmVsOwogCUxvY2tUdXBsZU1vZGUgbG9ja21vZGU7CiAJVE1fRmFpbHVyZURhdGEgdG1mZDsK IAlUVV9VcGRhdGVJbmRleGVzIHVwZGF0ZV9pbmRleGVzOwpAQCAtMzAyOSw4ICszMDAzLDggQEAg YXBwbHlfY29uY3VycmVudF91cGRhdGUoUmVsYXRpb24gcmVsLCBUdXBsZVRhYmxlU2xvdCAqc3Bp bGxlZF90dXBsZSwKIAogCQlpZiAodXBkYXRlX2luZGV4ZXMgPT0gVFVfU3VtbWFyaXppbmcpCiAJ CQlmbGFncyB8PSBFSUlUX09OTFlfU1VNTUFSSVpJTkc7Ci0JCUV4ZWNJbnNlcnRJbmRleFR1cGxl cyhjaGdjeHQtPmNjX3JyaSwKLQkJCQkJCQkgIGNoZ2N4dC0+Y2NfZXN0YXRlLAorCQlFeGVjSW5z ZXJ0SW5kZXhUdXBsZXMoZGVzdC0+cnJpLAorCQkJCQkJCSAgZGVzdC0+ZXN0YXRlLAogCQkJCQkJ CSAgZmxhZ3MsCiAJCQkJCQkJICBzcGlsbGVkX3R1cGxlLAogCQkJCQkJCSAgTklMLCBOVUxMKTsK QEAgLTMxOTcsMTAgKzMxNzEsMTEgQEAgcHJlcGFyZV9jb25jdXJyZW50X3VwZGF0ZShUdXBsZVRh YmxlU2xvdCAqZGVzdCwgVHVwbGVUYWJsZVNsb3QgKnNyYykKICAqIG5vdCBmb3VuZCwgcmV0dXJu IGZhbHNlLgogICovCiBzdGF0aWMgYm9vbAotZmluZF90YXJnZXRfdHVwbGUoUmVsYXRpb24gcmVs LCBDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIFR1cGxlVGFibGVTbG90ICpsb2NhdG9yLAorZmluZF90 YXJnZXRfdHVwbGUoUmVwYWNrRGVzdCAqZGVzdCwgVHVwbGVUYWJsZVNsb3QgKmxvY2F0b3IsCiAJ CQkJICBUdXBsZVRhYmxlU2xvdCAqcmV0cmlldmVkKQogewotCUZvcm1fcGdfaW5kZXggaWR4ID0g Y2hnY3h0LT5jY19pZGVudF9pbmRleC0+cmRfaW5kZXg7CisJUmVsYXRpb24JcmVsID0gZGVzdC0+ cmVsOworCUZvcm1fcGdfaW5kZXggaWR4ID0gZGVzdC0+aWRlbnRfaW5kZXgtPnJkX2luZGV4Owog CUluZGV4U2NhbkRlc2Mgc2NhbjsKIAlib29sCQlyZXR2YWwgPSBmYWxzZTsKIApAQCAtMzIxMSw5 ICszMTg2LDkgQEAgZmluZF90YXJnZXRfdHVwbGUoUmVsYXRpb24gcmVsLCBDaGFuZ2VDb250ZXh0 ICpjaGdjeHQsIFR1cGxlVGFibGVTbG90ICpsb2NhdG9yLAogCSAqCiAJICogVXNlIHRoZSBpbmNv bWluZyB0dXBsZSB0byBmaW5hbGl6ZSB0aGUgc2NhbiBrZXkuCiAJICovCi0JZm9yIChpbnQgaSA9 IDA7IGkgPCBjaGdjeHQtPmNjX2lkZW50X2tleV9uZW50cmllczsgaSsrKQorCWZvciAoaW50IGkg PSAwOyBpIDwgZGVzdC0+aWRlbnRfa2V5X25lbnRyaWVzOyBpKyspCiAJewotCQlTY2FuS2V5CQll bnRyeSA9ICZjaGdjeHQtPmNjX2lkZW50X2tleVtpXTsKKwkJU2NhbktleQkJZW50cnkgPSAmZGVz dC0+aWRlbnRfa2V5W2ldOwogCQlBdHRyTnVtYmVyCWF0dG5vID0gaWR4LT5pbmRrZXkudmFsdWVz W2ldOwogCiAJCWVudHJ5LT5za19hcmd1bWVudCA9IGxvY2F0b3ItPnR0c192YWx1ZXNbYXR0bm8g LSAxXTsKQEAgLTMyMjEsMTMgKzMxOTYsMTMgQEAgZmluZF90YXJnZXRfdHVwbGUoUmVsYXRpb24g cmVsLCBDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIFR1cGxlVGFibGVTbG90ICpsb2NhdG9yLAogCX0K IAogCS8qIFhYWCBubyBpbnN0cnVtZW50YXRpb24gZm9yIG5vdyAqLwotCXNjYW4gPSBpbmRleF9i ZWdpbnNjYW4ocmVsLCBjaGdjeHQtPmNjX2lkZW50X2luZGV4LCBmYWxzZSwgR2V0QWN0aXZlU25h cHNob3QoKSwKLQkJCQkJCSAgIE5VTEwsIGNoZ2N4dC0+Y2NfaWRlbnRfa2V5X25lbnRyaWVzLCAw LCAwKTsKLQlpbmRleF9yZXNjYW4oc2NhbiwgY2hnY3h0LT5jY19pZGVudF9rZXksIGNoZ2N4dC0+ Y2NfaWRlbnRfa2V5X25lbnRyaWVzLCBOVUxMLCAwKTsKKwlzY2FuID0gaW5kZXhfYmVnaW5zY2Fu KHJlbCwgZGVzdC0+aWRlbnRfaW5kZXgsIGZhbHNlLCBHZXRBY3RpdmVTbmFwc2hvdCgpLAorCQkJ CQkJICAgTlVMTCwgZGVzdC0+aWRlbnRfa2V5X25lbnRyaWVzLCAwLCAwKTsKKwlpbmRleF9yZXNj YW4oc2NhbiwgZGVzdC0+aWRlbnRfa2V5LCBkZXN0LT5pZGVudF9rZXlfbmVudHJpZXMsIE5VTEws IDApOwogCXdoaWxlICh0YWJsZV9pbmRleF9nZXRuZXh0X3Nsb3Qoc2NhbiwgRm9yd2FyZFNjYW5E aXJlY3Rpb24sIHJldHJpZXZlZCkpCiAJewogCQkvKiBCZSB3YXJ5IG9mIHRlbXBvcmFsIGNvbnN0 cmFpbnRzICovCi0JCWlmIChzY2FuLT54c19yZWNoZWNrICYmICFpZGVudGl0eV9rZXlfZXF1YWwo Y2hnY3h0LCBsb2NhdG9yLCByZXRyaWV2ZWQpKQorCQlpZiAoc2Nhbi0+eHNfcmVjaGVjayAmJiAh aWRlbnRpdHlfa2V5X2VxdWFsKGRlc3QsIGxvY2F0b3IsIHJldHJpZXZlZCkpCiAJCXsKIAkJCUNI RUNLX0ZPUl9JTlRFUlJVUFRTKCk7CiAJCQljb250aW51ZTsKQEAgLTMyNTAsMTYgKzMyMjUsMTYg QEAgZmluZF90YXJnZXRfdHVwbGUoUmVsYXRpb24gcmVsLCBDaGFuZ2VDb250ZXh0ICpjaGdjeHQs IFR1cGxlVGFibGVTbG90ICpsb2NhdG9yLAogICogdXNlZCBmb3IgdGVtcG9yYWwgY29uc3RyYWlu dHMuCiAgKi8KIHN0YXRpYyBib29sCi1pZGVudGl0eV9rZXlfZXF1YWwoQ2hhbmdlQ29udGV4dCAq Y2hnY3h0LCBUdXBsZVRhYmxlU2xvdCAqbG9jYXRvciwKK2lkZW50aXR5X2tleV9lcXVhbChSZXBh Y2tEZXN0ICpkZXN0LCBUdXBsZVRhYmxlU2xvdCAqbG9jYXRvciwKIAkJCQkgICBUdXBsZVRhYmxl U2xvdCAqY2FuZGlkYXRlKQogewotCXNsb3RfZ2V0c29tZWF0dHJzKGxvY2F0b3IsIGNoZ2N4dC0+ Y2NfbGFzdF9rZXlfYXR0bm8pOwotCXNsb3RfZ2V0c29tZWF0dHJzKGNhbmRpZGF0ZSwgY2hnY3h0 LT5jY19sYXN0X2tleV9hdHRubyk7CisJc2xvdF9nZXRzb21lYXR0cnMobG9jYXRvciwgZGVzdC0+ bGFzdF9rZXlfYXR0bm8pOworCXNsb3RfZ2V0c29tZWF0dHJzKGNhbmRpZGF0ZSwgZGVzdC0+bGFz dF9rZXlfYXR0bm8pOwogCi0JZm9yIChpbnQgaSA9IDA7IGkgPCBjaGdjeHQtPmNjX2lkZW50X2tl eV9uZW50cmllczsgaSsrKQorCWZvciAoaW50IGkgPSAwOyBpIDwgZGVzdC0+aWRlbnRfa2V5X25l bnRyaWVzOyBpKyspCiAJewotCQlTY2FuS2V5CQllbnRyeSA9ICZjaGdjeHQtPmNjX2lkZW50X2tl eVtpXTsKLQkJQXR0ck51bWJlcglhdHRubyA9IGNoZ2N4dC0+Y2NfaWRlbnRfaW5kZXgtPnJkX2lu ZGV4LT5pbmRrZXkudmFsdWVzW2ldOworCQlTY2FuS2V5CQllbnRyeSA9ICZkZXN0LT5pZGVudF9r ZXlbaV07CisJCUF0dHJOdW1iZXIJYXR0bm8gPSBkZXN0LT5pZGVudF9pbmRleC0+cmRfaW5kZXgt PmluZGtleS52YWx1ZXNbaV07CiAKIAkJQXNzZXJ0KGF0dG5vID4gMCk7CiAKQEAgLTMzMzAsNyAr MzMwNSw3IEBAIHByb2Nlc3NfY29uY3VycmVudF9jaGFuZ2VzKFhMb2dSZWNQdHIgZW5kX29mX3dh bCwgQ2hhbmdlQ29udGV4dCAqY2hnY3h0LCBib29sIGRvCiAJLyogT3BlbiB0aGUgZmlsZS4gKi8K IAlEZWNvZGluZ1dvcmtlckZpbGVOYW1lKGZuYW1lLCBzaGFyZWQtPnJlbGlkLCBjaGdjeHQtPmNj X2ZpbGVfc2VxKTsKIAlmaWxlID0gQnVmRmlsZU9wZW5GaWxlU2V0KCZzaGFyZWQtPnNmcy5mcywg Zm5hbWUsIE9fUkRPTkxZLCBmYWxzZSk7Ci0JYXBwbHlfY29uY3VycmVudF9jaGFuZ2VzKGZpbGUs IGNoZ2N4dCk7CisJYXBwbHlfY29uY3VycmVudF9jaGFuZ2VzKGNoZ2N4dCk7CiAKIAlCdWZGaWxl Q2xvc2UoZmlsZSk7CiAKQEAgLTMzNDgsOCArMzMyMyw2IEBAIGluaXRpYWxpemVfY2hhbmdlX2Nv bnRleHQoQ2hhbmdlQ29udGV4dCAqY2hnY3h0LAogCQkJCQkJICBSZWxhdGlvbiBzcmNfcmVsYXRp b24sIFJlbGF0aW9uIHRndF9yZWxhdGlvbiwKIAkJCQkJCSAgT2lkIGlkZW50X2luZGV4X2lkKQog ewotCWNoZ2N4dC0+Y2NfcmVsID0gdGd0X3JlbGF0aW9uOwotCiAJLyoKIAkgKiBVc2UgdGhlIGRl c2NyaXB0b3Igb2YgdGhlIHNvdXJjZSByZWxhdGlvbiBhcyB0aGUgb25lIHRvIGRlZm9ybSB0aGUK IAkgKiBkZWNvZGVkIHR1cGxlcyB3aXRoOyBpbiBwYXJ0aWN1bGFyLCB0aGlzIGRlc2NyaXB0b3Ig Y29udGFpbnMgYWxsIHRoZQpAQCAtMzM1OCw4ICszMzMxLDMzIEBAIGluaXRpYWxpemVfY2hhbmdl X2NvbnRleHQoQ2hhbmdlQ29udGV4dCAqY2hnY3h0LAogCSAqLwogCWNoZ2N4dC0+Y2NfdHVwZGVz YyA9IFJlbGF0aW9uR2V0RGVzY3Ioc3JjX3JlbGF0aW9uKTsKIAorCWluaXRpYWxpemVfY2hhbmdl X2Rlc3QoJmNoZ2N4dC0+Y2NfZGVzdCwgdGd0X3JlbGF0aW9uLCBpZGVudF9pbmRleF9pZCk7CisK KwljaGdjeHQtPmNjX2ZpbGVfc2VxID0gV09SS0VSX0ZJTEVfU05BUFNIT1QgKyAxOworfQorCisv KgorICogRnJlZSB1cCByZXNvdXJjZXMgdGFrZW4gYnkgYSBDaGFuZ2VDb250ZXh0LgorICovCitz dGF0aWMgdm9pZAorcmVsZWFzZV9jaGFuZ2VfY29udGV4dChDaGFuZ2VDb250ZXh0ICpjaGdjeHQp Cit7CisJcmVsZWFzZV9jaGFuZ2VfZGVzdCgmY2hnY3h0LT5jY19kZXN0KTsKK30KKworLyoKKyAq IEluaXRpYWxpemUgdGhlIFJlcGFja0Rlc3Qgc3RydWN0IGZvciB0aGUgZ2l2ZW4gcmVsYXRpb24s IHdpdGggdGhlIGdpdmVuCisgKiBpbmRleCBhcyBpZGVudGl0eSBpbmRleC4gSW52YWxpZE9pZCBj YW4gYmUgc3BlY2lmaWVkIHRvIG9ubHkgbWFrZSB0aGUKKyAqIHJlbGF0aW9uIHJlYWR5IGZvciBp bnNlcnRpb25zLgorICovCitzdGF0aWMgdm9pZAoraW5pdGlhbGl6ZV9jaGFuZ2VfZGVzdChSZXBh Y2tEZXN0ICpkZXN0LCBSZWxhdGlvbiByZWxhdGlvbiwKKwkJCQkJICAgT2lkIGlkZW50X2luZGV4 X2lkKQoreworCWRlc3QtPnJlbCA9IHJlbGF0aW9uOworCiAJLyogT25seSBpbml0aWFsaXplIGZp ZWxkcyBuZWVkZWQgYnkgRXhlY0luc2VydEluZGV4VHVwbGVzKCkuICovCi0JY2hnY3h0LT5jY19l c3RhdGUgPSBDcmVhdGVFeGVjdXRvclN0YXRlKCk7CisJZGVzdC0+ZXN0YXRlID0gQ3JlYXRlRXhl Y3V0b3JTdGF0ZSgpOwogCiAJLyoKIAkgKiBTZXQgdXAgYSByYW5nZSB0YWJsZSBmb3IgdGhlIGV4 ZWN1dG9yLCBjb250YWluaW5nIG91ciByZXBhY2tlZCB0YWJsZSBhcwpAQCAtMzM2Nyw3ICszMzY1 LDcgQEAgaW5pdGlhbGl6ZV9jaGFuZ2VfY29udGV4dChDaGFuZ2VDb250ZXh0ICpjaGdjeHQsCiAJ ICovCiAJewogCQlSYW5nZVRibEVudHJ5ICpydGU7Ci0JCVR1cGxlRGVzYwlkZXNjID0gUmVsYXRp b25HZXREZXNjcih0Z3RfcmVsYXRpb24pOworCQlUdXBsZURlc2MJZGVzYyA9IFJlbGF0aW9uR2V0 RGVzY3IocmVsYXRpb24pOwogCQlMaXN0CSAgICpwZXJtaW5mb3MgPSBOSUw7CiAJCUJpdG1hcHNl dCAgKnVwZGF0ZWRDb2xzID0gTlVMTDsKIAkJUlRFUGVybWlzc2lvbkluZm8gKnBlcm1pbmZvOwpA QCAtMzM3OSw4ICszMzc3LDggQEAgaW5pdGlhbGl6ZV9jaGFuZ2VfY29udGV4dChDaGFuZ2VDb250 ZXh0ICpjaGdjeHQsCiAJCSAqLwogCQlydGUgPSBtYWtlTm9kZShSYW5nZVRibEVudHJ5KTsKIAkJ cnRlLT5ydGVraW5kID0gUlRFX1JFTEFUSU9OOwotCQlydGUtPnJlbGlkID0gUmVsYXRpb25HZXRS ZWxpZCh0Z3RfcmVsYXRpb24pOwotCQlydGUtPnJlbGtpbmQgPSBSZWxhdGlvbkdldEZvcm0odGd0 X3JlbGF0aW9uKS0+cmVsa2luZDsKKwkJcnRlLT5yZWxpZCA9IFJlbGF0aW9uR2V0UmVsaWQocmVs YXRpb24pOworCQlydGUtPnJlbGtpbmQgPSBSZWxhdGlvbkdldEZvcm0ocmVsYXRpb24pLT5yZWxr aW5kOwogCQkvKiBDcmVhdGUgdGhlIFJURVBlcm1pc3Npb25JbmZvIGluc3RhbmNlIChhbmQgc2V0 IC0+cGVybWluZm9pbmRleCkuICovCiAJCWFkZFJURVBlcm1pc3Npb25JbmZvKCZwZXJtaW5mb3Ms IHJ0ZSk7CiAKQEAgLTM0MDgsNDEgKzM0MDYsNDEgQEAgaW5pdGlhbGl6ZV9jaGFuZ2VfY29udGV4 dChDaGFuZ2VDb250ZXh0ICpjaGdjeHQsCiAJCXBlcm1pbmZvLT51cGRhdGVkQ29scyA9IHVwZGF0 ZWRDb2xzOwogCiAJCS8qIGZpbmFsbHkgd2UgY2FuIGluaXRpYWxpemUgdGhlIHJhbmdlIHRhYmxl IHByb3BlciAqLwotCQlFeGVjSW5pdFJhbmdlVGFibGUoY2hnY3h0LT5jY19lc3RhdGUsIGxpc3Rf bWFrZTEocnRlKSwgcGVybWluZm9zLAorCQlFeGVjSW5pdFJhbmdlVGFibGUoZGVzdC0+ZXN0YXRl LCBsaXN0X21ha2UxKHJ0ZSksIHBlcm1pbmZvcywKIAkJCQkJCSAgIGJtc19tYWtlX3NpbmdsZXRv bigxKSk7CiAJfQogCiAJLyogU2V0IHVwIG91ciBSZXN1bHRSZWxJbmZvIHRvIHVzZSBmb3IgaW5k ZXggdXBkYXRlcyAqLwotCWNoZ2N4dC0+Y2NfcnJpID0gbWFrZU5vZGUoUmVzdWx0UmVsSW5mbyk7 Ci0JSW5pdFJlc3VsdFJlbEluZm8oY2hnY3h0LT5jY19ycmksIHRndF9yZWxhdGlvbiwgMSwgTlVM TCwgMCk7Ci0JRXhlY09wZW5JbmRpY2VzKGNoZ2N4dC0+Y2NfcnJpLCBmYWxzZSk7CisJZGVzdC0+ cnJpID0gbWFrZU5vZGUoUmVzdWx0UmVsSW5mbyk7CisJSW5pdFJlc3VsdFJlbEluZm8oZGVzdC0+ cnJpLCByZWxhdGlvbiwgMSwgTlVMTCwgMCk7CisJRXhlY09wZW5JbmRpY2VzKGRlc3QtPnJyaSwg ZmFsc2UpOwogCiAJLyoKIAkgKiBUaGUgdGFibGUncyByZWxjYWNoZSBlbnRyeSBhbHJlYWR5IGhh cyB0aGUgcmVsY2FjaGUgZW50cnkgZm9yIHRoZQogCSAqIGlkZW50aXR5IGluZGV4OyBmaW5kIHRo YXQuCiAJICovCi0JY2hnY3h0LT5jY19pZGVudF9pbmRleCA9IE5VTEw7Ci0JZm9yIChpbnQgaSA9 IDA7IGkgPCBjaGdjeHQtPmNjX3JyaS0+cmlfTnVtSW5kaWNlczsgaSsrKQorCWRlc3QtPmlkZW50 X2luZGV4ID0gTlVMTDsKKwlmb3IgKGludCBpID0gMDsgaSA8IGRlc3QtPnJyaS0+cmlfTnVtSW5k aWNlczsgaSsrKQogCXsKIAkJUmVsYXRpb24JaW5kX3JlbDsKIAotCQlpbmRfcmVsID0gY2hnY3h0 LT5jY19ycmktPnJpX0luZGV4UmVsYXRpb25EZXNjc1tpXTsKKwkJaW5kX3JlbCA9IGRlc3QtPnJy aS0+cmlfSW5kZXhSZWxhdGlvbkRlc2NzW2ldOwogCQlpZiAoaW5kX3JlbC0+cmRfaWQgPT0gaWRl bnRfaW5kZXhfaWQpCiAJCXsKLQkJCWNoZ2N4dC0+Y2NfaWRlbnRfaW5kZXggPSBpbmRfcmVsOwor CQkJZGVzdC0+aWRlbnRfaW5kZXggPSBpbmRfcmVsOwogCQkJYnJlYWs7CiAJCX0KIAl9Ci0JaWYg KGNoZ2N4dC0+Y2NfaWRlbnRfaW5kZXggPT0gTlVMTCkKKwlpZiAoZGVzdC0+aWRlbnRfaW5kZXgg PT0gTlVMTCkKIAkJZWxvZyhFUlJPUiwgImNvdWxkIG5vdCBmaW5kIGlkZW50aXR5IGluZGV4Iik7 CiAKIAkvKiBTZXQgdXAgZm9yIHNjYW5uaW5nIHNhaWQgaWRlbnRpdHkgaW5kZXggKi8KIAl7CiAJ CUZvcm1fcGdfaW5kZXggaW5kZXhGb3JtOwogCi0JCWluZGV4Rm9ybSA9IGNoZ2N4dC0+Y2NfaWRl bnRfaW5kZXgtPnJkX2luZGV4OwotCQljaGdjeHQtPmNjX2lkZW50X2tleV9uZW50cmllcyA9IGlu ZGV4Rm9ybS0+aW5kbmtleWF0dHM7Ci0JCWNoZ2N4dC0+Y2NfaWRlbnRfa2V5ID0gKFNjYW5LZXkp IHBhbGxvY19hcnJheShTY2FuS2V5RGF0YSwgaW5kZXhGb3JtLT5pbmRua2V5YXR0cyk7CisJCWlu ZGV4Rm9ybSA9IGRlc3QtPmlkZW50X2luZGV4LT5yZF9pbmRleDsKKwkJZGVzdC0+aWRlbnRfa2V5 X25lbnRyaWVzID0gaW5kZXhGb3JtLT5pbmRua2V5YXR0czsKKwkJZGVzdC0+aWRlbnRfa2V5ID0g KFNjYW5LZXkpIHBhbGxvY19hcnJheShTY2FuS2V5RGF0YSwgaW5kZXhGb3JtLT5pbmRua2V5YXR0 cyk7CiAJCWZvciAoaW50IGkgPSAwOyBpIDwgaW5kZXhGb3JtLT5pbmRua2V5YXR0czsgaSsrKQog CQl7CiAJCQlTY2FuS2V5CQllbnRyeTsKQEAgLTM0NTIsMTIgKzM0NTAsMTIgQEAgaW5pdGlhbGl6 ZV9jaGFuZ2VfY29udGV4dChDaGFuZ2VDb250ZXh0ICpjaGdjeHQsCiAJCQkJCQlvcGNvZGU7CiAJ CQlTdHJhdGVneU51bWJlciBlcV9zdHJhdGVneTsKIAotCQkJZW50cnkgPSAmY2hnY3h0LT5jY19p ZGVudF9rZXlbaV07CisJCQllbnRyeSA9ICZkZXN0LT5pZGVudF9rZXlbaV07CiAKLQkJCW9wZmFt aWx5ID0gY2hnY3h0LT5jY19pZGVudF9pbmRleC0+cmRfb3BmYW1pbHlbaV07Ci0JCQlvcGNpbnR5 cGUgPSBjaGdjeHQtPmNjX2lkZW50X2luZGV4LT5yZF9vcGNpbnR5cGVbaV07CisJCQlvcGZhbWls eSA9IGRlc3QtPmlkZW50X2luZGV4LT5yZF9vcGZhbWlseVtpXTsKKwkJCW9wY2ludHlwZSA9IGRl c3QtPmlkZW50X2luZGV4LT5yZF9vcGNpbnR5cGVbaV07CiAJCQllcV9zdHJhdGVneSA9IEluZGV4 QW1UcmFuc2xhdGVDb21wYXJlVHlwZShDT01QQVJFX0VRLAotCQkJCQkJCQkJCQkJCSAgY2hnY3h0 LT5jY19pZGVudF9pbmRleC0+cmRfcmVsLT5yZWxhbSwKKwkJCQkJCQkJCQkJCQkgIGRlc3QtPmlk ZW50X2luZGV4LT5yZF9yZWwtPnJlbGFtLAogCQkJCQkJCQkJCQkJCSAgb3BmYW1pbHksIGZhbHNl KTsKIAkJCWlmIChlcV9zdHJhdGVneSA9PSBJbnZhbGlkU3RyYXRlZ3kpCiAJCQkJZWxvZyhFUlJP UiwgImNvdWxkIG5vdCBmaW5kIGVxdWFsaXR5IHN0cmF0ZWd5IGZvciBpbmRleCBvcGVyYXRvciBm YW1pbHkgJXUgZm9yIHR5cGUgJXUiLApAQCAtMzQ3NiwzNCArMzQ3NCwyOSBAQCBpbml0aWFsaXpl X2NoYW5nZV9jb250ZXh0KENoYW5nZUNvbnRleHQgKmNoZ2N4dCwKIAkJCQkJCWkgKyAxLAogCQkJ CQkJZXFfc3RyYXRlZ3ksIG9wY29kZSwKIAkJCQkJCShEYXR1bSkgMCk7Ci0JCQllbnRyeS0+c2tf Y29sbGF0aW9uID0gY2hnY3h0LT5jY19pZGVudF9pbmRleC0+cmRfaW5kY29sbGF0aW9uW2ldOwor CQkJZW50cnktPnNrX2NvbGxhdGlvbiA9IGRlc3QtPmlkZW50X2luZGV4LT5yZF9pbmRjb2xsYXRp b25baV07CiAJCX0KIAl9CiAKIAkvKiBEZXRlcm1pbmUgdGhlIGxhc3QgY29sdW1uIHdlIG11c3Qg ZGVmb3JtIHRvIHJlYWQgdGhlIGlkZW50aXR5ICovCi0JY2hnY3h0LT5jY19sYXN0X2tleV9hdHRu byA9IEludmFsaWRBdHRyTnVtYmVyOwotCWZvciAoaW50IGkgPSAwOyBpIDwgY2hnY3h0LT5jY19p ZGVudF9rZXlfbmVudHJpZXM7IGkrKykKKwlkZXN0LT5sYXN0X2tleV9hdHRubyA9IEludmFsaWRB dHRyTnVtYmVyOworCWZvciAoaW50IGkgPSAwOyBpIDwgZGVzdC0+aWRlbnRfa2V5X25lbnRyaWVz OyBpKyspCiAJewotCQlBdHRyTnVtYmVyCWF0dG5vID0gY2hnY3h0LT5jY19pZGVudF9pbmRleC0+ cmRfaW5kZXgtPmluZGtleS52YWx1ZXNbaV07CisJCUF0dHJOdW1iZXIJYXR0bm8gPSBkZXN0LT5p ZGVudF9pbmRleC0+cmRfaW5kZXgtPmluZGtleS52YWx1ZXNbaV07CiAKIAkJQXNzZXJ0KGF0dG5v ID4gMCk7Ci0JCWNoZ2N4dC0+Y2NfbGFzdF9rZXlfYXR0bm8gPSBNYXgoY2hnY3h0LT5jY19sYXN0 X2tleV9hdHRubywgYXR0bm8pOworCQlkZXN0LT5sYXN0X2tleV9hdHRubyA9IE1heChkZXN0LT5s YXN0X2tleV9hdHRubywgYXR0bm8pOwogCX0KLQotCWNoZ2N4dC0+Y2NfZmlsZV9zZXEgPSBXT1JL RVJfRklMRV9TTkFQU0hPVCArIDE7CiB9CiAKLS8qCi0gKiBGcmVlIHVwIHJlc291cmNlcyB0YWtl biBieSBhIENoYW5nZUNvbnRleHQuCi0gKi8KIHN0YXRpYyB2b2lkCi1yZWxlYXNlX2NoYW5nZV9j b250ZXh0KENoYW5nZUNvbnRleHQgKmNoZ2N4dCkKK3JlbGVhc2VfY2hhbmdlX2Rlc3QoUmVwYWNr RGVzdCAqZGVzdCkKIHsKLQlFeGVjQ2xvc2VJbmRpY2VzKGNoZ2N4dC0+Y2NfcnJpKTsKLQlGcmVl RXhlY3V0b3JTdGF0ZShjaGdjeHQtPmNjX2VzdGF0ZSk7CisJRXhlY0Nsb3NlSW5kaWNlcyhkZXN0 LT5ycmkpOworCUZyZWVFeGVjdXRvclN0YXRlKGRlc3QtPmVzdGF0ZSk7CiAJLyogWFhYIGFyZSB0 aGVzZSBwZnJlZXMgbmVjZXNzYXJ5PyAqLwotCXBmcmVlKGNoZ2N4dC0+Y2NfcnJpKTsKLQlwZnJl ZShjaGdjeHQtPmNjX2lkZW50X2tleSk7CisJcGZyZWUoZGVzdC0+cnJpKTsKKwlwZnJlZShkZXN0 LT5pZGVudF9rZXkpOwogfQogCiAvKgpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvY29tbWFuZHMv cmVwYWNrLmggYi9zcmMvaW5jbHVkZS9jb21tYW5kcy9yZXBhY2suaAppbmRleCAyNzEwNWMxMDU5 MS4uZTE3OWFiMjNiMDIgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2NvbW1hbmRzL3JlcGFjay5o CisrKyBiL3NyYy9pbmNsdWRlL2NvbW1hbmRzL3JlcGFjay5oCkBAIC0xNiw2ICsxNiw3IEBACiAj aW5jbHVkZSA8c2lnbmFsLmg+CiAKICNpbmNsdWRlICJhY2Nlc3MvaGlvLmgiCisjaW5jbHVkZSAi YWNjZXNzL3NrZXkuaCIKICNpbmNsdWRlICJub2Rlcy9leGVjbm9kZXMuaCIKICNpbmNsdWRlICJu b2Rlcy9wYXJzZW5vZGVzLmgiCiAjaW5jbHVkZSAicGFyc2VyL3BhcnNlX25vZGUuaCIKQEAgLTM5 LDYgKzQwLDU3IEBAIHR5cGVkZWYgc3RydWN0IENsdXN0ZXJQYXJhbXMKIAogZXh0ZXJuIFBHRExM SU1QT1JUIHZvbGF0aWxlIHNpZ19hdG9taWNfdCBSZXBhY2tNZXNzYWdlUGVuZGluZzsKIAorLyoK KyAqIFRhYmxlIHRvIGFwcGx5IGNvbmN1cnJlbnQgZGF0YSBjaGFuZ2VzIHRvLgorICovCit0eXBl ZGVmIHN0cnVjdCBSZXBhY2tEZXN0Cit7CisJLyogVGhlIHJlbGF0aW9uIHRoZSBjaGFuZ2VzIGFy ZSBhcHBsaWVkIHRvLiAqLworCVJlbGF0aW9uCXJlbDsKKworCS8qIE5lZWRlZCB0byB1cGRhdGUg aW5kZXhlcyBvZiBjY19yZWwuICovCisJUmVzdWx0UmVsSW5mbyAqcnJpOworCUVTdGF0ZQkgICAq ZXN0YXRlOworCisJLyoKKwkgKiBFeGlzdGluZyB0dXBsZXMgdG8gVVBEQVRFIGFuZCBERUxFVEUg YXJlIGxvY2F0ZWQgdmlhIHRoaXMgaW5kZXguIFdlCisJICoga2VlcCB0aGUgc2NhbmtleSBpbiBw YXJ0aWFsbHkgaW5pdGlhbGl6ZWQgc3RhdGUgdG8gYXZvaWQgcmVwZWF0ZWQgd29yay4KKwkgKiBz a19hcmd1bWVudCBpcyBjb21wbGV0ZWQgb24gdGhlIGZseS4KKwkgKi8KKwlSZWxhdGlvbglpZGVu dF9pbmRleDsKKwlTY2FuS2V5CQlpZGVudF9rZXk7CisKKwlpbnQJCQlpZGVudF9rZXlfbmVudHJp ZXM7CisKKwkvKiBUaGUgbGF0ZXN0IGNvbHVtbiB3ZSBuZWVkIHRvIGRlZm9ybSB0byBoYXZlIHRo ZSB0dXBsZSBpZGVudGl0eSAqLworCUF0dHJOdW1iZXIJbGFzdF9rZXlfYXR0bm87Cit9IFJlcGFj a0Rlc3Q7CisKKy8qCisgKiBUaGUgZmlyc3QgZmlsZSBleHBvcnRlZCBieSB0aGUgZGVjb2Rpbmcg d29ya2VyIG11c3QgY29udGFpbiBhIHNuYXBzaG90LCB0aGUKKyAqIGZvbGxvd2luZyBvbmVzIGNv bnRhaW4gdGhlIGRhdGEgY2hhbmdlcy4KKyAqLworI2RlZmluZSBXT1JLRVJfRklMRV9TTkFQU0hP VAkwCisKKy8qCisgKiBJbmZvcm1hdGlvbiBuZWVkZWQgdG8gYXBwbHkgY29uY3VycmVudCBkYXRh IGNoYW5nZXMuCisgKgorICogWFhYIE5vdyB0aGF0IGl0J3MgaW4gKi5oIGZpbGUsIHJlbmFtZSB0 byBSZXBhY2tDaGFuZ2VDb250ZXh0PworICovCit0eXBlZGVmIHN0cnVjdCBDaGFuZ2VDb250ZXh0 Cit7CisJLyoKKwkgKiBUaGUgdHVwbGUgZGVzY3JpcHRvciB0byBkZWZvcm0gZGVjb2RlZCB0dXBs ZXMgd2l0aDsgaXQgbXVzdCBoYXZlIHRoZQorCSAqIGF0dG1pc3Npbmd2YWwgdmFsdWVzIGZyb20g dGhlIHJlbGF0aW9uIGJlaW5nIHJlcGFja2VkLgorCSAqLworCVR1cGxlRGVzYwljY190dXBkZXNj OworCisJLyogVGhlIGRlc3RpbmF0aW9uIHRhYmxlLiAqLworCVJlcGFja0Rlc3QJY2NfZGVzdDsK KworCS8qIFNlcXVlbnRpYWwgbnVtYmVyIG9mIHRoZSBmaWxlIGNvbnRhaW5pbmcgdGhlIGNoYW5n ZXMuICovCisJaW50CQkJY2NfZmlsZV9zZXE7Cit9IENoYW5nZUNvbnRleHQ7CiAKIGV4dGVybiB2 b2lkIEV4ZWNSZXBhY2soUGFyc2VTdGF0ZSAqcHN0YXRlLCBSZXBhY2tTdG10ICpzdG10LCBib29s IGlzVG9wTGV2ZWwpOwogCmRpZmYgLS1naXQgYS9zcmMvdG9vbHMvcGdpbmRlbnQvdHlwZWRlZnMu bGlzdCBiL3NyYy90b29scy9wZ2luZGVudC90eXBlZGVmcy5saXN0CmluZGV4IDhmNjVjZWU0MWIx Li5iZDc0YmYxNWE3NiAxMDA2NDQKLS0tIGEvc3JjL3Rvb2xzL3BnaW5kZW50L3R5cGVkZWZzLmxp c3QKKysrIGIvc3JjL3Rvb2xzL3BnaW5kZW50L3R5cGVkZWZzLmxpc3QKQEAgLTI2NDMsNiArMjY0 Myw3IEBAIFJlb3JkZXJCdWZmZXJUdXBsZUNpZEtleQogUmVvcmRlckJ1ZmZlclVwZGF0ZVByb2dy ZXNzVHhuQ0IKIFJlb3JkZXJUdXBsZQogUmVwYWNrQ29tbWFuZAorUmVwYWNrRGVzdAogUmVwYWNr RGVjb2RpbmdTdGF0ZQogUmVwYWNrU3RtdAogUmVwYXJhbWV0ZXJpemVGb3JlaWduUGF0aEJ5Q2hp bGRfZnVuY3Rpb24KLS0gCjIuNTEuMAoK --=-=-= Content-Type: application/mbox Content-Disposition: attachment; filename=v05-0005-Use-multiple-snapshots-to-copy-the-data.patch Content-Transfer-Encoding: base64 RnJvbSAyNWMxZWVmM2RiNTQyYTg2MjU5MWUxMTNjMjkyYjY4ODkzOWQ5MzM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmluIEhvdXNrYSA8YWhAY3liZXJ0ZWMuYXQ+CkRhdGU6 IFR1ZSwgMTAgTm92IDIwMjYgMTE6NDQ6MzkgKzAxMDAKU3ViamVjdDogW1BBVENIIDUvOV0gVXNl IG11bHRpcGxlIHNuYXBzaG90cyB0byBjb3B5IHRoZSBkYXRhLgoKUkVQQUNLIChDT05DVVJSRU5U TFkpIGRvZXMgbm90IHByZXZlbnQgYXBwbGljYXRpb25zIGZyb20gdXNpbmcgdGhlIHRhYmxlIHRo YXQKaXMgYmVpbmcgcHJvY2Vzc2VkLCBob3dldmVyIGl0IGNhbiBwcmV2ZW50IHRoZSB4bWluIGhv cml6b24gZnJvbSBhZHZhbmNpbmcgYW5kCnRodXMgcmVzdHJpY3QgVkFDVVVNIGZvciB0aGUgd2hv bGUgZGF0YWJhc2UuIFRoaXMgcGF0Y2ggYWRkcyB0aGUgYWJpbGl0eSB0bwp1c2UgcGFydGljdWxh ciBzbmFwc2hvdCBvbmx5IGZvciBjZXJ0YWluIHJhbmdlIG9mIHBhZ2VzLiBFYWNoIHRpbWUgdGhh dCByYW5nZQppcyBwcm9jZXNzZWQsIGEgbmV3IHNuYXBzaG90IGlzIGJ1aWx0LCB3aGljaCBzdXBw b3NlZGx5IGhhcyBpdHMgeG1pbiBoaWdoZXIKdGhhbiB0aGUgcHJldmlvdXMgc25hcHNob3QuCgpO b3RlIHRoYXQgd2Ugc3RpbGwgdXNlIHRoZSBzYW1lIFhJRCB0aHJvdWdob3V0IHRoZSBSRVBBQ0sg ZXhlY3V0aW9uLCBhbmQgdGhhdAphbHNvIHByZXZlbnRzIHRoZSB4bWluIGhvcml6b24gZnJvbSBh ZHZhbmNpbmcuIFRoZSBmb2xsb3dpbmcgcGFydCBvZiB0aGlzCnNlcmllcyB3aWxsIGZpeCB0aGUg cHJvYmxlbS4KClRvIHVzZSBtdWx0aXBsZSBzbmFwc2hvdHMsIHRoZSBkYXRhIGNvcHlpbmcgd29y a3MgYXMgZm9sbG93czoKCiAgMS4gSGF2ZSB0aGUgbG9naWNhbCBkZWNvZGluZyBzeXN0ZW0gYnVp bGQgYSBzbmFwc2hvdCBTMCBmb3IgcmFuZ2UgUjAgYXQKICAgICBMU04wLiBUaGlzIHNuYXBzaG90 IHNlZXMgYWxsIHRoZSBkYXRhIGNoYW5nZXMgd2hvc2UgY29tbWl0IHJlY29yZHMgaGF2ZQogICAg IExTTiA8IExTTjAuCgogIDIuIENvcHkgdGhlIHBhZ2VzIGluIHRoYXQgcmFuZ2UgdG8gdGhlIG5l dyByZWxhdGlvbi4gVGhlIGNoYW5nZXMgbm90IHZpc2libGUKICAgICB0byB0aGUgc25hcHNob3Qg KGJlY2F1c2UgdGhlaXIgdHJhbnNhY3Rpb25zIGFyZSBzdGlsbCBydW5uaW5nIGZyb20gdGhlCiAg ICAgUE9WIG9mIHRoZSBzbmFwc2hvdCkgd2lsbCBhcHBlYXIgaW4gdGhlIG91dHB1dCBvZiB0aGUg bG9naWNhbCBkZWNvZGluZwogICAgIHN5c3RlbSBhcyBzb29uIGFzIHRoZWlyIGNvbW1pdCByZWNv cmRzIGFyZSBkZWNvZGVkLgoKICAzLiBQZXJmb3JtIGxvZ2ljYWwgZGVjb2Rpbmcgb2YgYWxsIGNo YW5nZXMgd2UgZmluZCBpbiBXQUwgZm9yIHRoZSB0YWJsZQogICAgIHdlJ3JlIHJlcGFja2luZywg YnV0IG9ubHkgYXBwbHkgdGhvc2UgdGhhdCBhZmZlY3QgdGhlIHJhbmdlIFIwIGluIHRoZSBvbGQK ICAgICByZWxhdGlvbi4gKE5hdHVyYWxseSwgd2UgY2Fubm90IGFwcGx5IG9uZXMgdGhhdCBiZWxv bmcgdG8gb3RoZXIgcGFnZXMKICAgICBiZWNhdXNlIGl0J3MgaW1wb3NzaWJsZSB0byBVUERBVEUg LyBERUxFVEUgYSByb3cgaW4gdGhlIG5ldyByZWxhdGlvbiBpZgogICAgIGl0IGhhc24ndCBiZWVu IGNvcGllZCB5ZXQuKSBUaGVuIGNvbnNpZGVyIExTTjEgdG8gYmUgdGhlIHBvc2l0aW9uIG9mIHRo ZQogICAgIGVuZCBvZiB0aGUgbGFzdCBXQUwgcmVjb3JkIGRlY29kZWQuCgogIDQuIEJ1aWxkIGEg bmV3IHNuYXBzaG90IFMxIGF0IHBvc2l0aW9uIExTTjEsIGkuZS4gb25lIHRoYXQgc2VlcyBhbGwg dGhlIGRhdGEKICAgICB3aG9zZSBjb21taXQgcmVjb3JkcyBhcmUgYXQgV0FMIHBvc2l0aW9ucyA8 IExTTjEuIFVzZSB0aGlzIHNuYXBzaG90IHRvCiAgICAgY29weSB0aGUgcmFuZ2Ugb2YgcGFnZXMg UjEuCgogIDUuIFBlcmZvcm0gbG9naWNhbCBkZWNvZGluZyBsaWtlIGluIHN0ZXAgMywgYnV0IG91 dCBvZiB0aGlzIG5leHQgc2V0LCBvbmx5CiAgICAgYXBwbHkgY2hhbmdlcyBiZWxvbmdpbmcgdG8g cmFuZ2VzIFIwICphbmQqIFIxIGluIHRoZSBvbGQgdGFibGUuCgogIDYuIGV0YwoKU3BlY2lhbCBh dHRlbnRpb24gbmVlZHMgdG8gYmUgcGFpZCB0byBVUERBVEVTIHRoYXQgc3BhbiBwYWdlIHJhbmdl cy4gRm9yCmV4YW1wbGUsIGlmIHRoZSBvbGQgdHVwbGUgaXMgaW4gcmFuZ2UgUjAsIGJ1dCB0aGUg bmV3IHR1cGxlIGlzIGluIFIxLCBhbmQgUjEKaGFzbid0IGJlZW4gY29waWVkIHlldCwgd2Ugb25s eSBERUxFVEUgdGhlIG9sZCB2ZXJzaW9uIGZyb20gdGhlIG5ldwpyZWxhdGlvbi4gVGhlIG5ldyB2 ZXJzaW9uIHdpbGwgYmUgaGFuZGxlZCBkdXJpbmcgcHJvY2Vzc2luZyBvZiByYW5nZSBSMS4gVGhl CnNuYXBzaG90IFMxIHdpbGwgYmUgYmFzZWQgb24gV0FMIHBvc2l0aW9uIGZvbGxvd2luZyB0aGF0 IFVQREFURSwgc28gaXQnbGwgc2VlCnRoZSBuZXcgdHVwbGUgaWYgaXRzIHRyYW5zYWN0aW9uJ3Mg Y29tbWl0IHJlY29yZCBpcyBhdCBXQUwgcG9zaXRpb24gbG93ZXIgdGhhbgp0aGUgcG9zaXRpb24g d2hlcmUgd2UgYnVpbHQgdGhlIHNuYXBzaG90LiBPbiB0aGUgb3RoZXIgaGFuZCwgaWYgdGhlIGNv bW1pdApyZWNvcmQgYXBwZWFycyBhdCBoaWdoZXIgcG9zaXRpb24gdGhhbiB0aGUgdGhhdCBvZiB0 aGUgc25hcHNob3QsIHRoZSBpbnNlcnRpb24Kb2YgdGhlIG5ldyB0dXBsZSB3aWxsIGJlIGRlY29k ZWQgYW5kIHJlcGxheWVkIGxhdGVyIChhZnRlciB0aGUgY29weWluZyBvZgpyYW5nZSBSMSBoYXMg Y29tcGxldGVkKS4KCkxpa2V3aXNlLCBpZiB0aGUgb2xkIHR1cGxlIGlzIGluIHJhbmdlIFIxIChu b3QgeWV0IGNvcGllZCkgYnV0IHRoZSBuZXcgdHVwbGUKaXMgaW4gUjAsIHdlIG9ubHkgcGVyZm9y bSBJTlNFUlQgb24gdGhlIG5ldyByZWxhdGlvbi4gVGhlIGRlbGV0aW9uIG9mIHRoZSBvbGQKdmVy c2lvbiB3aWxsIGVpdGhlciBiZSB2aXNpYmxlIHRvIHRoZSBzbmFwc2hvdCBTMSAoaS5lLiB0aGUg c25hcHNob3Qgd29uJ3Qgc2VlCnRoZSBvbGQgdmVyc2lvbiksIG9yIHJlcGxheWVkIGxhdGVyLgoK RHVlIHRvIHRoZXNlIGNyb3NzLXJhbmdlIFVQREFURXMsIHdlIG11c3QgYXBwbHkgdGhlIGNoYW5n ZXMgcGVydGFpbmluZyB0bwpnaXZlbiByYW5nZSBiZWZvcmUgcHJvY2Vzc2luZyBvZiB0aGUgbmV4 dCByYW5nZSBzdGFydHMuIFNwZWNpZmljYWxseSwgaWYKVVBEQVRFIGJlY29tZXMgREVMRVRFIGZv ciBzcGVjaWZpYyByYW5nZSwgdGhhdCBERUxFVEUgbXVzdCBiZSByZXBsYXllZCBzb29uCmVub3Vn aCBzbyB0aGF0IHdlIGRvbid0IHNlZSBib3RoIG9sZCBhbmQgbmV3IHR1cGxlIHdoZW4gYnVpbGRp bmcgdGhlIGlkZW50aXR5CmluZGV4LiBUaGUgcHJvYmxlbSBpcyB0aGF0IGlmIHRoZSBVUERBVEUg ZG9lcyBub3QgY2hhbmdlIHRoZSBpZGVudGl0eSBrZXksCndlJ2QgZW5kIHVwIHdpdGggZHVwbGlj YXRlIGtleSB2YWx1ZXMuCgpFdmVuIGlmIHRoZSBVU0lORyBJTkRFWCBjbGF1c2UgaXMgc3BlY2lm aWVkLCBhIHNlcXVlbnRpYWwgc2NhbiBpcyB1c2VkIHRvCnJldHJpZXZlIHRoZSB0dXBsZXMgZnJv bSB0aGUgb2xkIHJlbGF0aW9uOiB0aGUgYXBwcm9hY2ggZGVzY3JpYmVkIGFib3ZlCnJlcXVpcmVz IHRoYXQgdGhlIHR1cGxlcyBhcmUgaW4gQ1RJRCBvcmRlci4gRm9yIHNvcnRpbmcgd2UgdXNlIGEg cmVndWxhciB0YWJsZQooImF1eGlsaWFyeSB0YWJsZSIpLCBvbiB3aGljaCB3ZSBjcmVhdGUgdGhl IGNsdXN0ZXJpbmcgaW5kZXggYW5kIHNjYW4gaXQuIFRoZQpzY2FuIG91dHB1dCBpcyBpbnNlcnRl ZCBpbnRvIHRoZSBuZXcgcmVsYXRpb24uIFR1cGxlc29ydCBpcyBub3QgYXBwcm9wcmlhdGUKaGVy ZSBiZWNhdXNlIGl0IGhhcyBubyBpZGVudGl0eSBpbmRleCwgc28gaXQncyBub3QgcG9zc2libGUg dG8gYXBwbHkgdGhlCmRlY29kZWQgY2hhbmdlcyB0byBpdCAiZWFnZXJseSIsIGFzIGV4cGxhaW5l ZCBhYm92ZS4KCkEgbmV3IEdVQyByZXBhY2tfc25hcHNob3RfYWZ0ZXIgY2FuIGJlIHVzZWQgdG8g c2V0IHRoZSBudW1iZXIgb2YgcGFnZXMgcGVyCnNuYXBzaG90LiBJdCdzIGN1cnJlbnRseSBjbGFz c2lmaWVkIGFzIERFVkVMT1BFUl9PUFRJT05TIGFuZCBtYXkgYmUgcmVwbGFjZWQKYnkgYSBjb25z dGFudCBhZnRlciBlbm91Z2ggZXZhbHVhdGlvbiBpcyBkb25lLgotLS0KIGRvYy9zcmMvc2dtbC9t b25pdG9yaW5nLnNnbWwgICAgICAgICAgICAgICAgICB8ICAxOCArCiBzcmMvYmFja2VuZC9hY2Nl c3MvaGVhcC9oZWFwYW1faGFuZGxlci5jICAgICAgfCAzMTIgKysrKystCiBzcmMvYmFja2VuZC9j YXRhbG9nL3N5c3RlbV92aWV3cy5zcWwgICAgICAgICAgfCAgMTIgKy0KIHNyYy9iYWNrZW5kL2Nv bW1hbmRzL3JlcGFjay5jICAgICAgICAgICAgICAgICB8IDkwNCArKysrKysrKysrKysrLS0tLS0K IHNyYy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFja193b3JrZXIuYyAgICAgICAgICB8ICA5NyArLQog c3JjL2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC9kZWNvZGUuYyAgICAgIHwgIDgzICstCiBz cmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL2xvZ2ljYWwuYyAgICAgfCAgMzAgKy0KIC4u Li9yZXBsaWNhdGlvbi9sb2dpY2FsL3Jlb3JkZXJidWZmZXIuYyAgICAgICB8ICA0MCArCiBzcmMv YmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL3NuYXBidWlsZC5jICAgfCAgMzAgKy0KIHNyYy9i YWNrZW5kL3JlcGxpY2F0aW9uL3BncmVwYWNrL3BncmVwYWNrLmMgICB8ICAyNCArLQogc3JjL2Jh Y2tlbmQvdXRpbHMvbWlzYy9ndWNfcGFyYW1ldGVycy5kYXQgICAgIHwgIDEwICsKIHNyYy9iYWNr ZW5kL3V0aWxzL21pc2MvZ3VjX3RhYmxlcy5jICAgICAgICAgICB8ICAgMSArCiBzcmMvaW5jbHVk ZS9hY2Nlc3MvdGFibGVhbS5oICAgICAgICAgICAgICAgICAgfCAgMTQgKy0KIHNyYy9pbmNsdWRl L2NvbW1hbmRzL3Byb2dyZXNzLmggICAgICAgICAgICAgICB8ICAxMiArLQogc3JjL2luY2x1ZGUv Y29tbWFuZHMvcmVwYWNrLmggICAgICAgICAgICAgICAgIHwgIDY5ICstCiBzcmMvaW5jbHVkZS9j b21tYW5kcy9yZXBhY2tfaW50ZXJuYWwuaCAgICAgICAgfCAgMTMgKy0KIHNyYy9pbmNsdWRlL3Jl cGxpY2F0aW9uL2xvZ2ljYWwuaCAgICAgICAgICAgICB8ICAgMiArLQogc3JjL2luY2x1ZGUvcmVw bGljYXRpb24vcmVvcmRlcmJ1ZmZlci5oICAgICAgIHwgICA3ICsKIHNyYy90ZXN0L21vZHVsZXMv aW5qZWN0aW9uX3BvaW50cy9NYWtlZmlsZSAgICB8ICAgMSArCiAuLi4vZXhwZWN0ZWQvcmVwYWNr X3NuYXBzaG90cy5vdXQgICAgICAgICAgICAgfCA0MDEgKysrKysrKysKIHNyYy90ZXN0L21vZHVs ZXMvaW5qZWN0aW9uX3BvaW50cy9tZXNvbi5idWlsZCB8ICAgMSArCiAuLi4vc3BlY3MvcmVwYWNr X3NuYXBzaG90cy5zcGVjICAgICAgICAgICAgICAgfCAyNzIgKysrKysrCiAyMiBmaWxlcyBjaGFu Z2VkLCAyMDM4IGluc2VydGlvbnMoKyksIDMxNSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEw MDY0NCBzcmMvdGVzdC9tb2R1bGVzL2luamVjdGlvbl9wb2ludHMvZXhwZWN0ZWQvcmVwYWNrX3Nu YXBzaG90cy5vdXQKIGNyZWF0ZSBtb2RlIDEwMDY0NCBzcmMvdGVzdC9tb2R1bGVzL2luamVjdGlv bl9wb2ludHMvc3BlY3MvcmVwYWNrX3NuYXBzaG90cy5zcGVjCgpkaWZmIC0tZ2l0IGEvZG9jL3Ny Yy9zZ21sL21vbml0b3Jpbmcuc2dtbCBiL2RvYy9zcmMvc2dtbC9tb25pdG9yaW5nLnNnbWwKaW5k ZXggNDQ1ZmJjOTIzMmMuLjUwMDk4N2U5M2U4IDEwMDY0NAotLS0gYS9kb2Mvc3JjL3NnbWwvbW9u aXRvcmluZy5zZ21sCisrKyBiL2RvYy9zcmMvc2dtbC9tb25pdG9yaW5nLnNnbWwKQEAgLTc1NTAs NiArNzU1MCwxOCBAQCBGUk9NIHBnX3N0YXRfZ2V0X2JhY2tlbmRfaWRzZXQoKSBBUyBiYWNrZW5k aWQ7CiAgICAgICA8L3BhcmE+PC9lbnRyeT4KICAgICAgPC9yb3c+CiAKKyAgICAgPHJvdz4KKyAg ICAgIDxlbnRyeSByb2xlPSJjYXRhbG9nX3RhYmxlX2VudHJ5Ij48cGFyYSByb2xlPSJjb2x1bW5f ZGVmaW5pdGlvbiI+CisgICAgICAgPHN0cnVjdGZpZWxkPmhlYXBfdHVwbGVzX2luc2VydGVkX2F1 eDwvc3RydWN0ZmllbGQ+IDx0eXBlPmJpZ2ludDwvdHlwZT4KKyAgICAgIDwvcGFyYT4KKyAgICAg IDxwYXJhPgorICAgICAgIE51bWJlciBvZiBoZWFwIHR1cGxlcyBpbnNlcnRlZCBpbnRvIGFuIGF1 eGlsaWFyeSB0YWJsZSwgd2hpY2ggaXMgdXNlZAorICAgICAgIHRvIHNvcnQgaWYgdGhlIDxsaXRl cmFsPkNPTkNVUlJFTlRMWTwvbGl0ZXJhbD4gb3B0aW9uIHdhcyBzcGVjaWZpZWQuIHRoZQorICAg ICAgIHR1cGxlcyBUaGlzIGNvdW50ZXIgb25seSBhZHZhbmNlcyB3aGVuIHRoZSBwaGFzZSBpcwor ICAgICAgIDxsaXRlcmFsPnNlcSBzY2FubmluZyBoZWFwPC9saXRlcmFsPi4KKyAgICAgIDwvcGFy YT48L2VudHJ5PgorICAgICA8L3Jvdz4KKwogICAgICA8cm93PgogICAgICAgPGVudHJ5IHJvbGU9 ImNhdGFsb2dfdGFibGVfZW50cnkiPjxwYXJhIHJvbGU9ImNvbHVtbl9kZWZpbml0aW9uIj4KICAg ICAgICA8c3RydWN0ZmllbGQ+aGVhcF90dXBsZXNfdXBkYXRlZDwvc3RydWN0ZmllbGQ+IDx0eXBl PmJpZ2ludDwvdHlwZT4KQEAgLTc2OTYsNiArNzcwOCwxMiBAQCBGUk9NIHBnX3N0YXRfZ2V0X2Jh Y2tlbmRfaWRzZXQoKSBBUyBiYWNrZW5kaWQ7CiAgICAgICAgVGhlIGNvbW1hbmQgaXMgY3VycmVu dGx5IHJlYnVpbGRpbmcgYW4gaW5kZXguCiAgICAgIDwvZW50cnk+CiAgICAgPC9yb3c+CisgICAg PHJvdz4KKyAgICAgPGVudHJ5PjxsaXRlcmFsPmJ1aWxkaW5nIGF1eGlsaWFyeSByZWxhdGlvbiBp bmRleDwvbGl0ZXJhbD48L2VudHJ5PgorICAgICA8ZW50cnk+CisgICAgICAgVGhlIGNvbW1hbmQg aXMgY3VycmVudGx5IGJ1aWxkaW5nIGFuIGluZGV4IG9uIHRoZSBhdXhpbGlhcnkgcmVsYXRpb24u CisgICAgIDwvZW50cnk+CisgICAgPC9yb3c+CiAgICAgPHJvdz4KICAgICAgPGVudHJ5PjxsaXRl cmFsPnBlcmZvcm1pbmcgZmluYWwgY2xlYW51cDwvbGl0ZXJhbD48L2VudHJ5PgogICAgICA8ZW50 cnk+CmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9hY2Nlc3MvaGVhcC9oZWFwYW1faGFuZGxlci5j IGIvc3JjL2JhY2tlbmQvYWNjZXNzL2hlYXAvaGVhcGFtX2hhbmRsZXIuYwppbmRleCAzM2E3YWNl Mjc1Yi4uNWVkNmJmM2UyMTYgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2FjY2Vzcy9oZWFwL2hl YXBhbV9oYW5kbGVyLmMKKysrIGIvc3JjL2JhY2tlbmQvYWNjZXNzL2hlYXAvaGVhcGFtX2hhbmRs ZXIuYwpAQCAtNDMsMTIgKzQzLDE5IEBACiAjaW5jbHVkZSAic3RvcmFnZS9sbWdyLmgiCiAjaW5j bHVkZSAic3RvcmFnZS9sb2NrLmgiCiAjaW5jbHVkZSAic3RvcmFnZS9wcmVkaWNhdGUuaCIKKyNp bmNsdWRlICJzdG9yYWdlL3Byb2MuaCIKICNpbmNsdWRlICJzdG9yYWdlL3Byb2NhcnJheS5oIgog I2luY2x1ZGUgInN0b3JhZ2Uvc21nci5oIgogI2luY2x1ZGUgInV0aWxzL2J1aWx0aW5zLmgiCisj aW5jbHVkZSAidXRpbHMvaW5qZWN0aW9uX3BvaW50LmgiCiAjaW5jbHVkZSAidXRpbHMvcmVsLmgi CiAjaW5jbHVkZSAidXRpbHMvdHVwbGVzb3J0LmgiCiAKK3N0YXRpYyBTbmFwc2hvdCBmaW5hbGl6 ZV9ibG9ja19yYW5nZShSZWxhdGlvbiByZWxfZHN0LCBDaGFuZ2VDb250ZXh0ICpjaGdjeHQsCisJ CQkJCQkJCQkgQmxvY2tOdW1iZXIgY3VyLAorCQkJCQkJCQkJIEJsb2NrTnVtYmVyIHN0YXJ0LCBC bG9ja051bWJlciAqZW5kX3AsCisJCQkJCQkJCQkgQmxvY2tOdW1iZXIgbmJsb2NrcywKKwkJCQkJ CQkJCSBCbG9ja051bWJlciAqcmFuZ2Vfc3RhcnRfZHN0X3ApOwogc3RhdGljIHZvaWQgcmVmb3Jt X2FuZF9yZXdyaXRlX3R1cGxlKFR1cGxlVGFibGVTbG90ICpzcmMsIFR1cGxlVGFibGVTbG90ICpy ZWZvcm0sCiAJCQkJCQkJCQkgUmV3cml0ZVN0YXRlIHJ3c3RhdGUpOwogCkBAIC01ODMsMTUgKzU5 MCwxNCBAQCBzdGF0aWMgdm9pZAogaGVhcGFtX3JlbGF0aW9uX2NvcHlfZm9yX2NsdXN0ZXIoUmVs YXRpb24gT2xkSGVhcCwgUmVsYXRpb24gTmV3SGVhcCwKIAkJCQkJCQkJIFJlbGF0aW9uIE9sZElu ZGV4LCBib29sIHVzZV9zb3J0LAogCQkJCQkJCQkgVHJhbnNhY3Rpb25JZCBPbGRlc3RYbWluLAot CQkJCQkJCQkgU25hcHNob3Qgc25hcHNob3QsCiAJCQkJCQkJCSBUcmFuc2FjdGlvbklkICp4aWRf Y3V0b2ZmLAogCQkJCQkJCQkgTXVsdGlYYWN0SWQgKm11bHRpX2N1dG9mZiwKIAkJCQkJCQkJIGRv dWJsZSAqbnVtX3R1cGxlcywKIAkJCQkJCQkJIGRvdWJsZSAqdHVwc192YWN1dW1lZCwKLQkJCQkJ CQkJIGRvdWJsZSAqdHVwc19yZWNlbnRseV9kZWFkKQorCQkJCQkJCQkgZG91YmxlICp0dXBzX3Jl Y2VudGx5X2RlYWQsCisJCQkJCQkJCSB2b2lkICp0YWJsZWFtX2RhdGEpCiB7CiAJUmV3cml0ZVN0 YXRlIHJ3c3RhdGU7Ci0JQnVsa0luc2VydFN0YXRlIGJpc3RhdGU7CiAJSW5kZXhTY2FuRGVzYyBp bmRleFNjYW47CiAJVGFibGVTY2FuRGVzYyB0YWJsZVNjYW47CiAJSGVhcFNjYW5EZXNjIGhlYXBT Y2FuOwpAQCAtNjAyLDE2ICs2MDgsMjkgQEAgaGVhcGFtX3JlbGF0aW9uX2NvcHlfZm9yX2NsdXN0 ZXIoUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gTmV3SGVhcCwKIAlUdXBsZVRhYmxlU2xvdCAq cmVmb3JtX3Nsb3Q7CiAJQnVmZmVySGVhcFR1cGxlVGFibGVTbG90ICpoc2xvdDsKIAlCbG9ja051 bWJlciBwcmV2X2NibG9jayA9IEludmFsaWRCbG9ja051bWJlcjsKLQlib29sCQljb25jdXJyZW50 ID0gc25hcHNob3QgIT0gTlVMTDsKKwlDaGFuZ2VDb250ZXh0ICpjaGdjeHQgPSAoQ2hhbmdlQ29u dGV4dCAqKSB0YWJsZWFtX2RhdGE7CisJYm9vbAkJY29uY3VycmVudCA9IGNoZ2N4dCAhPSBOVUxM OworCVNuYXBzaG90CXNuYXBzaG90ID0gTlVMTDsKKwlCbG9ja051bWJlciByYW5nZV9zdGFydCA9 IEludmFsaWRCbG9ja051bWJlcjsKKwlCbG9ja051bWJlciByYW5nZV9lbmQgPSBJbnZhbGlkQmxv Y2tOdW1iZXI7CisJQmxvY2tOdW1iZXIgcmFuZ2Vfc3RhcnRfbmV3ID0gSW52YWxpZEJsb2NrTnVt YmVyOworCUJsb2NrTnVtYmVyCW5ibG9ja3MgPSBJbnZhbGlkQmxvY2tOdW1iZXI7CisJUmVsYXRp b24JcmVsX2RzdDsKIAogCS8qIFJlbWVtYmVyIGlmIGl0J3MgYSBzeXN0ZW0gY2F0YWxvZyAqLwog CWlzX3N5c3RlbV9jYXRhbG9nID0gSXNTeXN0ZW1SZWxhdGlvbihPbGRIZWFwKTsKIAorCS8qIERl dGVybWluZSB0aGUgZGVzdGluYXRpb24gZm9yIHRoZSB0dXBsZXMuICovCisJaWYgKCFjb25jdXJy ZW50IHx8IGNoZ2N4dC0+Y2NfZGVzdF9hdXggPT0gTlVMTCkKKwkJcmVsX2RzdCA9IE5ld0hlYXA7 CisJZWxzZQorCQlyZWxfZHN0ID0gY2hnY3h0LT5jY19kZXN0X2F1eC0+cmVsOworCiAJLyoKIAkg KiBWYWxpZCBzbWdyX3RhcmdibG9jayBpbXBsaWVzIHNvbWV0aGluZyBhbHJlYWR5IHdyb3RlIHRv IHRoZSByZWxhdGlvbi4KIAkgKiBUaGlzIG1heSBiZSBoYXJtbGVzcywgYnV0IHRoaXMgZnVuY3Rp b24gaGFzbid0IHBsYW5uZWQgZm9yIGl0LgogCSAqLwotCUFzc2VydChSZWxhdGlvbkdldFRhcmdl dEJsb2NrKE5ld0hlYXApID09IEludmFsaWRCbG9ja051bWJlcik7CisJQXNzZXJ0KFJlbGF0aW9u R2V0VGFyZ2V0QmxvY2socmVsX2RzdCkgPT0gSW52YWxpZEJsb2NrTnVtYmVyKTsKIAogCS8qCiAJ ICogSW4gbm9uLWNvbmN1cnJlbnQgbW9kZSwgaW5pdGlhbGl6ZSB0aGUgcmV3cml0ZSBvcGVyYXRp b24uICBUaGlzIGlzIG5vdApAQCAtNjIzLDE0ICs2NDIsMTEgQEAgaGVhcGFtX3JlbGF0aW9uX2Nv cHlfZm9yX2NsdXN0ZXIoUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gTmV3SGVhcCwKIAllbHNl CiAJCXJ3c3RhdGUgPSBOVUxMOwogCi0JLyogSW4gY29uY3VycmVudCBtb2RlLCBwcmVwYXJlIGZv ciBidWxrLWluc2VydCBvcGVyYXRpb24uICovCi0JaWYgKGNvbmN1cnJlbnQpCi0JCWJpc3RhdGUg PSBHZXRCdWxrSW5zZXJ0U3RhdGUoKTsKLQllbHNlCi0JCWJpc3RhdGUgPSBOVUxMOwotCi0JLyog U2V0IHVwIHNvcnRpbmcgaWYgd2FudGVkICovCi0JaWYgKHVzZV9zb3J0KQorCS8qCisJICogU2V0 IHVwIHNvcnRpbmcgaWYgd2FudGVkLiBDT05DVVJSRU5UTFkgZWZmZWN0aXZlbHkgaWdub3JlcyB1 c2Vfc29ydCAtCisJICogaXQgc29ydHMgdGhlIHR1cGxlIHcvbyB0dXBsZXNvcnQsIHNlZSBiZWxv dy4KKwkgKi8KKwlpZiAodXNlX3NvcnQgJiYgIWNvbmN1cnJlbnQpCiAJCXR1cGxlc29ydCA9IHR1 cGxlc29ydF9iZWdpbl9jbHVzdGVyKG9sZFR1cERlc2MsIE9sZEluZGV4LAogCQkJCQkJCQkJCQlt YWludGVuYW5jZV93b3JrX21lbSwKIAkJCQkJCQkJCQkJTlVMTCwgVFVQTEVTT1JUX05PTkUpOwpA QCAtNjQyLDIwICs2NTgsMjEgQEAgaGVhcGFtX3JlbGF0aW9uX2NvcHlfZm9yX2NsdXN0ZXIoUmVs YXRpb24gT2xkSGVhcCwgUmVsYXRpb24gTmV3SGVhcCwKIAkgKiB0aGF0IHN0aWxsIG5lZWQgdG8g YmUgY29waWVkLCB3ZSBzY2FuIHdpdGggU25hcHNob3RBbnkgYW5kIHVzZQogCSAqIEhlYXBUdXBs ZVNhdGlzZmllc1ZhY3V1bSBmb3IgdGhlIHZpc2liaWxpdHkgdGVzdC4KIAkgKgotCSAqIEluIHRo ZSBDT05DVVJSRU5UTFkgY2FzZSwgd2UgZG8gcmVndWxhciBNVkNDIHZpc2liaWxpdHkgdGVzdHMs IHVzaW5nCi0JICogdGhlIHNuYXBzaG90IHBhc3NlZCBieSB0aGUgY2FsbGVyLgorCSAqIEluIHRo ZSBDT05DVVJSRU5UTFkgY2FzZSwgd2UgY2hhbmdlIHRoZSBzbmFwc2hvdCBlYWNoIHRpbWUgd2Ug aGF2ZQorCSAqIHNjYW5uZWQgY2VydGFpbiByYW5nZSBvZiBibG9ja3MsIHNvIHRoYXQgd2UgZG8g bm90IHJlc3RyaWN0IHRoZQorCSAqIHByb2dyZXNzIG9mIHRoZSB4bWluIGhvcml6b24gZm9yIFZB Q1VVTSB0b28gbXVjaC4gSW5kZXggc2NhbiBjYW5ub3QgYmUKKwkgKiB1c2VkIGJlY2F1c2UgaXQg cmV0dXJucyB0dXBsZXMgaW4gcmFuZG9tIG9yZGVyLCB3aGljaCBtYWtlcyBpdAorCSAqIGltcG9z c2libGUgdG8gc3BsaXQgdGhlIHNjYW4gaW50byBibG9jayByYW5nZXMuCiAJICovCi0JaWYgKE9s ZEluZGV4ICE9IE5VTEwgJiYgIXVzZV9zb3J0KQorCWlmIChPbGRJbmRleCAhPSBOVUxMICYmICF1 c2Vfc29ydCAmJiAhY29uY3VycmVudCkKIAl7CiAJCXBnc3RhdF9wcm9ncmVzc191cGRhdGVfcGFy YW0oUFJPR1JFU1NfUkVQQUNLX1BIQVNFLAogCQkJCQkJCQkJIFBST0dSRVNTX1JFUEFDS19QSEFT RV9JTkRFWF9TQ0FOX0hFQVApOwogCiAJCXRhYmxlU2NhbiA9IE5VTEw7CiAJCWhlYXBTY2FuID0g TlVMTDsKLQkJaW5kZXhTY2FuID0gaW5kZXhfYmVnaW5zY2FuKE9sZEhlYXAsIE9sZEluZGV4LCBm YWxzZSwKLQkJCQkJCQkJCXNuYXBzaG90ID8gc25hcHNob3QgOiBTbmFwc2hvdEFueSwKLQkJCQkJ CQkJCU5VTEwsIDAsIDAsCi0JCQkJCQkJCQlTT19OT05FKTsKKwkJaW5kZXhTY2FuID0gaW5kZXhf YmVnaW5zY2FuKE9sZEhlYXAsIE9sZEluZGV4LCBmYWxzZSwgU25hcHNob3RBbnksIE5VTEwsIDAs CisJCQkJCQkJCQkwLCBTT19OT05FKTsKIAkJaW5kZXhfcmVzY2FuKGluZGV4U2NhbiwgTlVMTCwg MCwgTlVMTCwgMCk7CiAJfQogCWVsc2UKQEAgLTY2NCwxNiArNjgxLDI5IEBAIGhlYXBhbV9yZWxh dGlvbl9jb3B5X2Zvcl9jbHVzdGVyKFJlbGF0aW9uIE9sZEhlYXAsIFJlbGF0aW9uIE5ld0hlYXAs CiAJCXBnc3RhdF9wcm9ncmVzc191cGRhdGVfcGFyYW0oUFJPR1JFU1NfUkVQQUNLX1BIQVNFLAog CQkJCQkJCQkJIFBST0dSRVNTX1JFUEFDS19QSEFTRV9TRVFfU0NBTl9IRUFQKTsKIAotCQl0YWJs ZVNjYW4gPSB0YWJsZV9iZWdpbnNjYW4oT2xkSGVhcCwKLQkJCQkJCQkJCXNuYXBzaG90ID8gc25h cHNob3QgOiBTbmFwc2hvdEFueSwKLQkJCQkJCQkJCTAsIChTY2FuS2V5KSBOVUxMLAorCQl0YWJs ZVNjYW4gPSB0YWJsZV9iZWdpbnNjYW4oT2xkSGVhcCwgU25hcHNob3RBbnksIDAsIChTY2FuS2V5 KSBOVUxMLAogCQkJCQkJCQkJU09fTk9ORSk7CiAJCWhlYXBTY2FuID0gKEhlYXBTY2FuRGVzYykg dGFibGVTY2FuOworCisJCS8qCisJCSAqIEluIENPTkNVUlJFTlRMWSBtb2RlIHdlIHNjYW4gdGhl IHRhYmxlIGJ5IHJhbmdlcyBvZiBibG9ja3MgYW5kIHRoZQorCQkgKiBhbGdvcml0aG0gYmVsb3cg ZXhwZWN0cyBmb3J3YXJkIGRpcmVjdGlvbi4gKE5vIG90aGVyIGRpcmVjdGlvbgorCQkgKiBzaG91 bGQgYmUgc2V0IGhlcmUgcmVnYXJkbGVzcyBjb25jdXJyZW50bHkgYW55d2F5LikKKwkJICovCisJ CUFzc2VydChoZWFwU2Nhbi0+cnNfZGlyID09IEZvcndhcmRTY2FuRGlyZWN0aW9uIHx8ICFjb25j dXJyZW50KTsKIAkJaW5kZXhTY2FuID0gTlVMTDsKIAogCQkvKiBTZXQgdG90YWwgaGVhcCBibG9j a3MgKi8KIAkJcGdzdGF0X3Byb2dyZXNzX3VwZGF0ZV9wYXJhbShQUk9HUkVTU19SRVBBQ0tfVE9U QUxfSEVBUF9CTEtTLAogCQkJCQkJCQkJIGhlYXBTY2FuLT5yc19uYmxvY2tzKTsKKworCQkvKiBT ZXR1cCB0aGUgZmlyc3QgcmFuZ2UuICovCisJCWlmIChjb25jdXJyZW50KQorCQl7CisJCQlyYW5n ZV9zdGFydCA9IGhlYXBTY2FuLT5yc19zdGFydGJsb2NrOworCQkJcmFuZ2VfZW5kID0gcmFuZ2Vf c3RhcnQgKyByZXBhY2tfcGFnZXNfcGVyX3NuYXBzaG90OworCQkJcmFuZ2Vfc3RhcnRfbmV3ID0g UmVsYXRpb25HZXROdW1iZXJPZkJsb2NrcyhyZWxfZHN0KTsKKwkJfQogCX0KIAogCXNsb3QgPSB0 YWJsZV9zbG90X2NyZWF0ZShPbGRIZWFwLCBOVUxMKTsKQEAgLTY4MSw5ICs3MTEsNDUgQEAgaGVh cGFtX3JlbGF0aW9uX2NvcHlfZm9yX2NsdXN0ZXIoUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24g TmV3SGVhcCwKIAlyZWZvcm1fc2xvdCA9IE1ha2VTaW5nbGVUdXBsZVRhYmxlU2xvdChSZWxhdGlv bkdldERlc2NyKE9sZEhlYXApLAogCQkJCQkJCQkJCSAgICZUVFNPcHNWaXJ0dWFsKTsKIAorCWlm IChjb25jdXJyZW50KQorCXsKKwkJLyoKKwkJICogRG8gbm90IGJsb2NrIHRoZSBwcm9ncmVzcyBv ZiB4bWluIGhvcml6b25zLgorCQkgKi8KKwkJUG9wQWN0aXZlU25hcHNob3QoKTsKKwkJSW52YWxp ZGF0ZUNhdGFsb2dTbmFwc2hvdCgpOworCisJCS8qCisJCSAqIEFzIHRoZXJlIGlzIG5vIHNuYXBz aG90LCBvdXIgeG1pbiBzaG91bGQgYmUgaW52YWxpZCBub3cuCisJCSAqCisJCSAqIFhYWCB4aWQg Y2FuIHN0aWxsIGJlIHZhbGlkLiBUaGUgbmV4dCBwYXRjaGVzIGluIHRoZSBzZXJpZXMgZml4CisJ CSAqIHRoYXQuCisJCSAqLworCQlBc3NlcnQoIVRyYW5zYWN0aW9uSWRJc1ZhbGlkKE15UHJvYy0+ eG1pbikpOworCisJCS8qCisJCSAqIFdhaXQgdW50aWwgdGhlIHdvcmtlciBoYXMgdGhlIGluaXRp YWwgc25hcHNob3QgYW5kIHJldHJpZXZlIGl0LgorCQkgKi8KKwkJc25hcHNob3QgPSByZXBhY2tf Z2V0X3NuYXBzaG90KGNoZ2N4dCk7CisKKwkJLyoKKwkJICogVW5saWtlIGEgc2NhbiBkdXJpbmcg cXVlcnkgcHJvY2Vzc2luZywgd2UgYWxzbyBuZWVkIHRvIGNhcHR1cmUKKwkJICogY2hhbmdlcyBv biBwYWdlcyB0aGF0IHRoZSBzY2FuIHdpbGwgbm90IHJlYWNoOiB3aGVuIHByb2Nlc3NpbmcKKwkJ ICogcGFydGljdWxhciByYW5nZSBvZiBwYWdlcywgd2UgYWx3YXlzIG5lZWQgdG8gcHJvY2VzcyBj aGFuZ2VzIG9uCisJCSAqIHBhZ2VzIGJleW9uZCBuYmxvY2tzLgorCQkgKgorCQkgKiBUaGlzIGhh ZCB0byB3YWl0IHVudGlsIGxvZ2ljYWwgZGVjb2RpbmcgaGFzIHN0YXJ0ZWQgKGkuZS4gdW50aWwg d2UKKwkJICogcmVjZWl2ZWQgdGhlIHNuYXBzaG90IGFib3ZlKSwgb3RoZXJ3aXNlIHdlIGNvdWxk IG1pc3MgdHVwbGVzCisJCSAqIGluc2VydGVkIHJpZ2h0IGFmdGVyIHRoZSBibG9jayB0aGF0IHdl IGNvbnNpZGVyIHRoZSBsYXN0IG9uZS4KKwkJICovCisJCW5ibG9ja3MgPSBoZWFwU2Nhbi0+cnNf bmJsb2NrczsKKworCQlQdXNoQWN0aXZlU25hcHNob3Qoc25hcHNob3QpOworCX0KKwogCS8qCiAJ ICogU2NhbiB0aHJvdWdoIHRoZSBPbGRIZWFwLCBlaXRoZXIgaW4gT2xkSW5kZXggb3JkZXIgb3Ig c2VxdWVudGlhbGx5OwotCSAqIGNvcHkgZWFjaCB0dXBsZSBpbnRvIHRoZSBOZXdIZWFwLCBvciB0 cmFuc2llbnRseSB0byB0aGUgdHVwbGVzb3J0CisJICogY29weSBlYWNoIHR1cGxlIGludG8gdGhl IHJlbF9kc3QsIG9yIHRyYW5zaWVudGx5IHRvIHRoZSB0dXBsZXNvcnQKIAkgKiBtb2R1bGUuICBO b3RlIHRoYXQgd2UgZG9uJ3QgYm90aGVyIHNvcnRpbmcgZGVhZCB0dXBsZXMgKHRoZXkgd29uJ3Qg Z2V0CiAJICogdG8gdGhlIG5ldyB0YWJsZSBhbnl3YXkpLgogCSAqLwpAQCAtNjk3LDggKzc2Mywx MCBAQCBoZWFwYW1fcmVsYXRpb25fY29weV9mb3JfY2x1c3RlcihSZWxhdGlvbiBPbGRIZWFwLCBS ZWxhdGlvbiBOZXdIZWFwLAogCiAJCWlmIChpbmRleFNjYW4gIT0gTlVMTCkKIAkJewotCQkJaWYg KCF0YWJsZV9pbmRleF9nZXRuZXh0X3Nsb3QoaW5kZXhTY2FuLCBGb3J3YXJkU2NhbkRpcmVjdGlv biwKLQkJCQkJCQkJCQkgIHNsb3QpKQorCQkJLyogU2VlIGFib3ZlLiAqLworCQkJQXNzZXJ0KCFj b25jdXJyZW50KTsKKworCQkJaWYgKCF0YWJsZV9pbmRleF9nZXRuZXh0X3Nsb3QoaW5kZXhTY2Fu LCBGb3J3YXJkU2NhbkRpcmVjdGlvbiwgc2xvdCkpCiAJCQkJYnJlYWs7CiAKIAkJCS8qIFNpbmNl IHdlIHVzZWQgbm8gc2NhbiBrZXlzLCBzaG91bGQgbmV2ZXIgbmVlZCB0byByZWNoZWNrICovCkBA IC04MzUsMTAgKzkwMyw0MiBAQCBoZWFwYW1fcmVsYXRpb25fY29weV9mb3JfY2x1c3RlcihSZWxh dGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBOZXdIZWFwLAogCQkJCWNvbnRpbnVlOwogCQkJfQogCQl9 CisJCWVsc2UKKwkJeworCQkJQmxvY2tOdW1iZXIgYmxrbm87CisJCQlib29sCQl2aXNpYmxlOwor CisJCQkvKgorCQkJICogV2l0aCBDT05DVVJSRU5UTFksIHdlIHVzZSBlYWNoIHNuYXBzaG90IG9u bHkgZm9yIGNlcnRhaW4gcmFuZ2UKKwkJCSAqIG9mIHBhZ2VzLCBzbyB0aGF0IFZBQ1VVTSBkb2Vz IG5vdCBnZXQgYmxvY2tlZCBmb3IgdG9vIGxvbmcuIFNvCisJCQkgKiBmaXJzdCBjaGVjayBpZiB0 aGUgdHVwbGUgZmFsbHMgaW50byB0aGUgY3VycmVudCByYW5nZS4KKwkJCSAqLworCQkJYmxrbm8g PSBCdWZmZXJHZXRCbG9ja051bWJlcihidWYpOworCisJCQlBc3NlcnQoQmxvY2tOdW1iZXJJc1Zh bGlkKHJhbmdlX2VuZCkpOworCisJCQkvKiBFbmQgb2YgdGhlIGN1cnJlbnQgcmFuZ2Ugb3IgYSB3 cmFwYXJvdW5kPyAqLworCQkJaWYgKCFyZXBhY2tfYmxvY2tfaW5fcmFuZ2UoYmxrbm8sIHJhbmdl X3N0YXJ0LCByYW5nZV9lbmQsCisJCQkJCQkJCQkgICBJbnZhbGlkQmxvY2tOdW1iZXIpKQorCQkJ CXNuYXBzaG90ID0gZmluYWxpemVfYmxvY2tfcmFuZ2UocmVsX2RzdCwgY2hnY3h0LCBibGtubywK KwkJCQkJCQkJCQkJCXJhbmdlX3N0YXJ0LAorCQkJCQkJCQkJCQkJJnJhbmdlX2VuZCwgbmJsb2Nr cywKKwkJCQkJCQkJCQkJCSZyYW5nZV9zdGFydF9uZXcpOworCisJCQkvKiBGaW5hbGx5IGNoZWNr IHRoZSB0dXBsZSB2aXNpYmlsaXR5LiAqLworCQkJTG9ja0J1ZmZlcihidWYsIEJVRkZFUl9MT0NL X1NIQVJFKTsKKwkJCXZpc2libGUgPSBIZWFwVHVwbGVTYXRpc2ZpZXNWaXNpYmlsaXR5KHR1cGxl LCBzbmFwc2hvdCwgYnVmKTsKKwkJCUxvY2tCdWZmZXIoYnVmLCBCVUZGRVJfTE9DS19VTkxPQ0sp OworCisJCQlpZiAoIXZpc2libGUpCisJCQkJY29udGludWU7CisJCX0KIAogCQkqbnVtX3R1cGxl cyArPSAxOwogCQlpZiAodHVwbGVzb3J0ICE9IE5VTEwpCiAJCXsKKwkJCUFzc2VydCghY29uY3Vy cmVudCk7CisKIAkJCXR1cGxlc29ydF9wdXRoZWFwdHVwbGUodHVwbGVzb3J0LCB0dXBsZSk7CiAK IAkJCS8qCkBAIC04NTAsMTYgKzk1MCwxOSBAQCBoZWFwYW1fcmVsYXRpb25fY29weV9mb3JfY2x1 c3RlcihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBOZXdIZWFwLAogCQl9CiAJCWVsc2UKIAkJ ewotCQkJY29uc3QgaW50CWN0X2luZGV4W10gPSB7Ci0JCQkJUFJPR1JFU1NfUkVQQUNLX0hFQVBf VFVQTEVTX1NDQU5ORUQsCi0JCQkJUFJPR1JFU1NfUkVQQUNLX0hFQVBfVFVQTEVTX0lOU0VSVEVE Ci0JCQl9OworCQkJaW50CWN0X2luZGV4WzJdOwogCQkJaW50NjQJCWN0X3ZhbFsyXTsKIAorCQkJ Y3RfaW5kZXhbMF0gPSBQUk9HUkVTU19SRVBBQ0tfSEVBUF9UVVBMRVNfU0NBTk5FRDsKKwkJCWlm ICghY29uY3VycmVudCB8fCBjaGdjeHQtPmNjX2Rlc3RfYXV4ID09IE5VTEwpCisJCQkJY3RfaW5k ZXhbMV0gPSBQUk9HUkVTU19SRVBBQ0tfSEVBUF9UVVBMRVNfSU5TRVJURUQ7CisJCQllbHNlCisJ CQkJY3RfaW5kZXhbMV0gPSBQUk9HUkVTU19SRVBBQ0tfSEVBUF9UVVBMRVNfSU5TRVJURURfQVVY OworCiAJCQlpZiAoIWNvbmN1cnJlbnQpCiAJCQkJcmVmb3JtX2FuZF9yZXdyaXRlX3R1cGxlKHNs b3QsIHJlZm9ybV9zbG90LCByd3N0YXRlKTsKIAkJCWVsc2UKLQkJCQloZWFwX2luc2VydF9mb3Jf cmVwYWNrKE5ld0hlYXAsIHNsb3QsIHJlZm9ybV9zbG90LCBiaXN0YXRlKTsKKwkJCQloZWFwX2lu c2VydF9mb3JfcmVwYWNrKGNoZ2N4dCwgc2xvdCwgcmVmb3JtX3Nsb3QpOwogCiAJCQkvKgogCQkJ ICogSW4gaW5kZXhzY2FuIG1vZGUgYW5kIGFsc28gVkFDVVVNIEZVTEwsIHJlcG9ydCBpbmNyZWFz ZSBpbgpAQCAtODcxLDYgKzk3NCwyOSBAQCBoZWFwYW1fcmVsYXRpb25fY29weV9mb3JfY2x1c3Rl cihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBOZXdIZWFwLAogCQl9CiAJfQogCisJaWYgKGNv bmN1cnJlbnQpCisJeworCQlYTG9nUmVjUHRyCWVuZF9vZl93YWw7CisKKwkJLyoKKwkJICogUHJv Y2VzcyB0aGUgY2hhbmdlcyBiZWxvbmdpbmcgdG8gdGhlIGxhc3QgcmFuZ2UuCisJCSAqLworCQll bmRfb2Zfd2FsID0gR2V0Rmx1c2hSZWNQdHIoTlVMTCk7CisJCXJlcGFja19wcm9jZXNzX2NvbmN1 cnJlbnRfY2hhbmdlcyhjaGdjeHQsIGVuZF9vZl93YWwsCisJCQkJCQkJCQkJICBJbnZhbGlkQmxv Y2tOdW1iZXIsCisJCQkJCQkJCQkJICBJbnZhbGlkQmxvY2tOdW1iZXIsCisJCQkJCQkJCQkJICBJ bnZhbGlkQmxvY2tOdW1iZXIsCisJCQkJCQkJCQkJICBmYWxzZSwgZmFsc2UpOworCisJCS8qCisJ CSAqIFRoZXJlIHdhcyBhbiBhY3RpdmUgdHJhbnNhY3Rpb24gc25hcHNob3Qgb24gZW50cnksIHNv IHB1c2ggb25lCisJCSAqIGJlZm9yZSByZXR1cm4uCisJCSAqLworCQlQb3BBY3RpdmVTbmFwc2hv dCgpOworCQlQdXNoQWN0aXZlU25hcHNob3QoR2V0VHJhbnNhY3Rpb25TbmFwc2hvdCgpKTsKKwor CX0KKwogCWlmIChpbmRleFNjYW4gIT0gTlVMTCkKIAkJaW5kZXhfZW5kc2NhbihpbmRleFNjYW4p OwogCWlmICh0YWJsZVNjYW4gIT0gTlVMTCkKQEAgLTkxNiwxMCArMTA0MiwxMyBAQCBoZWFwYW1f cmVsYXRpb25fY29weV9mb3JfY2x1c3RlcihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBOZXdI ZWFwLAogCQkJRXhlY1N0b3JlSGVhcFR1cGxlKHR1cGxlLCBzbG90LCBmYWxzZSk7CiAKIAkJCW5f dHVwbGVzICs9IDE7Ci0JCQlpZiAoIWNvbmN1cnJlbnQpCi0JCQkJcmVmb3JtX2FuZF9yZXdyaXRl X3R1cGxlKHNsb3QsIHJlZm9ybV9zbG90LCByd3N0YXRlKTsKLQkJCWVsc2UKLQkJCQloZWFwX2lu c2VydF9mb3JfcmVwYWNrKE5ld0hlYXAsIHNsb3QsIHJlZm9ybV9zbG90LCBiaXN0YXRlKTsKKwor CQkJLyoKKwkJCSAqIFRoZSBDT05DVVJSRU5UTFkgbW9kZSB1c2VzIGF1eGlsaWFyeSB0YWJsZXMg cmF0aGVyIHRoYW4KKwkJCSAqIHR1cGxlc29ydC4KKwkJCSAqLworCQkJQXNzZXJ0KCFjb25jdXJy ZW50KTsKKwkJCXJlZm9ybV9hbmRfcmV3cml0ZV90dXBsZShzbG90LCByZWZvcm1fc2xvdCwgcndz dGF0ZSk7CiAKIAkJCS8qIFJlcG9ydCBuX3R1cGxlcyAqLwogCQkJcGdzdGF0X3Byb2dyZXNzX3Vw ZGF0ZV9wYXJhbShQUk9HUkVTU19SRVBBQ0tfSEVBUF9UVVBMRVNfSU5TRVJURUQsCkBAIC05MzUs OCArMTA2NCwxMTcgQEAgaGVhcGFtX3JlbGF0aW9uX2NvcHlfZm9yX2NsdXN0ZXIoUmVsYXRpb24g T2xkSGVhcCwgUmVsYXRpb24gTmV3SGVhcCwKIAkvKiBXcml0ZSBvdXQgYW55IHJlbWFpbmluZyB0 dXBsZXMsIGFuZCBmc3luYyBpZiBuZWVkZWQgKi8KIAlpZiAocndzdGF0ZSkKIAkJZW5kX2hlYXBf cmV3cml0ZShyd3N0YXRlKTsKLQlpZiAoYmlzdGF0ZSkKLQkJRnJlZUJ1bGtJbnNlcnRTdGF0ZShi aXN0YXRlKTsKK30KKworLyoKKyAqIEZpbmFsaXplIHByb2Nlc3Npbmcgb2YgdGhlIGN1cnJlbnQg YmxvY2sgcmFuZ2UuCisgKgorICogJ2N1cicgaXMgdGhlIGN1cnJlbnQgYmxvY2ssICdzdGFydCcg aXMgdGhlIGZpcnN0IGJsb2NrIG9mIHRoZSBjdXJyZW50CisgKiByYW5nZS4KKyAqCisgKiAnKmVu ZF9wJzogb24gZW50cnksIHRoZSBmaXJzdCBibG9jayBiZXlvbmQgdGhlIGN1cnJlbnQgcmFuZ2Us IG9uIGV4aXQsIHRoZQorICogZmlyc3QgYmxvY2sgYmV5b25kIHRoZSBuZXcgcmFuZ2UuCisgKgor ICogUmV0dXJuIHRoZSBzbmFwc2hvdCBmb3IgdGhlIHNjYW4gb2YgdGhlIG5ldyByYW5nZS4KKyAq Lworc3RhdGljIFNuYXBzaG90CitmaW5hbGl6ZV9ibG9ja19yYW5nZShSZWxhdGlvbiByZWxfZHN0 LCBDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIEJsb2NrTnVtYmVyIGN1ciwKKwkJCQkJIEJsb2NrTnVt YmVyIHN0YXJ0LCBCbG9ja051bWJlciAqZW5kX3AsCisJCQkJCSBCbG9ja051bWJlciBuYmxvY2tz LAorCQkJCQkgQmxvY2tOdW1iZXIgKnJhbmdlX3N0YXJ0X2RzdF9wKQoreworCUJsb2NrTnVtYmVy IGVuZCA9ICplbmRfcDsKKwlYTG9nUmVjUHRyCWVuZF9vZl93YWw7CisJU25hcHNob3QJc25hcHNo b3Q7CisKKwkvKgorCSAqIFdhaXQgaGVyZSB3aGVuIHRlc3RpbmcgaG93IHNuYXBzaG90IGlzIGNo YW5nZWQgYXQgcGFnZSBib3VuZGFyeS4KKwkgKi8KKwlJTkpFQ1RJT05fUE9JTlQoInJlcGFjay1j b25jdXJyZW50bHktbmV3LXJhbmdlIiwgTlVMTCk7CisKKwkvKgorCSAqIERlY29kZSBhbGwgdGhl IGNvbmN1cnJlbnQgZGF0YSBjaGFuZ2VzIGNvbW1pdHRlZCBzbyBmYXIgYmVmb3JlCisJICogcmVx dWVzdGluZyB0aGUgbmV4dCBzbmFwc2hvdCAtIHRoZXNlIGNoYW5nZXMgYXJlIGFwcGxpY2FibGUg b24gdG9wIG9mCisJICogdGhlIGN1cnJlbnQgc25hcHNob3QuIFNpbmNlIHdlIG9ubHkgY29waWVk IHBhcnQgb2YgdGhlIHRhYmxlIHNvIGZhciwKKwkgKiBvbmx5IGNoYW5nZXMgYXBwbGljYWJsZSB0 byB0aGF0IHBhcnQgY2FuIGJlIGFwcGxpZWQuCisJICoKKwkgKiBJdCdzIGltcG9ydGFudCB0byBh cHBseSB0aGUgY2hhbmdlcyBiZWZvcmUgd2Ugc3RhcnQgY29weWluZyB0aGUgbmV4dAorCSAqIHJh bmdlIG9mIGJsb2Nrcy4gV2l0aG91dCB0aGF0LCBpbiBjYXNlIG9mIGNvbmN1cnJlbnQgVVBEQVRF LCB3ZSBjb3VsZAorCSAqIGVuZCB1cCB3aXRoIGJvdGggb2xkIGFuZCBuZXcgdHVwbGUgcHJlc2Vu dCBpbiB0aGUgbmV3IHRhYmxlOiB0aGUgb2xkCisJICogc3RpbGwgdmlzaWJsZSBpbiB0aGUgY3Vy cmVudCByYW5nZSBhbmQgdGhlIG5ldyBhbHJlYWR5IHZpc2libGUgaW4gdGhlCisJICogZm9sbG93 aW5nIHJhbmdlIChmb3Igd2hpY2ggd2UnbGwgdXNlIG1vcmUgcmVjZW50IHNuYXBzaG90KS4gVGh1 cyBpdCdkCisJICogYmUgbm9uLXRyaXZpYWwgdG8gYXBwbHkgdGhlIFVQREFURSBsYXRlci4gQnkg cmVwbGF5aW5nIGl0IG5vdywgd2UgZ2V0CisJICogcmlkIG9mIHRoZSBvbGQgdHVwbGUgaW4gdGhl IGN1cnJlbnQgcmFuZ2UuCisJICoKKwkgKiBCZWZvcmUgcHJvY2Vzc2luZyB0aGUgZGF0YSBjaGFu Z2VzLCBoYW5kbGUgc3BlY2lhbCBjYXNlIG9mIHRoZSBjdXJyZW50CisJICogYmxvY2sgbnVtYmVy LgorCSAqLworCWlmIChjdXIgPiBlbmQpCisJeworCQkvKgorCQkgKiBJZiB0aGUgcmFuZ2UgZW5k cyB3aXRoIGVtcHR5IGJsb2NrcywgbWFrZSBzdXJlIHRoZWlyIGRhdGEgY2hhbmdlcworCQkgKiBh cmUgcHJvY2Vzc2VkOiB0aGUgbmV4dCBzbmFwc2hvdCB3aWxsIG5vdCBiZSB1c2VkIGZvciB0aG9z ZSBibG9ja3MuCisJCSAqLworCQllbmQgPSBjdXI7CisJfQorI2lmZGVmIFVTRV9BU1NFUlRfQ0hF Q0tJTkcKKwllbHNlIGlmIChjdXIgPj0gc3RhcnQpCisJCUFzc2VydChjdXIgPT0gZW5kKTsKKyNl bmRpZiAvKiBVU0VfQVNTRVJUX0NIRUNLSU5HICovCisKKwllbmRfb2Zfd2FsID0gR2V0Rmx1c2hS ZWNQdHIoTlVMTCk7CisJcmVwYWNrX3Byb2Nlc3NfY29uY3VycmVudF9jaGFuZ2VzKGNoZ2N4dCwg ZW5kX29mX3dhbCwgc3RhcnQsIGVuZCwgbmJsb2NrcywKKwkJCQkJCQkJCSAgdHJ1ZSwgZmFsc2Up OworCisJLyoKKwkgKiBBIG5ldyBzbmFwc2hvdCB3aWxsIGJlIHB1c2hlZCBiZWxvdy4gTm90ZSB0 aGF0IGl0J3MgaW1wb3J0YW50IHRvIG5vdCBkbworCSAqIHRoaXMgZWFybGllciwgYmVjYXVzZSAt IHdoaWxlIHByb2Nlc3NpbmcgdGhlIGNvbmN1cnJlbnQgZGF0YSBjaGFuZ2VzIC0KKwkgKiB3ZSBt aWdodCBoYXZlIG5lZWRlZCB0byBmZXRjaCBUT0FTVGVkIHZhbHVlcyBmcm9tIHRoZSBvbGQgcmVs YXRpb24gLQorCSAqIHNlZSB0aGUgVVBEQVRFLXRvLUlOU0VSVCBjb252ZXJzaW9uIGluIGFwcGx5 X2NvbmN1cnJlbnRfY2hhbmdlcygpLiBBcworCSAqIHRoaXMgc25hcHNob3QgcHJvdGVjdHMgdGhl IGRhdGEgY29waWVkIGZyb20gVkFDVVVNLCBpdCBzaG91bGQgYWxzbworCSAqIHByb3RlY3QgdGhl IFRPQVNUIHZhbHVlcyByZWZlcmVuY2VkIGJ5IHRoZSBjb25zZXF1ZW50IFVQREFURQorCSAqIHN0 YXRlbWVudHMuCisJICovCisJUG9wQWN0aXZlU25hcHNob3QoKTsKKwlJbnZhbGlkYXRlQ2F0YWxv Z1NuYXBzaG90KCk7CisKKwkvKiBTZWUgYWJvdmUuICovCisJQXNzZXJ0KCFUcmFuc2FjdGlvbklk SXNWYWxpZChNeVByb2MtPnhtaW4pKTsKKworCS8qCisJICogWFhYIEl0IG1pZ2h0IGJlIHdvcnRo IEFzc2VydChDYXRhbG9nU25hcHNob3QgPT0gTlVMTCkgaGVyZSwgaG93ZXZlcgorCSAqIHRoYXQg c3ltYm9sIGlzIG5vdCBleHRlcm5hbC4KKwkgKi8KKworCS8qCisJICogQ29tcHV0ZSB0aGUgZW5k IG9mIHRoZSBuZXcgcmFuZ2UgYnkgYWxpZ25pbmcgJ2N1cicgdG8gYSBtdWx0aXBsZSBvZgorCSAq IHJhbmdlIGJvdW5kYXJ5LiBUaGlzIGFjY291bnRzIGZvciB0aGUgcG9zc2liaWxpdHkgdGhhdCBz b21lIGJsb2NrCisJICogbnVtYmVycyBjb3VsZCBoYXZlIGJlZW4gc2tpcHBlZCAoZHVlIHRvIHBh Z2VzIGJlaW5nIGVtcHR5KS4KKwkgKi8KKwllbmQgPSBjdXIgKyByZXBhY2tfcGFnZXNfcGVyX3Nu YXBzaG90IC0gKGN1ciAlIHJlcGFja19wYWdlc19wZXJfc25hcHNob3QpOworCS8qCisJICogVGhl IHNjYW4gc2hvdWxkIGFsd2F5cyBlbmQgcmlnaHQgYmVmb3JlICdzdGFydCcuIElmIHdlIGhhdmUg YQorCSAqIHdyYXBhcm91bmQsIG1ha2Ugc3VyZSB0aGF0IG5ldyAnZW5kJyBkb2VzIG5vdCBnbyBi ZXlvbmQgJ3N0YXJ0Jy4KKwkgKiBPdGhlcndpc2UgdGhlIHJhbmdlIGJvdW5kYXJpZXMgd291bGQg ZmFpbCB0byBpbmRpY2F0ZSB0aGF0IGEgd3JhcGFyb3VuZAorCSAqIHRvb2sgcGxhY2UsIGFuZCBy ZXBhY2tfYmxvY2tfaW5fcmFuZ2UoKSB3b3VsZCBnaXZlIHdyb25nIGFuc3dlcnMuCisJICovCisJ aWYgKGN1ciA8IHN0YXJ0ICYmIGVuZCA+IHN0YXJ0KQorCQllbmQgPSBzdGFydDsKKworCSplbmRf cCA9IGVuZDsKKworCS8qCisJICogR2V0IHRoZSBzbmFwc2hvdCBmb3IgdGhlIG5leHQgcmFuZ2Ug LSBpdCBzaG91bGQgaGF2ZSBiZWVuIGJ1aWx0IGF0IHRoZQorCSAqIHBvc2l0aW9uIHJpZ2h0IGFm dGVyIHRoZSBsYXN0IGNoYW5nZSBkZWNvZGVkLiBEYXRhIHByZXNlbnQgaW4gdGhlIG5leHQKKwkg KiByYW5nZSBvZiBibG9ja3Mgd2lsbCBlaXRoZXIgYmUgdmlzaWJsZSB0byB0aGUgc25hcHNob3Qg b3IgYXBwZWFyIGluIHRoZQorCSAqIG5leHQgYmF0Y2ggb2YgZGVjb2RlZCBjaGFuZ2VzLgorCSAq LworCXNuYXBzaG90ID0gcmVwYWNrX2dldF9zbmFwc2hvdChjaGdjeHQpOworCVB1c2hBY3RpdmVT bmFwc2hvdChzbmFwc2hvdCk7CisKKwkqcmFuZ2Vfc3RhcnRfZHN0X3AgPSBSZWxhdGlvbkdldE51 bWJlck9mQmxvY2tzKHJlbF9kc3QpOworCisJcmV0dXJuIHNuYXBzaG90OwogfQogCiAvKgpkaWZm IC0tZ2l0IGEvc3JjL2JhY2tlbmQvY2F0YWxvZy9zeXN0ZW1fdmlld3Muc3FsIGIvc3JjL2JhY2tl bmQvY2F0YWxvZy9zeXN0ZW1fdmlld3Muc3FsCmluZGV4IDZkY2U5MTkyYmEwLi5lZjhlMjNhMjk5 NSAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvY2F0YWxvZy9zeXN0ZW1fdmlld3Muc3FsCisrKyBi L3NyYy9iYWNrZW5kL2NhdGFsb2cvc3lzdGVtX3ZpZXdzLnNxbApAQCAtMTM4MiwxNSArMTM4Miwx NyBAQCBDUkVBVEUgVklFVyBwZ19zdGF0X3Byb2dyZXNzX3JlcGFjayBBUwogICAgICAgICAgICAg ICAgICAgICAgIFdIRU4gOCBUSEVOICdwZXJmb3JtaW5nIGZpbmFsIGNsZWFudXAnCiAgICAgICAg ICAgICAgICAgICAgICAgV0hFTiA5IFRIRU4gJ2VuYWJsaW5nIGxvZ2ljYWwgZGVjb2RpbmcnCiAg ICAgICAgICAgICAgICAgICAgICAgV0hFTiAxMCBUSEVOICdpbml0aWFsaXppbmcgbG9naWNhbCBk ZWNvZGluZycKKyAgICAgICAgICAgICAgICAgICAgICBXSEVOIDExIFRIRU4gJ2J1aWxkaW5nIGF1 eGlsaWFyeSByZWxhdGlvbiBpbmRleCcKICAgICAgICAgICAgICAgICAgICAgICBFTkQgQVMgcGhh c2UsCiAgICAgICAgIENBU1QoUy5wYXJhbTMgQVMgb2lkKSBBUyByZXBhY2tfaW5kZXhfcmVsaWQs CiAgICAgICAgIFMucGFyYW00IEFTIGhlYXBfdHVwbGVzX3NjYW5uZWQsCiAgICAgICAgIFMucGFy YW01IEFTIGhlYXBfdHVwbGVzX2luc2VydGVkLAotICAgICAgICBTLnBhcmFtNiBBUyBoZWFwX3R1 cGxlc191cGRhdGVkLAotICAgICAgICBTLnBhcmFtNyBBUyBoZWFwX3R1cGxlc19kZWxldGVkLAot ICAgICAgICBTLnBhcmFtOCBBUyBoZWFwX2Jsa3NfdG90YWwsCi0gICAgICAgIFMucGFyYW05IEFT IGhlYXBfYmxrc19zY2FubmVkLAotICAgICAgICBTLnBhcmFtMTAgQVMgaW5kZXhfcmVidWlsZF9j b3VudAorICAgICAgICBTLnBhcmFtNiBBUyBoZWFwX3R1cGxlc19pbnNlcnRlZF9hdXgsCisgICAg ICAgIFMucGFyYW03IEFTIGhlYXBfdHVwbGVzX3VwZGF0ZWQsCisgICAgICAgIFMucGFyYW04IEFT IGhlYXBfdHVwbGVzX2RlbGV0ZWQsCisgICAgICAgIFMucGFyYW05IEFTIGhlYXBfYmxrc190b3Rh bCwKKyAgICAgICAgUy5wYXJhbTEwIEFTIGhlYXBfYmxrc19zY2FubmVkLAorICAgICAgICBTLnBh cmFtMTEgQVMgaW5kZXhfcmVidWlsZF9jb3VudAogICAgIEZST00gcGdfc3RhdF9nZXRfcHJvZ3Jl c3NfaW5mbygnUkVQQUNLJykgQVMgUwogICAgICAgICBMRUZUIEpPSU4gcGdfZGF0YWJhc2UgRCBP TiBTLmRhdGlkID0gRC5vaWQ7CiAKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3Jl cGFjay5jIGIvc3JjL2JhY2tlbmQvY29tbWFuZHMvcmVwYWNrLmMKaW5kZXggNWZkOGI4ZjYzOWMu LjlkNjlhNGYwNzE3IDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9jb21tYW5kcy9yZXBhY2suYwor KysgYi9zcmMvYmFja2VuZC9jb21tYW5kcy9yZXBhY2suYwpAQCAtMzMsNiArMzMsNyBAQAogI2lu Y2x1ZGUgInBvc3RncmVzLmgiCiAKICNpbmNsdWRlICJhY2Nlc3MvYW1hcGkuaCIKKyNpbmNsdWRl ICJhY2Nlc3MvZGV0b2FzdC5oIgogI2luY2x1ZGUgImFjY2Vzcy9oZWFwYW0uaCIKICNpbmNsdWRl ICJhY2Nlc3MvbXVsdGl4YWN0LmgiCiAjaW5jbHVkZSAiYWNjZXNzL3JlbHNjYW4uaCIKQEAgLTk1 LDYgKzk2LDEyIEBAIHR5cGVkZWYgc3RydWN0CiAJT2lkCQkJaW5kZXhPaWQ7CiB9IFJlbFRvQ2x1 c3RlcjsKIAorLyoKKyAqIFdoZW4gUkVQQUNLIChDT05DVVJSRU5UTFkpIGNvcGllcyBkYXRhIHRv IHRoZSBuZXcgaGVhcCwgYSBuZXcgc25hcHNob3QgaXMKKyAqIGJ1aWx0IGFmdGVyIHByb2Nlc3Np bmcgdGhpcyBtYW55IHBhZ2VzLiBYWFggVHVuZSB0aGUgdmFsdWUuCisgKi8KK2ludAkJCXJlcGFj a19wYWdlc19wZXJfc25hcHNob3QgPSAxMDI0OworCiAvKgogICogQmFja2VuZC1sb2NhbCBpbmZv cm1hdGlvbiB0byBjb250cm9sIHRoZSBkZWNvZGluZyB3b3JrZXIuCiAgKi8KQEAgLTEyOSwxMSAr MTM2LDExIEBAIHN0YXRpYyB2b2lkIGNoZWNrX2luZGV4X3JlcXVpcmVtZW50cyhSZWxhdGlvbiBy ZWwsIFJlcGFja0NvbW1hbmQgY21kKTsKIHN0YXRpYyB2b2lkIHJlYnVpbGRfcmVsYXRpb24oUmVs YXRpb24gT2xkSGVhcCwgUmVsYXRpb24gaW5kZXgsIGJvb2wgdmVyYm9zZSwKIAkJCQkJCQkgT2lk IGlkZW50X2lkeCk7CiBzdGF0aWMgdm9pZCBjb3B5X3RhYmxlX2RhdGEoUmVsYXRpb24gTmV3SGVh cCwgUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gT2xkSW5kZXgsCi0JCQkJCQkJU25hcHNob3Qg c25hcHNob3QsCiAJCQkJCQkJYm9vbCB2ZXJib3NlLAogCQkJCQkJCWJvb2wgKnBTd2FwVG9hc3RC eUNvbnRlbnQsCiAJCQkJCQkJVHJhbnNhY3Rpb25JZCAqcEZyZWV6ZVhpZCwKLQkJCQkJCQlNdWx0 aVhhY3RJZCAqcEN1dG9mZk11bHRpKTsKKwkJCQkJCQlNdWx0aVhhY3RJZCAqcEN1dG9mZk11bHRp LAorCQkJCQkJCUNoYW5nZUNvbnRleHQgKmNoZ2N4dCk7CiBzdGF0aWMgTGlzdCAqZ2V0X3RhYmxl c190b19yZXBhY2soUmVwYWNrQ29tbWFuZCBjbWQsIGJvb2wgdXNpbmdpbmRleCwKIAkJCQkJCQkJ ICBNZW1vcnlDb250ZXh0IHBlcm1jeHQpOwogc3RhdGljIExpc3QgKmdldF90YWJsZXNfdG9fcmVw YWNrX3BhcnRpdGlvbmVkKFJlcGFja1N0bXQgKnN0bXQsCkBAIC0xNDMsMjMgKzE1MCwyNSBAQCBz dGF0aWMgYm9vbCByZXBhY2tfaXNfcGVybWl0dGVkX2Zvcl9yZWxhdGlvbihSZXBhY2tDb21tYW5k IGNtZCwKIAkJCQkJCQkJCQkJIE9pZCByZWxpZCwgT2lkIHVzZXJpZCwKIAkJCQkJCQkJCQkJIGJv b2wgYWxyZWFkeV9sb2NrZWQpOwogCi1zdGF0aWMgdm9pZCBhcHBseV9jb25jdXJyZW50X2NoYW5n ZXMoQ2hhbmdlQ29udGV4dCAqY2hnY3h0KTsKK3N0YXRpYyB2b2lkIGFwcGx5X2NvbmN1cnJlbnRf Y2hhbmdlcyhDaGFuZ2VDb250ZXh0ICpjaGdjeHQsCisJCQkJCQkJCQkgQmxvY2tOdW1iZXIgcmFu Z2Vfc3RhcnQsCisJCQkJCQkJCQkgQmxvY2tOdW1iZXIgcmFuZ2VfZW5kLAorCQkJCQkJCQkJIEJs b2NrTnVtYmVyIG5ibG9ja3MpOwogc3RhdGljIHZvaWQgYXBwbHlfY29uY3VycmVudF9pbnNlcnQo UmVwYWNrRGVzdCAqZGVzdCwgVHVwbGVUYWJsZVNsb3QgKnNsb3QpOwogc3RhdGljIHZvaWQgYXBw bHlfY29uY3VycmVudF91cGRhdGUoUmVwYWNrRGVzdCAqZGVzdCwKIAkJCQkJCQkJCVR1cGxlVGFi bGVTbG90ICpzcGlsbGVkX3R1cGxlLAogCQkJCQkJCQkJVHVwbGVUYWJsZVNsb3QgKm9uZGlza190 dXBsZSk7CiBzdGF0aWMgdm9pZCBhcHBseV9jb25jdXJyZW50X2RlbGV0ZShSZWxhdGlvbiByZWws IFR1cGxlVGFibGVTbG90ICpzbG90KTsKIHN0YXRpYyB2b2lkIHJlc3RvcmVfdHVwbGUoQnVmRmls ZSAqZmlsZSwgUmVsYXRpb24gcmVsYXRpb24sCi0JCQkJCQkgIFR1cGxlVGFibGVTbG90ICpzbG90 KTsKKwkJCQkJCSAgVHVwbGVUYWJsZVNsb3QgKnNsb3QsIEJsb2NrTnVtYmVyICpibG9ja19ucl9w LAorCQkJCQkJICBCbG9ja051bWJlciAqb2xkX2Jsb2NrX25yX3ApOwogc3RhdGljIHZvaWQgcHJl cGFyZV9jb25jdXJyZW50X3VwZGF0ZShUdXBsZVRhYmxlU2xvdCAqZGVzdCwKIAkJCQkJCQkJCSAg VHVwbGVUYWJsZVNsb3QgKnNyYyk7CiBzdGF0aWMgYm9vbCBmaW5kX3RhcmdldF90dXBsZShSZXBh Y2tEZXN0ICpkZXN0LCBUdXBsZVRhYmxlU2xvdCAqbG9jYXRvciwKIAkJCQkJCQkgIFR1cGxlVGFi bGVTbG90ICpyZXRyaWV2ZWQpOwotc3RhdGljIGJvb2wgaWRlbnRpdHlfa2V5X2VxdWFsKFJlcGFj a0Rlc3QgKmRlc3QsIFR1cGxlVGFibGVTbG90ICpsb2NhdG9yLAorc3RhdGljIGJvb2wgaWRlbnRp dHlfa2V5X2VxdWFsKFJlcGFja0Rlc3QgKmRlc3QsCisJCQkJCQkJICAgVHVwbGVUYWJsZVNsb3Qg KmxvY2F0b3IsCiAJCQkJCQkJICAgVHVwbGVUYWJsZVNsb3QgKmNhbmRpZGF0ZSk7Ci1zdGF0aWMg dm9pZCBwcm9jZXNzX2NvbmN1cnJlbnRfY2hhbmdlcyhYTG9nUmVjUHRyIGVuZF9vZl93YWwsCi0J CQkJCQkJCQkgICBDaGFuZ2VDb250ZXh0ICpjaGdjeHQsCi0JCQkJCQkJCQkgICBib29sIGRvbmUp Owogc3RhdGljIHZvaWQgaW5pdGlhbGl6ZV9jaGFuZ2VfY29udGV4dChDaGFuZ2VDb250ZXh0ICpj aGdjeHQsCiAJCQkJCQkJCQkgIFJlbGF0aW9uIHNyY19yZWxhdGlvbiwKIAkJCQkJCQkJCSAgUmVs YXRpb24gdGd0X3JlbGF0aW9uLApAQCAtMTcxLDggKzE4MCwxMiBAQCBzdGF0aWMgdm9pZCByZWxl YXNlX2NoYW5nZV9kZXN0KFJlcGFja0Rlc3QgKmRlc3QpOwogc3RhdGljIHZvaWQgcmVidWlsZF9y ZWxhdGlvbl9maW5pc2hfY29uY3VycmVudChSZWxhdGlvbiBOZXdIZWFwLCBSZWxhdGlvbiBPbGRI ZWFwLAogCQkJCQkJCQkJCQkgICBPaWQgaWRlbnRJZHgsCiAJCQkJCQkJCQkJCSAgIFRyYW5zYWN0 aW9uSWQgZnJvemVuWGlkLAotCQkJCQkJCQkJCQkgICBNdWx0aVhhY3RJZCBjdXRvZmZNdWx0aSk7 CisJCQkJCQkJCQkJCSAgIE11bHRpWGFjdElkIGN1dG9mZk11bHRpLAorCQkJCQkJCQkJCQkgICBD aGFuZ2VDb250ZXh0ICpjaGdjeHQpOworc3RhdGljIHZvaWQgcHJvY2Vzc19hdXhpbGlhcnlfdGFi bGUoQ2hhbmdlQ29udGV4dCAqY2hnY3h0LCBSZWxhdGlvbiBPbGRIZWFwLAorCQkJCQkJCQkJT2lk IGlkZW50SWR4KTsKIHN0YXRpYyBMaXN0ICpidWlsZF9uZXdfaW5kZXhlcyhSZWxhdGlvbiBOZXdI ZWFwLCBMaXN0ICpPbGRJbmRleGVzKTsKK3N0YXRpYyBPaWQJYnVpbGRfbmV3X2luZGV4KFJlbGF0 aW9uIE5ld0hlYXAsIE9pZCBvbGRpbmRleCwgYm9vbCBpc19hdXgpOwogc3RhdGljIHZvaWQgY29w eV9pbmRleF9jb25zdHJhaW50cyhSZWxhdGlvbiBvbGRfaW5kZXgsIE9pZCBuZXdfaW5kZXhfaWQs CiAJCQkJCQkJCSAgIE9pZCBuZXdfaGVhcF9pZCk7CiBzdGF0aWMgdm9pZCBjb3B5X2F0dHJpYnV0 ZV9kZWZhdWx0cyhPaWQgb2xkX2hlYXBfb2lkLCBPaWQgbmV3X2hlYXBfb2lkKTsKQEAgLTE4Nyw3 ICsyMDAsNiBAQCBzdGF0aWMgdm9pZCBzdGFydF9yZXBhY2tfZGVjb2Rpbmdfd29ya2VyKE9pZCBy ZWxpZCk7CiBzdGF0aWMgdm9pZCB3YWl0X2Zvcl9yZXBhY2tfZGVjb2Rpbmdfd29ya2VyKHZvaWQp Owogc3RhdGljIHZvaWQgc3RvcF9yZXBhY2tfZGVjb2Rpbmdfd29ya2VyKHZvaWQpOwogc3RhdGlj IHZvaWQgc3RvcF9yZXBhY2tfZGVjb2Rpbmdfd29ya2VyX2NiKGludCBjb2RlLCBEYXR1bSBhcmcp Owotc3RhdGljIFNuYXBzaG90IGdldF9pbml0aWFsX3NuYXBzaG90KERlY29kaW5nV29ya2VyICp3 b3JrZXIpOwogCiBzdGF0aWMgdm9pZCBQcm9jZXNzUmVwYWNrTWVzc2FnZShTdHJpbmdJbmZvIG1z Zyk7CiBzdGF0aWMgY29uc3QgY2hhciAqUmVwYWNrQ29tbWFuZEFzU3RyaW5nKFJlcGFja0NvbW1h bmQgY21kKTsKQEAgLTEwNDMsMTMgKzEwNTUsMjMgQEAgY2hlY2tfY29uY3VycmVudF9yZXBhY2tf cmVxdWlyZW1lbnRzKFJlbGF0aW9uIHJlbCwgT2lkICppZGVudF9pZHhfcCkKIAkJCQllcnJtc2co ImNhbm5vdCBleGVjdXRlICVzIG9uIHJlbGF0aW9uIFwiJXNcIiIsCiAJCQkJCSAgICJSRVBBQ0sg KENPTkNVUlJFTlRMWSkiLCBSZWxhdGlvbkdldFJlbGF0aW9uTmFtZShyZWwpKSwKIAkJCQllcnJk ZXRhaWwoIlJlbGF0aW9uIFwiJXNcIiBoYXMgbm8gaWRlbnRpdHkgaW5kZXguIiwKLQkJCQkJCSAg UmVsYXRpb25HZXRSZWxhdGlvbk5hbWUocmVsKSkpOworCQkJCQkJUmVsYXRpb25HZXRSZWxhdGlv bk5hbWUocmVsKSkpOwogCX0KIAorCS8qCisJICogSW4gdGhlIENPTkNVUlJFTlRMWSBtb2RlIHdl IGRvbid0IHdhbnQgdG8gdXNlIHRoZSBzYW1lIHNuYXBzaG90CisJICogdGhyb3VnaG91dCB0aGUg d2hvbGUgcHJvY2Vzc2luZywgYXMgaXQgY291bGQgYmxvY2sgdGhlIHByb2dyZXNzIG9mIHhtaW4K KwkgKiBob3Jpem9uLiBBc3NlcnQgc2hvdWxkIGJlIG9rIGFzIHdlIGFscmVhZHkgZGlzYWxsb3cg dHJhbnNhY3Rpb24gYmxvY2sKKwkgKiBpbiB0aGUgQ09OQ1VSUkVOVExZIGNhc2UuCisJICovCisJ aWYgKElzb2xhdGlvblVzZXNYYWN0U25hcHNob3QoKSkKKwkJZXJlcG9ydChFUlJPUiwKKwkJCQll cnJjb2RlKEVSUkNPREVfRkVBVFVSRV9OT1RfU1VQUE9SVEVEKSwKKwkJCQllcnJtc2coIlJFUEFD SyAoQ09OQ1VSUkVOVExZKSBkb2VzIG5vdCBzdXBwb3J0IGlzb2xhdGlvbiBsZXZlbCBSRVBFQVRB QkxFIFJFQUQgb3IgaGlnaGVyIikpOworCiAJKmlkZW50X2lkeF9wID0gaWRlbnRfaWR4OwogfQog Ci0KIC8qCiAgKiByZWJ1aWxkX3JlbGF0aW9uOiByZWJ1aWxkIGFuIGV4aXN0aW5nIHJlbGF0aW9u IGluIGluZGV4IG9yIHBoeXNpY2FsIG9yZGVyCiAgKgpAQCAtMTA4Miw3ICsxMTA0LDcgQEAgcmVi dWlsZF9yZWxhdGlvbihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBpbmRleCwgYm9vbCB2ZXJi b3NlLAogCVRyYW5zYWN0aW9uSWQgZnJvemVuWGlkOwogCU11bHRpWGFjdElkIGN1dG9mZk11bHRp OwogCWJvb2wJCWNvbmN1cnJlbnQgPSBPaWRJc1ZhbGlkKGlkZW50X2lkeCk7Ci0JU25hcHNob3QJ c25hcHNob3QgPSBOVUxMOworCUNoYW5nZUNvbnRleHQgKmNoZ2N4dCA9IE5VTEw7CiAjaWYgVVNF X0FTU0VSVF9DSEVDS0lORwogCUxPQ0tNT0RFCWxtb2RlOwogCkBAIC0xMTI1LDEzICsxMTQ3LDYg QEAgcmVidWlsZF9yZWxhdGlvbihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBpbmRleCwgYm9v bCB2ZXJib3NlLAogCQkgKiB1cCBpbiBhIGRlYWRsb2NrLgogCQkgKi8KIAkJc3RhcnRfcmVwYWNr X2RlY29kaW5nX3dvcmtlcih0YWJsZU9pZCk7Ci0KLQkJLyoKLQkJICogV2FpdCB1bnRpbCB0aGUg d29ya2VyIGhhcyB0aGUgaW5pdGlhbCBzbmFwc2hvdCBhbmQgcmV0cmlldmUgaXQuCi0JCSAqLwot CQlzbmFwc2hvdCA9IGdldF9pbml0aWFsX3NuYXBzaG90KGRlY29kaW5nX3dvcmtlcik7Ci0KLQkJ UHVzaEFjdGl2ZVNuYXBzaG90KHNuYXBzaG90KTsKIAl9CiAKIAkvKiBmb3IgQ0xVU1RFUiBvciBS RVBBQ0sgVVNJTkcgSU5ERVgsIG1hcmsgdGhlIGluZGV4IGFzIHRoZSBvbmUgdG8gdXNlICovCkBA IC0xMTU0LDI2ICsxMTY5LDExNCBAQCByZWJ1aWxkX3JlbGF0aW9uKFJlbGF0aW9uIE9sZEhlYXAs IFJlbGF0aW9uIGluZGV4LCBib29sIHZlcmJvc2UsCiAJQXNzZXJ0KENoZWNrUmVsYXRpb25PaWRM b2NrZWRCeU1lKE9JRE5ld0hlYXAsIEFjY2Vzc0V4Y2x1c2l2ZUxvY2ssIGZhbHNlKSk7CiAJTmV3 SGVhcCA9IHRhYmxlX29wZW4oT0lETmV3SGVhcCwgTm9Mb2NrKTsKIAotCS8qCi0JICogSW4gY29u Y3VycmVudCBtb2RlLCBjcmVhdGUgYSBjb3B5IG9mIHRoZSBhdHRyaWJ1dGUgZGVmYXVsdHMgb24g dGhlIHRlbXAKLQkgKiB0YWJsZSwgd2hpY2ggdGhlIGV4ZWN1dG9yIG5lZWRzIHdoZW4gcmVwbGF5 aW5nIGNvbmN1cnJlbnQgZGF0YSBjaGFuZ2VzLgotCSAqLwogCWlmIChjb25jdXJyZW50KQorCXsK KwkJYm9vbAkJbmVlZF9hdXhfcmVsOworCisKKwkJLyoKKwkJICogQXV4aWxpYXJ5IHRhYmxlIGlz IG5lZWRlZCBmb3IgY2x1c3RlcmluZyBpbiB0aGUgQ09OQ1VSUkVOVExZIG1vZGUsCisJCSAqIHNl ZSBjb21tZW50cyBpbiBDaGFuZ2VDb250ZXh0LiBYWFggTm9uLWJ0cmVlIGluZGV4IGlzIHByb2Jh Ymx5IG5vdAorCQkgKiB2ZXJ5IHVzZWZ1bCBmb3IgY2x1c3RlcmluZywgYnV0IENMVVNURVIgYWNj ZXB0ZWQgaXQsIHNvIHRoZXJlJ3Mgbm8KKwkJICogcmVhc29uIGZvciBSRVBBQ0sgdG8gaW50cm9k dWNlIG5ldyByZXN0cmljdGlvbnMuCisJCSAqLworCQluZWVkX2F1eF9yZWwgPSBpbmRleCAhPSBO VUxMOworCisJCS8qIEdhdGhlciBpbmZvcm1hdGlvbiB0byBhcHBseSBjb25jdXJyZW50IGNoYW5n ZXMuICovCisJCWNoZ2N4dCA9IHBhbGxvYzBfb2JqZWN0KENoYW5nZUNvbnRleHQpOworCisJCS8q CisJCSAqIENyZWF0ZSBhIGNvcHkgb2YgdGhlIGF0dHJpYnV0ZSBkZWZhdWx0cyBvbiB0aGUgdGVt cCB0YWJsZSwgd2hpY2gKKwkJICogdGhlIGV4ZWN1dG9yIG5lZWRzIHdoZW4gcmVwbGF5aW5nIGNv bmN1cnJlbnQgZGF0YSBjaGFuZ2VzLgorCQkgKi8KIAkJY29weV9hdHRyaWJ1dGVfZGVmYXVsdHMo dGFibGVPaWQsIE9JRE5ld0hlYXApOwogCi0JLyogQ29weSB0aGUgaGVhcCBkYXRhIGludG8gdGhl IG5ldyB0YWJsZSBpbiB0aGUgZGVzaXJlZCBvcmRlciAqLwotCWNvcHlfdGFibGVfZGF0YShOZXdI ZWFwLCBPbGRIZWFwLCBpbmRleCwgc25hcHNob3QsIHZlcmJvc2UsCi0JCQkJCSZzd2FwX3RvYXN0 X2J5X2NvbnRlbnQsICZmcm96ZW5YaWQsICZjdXRvZmZNdWx0aSk7CisJCWlmICghbmVlZF9hdXhf cmVsKQorCQl7CisJCQlPaWQJCQlpZGVudF9pZHhfbmV3OwogCi0JLyogVGhlIGhpc3RvcmljIHNu YXBzaG90IHdvbid0IGJlIG5lZWRlZCBhbnltb3JlLiAqLwotCWlmIChzbmFwc2hvdCkKLQl7Ci0J CVBvcEFjdGl2ZVNuYXBzaG90KCk7Ci0JCVVwZGF0ZUFjdGl2ZVNuYXBzaG90Q29tbWFuZElkKCk7 CisJCQkvKgorCQkJICogQ3JlYXRlIHRoZSBpZGVudGl0eSBpbmRleC4gV2Ugd2lsbCBuZWVkIGl0 IGR1cmluZyBkYXRhIGNvcHlpbmcKKwkJCSAqIHNvIHRoYXQgd2UgY2FuIGFwcGx5IHRoZSBkYXRh IGNoYW5nZXMgYXQgdGhlIGFwcHJvcHJpYXRlIHRpbWUgLQorCQkJICogc2VlIGNvbW1lbnRzIGFy b3VuZCB0aGUgY2FsbCBvZgorCQkJICogcmVwYWNrX3Byb2Nlc3NfY29uY3VycmVudF9jaGFuZ2Vz KCkgd2l0aCBibG9jayByYW5nZSBzcGVjaWZpZWQuCisJCQkgKi8KKwkJCWlkZW50X2lkeF9uZXcg PSBidWlsZF9uZXdfaW5kZXgoTmV3SGVhcCwgaWRlbnRfaWR4LCBmYWxzZSk7CisKKwkJCWluaXRp YWxpemVfY2hhbmdlX2NvbnRleHQoY2hnY3h0LCBPbGRIZWFwLCBOZXdIZWFwLAorCQkJCQkJCQkJ ICBpZGVudF9pZHhfbmV3KTsKKwkJfQorCQllbHNlCisJCXsKKwkJCU9pZAkJCWF1eF9vaWQ7CisJ CQlSZWxhdGlvbglhdXhfcmVsOworCQkJT2lkCQkJYXV4X2lkZW50X2lkeDsKKworCQkJLyoKKwkJ CSAqIEFzIHRoZSBjb25jdXJyZW50IGRhdGEgY2hhbmdlcyB3aWxsIGJlIGFwcGxpZWQgdG8gdGhl IGF1eGlsaWFyeQorCQkJICogaGVhcCwgdGhlIG5ldyBoZWFwIGRvZXMgbm90IG5lZWQgdGhlIGlk ZW50aXR5IGluZGV4IHlldC4gV2UnbGwKKwkJCSAqIGJ1aWxkIGl0IGFmdGVyIGhhdmluZyBjb3Bp ZWQgdGhlIGRhdGEgZnJvbSB0aGUgYXV4aWxpYXJ5IGhlYXAuCisJCQkgKiAoQnVsayBpbnNlcnQg c2hvdWxkIGJlIG1vcmUgZWZmaWNpZW50LikKKwkJCSAqLworCQkJaW5pdGlhbGl6ZV9jaGFuZ2Vf Y29udGV4dChjaGdjeHQsIE9sZEhlYXAsIE5ld0hlYXAsIEludmFsaWRPaWQpOworCisJCQkvKgor CQkJICogTGlrZSBhYm92ZSwgYnV0IG9ubHkgdGVtcG9yYXJ5IC0gbm8gb3RoZXIgYmFja2VuZCBz aG91bGQgbmVlZAorCQkJICogaXQuCisJCQkgKi8KKwkJCWF1eF9vaWQgPSBtYWtlX25ld19oZWFw KHRhYmxlT2lkLCB0YWJsZVNwYWNlLCBhY2Nlc3NNZXRob2QsCisJCQkJCQkJCQlSRUxQRVJTSVNU RU5DRV9URU1QLCBOb0xvY2spOworCQkJQXNzZXJ0KENoZWNrUmVsYXRpb25PaWRMb2NrZWRCeU1l KGF1eF9vaWQsIEFjY2Vzc0V4Y2x1c2l2ZUxvY2ssCisJCQkJCQkJCQkJCSAgZmFsc2UpKTsKKwkJ CWF1eF9yZWwgPSB0YWJsZV9vcGVuKGF1eF9vaWQsIE5vTG9jayk7CisKKworCQkJLyoKKwkJCSAq IENvcHkgdGhlIGF0dHJpYnV0ZSBkZWZhdWx0cyBhcyB3ZSBkaWQgZm9yIHRoZSBuZXcgaGVhcCBh Ym92ZSAtCisJCQkgKiB0aGUgY29uY3VycmVudCBjaGFuZ2VzIGFsc28gbmVlZCB0byBiZSBhcHBs aWVkIHRvIHRoZSBhdXhpbGlhcnkKKwkJCSAqIHRhYmxlLgorCQkJICovCisJCQljb3B5X2F0dHJp YnV0ZV9kZWZhdWx0cyh0YWJsZU9pZCwgYXV4X29pZCk7CisKKwkJCS8qCisJCQkgKiBUaGUgc2Ft ZSBmb3IgaWRlbnRpdHkgaW5kZXguIChUaGUgYWRkaXRpb25hbAorCQkJICogU2hhcmVVcGRhdGVF eGNsdXNpdmVMb2NrIG9uIGlkZW50X2lkeCBpcyBub3QgYSBwcm9ibGVtLCBpdCdsbAorCQkJICog YmUgcmVsZWFzZWQgYXQgdGhlIGVuZCBvZiB0cmFuc2FjdGlvbi4pCisJCQkgKi8KKwkJCWF1eF9p ZGVudF9pZHggPSBidWlsZF9uZXdfaW5kZXgoYXV4X3JlbCwgaWRlbnRfaWR4LCB0cnVlKTsKKwor CQkJLyoKKwkJCSAqIE1ha2UgdGhlIHJlbGF0aW9uIHJlYWR5IGZvciB1c2UuCisJCQkgKi8KKwkJ CWNoZ2N4dC0+Y2NfZGVzdF9hdXggPSBwYWxsb2MwX29iamVjdChSZXBhY2tEZXN0KTsKKwkJCWlu aXRpYWxpemVfY2hhbmdlX2Rlc3QoY2hnY3h0LT5jY19kZXN0X2F1eCwgYXV4X3JlbCwKKwkJCQkJ CQkJICAgYXV4X2lkZW50X2lkeCk7CisKKwkJCS8qCisJCQkgKiBTZXQgT0lEIG9mIHRoZSBvbGQg cmVsYXRpb24ncyBjbHVzdGVyaW5nIGluZGV4IGlmIGl0J3MKKwkJCSAqIGRpZmZlcmVudCBmcm9t IHRoZSBpZGVudGl0eSBpbmRleC4gT3RoZXJ3aXNlIHNldCBJbnZhbGlkT2lkIHRvCisJCQkgKiBp bmRpY2F0ZSB0aGF0IHRoZSBpZGVudGl0eSBpbmRleCBzaG91bGQgYmUgdXNlZCBmb3IgY2x1c3Rl cmluZy4KKwkJCSAqLworCQkJaWYgKFJlbGF0aW9uR2V0UmVsaWQoaW5kZXgpICE9IGlkZW50X2lk eCkKKwkJCQljaGdjeHQtPmNjX2NsdXN0ZXJpbmdfaW5kZXggPSBSZWxhdGlvbkdldFJlbGlkKGlu ZGV4KTsKKwkJCWVsc2UKKwkJCQljaGdjeHQtPmNjX2NsdXN0ZXJpbmdfaW5kZXggPSBJbnZhbGlk T2lkOworCQl9CiAJfQogCisJLyogQ29weSB0aGUgaGVhcCBkYXRhIGludG8gdGhlIG5ldyB0YWJs ZSBpbiB0aGUgZGVzaXJlZCBvcmRlciAqLworCWNvcHlfdGFibGVfZGF0YShOZXdIZWFwLCBPbGRI ZWFwLCBpbmRleCwgdmVyYm9zZSwKKwkJCQkJJnN3YXBfdG9hc3RfYnlfY29udGVudCwgJmZyb3pl blhpZCwgJmN1dG9mZk11bHRpLAorCQkJCQljaGdjeHQpOworCiAJaWYgKGNvbmN1cnJlbnQpCiAJ eworCQkvKgorCQkgKiBNYWtlIHN1cmUgdGhlIGFjdGl2ZSBzbmFwc2hvdCBjYW4gc2VlIHRoZSBk YXRhIGNvcGllZCwgc28gdGhlIHJvd3MKKwkJICogY2FuIGJlIHVwZGF0ZWQgLyBkZWxldGVkLgor CQkgKi8KKwkJVXBkYXRlQWN0aXZlU25hcHNob3RDb21tYW5kSWQoKTsKKwogCQlBc3NlcnQoIXN3 YXBfdG9hc3RfYnlfY29udGVudCk7CiAKIAkJLyoKQEAgLTExODQsMTAgKzEyODcsMTYgQEAgcmVi dWlsZF9yZWxhdGlvbihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBpbmRleCwgYm9vbCB2ZXJi b3NlLAogCQkJaW5kZXhfY2xvc2UoaW5kZXgsIE5vTG9jayk7CiAKIAkJcmVidWlsZF9yZWxhdGlv bl9maW5pc2hfY29uY3VycmVudChOZXdIZWFwLCBPbGRIZWFwLCBpZGVudF9pZHgsCi0JCQkJCQkJ CQkJICAgZnJvemVuWGlkLCBjdXRvZmZNdWx0aSk7CisJCQkJCQkJCQkJICAgZnJvemVuWGlkLCBj dXRvZmZNdWx0aSwgY2hnY3h0KTsKIAogCQlwZ3N0YXRfcHJvZ3Jlc3NfdXBkYXRlX3BhcmFtKFBS T0dSRVNTX1JFUEFDS19QSEFTRSwKIAkJCQkJCQkJCSBQUk9HUkVTU19SRVBBQ0tfUEhBU0VfRklO QUxfQ0xFQU5VUCk7CisKKwkJLyoKKwkJICogUkVQQUNLIChDT05DVVJSRU5UTFkpIGxhdW5jaGVz IHNlcGFyYXRlIHRyYW5zYWN0aW9uKHMpIHNvIGl0CisJCSAqIHNob3VsZG4ndCByZWx5IG9uIHRo ZSBjdXJyZW50IHBvcnRhbCB0byBwb3AgdGhlIGFjdGl2ZSBzbmFwc2hvdC4KKwkJICovCisJCVBv cEFjdGl2ZVNuYXBzaG90KCk7CiAJfQogCWVsc2UKIAl7CkBAIC0xMzUwLDEwICsxNDU5LDkgQEAg bWFrZV9uZXdfaGVhcChPaWQgT0lET2xkSGVhcCwgT2lkIE5ld1RhYmxlU3BhY2UsIE9pZCBOZXdB Y2Nlc3NNZXRob2QsCiAgKiBJbnNlcnQgdHVwbGUgd2hlbiBwcm9jZXNzaW5nIFJFUEFDSyBDT05D VVJSRU5UTFkuCiAgKgogICogcmV3cml0ZWhlYXAuYyBpcyBub3QgdXNlZCBpbiB0aGUgQ09OQ1VS UkVOVExZIGNhc2UgYmVjYXVzZSBpdCdkIGJlCi0gKiBkaWZmaWN1bHQgdG8gZG8gdGhlIHNhbWUg aW4gdGhlIGNhdGNoLXVwIHBoYXNlIChhcyB0aGUgbG9naWNhbAotICogZGVjb2RpbmcgZG9lcyBu b3QgcHJvdmlkZSB1cyB3aXRoIHN1ZmZpY2llbnQgdmlzaWJpbGl0eQotICogaW5mb3JtYXRpb24p LiBUaHVzIHdlIG11c3QgdXNlIGhlYXBfaW5zZXJ0KCkgYm90aCBkdXJpbmcgdGhlCi0gKiBjYXRj aC11cCBhbmQgaGVyZS4KKyAqIGRpZmZpY3VsdCB0byBkbyB0aGUgc2FtZSBpbiB0aGUgY2F0Y2gt dXAgcGhhc2UgKGFzIHRoZSBsb2dpY2FsIGRlY29kaW5nCisgKiBkb2VzIG5vdCBwcm92aWRlIHVz IHdpdGggc3VmZmljaWVudCB2aXNpYmlsaXR5IGluZm9ybWF0aW9uKS4gVGh1cyB3ZSBtdXN0Cisg KiB1c2UgaGVhcF9pbnNlcnQoKSBib3RoIGR1cmluZyB0aGUgY2F0Y2gtdXAgYW5kIGhlcmUuCiAg KgogICogJ3JlZm9ybScgaXMgYSBzbG90IHRvIHVzZSBmb3IgdHVwbGUgInJlZm9ybWluZyIsIHR5 cGljYWxseSB0byBnZXQgc2V0CiAgKiB2YWx1ZXMgb2YgZHJvcHBlZCBjb2x1bW5zIHRvIE5VTEwu CkBAIC0xMzYxLDE3ICsxNDY5LDI0IEBAIG1ha2VfbmV3X2hlYXAoT2lkIE9JRE9sZEhlYXAsIE9p ZCBOZXdUYWJsZVNwYWNlLCBPaWQgTmV3QWNjZXNzTWV0aG9kLAogICogV2UgcGFzcyB0aGUgTk9f TE9HSUNBTCBmbGFnIHRvIGhlYXBfaW5zZXJ0KCkgaW4gb3JkZXIgdG8gc2tpcCBsb2dpY2FsCiAg KiBkZWNvZGluZzogYXMgc29vbiBhcyBSRVBBQ0sgQ09OQ1VSUkVOVExZIHN3YXBzIHRoZSByZWxh dGlvbiBmaWxlcywgaXQgZHJvcHMKICAqIHRoaXMgcmVsYXRpb24sIHNvIG5vIGxvZ2ljYWwgcmVw bGljYXRpb24gc3Vic2NyaXB0aW9uIHNob3VsZCBuZWVkIHRoZSBkYXRhLgotICoKLSAqIEJ1bGtJ bnNlcnRTdGF0ZSBpcyB1c2VkIGJlY2F1c2UgbWFueSB0dXBsZXMgYXJlIGluc2VydGVkIGluIHRo ZSB0eXBpY2FsCi0gKiBjYXNlLgogICovCiB2b2lkCi1oZWFwX2luc2VydF9mb3JfcmVwYWNrKFJl bGF0aW9uIHJlbCwgVHVwbGVUYWJsZVNsb3QgKnNyYywKLQkJCQkJICAgVHVwbGVUYWJsZVNsb3Qg KnJlZm9ybSwgQnVsa0luc2VydFN0YXRlRGF0YSAqYmlzdGF0ZSkKK2hlYXBfaW5zZXJ0X2Zvcl9y ZXBhY2soQ2hhbmdlQ29udGV4dCAqY2hnY3h0LCBUdXBsZVRhYmxlU2xvdCAqc3JjLAorCQkJCQkg ICBUdXBsZVRhYmxlU2xvdCAqcmVmb3JtKQogewogCUhlYXBUdXBsZQl0dXBsZTsKIAlib29sCQlz aG91bGRGcmVlOwogCVR1cGxlVGFibGVTbG90ICpzbG90OworCVJlcGFja0Rlc3QgKmRlc3Q7CisK KwkvKgorCSAqIFVzZSB0aGUgY3VycmVudCBhdXhpbGlhcnkgdGFibGUgYXMgb3V0cHV0IGlmIG9u ZSBpcyBhY3RpdmUsIG90aGVyd2lzZQorCSAqIGluc2VydCB0aGUgdHVwbGUgaW50byB0aGUgYWN0 dWFsIGRlc3RpbmF0aW9uIHRhYmxlLgorCSAqLworCWlmIChjaGdjeHQtPmNjX2Rlc3RfYXV4KQor CQlkZXN0ID0gY2hnY3h0LT5jY19kZXN0X2F1eDsKKwllbHNlCisJCWRlc3QgPSAmY2hnY3h0LT5j Y19kZXN0OwogCiAJdHVwbGUgPSBFeGVjRmV0Y2hTbG90SGVhcFR1cGxlKHNyYywgZmFsc2UsICZz aG91bGRGcmVlKTsKIApAQCAtMTM4MSw3ICsxNDk2LDcgQEAgaGVhcF9pbnNlcnRfZm9yX3JlcGFj ayhSZWxhdGlvbiByZWwsIFR1cGxlVGFibGVTbG90ICpzcmMsCiAJQXNzZXJ0KFRUU19JU19CVUZG RVJUVVBMRShzcmMpKTsKIAlBc3NlcnQoIXNob3VsZEZyZWUpOwogCi0JaWYgKHR1cGxlX25lZWRz X3JlZm9ybSh0dXBsZSwgc3JjLT50dHNfdHVwbGVEZXNjcmlwdG9yKSkKKwlpZiAocmVmb3JtICE9 IE5VTEwgJiYgdHVwbGVfbmVlZHNfcmVmb3JtKHR1cGxlLCBzcmMtPnR0c190dXBsZURlc2NyaXB0 b3IpKQogCXsKIAkJY2xlYXJfZHJvcHBlZF9hdHRyaWJ1dGVzKHR1cGxlLCByZWZvcm0pOwogCQlz bG90ID0gcmVmb3JtOwpAQCAtMTM4OSw4ICsxNTA0LDE2IEBAIGhlYXBfaW5zZXJ0X2Zvcl9yZXBh Y2soUmVsYXRpb24gcmVsLCBUdXBsZVRhYmxlU2xvdCAqc3JjLAogCWVsc2UKIAkJc2xvdCA9IHNy YzsKIAotCXRhYmxlX3R1cGxlX2luc2VydChyZWwsIHNsb3QsIEdldEN1cnJlbnRDb21tYW5kSWQo dHJ1ZSksCi0JCQkJCSAgIFRBQkxFX0lOU0VSVF9OT19MT0dJQ0FMLCBiaXN0YXRlKTsKKwl0YWJs ZV90dXBsZV9pbnNlcnQoZGVzdC0+cmVsLCBzbG90LCBHZXRDdXJyZW50Q29tbWFuZElkKHRydWUp LAorCQkJCQkgICBUQUJMRV9JTlNFUlRfTk9fTE9HSUNBTCwgZGVzdC0+YmlzdGF0ZSk7CisKKwkv KgorCSAqIEluc2VydCB0aGUgdHVwbGUgaW50byB0aGUgaWRlbnRpdHkgaW5kZXguIGluaXRpYWxp emVfY2hhbmdlX2NvbnRleHQoKQorCSAqIG1heSBza2lwIG9wZW5pbmcgb2YgaW5kZXhlcyBpZiB0 aGUgaWRlbnRpdHkgaW5kZXggaXMgbm90IG5lZWRlZAorCSAqIGltbWVkaWF0ZWx5LgorCSAqLwor CWlmIChkZXN0LT5ycmkpCisJCUV4ZWNJbnNlcnRJbmRleFR1cGxlcyhkZXN0LT5ycmksIGRlc3Qt PmVzdGF0ZSwgMCwgc2xvdCwgTklMLCBOVUxMKTsKIH0KIAogYm9vbApAQCAtMTQ0MCw5ICsxNTYz LDYgQEAgY2xlYXJfZHJvcHBlZF9hdHRyaWJ1dGVzKEhlYXBUdXBsZSB0dXBsZSwgVHVwbGVUYWJs ZVNsb3QgKnJlZm9ybSkKIC8qCiAgKiBEbyB0aGUgcGh5c2ljYWwgY29weWluZyBvZiB0YWJsZSBk YXRhLgogICoKLSAqICdzbmFwc2hvdCcgYW5kICdkZWNvZGluZ19jdHgnOiBzZWUgdGFibGVfcmVs YXRpb25fY29weV9mb3JfY2x1c3RlcigpLiBQYXNzCi0gKiBpZmYgY29uY3VycmVudCBwcm9jZXNz aW5nIGlzIHJlcXVpcmVkLgotICoKICAqIFRoZXJlIGFyZSB0aHJlZSBvdXRwdXQgcGFyYW1ldGVy czoKICAqICpwU3dhcFRvYXN0QnlDb250ZW50IGlzIHNldCB0cnVlIGlmIHRvYXN0IHRhYmxlcyBt dXN0IGJlIHN3YXBwZWQgYnkgY29udGVudC4KICAqICpwRnJlZXplWGlkIHJlY2VpdmVzIHRoZSBU cmFuc2FjdGlvbklkIHVzZWQgYXMgZnJlZXplIGN1dG9mZiBwb2ludC4KQEAgLTE0NTAsOCArMTU3 MCw5IEBAIGNsZWFyX2Ryb3BwZWRfYXR0cmlidXRlcyhIZWFwVHVwbGUgdHVwbGUsIFR1cGxlVGFi bGVTbG90ICpyZWZvcm0pCiAgKi8KIHN0YXRpYyB2b2lkCiBjb3B5X3RhYmxlX2RhdGEoUmVsYXRp b24gTmV3SGVhcCwgUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gT2xkSW5kZXgsCi0JCQkJU25h cHNob3Qgc25hcHNob3QsIGJvb2wgdmVyYm9zZSwgYm9vbCAqcFN3YXBUb2FzdEJ5Q29udGVudCwK LQkJCQlUcmFuc2FjdGlvbklkICpwRnJlZXplWGlkLCBNdWx0aVhhY3RJZCAqcEN1dG9mZk11bHRp KQorCQkJCWJvb2wgdmVyYm9zZSwgYm9vbCAqcFN3YXBUb2FzdEJ5Q29udGVudCwKKwkJCQlUcmFu c2FjdGlvbklkICpwRnJlZXplWGlkLCBNdWx0aVhhY3RJZCAqcEN1dG9mZk11bHRpLAorCQkJCUNo YW5nZUNvbnRleHQgKmNoZ2N4dCkKIHsKIAlSZWxhdGlvbglyZWxSZWxhdGlvbjsKIAlIZWFwVHVw bGUJcmVsdHVwOwpAQCAtMTQ2OCw3ICsxNTg5LDcgQEAgY29weV90YWJsZV9kYXRhKFJlbGF0aW9u IE5ld0hlYXAsIFJlbGF0aW9uIE9sZEhlYXAsIFJlbGF0aW9uIE9sZEluZGV4LAogCWludAkJCWVs ZXZlbCA9IHZlcmJvc2UgPyBJTkZPIDogREVCVUcyOwogCVBHUlVzYWdlCXJ1MDsKIAljaGFyCSAg ICpuc3BuYW1lOwotCWJvb2wJCWNvbmN1cnJlbnQgPSBzbmFwc2hvdCAhPSBOVUxMOworCWJvb2wJ CWNvbmN1cnJlbnQgPSBjaGdjeHQgIT0gTlVMTDsKIAlMT0NLTU9ERQlsbW9kZTsKIAogCWxtb2Rl ID0gUmVwYWNrTG9ja0xldmVsKGNvbmN1cnJlbnQpOwpAQCAtMTU4MCwyMCArMTcwMSwzMyBAQCBj b3B5X3RhYmxlX2RhdGEoUmVsYXRpb24gTmV3SGVhcCwgUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRp b24gT2xkSW5kZXgsCiAJCQljdXRvZmZzLk11bHRpWGFjdEN1dG9mZiA9IHJlbG1pbm14aWQ7CiAJ fQogCi0JLyoKLQkgKiBEZWNpZGUgd2hldGhlciB0byB1c2UgYW4gaW5kZXhzY2FuIG9yIHNlcXNj YW4tYW5kLW9wdGlvbmFsLXNvcnQgdG8gc2NhbgotCSAqIHRoZSBPbGRIZWFwLiAgSWYgdGhlIGlu ZGV4IGlzIGEgYnRyZWUsIGFzayB0aGUgcGxhbm5lciB0byBjaG9vc2UgdmlhCi0JICogbm9ybWFs IHBhdGggY29zdCBjb21wYXJpc29uLgotCSAqCi0JICogVGhlIHVuZGVybHlpbmcgdHVwbGVzb3J0 LmMgY29kZSBkb2Vzbid0IHN1cHBvcnQgQU1zIG90aGVyIHRoYW4gYnRyZWUsCi0JICogc28gd2Ug bXVzdCBhbHdheXMgdXNlIGEgbm9ybWFsIGluZGV4c2NhbiBpZiBhIG5vbi1idHJlZSBpbmRleCBp cwotCSAqIHNwZWNpZmllZCAtLSBvciBhbiB1bnNvcnRlZCBzZXFzY2FuIGlmIG5vIGluZGV4IGlz IGdpdmVuLgotCSAqLwotCWlmIChPbGRJbmRleCAhPSBOVUxMICYmIE9sZEluZGV4LT5yZF9yZWwt PnJlbGFtID09IEJUUkVFX0FNX09JRCkKLQkJdXNlX3NvcnQgPSBwbGFuX2NsdXN0ZXJfdXNlX3Nv cnQoUmVsYXRpb25HZXRSZWxpZChPbGRIZWFwKSwKLQkJCQkJCQkJCQkgUmVsYXRpb25HZXRSZWxp ZChPbGRJbmRleCkpOworCWlmICghY29uY3VycmVudCkKKwl7CisJCS8qCisJCSAqIERlY2lkZSB3 aGV0aGVyIHRvIHVzZSBhbiBpbmRleHNjYW4gb3Igc2Vxc2Nhbi1hbmQtb3B0aW9uYWwtc29ydCB0 bworCQkgKiBzY2FuIHRoZSBPbGRIZWFwLiAgSWYgdGhlIGluZGV4IGlzIGEgYnRyZWUsIGFzayB0 aGUgcGxhbm5lciB0bworCQkgKiBjaG9vc2UgdmlhIG5vcm1hbCBwYXRoIGNvc3QgY29tcGFyaXNv bi4KKwkJICoKKwkJICogVGhlIHVuZGVybHlpbmcgdHVwbGVzb3J0LmMgY29kZSBkb2Vzbid0IHN1 cHBvcnQgQU1zIG90aGVyIHRoYW4KKwkJICogYnRyZWUsIHNvIHdlIG11c3QgYWx3YXlzIHVzZSBh IG5vcm1hbCBpbmRleHNjYW4gaWYgYSBub24tYnRyZWUKKwkJICogaW5kZXggaXMgc3BlY2lmaWVk IC0tIG9yIGFuIHVuc29ydGVkIHNlcXNjYW4gaWYgbm8gaW5kZXggaXMgZ2l2ZW4uCisJCSAqLwor CQlpZiAoT2xkSW5kZXggIT0gTlVMTCAmJiBPbGRJbmRleC0+cmRfcmVsLT5yZWxhbSA9PSBCVFJF RV9BTV9PSUQpCisJCQl1c2Vfc29ydCA9IHBsYW5fY2x1c3Rlcl91c2Vfc29ydChSZWxhdGlvbkdl dFJlbGlkKE9sZEhlYXApLAorCQkJCQkJCQkJCQkgUmVsYXRpb25HZXRSZWxpZChPbGRJbmRleCkp OworCQllbHNlCisJCQl1c2Vfc29ydCA9IGZhbHNlOworCX0KIAllbHNlCi0JCXVzZV9zb3J0ID0g ZmFsc2U7CisJeworCQkvKgorCQkgKiBUaGUgQ09OQ1VSUkVOVExZIG1vZGUgaXMgY3VycmVudGx5 IGhhbmRsZWQgb25seSBieSBoZWFwIEFNLCBhbmQKKwkJICogdGhpcyBmbGFnIGhhcyBubyBlZmZl Y3QgaW4gdGhhdCBjYXNlIC0gc2V0IGl0IGp1c3QgZm9yIHNhbml0eS4gKFdlCisJCSAqIGRvIHRo YXQgaW4gYSBzZXBhcmF0ZSBicmFuY2ggc28gdGhhdCBwbGFubmVyIGlzIG5vdCBpbnZvbHZlZAor CQkgKiB1bm5lY2Vzc2FyaWx5LikKKwkJICovCisJCXVzZV9zb3J0ID0gdHJ1ZTsKKwl9CiAKIAkv KiBMb2cgd2hhdCB3ZSdyZSBkb2luZyAqLwogCWlmIChPbGRJbmRleCAhPSBOVUxMICYmICF1c2Vf c29ydCkKQEAgLTE2MjAsMTEgKzE3NTQsMTEgQEAgY29weV90YWJsZV9kYXRhKFJlbGF0aW9uIE5l d0hlYXAsIFJlbGF0aW9uIE9sZEhlYXAsIFJlbGF0aW9uIE9sZEluZGV4LAogCSAqIHZhbHVlcyAo ZS5nLiBiZWNhdXNlIHRoZSBBTSBkb2Vzbid0IHVzZSBmcmVlemluZykuCiAJICovCiAJdGFibGVf cmVsYXRpb25fY29weV9mb3JfY2x1c3RlcihPbGRIZWFwLCBOZXdIZWFwLCBPbGRJbmRleCwgdXNl X3NvcnQsCi0JCQkJCQkJCQljdXRvZmZzLk9sZGVzdFhtaW4sIHNuYXBzaG90LAorCQkJCQkJCQkJ Y3V0b2Zmcy5PbGRlc3RYbWluLAogCQkJCQkJCQkJJmN1dG9mZnMuRnJlZXplTGltaXQsCiAJCQkJ CQkJCQkmY3V0b2Zmcy5NdWx0aVhhY3RDdXRvZmYsCiAJCQkJCQkJCQkmbnVtX3R1cGxlcywgJnR1 cHNfdmFjdXVtZWQsCi0JCQkJCQkJCQkmdHVwc19yZWNlbnRseV9kZWFkKTsKKwkJCQkJCQkJCSZ0 dXBzX3JlY2VudGx5X2RlYWQsIGNoZ2N4dCk7CiAKIAkvKiByZXR1cm4gc2VsZWN0ZWQgdmFsdWVz IHRvIGNhbGxlciwgZ2V0IHNldCBhcyByZWxmcm96ZW54aWQvbWlubXhpZCAqLwogCSpwRnJlZXpl WGlkID0gY3V0b2Zmcy5GcmVlemVMaW1pdDsKQEAgLTI2NDUsNiArMjc3OSw4IEBAIHJlcGFja19p c19wZXJtaXR0ZWRfZm9yX3JlbGF0aW9uKFJlcGFja0NvbW1hbmQgY21kLCBPaWQgcmVsaWQsIE9p ZCB1c2VyaWQsCiAgKiBpbnN0ZWFkIHJldHVybiB0aGUgb3BlbmVkIGFuZCBsb2NrZWQgcmVsY2Fj aGUgZW50cnksIHNvIHRoYXQgY2FsbGVyIGNhbgogICogcHJvY2VzcyB0aGUgcGFydGl0aW9ucyB1 c2luZyB0aGUgbXVsdGlwbGUtdGFibGUgaGFuZGxpbmcgY29kZS4gIEluIHRoaXMKICAqIGNhc2Us IGlmIGFuIGluZGV4IG5hbWUgaXMgZ2l2ZW4sIGl0J3MgdXAgdG8gdGhlIGNhbGxlciB0byByZXNv bHZlIGl0LgorICoKKyAqIEEgbmV3IHRyYW5zYWN0aW9uIGlzIHN0YXJ0ZWQgaW4gZWl0aGVyIGNh c2UuCiAgKi8KIHN0YXRpYyBSZWxhdGlvbgogcHJvY2Vzc19zaW5nbGVfcmVsYXRpb24oUmVwYWNr U3RtdCAqc3RtdCwgTE9DS01PREUgbG9ja21vZGUsIGJvb2wgaXNUb3BMZXZlbCwKQEAgLTI2NTcs NiArMjc5MywzMSBAQCBwcm9jZXNzX3NpbmdsZV9yZWxhdGlvbihSZXBhY2tTdG10ICpzdG10LCBM T0NLTU9ERSBsb2NrbW9kZSwgYm9vbCBpc1RvcExldmVsLAogCUFzc2VydChzdG10LT5jb21tYW5k ID09IFJFUEFDS19DT01NQU5EX0NMVVNURVIgfHwKIAkJICAgc3RtdC0+Y29tbWFuZCA9PSBSRVBB Q0tfQ09NTUFORF9SRVBBQ0spOwogCisJaWYgKHBhcmFtcy0+b3B0aW9ucyAmIENMVU9QVF9DT05D VVJSRU5UKQorCXsKKwkJLyoKKwkJICogU2luY2UgUkVQQUNLIChDT05DVVJSRU5UTFkpIHBvcHMg dGhlIGFjdGl2ZSBzbmFwc2hvdCBkdXJpbmcgdGhlCisJCSAqIHByb2Nlc3NpbmcgKGl0IGNyZWF0 ZXMgYW5kIHB1c2hlcyBzbmFwc2hvdHMgb24gaXRzIG93biksIGFuZCBzaW5jZQorCQkgKiB0aGF0 IHNuYXBzaG90IGNhbiBiZSByZWZlcmVuY2VkIGJ5IHRoZSBjdXJyZW50IHBvcnRhbCwgd2UgbmVl ZCB0bworCQkgKiBtYWtlIHN1cmUgdGhhdCB0aGUgcG9ydGFsIGhhcyBubyBkYW5nbGluZyBwb2lu dGVyIHRvIHRoZSBzbmFwc2hvdC4KKwkJICogU3RhcnRpbmcgYSBuZXcgdHJhbnNhY3Rpb24gc2Vl bXMgdG8gYmUgdGhlIHNpbXBsZXN0IHdheS4KKwkJICoKKwkJICogWFhYIFRoZSBmb2xsb3dpbmcg cGF0Y2hlcyBpbiB0aGUgc2VyaWVzIG1ha2UgdGhpcyB1bm5lY2Vzc2FyeSwgYXMKKwkJICogdGhl eSBzdGFydCBuZXcgdHJhbnNhY3Rpb25zIGZvciBvdGhlciByZWFzb25zIGVsc2V3aGVyZS4KKwkJ ICovCisJCVBvcEFjdGl2ZVNuYXBzaG90KCk7CisJCUNvbW1pdFRyYW5zYWN0aW9uQ29tbWFuZCgp OworCisJCS8qIFN0YXJ0IGEgbmV3IHRyYW5zYWN0aW9uLiAqLworCQlTdGFydFRyYW5zYWN0aW9u Q29tbWFuZCgpOworCisJCS8qCisJCSAqIEZ1bmN0aW9ucyBpbiBpbmRleGVzIG1heSB3YW50IGEg c25hcHNob3Qgc2V0LiBOb3RlIHRoYXQgdGhlIHBvcnRhbAorCQkgKiBpcyBub3QgYXdhcmUgb2Yg dGhpcyBvbmUsIHNvIHRoZSBjYWxsZXIgbmVlZHMgdG8gcG9wIGl0IGV4cGxpY2l0bHkuCisJCSAq LworCQlQdXNoQWN0aXZlU25hcHNob3QoR2V0VHJhbnNhY3Rpb25TbmFwc2hvdCgpKTsKKwl9CisK IAkvKgogCSAqIE1ha2Ugc3VyZSBBTkFMWVpFIGlzIHNwZWNpZmllZCBpZiBhIGNvbHVtbiBsaXN0 IGlzIHByZXNlbnQuCiAJICovCkBAIC0yNzk2LDEwICsyOTU3LDEyIEBAIFJlcGFja0NvbW1hbmRB c1N0cmluZyhSZXBhY2tDb21tYW5kIGNtZCkKIH0KIAogLyoKLSAqIEFwcGx5IGFsbCB0aGUgY2hh bmdlcyBwcm92aWRlZCBieSBkZWNvZGluZyB3b3JrZXIuCisgKiBBcHBseSBkYXRhIGNoYW5nZXMg dGhhdCBhZmZlY3QgcGFnZXMgaW4gZ2l2ZW4gcmFuZ2UgKHBsdXMgY2hhbmdlcyBiZXlvbmQKKyAq IG5ibG9ja3MpLgogICovCiBzdGF0aWMgdm9pZAotYXBwbHlfY29uY3VycmVudF9jaGFuZ2VzKENo YW5nZUNvbnRleHQgKmNoZ2N4dCkKK2FwcGx5X2NvbmN1cnJlbnRfY2hhbmdlcyhDaGFuZ2VDb250 ZXh0ICpjaGdjeHQsIEJsb2NrTnVtYmVyIHJhbmdlX3N0YXJ0LAorCQkJCQkJIEJsb2NrTnVtYmVy IHJhbmdlX2VuZCwgQmxvY2tOdW1iZXIgbmJsb2NrcykKIHsKIAlDb25jdXJyZW50Q2hhbmdlS2lu ZCBraW5kID0gJ1wwJzsKIAlSZXBhY2tEZXN0ICpkZXN0OwpAQCAtMjgwOCwxOCArMjk3MSwzMSBA QCBhcHBseV9jb25jdXJyZW50X2NoYW5nZXMoQ2hhbmdlQ29udGV4dCAqY2hnY3h0KQogCVR1cGxl VGFibGVTbG90ICpvbGRfdXBkYXRlX3R1cGxlOwogCVR1cGxlVGFibGVTbG90ICpvbmRpc2tfdHVw bGU7CiAJYm9vbAkJaGF2ZV9vbGRfdHVwbGUgPSBmYWxzZTsKKwlib29sCQljaGVja19yYW5nZTsK IAlNZW1vcnlDb250ZXh0IG9sZGN4dDsKIAlEZWNvZGluZ1dvcmtlclNoYXJlZCAqc2hhcmVkOwog CWNoYXIJCWZuYW1lW01BWFBHUEFUSF07CiAJQnVmRmlsZSAgICAqZmlsZTsKIAotCWRlc3QgPSAm Y2hnY3h0LT5jY19kZXN0OworCS8qCisJICogVXNlIHRoZSBhdXhpbGlhcnkgdGFibGUgaWYgb25l IGV4aXN0cywgb3RoZXJ3aXNlIHRoZSAiZmluYWwiCisJICogZGVzdGluYXRpb24gdGFibGUuCisJ ICovCisJZGVzdCA9IGNoZ2N4dC0+Y2NfZGVzdF9hdXggPyBjaGdjeHQtPmNjX2Rlc3RfYXV4IDog JmNoZ2N4dC0+Y2NfZGVzdDsKIAlyZWwgPSBkZXN0LT5yZWw7CiAKKwkvKgorCSAqIFJhbmdlIG5l ZWRzIHRvIGJlIGNoZWNrZWQgaWYgdGhlIGJvdW5kcyBhcmUgc3BlY2lmaWVkLiBFeHBlY3QgZWl0 aGVyCisJICogYm90aCBvciBub25lLgorCSAqLworCUFzc2VydChCbG9ja051bWJlcklzVmFsaWQo cmFuZ2Vfc3RhcnQpID09IEJsb2NrTnVtYmVySXNWYWxpZChyYW5nZV9lbmQpKTsKKwljaGVja19y YW5nZSA9IEJsb2NrTnVtYmVySXNWYWxpZChyYW5nZV9zdGFydCk7CisKIAlzaGFyZWQgPSAoRGVj b2RpbmdXb3JrZXJTaGFyZWQgKikgZHNtX3NlZ21lbnRfYWRkcmVzcyhkZWNvZGluZ193b3JrZXIt PnNlZyk7CiAKIAkvKiBPcGVuIHRoZSBmaWxlIGNvbnRhaW5pbmcgdGhlIGNoYW5nZXMuICovCi0J RGVjb2RpbmdXb3JrZXJGaWxlTmFtZShmbmFtZSwgc2hhcmVkLT5yZWxpZCwgY2hnY3h0LT5jY19m aWxlX3NlcSk7CisJRGVjb2RpbmdXb3JrZXJGaWxlTmFtZShmbmFtZSwgc2hhcmVkLT5yZWxpZCwg Y2hnY3h0LT5jY19maWxlX3NlcV9jaGFuZ2VzLAorCQkJCQkJICAgZmFsc2UpOwogCWZpbGUgPSBC dWZGaWxlT3BlbkZpbGVTZXQoJnNoYXJlZC0+c2ZzLmZzLCBmbmFtZSwgT19SRE9OTFksIGZhbHNl KTsKIAogCS8qCkBAIC0yODQ5LDYgKzMwMjUsOSBAQCBhcHBseV9jb25jdXJyZW50X2NoYW5nZXMo Q2hhbmdlQ29udGV4dCAqY2hnY3h0KQogCXsKIAkJc2l6ZV90CQlucmVhZDsKIAkJQ29uY3VycmVu dENoYW5nZUtpbmQgcHJldmtpbmQgPSBraW5kOworCQlCbG9ja051bWJlciBibG9jaywKKwkJCQkJ b2xkX2Jsb2NrOworCQlCbG9ja051bWJlciAqb2xkX2Jsb2NrX3A7CiAKIAkJQ0hFQ0tfRk9SX0lO VEVSUlVQVFMoKTsKIApAQCAtMjg2Myw3ICszMDQyLDcgQEAgYXBwbHlfY29uY3VycmVudF9jaGFu Z2VzKENoYW5nZUNvbnRleHQgKmNoZ2N4dCkKIAkJICovCiAJCWlmIChraW5kID09IENIQU5HRV9V UERBVEVfT0xEKQogCQl7Ci0JCQlyZXN0b3JlX3R1cGxlKGZpbGUsIHJlbCwgb2xkX3VwZGF0ZV90 dXBsZSk7CisJCQlyZXN0b3JlX3R1cGxlKGZpbGUsIHJlbCwgb2xkX3VwZGF0ZV90dXBsZSwgTlVM TCwgTlVMTCk7CiAJCQloYXZlX29sZF90dXBsZSA9IHRydWU7CiAJCQljb250aW51ZTsKIAkJfQpA QCAtMjg4NywyMiArMzA2NiwzOSBAQCBhcHBseV9jb25jdXJyZW50X2NoYW5nZXMoQ2hhbmdlQ29u dGV4dCAqY2hnY3h0KQogCiAJCS8qCiAJCSAqIE5vdyByZXN0b3JlIHRoZSB0dXBsZSBpbnRvIHRo ZSBzbG90IGFuZCBleGVjdXRlIHRoZSBjaGFuZ2UuCisJCSAqCisJCSAqIG9sZF9ibG9jayBpcyBv bmx5IHN0b3JlZCB3aXRoIFVQREFURV9ORVcuCiAJCSAqLwotCQlyZXN0b3JlX3R1cGxlKGZpbGUs IHJlbCwgc3BpbGxlZF90dXBsZSk7CisJCW9sZF9ibG9ja19wID0ga2luZCA9PSBDSEFOR0VfVVBE QVRFX05FVyA/ICZvbGRfYmxvY2sgOiBOVUxMOworCQlyZXN0b3JlX3R1cGxlKGZpbGUsIHJlbCwg c3BpbGxlZF90dXBsZSwgJmJsb2NrLCBvbGRfYmxvY2tfcCk7CiAKIAkJaWYgKGtpbmQgPT0gQ0hB TkdFX0lOU0VSVCkKIAkJewotCQkJYXBwbHlfY29uY3VycmVudF9pbnNlcnQoZGVzdCwgc3BpbGxl ZF90dXBsZSk7CisJCQkvKgorCQkJICogT25seSBpbnNlcnQgdGhlIHR1cGxlIGlmIGl0IGZpdHMg aW50byB0aGUgY3VycmVudCByYW5nZSAob3IgaWYKKwkJCSAqIHJhbmdlIGRvZXMgbm90IG1hdHRl cikuCisJCQkgKi8KKwkJCWlmICghY2hlY2tfcmFuZ2UgfHwKKwkJCQlyZXBhY2tfYmxvY2tfaW5f cmFuZ2UoYmxvY2ssIHJhbmdlX3N0YXJ0LCByYW5nZV9lbmQsIG5ibG9ja3MpKQorCQkJCWFwcGx5 X2NvbmN1cnJlbnRfaW5zZXJ0KGRlc3QsIHNwaWxsZWRfdHVwbGUpOwogCQl9CiAJCWVsc2UgaWYg KGtpbmQgPT0gQ0hBTkdFX0RFTEVURSkKIAkJewotCQkJYm9vbAkJZm91bmQ7CisJCQkvKgorCQkJ ICogT25seSBkZWxldGUgdGhlIHR1cGxlIGlmIGl0IGZpdHMgaW50byB0aGUgY3VycmVudCByYW5n ZSAob3IgaWYKKwkJCSAqIHJhbmdlIGRvZXMgbm90IG1hdHRlcikuCisJCQkgKi8KKwkJCWlmICgh Y2hlY2tfcmFuZ2UgfHwKKwkJCQlyZXBhY2tfYmxvY2tfaW5fcmFuZ2UoYmxvY2ssIHJhbmdlX3N0 YXJ0LCByYW5nZV9lbmQsIG5ibG9ja3MpKQorCQkJeworCQkJCWJvb2wJCWZvdW5kOwogCi0JCQkv KiBGaW5kIHRoZSB0dXBsZSB0byBiZSBkZWxldGVkICovCi0JCQlmb3VuZCA9IGZpbmRfdGFyZ2V0 X3R1cGxlKGRlc3QsIHNwaWxsZWRfdHVwbGUsIG9uZGlza190dXBsZSk7Ci0JCQlpZiAoIWZvdW5k KQotCQkJCWVsb2coRVJST1IsICJjb3VsZCBub3QgZmluZCB0YXJnZXQgdHVwbGUiKTsKLQkJCWFw cGx5X2NvbmN1cnJlbnRfZGVsZXRlKHJlbCwgb25kaXNrX3R1cGxlKTsKKwkJCQkvKiBGaW5kIHRo ZSB0dXBsZSB0byBiZSBkZWxldGVkICovCisJCQkJZm91bmQgPSBmaW5kX3RhcmdldF90dXBsZShk ZXN0LCBzcGlsbGVkX3R1cGxlLCBvbmRpc2tfdHVwbGUpOworCQkJCWlmICghZm91bmQpCisJCQkJ CWVsb2coRVJST1IsICJjb3VsZCBub3QgZmluZCB0YXJnZXQgdHVwbGUiKTsKKwkJCQlhcHBseV9j b25jdXJyZW50X2RlbGV0ZShyZWwsIG9uZGlza190dXBsZSk7CisJCQl9CiAJCX0KIAkJZWxzZSBp ZiAoa2luZCA9PSBDSEFOR0VfVVBEQVRFX05FVykKIAkJewpAQCAtMjkxNCwxOSArMzExMCw3NCBA QCBhcHBseV9jb25jdXJyZW50X2NoYW5nZXMoQ2hhbmdlQ29udGV4dCAqY2hnY3h0KQogCQkJZWxz ZQogCQkJCWtleSA9IHNwaWxsZWRfdHVwbGU7CiAKLQkJCS8qIEZpbmQgdGhlIHR1cGxlIHRvIGJl IHVwZGF0ZWQgb3IgZGVsZXRlZC4gKi8KLQkJCWZvdW5kID0gZmluZF90YXJnZXRfdHVwbGUoZGVz dCwga2V5LCBvbmRpc2tfdHVwbGUpOwotCQkJaWYgKCFmb3VuZCkKLQkJCQllbG9nKEVSUk9SLCAi Y291bGQgbm90IGZpbmQgdGFyZ2V0IHR1cGxlIik7Ci0KIAkJCS8qCi0JCQkgKiBBZGp1c3Qgc3Bp bGxlZF90dXBsZSBzbyB0aGF0IGl0IGNhbiBiZSB1c2VkIGFzIHRoZSBuZXcgdHVwbGUgaW4KLQkJ CSAqIHRoZSB1cGRhdGUgdGhhdCB3ZSdyZSBhYm91dCB0byByZXBsYXkuICBUaGlzIGZpeGVzIFRP QVNUCi0JCQkgKiBwb2ludGVycy4KKwkJCSAqIFBlcmZvcm0gbm9ybWFsIHVwZGF0ZSBpZiBib3Ro IG9sZCBhbmQgbmV3IHZlcnNpb24gYXJlIGluIHRoZQorCQkJICogY3VycmVudCByYW5nZS4KIAkJ CSAqLwotCQkJcHJlcGFyZV9jb25jdXJyZW50X3VwZGF0ZShzcGlsbGVkX3R1cGxlLCBvbmRpc2tf dHVwbGUpOworCQkJaWYgKCFjaGVja19yYW5nZSB8fAorCQkJCShyZXBhY2tfYmxvY2tfaW5fcmFu Z2Uob2xkX2Jsb2NrLCByYW5nZV9zdGFydCwgcmFuZ2VfZW5kLAorCQkJCQkJCQkJICAgbmJsb2Nr cykgJiYKKwkJCQkgcmVwYWNrX2Jsb2NrX2luX3JhbmdlKGJsb2NrLCByYW5nZV9zdGFydCwgcmFu Z2VfZW5kLAorCQkJCQkJCQkJICAgbmJsb2NrcykpKQorCQkJeworCQkJCS8qIEZpbmQgdGhlIHR1 cGxlIHRvIGJlIHVwZGF0ZWQgb3IgZGVsZXRlZC4gKi8KKwkJCQlmb3VuZCA9IGZpbmRfdGFyZ2V0 X3R1cGxlKGRlc3QsIGtleSwgb25kaXNrX3R1cGxlKTsKKwkJCQlpZiAoIWZvdW5kKQorCQkJCQll bG9nKEVSUk9SLCAiY291bGQgbm90IGZpbmQgdGFyZ2V0IHR1cGxlIik7CisKKwkJCQkvKgorCQkJ CSAqIEFkanVzdCBzcGlsbGVkX3R1cGxlIHNvIHRoYXQgaXQgY2FuIGJlIHVzZWQgYXMgdGhlIG5l dworCQkJCSAqIHR1cGxlIGluIHRoZSB1cGRhdGUgdGhhdCB3ZSdyZSBhYm91dCB0byByZXBsYXku ICBUaGlzIGZpeGVzCisJCQkJICogVE9BU1QgcG9pbnRlcnMuCisJCQkJICovCisJCQkJcHJlcGFy ZV9jb25jdXJyZW50X3VwZGF0ZShzcGlsbGVkX3R1cGxlLCBvbmRpc2tfdHVwbGUpOwogCi0JCQlh cHBseV9jb25jdXJyZW50X3VwZGF0ZShkZXN0LCBzcGlsbGVkX3R1cGxlLCBvbmRpc2tfdHVwbGUp OworCQkJCWFwcGx5X2NvbmN1cnJlbnRfdXBkYXRlKGRlc3QsIHNwaWxsZWRfdHVwbGUsIG9uZGlz a190dXBsZSk7CisJCQl9CisJCQllbHNlCisJCQl7CisJCQkJQXNzZXJ0KGNoZWNrX3JhbmdlKTsK KworCQkJCWlmIChyZXBhY2tfYmxvY2tfaW5fcmFuZ2UoYmxvY2ssIHJhbmdlX3N0YXJ0LCByYW5n ZV9lbmQsCisJCQkJCQkJCQkJICBuYmxvY2tzKSkKKwkJCQl7CisJCQkJCS8qCisJCQkJCSAqIFRo ZSBvbGQga2V5IGlzIGluIGFub3RoZXIgcmFuZ2UsIHNvIG9ubHkgaW5zZXJ0IHRoZSBuZXcKKwkJ CQkJICogb25lIGludG8gdGhlIGN1cnJlbnQgcmFuZ2UuIFRoZSBvbGQgdmVyc2lvbiBzaG91bGQg bm90CisJCQkJCSAqIGJlIHZpc2libGUgdG8gdGhlIHNuYXBzaG90IHRoYXQgd2UnbGwgdXNlIHRv IGNvcHkgdGhlCisJCQkJCSAqIG90aGVyIHJhbmdlLgorCQkJCQkgKgorCQkJCQkgKiBVbmxpa2Ug VVBEQVRFLCB0aGVyZSdzIG5vIG9sZCB0dXBsZSB0byBjb3B5IHRoZSBUT0FTVAorCQkJCQkgKiBw b2ludGVycyBmcm9tLiBUaGVyZWZvcmUgcGFzcyBOVUxMIGZvciB0aGUgc291cmNlCisJCQkJCSAq IHR1cGxlLCB0byBlbmZvcmNlIGRldG9hc3Rpbmcgb2YgdGhlIFRPQVNUIHBvaW50ZXJzIGluCisJ CQkJCSAqICdzcGlsbGVkX3R1cGxlJy4KKwkJCQkJICovCisJCQkJCXByZXBhcmVfY29uY3VycmVu dF91cGRhdGUoc3BpbGxlZF90dXBsZSwgTlVMTCk7CisKKwkJCQkJYXBwbHlfY29uY3VycmVudF9p bnNlcnQoZGVzdCwgc3BpbGxlZF90dXBsZSk7CisJCQkJfQorCQkJCWVsc2UgaWYgKHJlcGFja19i bG9ja19pbl9yYW5nZShvbGRfYmxvY2ssIHJhbmdlX3N0YXJ0LAorCQkJCQkJCQkJCQkgICByYW5n ZV9lbmQsCisJCQkJCQkJCQkJCSAgIG5ibG9ja3MpKQorCQkJCXsKKwkJCQkJZm91bmQgPSBmaW5k X3RhcmdldF90dXBsZShkZXN0LCBrZXksIG9uZGlza190dXBsZSk7CisJCQkJCWlmICghZm91bmQp CisJCQkJCQllbG9nKEVSUk9SLCAiY291bGQgbm90IGZpbmQgdGFyZ2V0IHR1cGxlIik7CisKKwkJ CQkJLyoKKwkJCQkJICogVGhlIG5ldyBrZXkgaXMgaW4gYW5vdGhlciByYW5nZSwgc28gb25seSBk ZWxldGUgdGhlIG9sZAorCQkJCQkgKiBvbmUgZnJvbSB0aGUgY3VycmVudCByYW5nZS4gVGhlIG5l dyB2ZXJzaW9uIHNob3VsZCBiZQorCQkJCQkgKiB2aXNpYmxlIHRvIHRoZSBzbmFwc2hvdCB0aGF0 IHdlJ2xsIHVzZSB0byBjb3B5IHRoZQorCQkJCQkgKiBvdGhlciByYW5nZS4KKwkJCQkJICovCisJ CQkJCWFwcGx5X2NvbmN1cnJlbnRfZGVsZXRlKHJlbCwgb25kaXNrX3R1cGxlKTsKKwkJCQl9CisK KwkJCQkvKgorCQkJCSAqIE90aGVyd2lzZSwgYm90aCB0dXBsZSB2ZXJzaW9ucyBiZWxvbmcgdG8g YW5vdGhlciByYW5nZSwgc28KKwkJCQkgKiB0aGVyZSdzIG5vdGhpbmcgdG8gZG8gaGVyZS4KKwkJ CQkgKi8KKwkJCX0KIAogCQkJRXhlY0NsZWFyVHVwbGUob2xkX3VwZGF0ZV90dXBsZSk7CiAJCQlo YXZlX29sZF90dXBsZSA9IGZhbHNlOwpAQCAtMzA0OCw3ICszMjk5LDggQEAgYXBwbHlfY29uY3Vy cmVudF9kZWxldGUoUmVsYXRpb24gcmVsLCBUdXBsZVRhYmxlU2xvdCAqc2xvdCkKICAqIHNtYWxs ZXIgdGhhbiBNYXhBbGxvY1NpemUgYnV0IHRoZSB3aG9sZSB0dXBsZSBpcyBiaWdnZXIuCiAgKi8K IHN0YXRpYyB2b2lkCi1yZXN0b3JlX3R1cGxlKEJ1ZkZpbGUgKmZpbGUsIFJlbGF0aW9uIHJlbGF0 aW9uLCBUdXBsZVRhYmxlU2xvdCAqc2xvdCkKK3Jlc3RvcmVfdHVwbGUoQnVmRmlsZSAqZmlsZSwg UmVsYXRpb24gcmVsYXRpb24sIFR1cGxlVGFibGVTbG90ICpzbG90LAorCQkJICBCbG9ja051bWJl ciAqYmxvY2tfbnJfcCwgQmxvY2tOdW1iZXIgKm9sZF9ibG9ja19ucl9wKQogewogCXVpbnQzMgkJ dF9sZW47CiAJSGVhcFR1cGxlCXR1cDsKQEAgLTMwNjEsNyArMzMxMyw2IEBAIHJlc3RvcmVfdHVw bGUoQnVmRmlsZSAqZmlsZSwgUmVsYXRpb24gcmVsYXRpb24sIFR1cGxlVGFibGVTbG90ICpzbG90 KQogCXR1cC0+dF9kYXRhID0gKEhlYXBUdXBsZUhlYWRlcikgKChjaGFyICopIHR1cCArIEhFQVBU VVBMRVNJWkUpOwogCUJ1ZkZpbGVSZWFkRXhhY3QoZmlsZSwgdHVwLT50X2RhdGEsIHRfbGVuKTsK IAl0dXAtPnRfbGVuID0gdF9sZW47Ci0JSXRlbVBvaW50ZXJTZXRJbnZhbGlkKCZ0dXAtPnRfc2Vs Zik7CiAJdHVwLT50X3RhYmxlT2lkID0gUmVsYXRpb25HZXRSZWxpZChyZWxhdGlvbik7CiAKIAkv KgpAQCAtMzA3MCw2ICszMzIxLDEyIEBAIHJlc3RvcmVfdHVwbGUoQnVmRmlsZSAqZmlsZSwgUmVs YXRpb24gcmVsYXRpb24sIFR1cGxlVGFibGVTbG90ICpzbG90KQogCSAqLwogCUV4ZWNGb3JjZVN0 b3JlSGVhcFR1cGxlKHR1cCwgc2xvdCwgZmFsc2UpOwogCisJLyogSGFuZGxlIFRJRCBzZXBhcmF0 ZSBiZWNhdXNlIG5vdCBhbGwgdHVwbGUgc2xvdHMgY2FyZSBhYm91dCBpdC4gKi8KKwlpZiAoYmxv Y2tfbnJfcCkKKwkJKmJsb2NrX25yX3AgPSBJdGVtUG9pbnRlckdldEJsb2NrTnVtYmVyKCZ0dXAt PnRfZGF0YS0+dF9jdGlkKTsKKwlpZiAob2xkX2Jsb2NrX25yX3ApCisJCUJ1ZkZpbGVSZWFkRXhh Y3QoZmlsZSwgb2xkX2Jsb2NrX25yX3AsIHNpemVvZihCbG9ja051bWJlcikpOworCiAJLyoKIAkg KiBEcm9wcGVkIGNvbHVtbnMgY2FuIHN0aWxsIGhhdmUgdmFsdWVzIGluIHNvbWUgdHVwbGVzLiAg TnVsbCB0aGVtIG91dC4KIAkgKiBUaGlzIHNhdmVzIHNwYWNlLCBhbmQgdGhlIG5ldyBoZWFwIG1p Z2h0IG5vdCBldmVuIGhhdmUgYSBUT0FTVCB0YWJsZS4KQEAgLTMxNTcsOSArMzQxNCw0OSBAQCBw cmVwYXJlX2NvbmN1cnJlbnRfdXBkYXRlKFR1cGxlVGFibGVTbG90ICpkZXN0LCBUdXBsZVRhYmxl U2xvdCAqc3JjKQogCQl2YXJsZW5hX2RzdCA9ICh2YXJsZW5hICopIERhdHVtR2V0UG9pbnRlcihk ZXN0LT50dHNfdmFsdWVzW2ldKTsKIAkJaWYgKCFWQVJBVFRfSVNfRVhURVJOQUxfT05ESVNLKHZh cmxlbmFfZHN0KSkKIAkJCWNvbnRpbnVlOwotCQlzbG90X2dldHNvbWVhdHRycyhzcmMsIGkgKyAx KTsKIAotCQlkZXN0LT50dHNfdmFsdWVzW2ldID0gc3JjLT50dHNfdmFsdWVzW2ldOworCQkvKgor CQkgKiBJZGVhbGx5IHdlIGp1c3QgY29weSB0aGUgdmFsdWUsIGJ1dCBpZiB0aGVyZSBpcyBubyBz b3VyY2UgdHVwbGUsIHdlCisJCSAqIG5lZWQgdG8gZGV0b2FzdCB0aGUgdmFsdWUuCisJCSAqLwor CQlpZiAoc3JjKQorCQl7CisJCQlzbG90X2dldHNvbWVhdHRycyhzcmMsIGkgKyAxKTsKKwkJCWRl c3QtPnR0c192YWx1ZXNbaV0gPSBzcmMtPnR0c192YWx1ZXNbaV07CisJCX0KKwkJZWxzZQorCQl7 CisJCQl2YXJsZW5hICAgICpkZXRvYXN0ZWQ7CisKKwkJCWRldG9hc3RlZCA9IGRldG9hc3RfZXh0 ZXJuYWxfYXR0cih2YXJsZW5hX2RzdCk7CisJCQlkZXN0LT50dHNfdmFsdWVzW2ldID0gUG9pbnRl ckdldERhdHVtKGRldG9hc3RlZCk7CisJCX0KKwl9Cit9CisKKy8qCisgKiBDaGVjayBpZiB0dXBs ZSBvcmlnaW5hdGVzIGZyb20gZ2l2ZW4gcmFuZ2Ugb2YgYmxvY2tzIHRoYXQgaGF2ZSBhbHJlYWR5 IGJlZW4KKyAqIGNvcGllZC4KKyAqLworYm9vbAorcmVwYWNrX2Jsb2NrX2luX3JhbmdlKEJsb2Nr TnVtYmVyIGJsa251bSwgQmxvY2tOdW1iZXIgc3RhcnQsIEJsb2NrTnVtYmVyIGVuZCwKKwkJCQkJ ICBCbG9ja051bWJlciBuYmxvY2tzKQoreworCUFzc2VydChCbG9ja051bWJlcklzVmFsaWQoc3Rh cnQpICYmIEJsb2NrTnVtYmVySXNWYWxpZChlbmQpKTsKKwlBc3NlcnQoQmxvY2tOdW1iZXJJc1Zh bGlkKGJsa251bSkpOworCisJLyoKKwkgKiBDaGFuZ2VzIGJleW9uZCB0aGUgc2NhbiBib3VuZGFy eSBhcmUgYWx3YXlzIG5lZWRlZC4KKwkgKi8KKwlpZiAoQmxvY2tOdW1iZXJJc1ZhbGlkKG5ibG9j a3MpICYmIGJsa251bSA+PSBuYmxvY2tzKQorCQlyZXR1cm4gdHJ1ZTsKKworCWlmIChzdGFydCA8 IGVuZCkKKwkJcmV0dXJuIGJsa251bSA+PSBzdGFydCAmJiBibGtudW0gPCBlbmQ7CisJZWxzZQor CXsKKwkJLyogVGhlIHNjYW4gcG9zaXRpb24gaGFzIHdyYXBwZWQgYXJvdW5kLiAqLworCQlyZXR1 cm4gYmxrbnVtID49IHN0YXJ0IHx8IGJsa251bSA8IGVuZDsKIAl9CiB9CiAKQEAgLTMyNTQsNjUg KzM1NTEsNiBAQCBpZGVudGl0eV9rZXlfZXF1YWwoUmVwYWNrRGVzdCAqZGVzdCwgVHVwbGVUYWJs ZVNsb3QgKmxvY2F0b3IsCiAJcmV0dXJuIHRydWU7CiB9CiAKLS8qCi0gKiBEZWNvZGUgYW5kIGFw cGx5IGNvbmN1cnJlbnQgY2hhbmdlcywgdXAgdG8gKGFuZCBpbmNsdWRpbmcpIHRoZSByZWNvcmQg d2hvc2UKLSAqIExTTiBpcyAnZW5kX29mX3dhbCcuCi0gKgotICogWFhYIHRoZSBuYW1lcyAicHJv Y2Vzc19jb25jdXJyZW50X2NoYW5nZXMiIGFuZCAiYXBwbHlfY29uY3VycmVudF9jaGFuZ2VzIgot ICogYXJlIGZhciB0b28gc2ltaWxhciB0byBlYWNoIG90aGVyLgotICovCi1zdGF0aWMgdm9pZAot cHJvY2Vzc19jb25jdXJyZW50X2NoYW5nZXMoWExvZ1JlY1B0ciBlbmRfb2Zfd2FsLCBDaGFuZ2VD b250ZXh0ICpjaGdjeHQsIGJvb2wgZG9uZSkKLXsKLQlEZWNvZGluZ1dvcmtlclNoYXJlZCAqc2hh cmVkOwotCWNoYXIJCWZuYW1lW01BWFBHUEFUSF07Ci0JQnVmRmlsZSAgICAqZmlsZTsKLQotCXBn c3RhdF9wcm9ncmVzc191cGRhdGVfcGFyYW0oUFJPR1JFU1NfUkVQQUNLX1BIQVNFLAotCQkJCQkJ CQkgUFJPR1JFU1NfUkVQQUNLX1BIQVNFX0NBVENIX1VQKTsKLQotCS8qIEFzayB0aGUgd29ya2Vy IGZvciB0aGUgZmlsZS4gKi8KLQlzaGFyZWQgPSAoRGVjb2RpbmdXb3JrZXJTaGFyZWQgKikgZHNt X3NlZ21lbnRfYWRkcmVzcyhkZWNvZGluZ193b3JrZXItPnNlZyk7Ci0JU3BpbkxvY2tBY3F1aXJl KCZzaGFyZWQtPm11dGV4KTsKLQlzaGFyZWQtPmxzbl91cHRvID0gZW5kX29mX3dhbDsKLQlzaGFy ZWQtPmRvbmUgPSBkb25lOwotCVNwaW5Mb2NrUmVsZWFzZSgmc2hhcmVkLT5tdXRleCk7Ci0KLQkv KgotCSAqIFRoZSB3b3JrZXIgbmVlZHMgdG8gZmluaXNoIHByb2Nlc3Npbmcgb2YgdGhlIGN1cnJl bnQgV0FMIHJlY29yZC4gRXZlbgotCSAqIGlmIGl0J3MgaWRsZSwgaXQnbGwgbmVlZCB0byBjbG9z ZSB0aGUgb3V0cHV0IGZpbGUuIFRodXMgd2UncmUgbGlrZWx5IHRvCi0JICogd2FpdCwgc28gcHJl cGFyZSBmb3Igc2xlZXAuCi0JICovCi0JQ29uZGl0aW9uVmFyaWFibGVQcmVwYXJlVG9TbGVlcCgm c2hhcmVkLT5jdik7Ci0JZm9yICg7OykKLQl7Ci0JCWludAkJCWxhc3RfZXhwb3J0ZWQ7Ci0KLQkJ U3BpbkxvY2tBY3F1aXJlKCZzaGFyZWQtPm11dGV4KTsKLQkJbGFzdF9leHBvcnRlZCA9IHNoYXJl ZC0+bGFzdF9leHBvcnRlZDsKLQkJU3BpbkxvY2tSZWxlYXNlKCZzaGFyZWQtPm11dGV4KTsKLQot CQkvKgotCQkgKiBIYXMgdGhlIHdvcmtlciBleHBvcnRlZCB0aGUgZmlsZSB3ZSBhcmUgd2FpdGlu ZyBmb3I/Ci0JCSAqLwotCQlpZiAobGFzdF9leHBvcnRlZCA9PSBjaGdjeHQtPmNjX2ZpbGVfc2Vx KQotCQkJYnJlYWs7Ci0KLQkJQ29uZGl0aW9uVmFyaWFibGVTbGVlcCgmc2hhcmVkLT5jdiwgV0FJ VF9FVkVOVF9SRVBBQ0tfV09SS0VSX0VYUE9SVCk7Ci0JfQotCUNvbmRpdGlvblZhcmlhYmxlQ2Fu Y2VsU2xlZXAoKTsKLQotCS8qIE9wZW4gdGhlIGZpbGUuICovCi0JRGVjb2RpbmdXb3JrZXJGaWxl TmFtZShmbmFtZSwgc2hhcmVkLT5yZWxpZCwgY2hnY3h0LT5jY19maWxlX3NlcSk7Ci0JZmlsZSA9 IEJ1ZkZpbGVPcGVuRmlsZVNldCgmc2hhcmVkLT5zZnMuZnMsIGZuYW1lLCBPX1JET05MWSwgZmFs c2UpOwotCWFwcGx5X2NvbmN1cnJlbnRfY2hhbmdlcyhjaGdjeHQpOwotCi0JQnVmRmlsZUNsb3Nl KGZpbGUpOwotCi0JLyogR2V0IHJlYWR5IGZvciB0aGUgbmV4dCBmaWxlLiAqLwotCWNoZ2N4dC0+ Y2NfZmlsZV9zZXErKzsKLX0KLQogLyoKICAqIEluaXRpYWxpemUgQ2hhbmdlQ29udGV4dCB0byBw cm9wYWdhdGUgY2hhbmdlcyBvZiBzcmNfcmVsYXRpb24gKHRoZSByZWxhdGlvbgogICogYmVpbmcg cmVwYWNrZWQpIGludG8gdGd0X3JlbGF0aW9uICh0aGUgdHJhbnNpZW50IHJlbGF0aW9uKSwgdXNp bmcgdGhlIGdpdmVuCkBAIC0zMzMzLDcgKzM1NzEsMTEgQEAgaW5pdGlhbGl6ZV9jaGFuZ2VfY29u dGV4dChDaGFuZ2VDb250ZXh0ICpjaGdjeHQsCiAKIAlpbml0aWFsaXplX2NoYW5nZV9kZXN0KCZj aGdjeHQtPmNjX2Rlc3QsIHRndF9yZWxhdGlvbiwgaWRlbnRfaW5kZXhfaWQpOwogCi0JY2hnY3h0 LT5jY19maWxlX3NlcSA9IFdPUktFUl9GSUxFX1NOQVBTSE9UICsgMTsKKwljaGdjeHQtPmNjX2Zp bGVfc2VxX3NuYXBzaG90ID0gMDsKKwljaGdjeHQtPmNjX2ZpbGVfc2VxX2NoYW5nZXMgPSAwOwor CisJY2hnY3h0LT5jY19kZXN0X2F1eCA9IE5VTEw7CisJY2hnY3h0LT5jY19jbHVzdGVyaW5nX2lu ZGV4ID0gSW52YWxpZE9pZDsKIH0KIAogLyoKQEAgLTMzNDMsNiArMzU4NSw4IEBAIHN0YXRpYyB2 b2lkCiByZWxlYXNlX2NoYW5nZV9jb250ZXh0KENoYW5nZUNvbnRleHQgKmNoZ2N4dCkKIHsKIAly ZWxlYXNlX2NoYW5nZV9kZXN0KCZjaGdjeHQtPmNjX2Rlc3QpOworCWlmIChjaGdjeHQtPmNjX2Rl c3RfYXV4KQorCQlyZWxlYXNlX2NoYW5nZV9kZXN0KGNoZ2N4dC0+Y2NfZGVzdF9hdXgpOwogfQog CiAvKgpAQCAtMzM1NSw2ICszNTk5LDExIEBAIGluaXRpYWxpemVfY2hhbmdlX2Rlc3QoUmVwYWNr RGVzdCAqZGVzdCwgUmVsYXRpb24gcmVsYXRpb24sCiAJCQkJCSAgIE9pZCBpZGVudF9pbmRleF9p ZCkKIHsKIAlkZXN0LT5yZWwgPSByZWxhdGlvbjsKKwlkZXN0LT5iaXN0YXRlID0gR2V0QnVsa0lu c2VydFN0YXRlKCk7CisKKwkvKiBJZiB0aGVyZSdzIG5vIGlkZW50aXR5IGluZGV4IHlldCwgdGhl cmUgc2hvdWxkIGJlIG5vIGluZGV4ZXMgYXQgYWxsLiAqLworCWlmICghT2lkSXNWYWxpZChpZGVu dF9pbmRleF9pZCkpCisJCXJldHVybjsKIAogCS8qIE9ubHkgaW5pdGlhbGl6ZSBmaWVsZHMgbmVl ZGVkIGJ5IEV4ZWNJbnNlcnRJbmRleFR1cGxlcygpLiAqLwogCWRlc3QtPmVzdGF0ZSA9IENyZWF0 ZUV4ZWN1dG9yU3RhdGUoKTsKQEAgLTM0OTIsNiArMzc0MSwxMiBAQCBpbml0aWFsaXplX2NoYW5n ZV9kZXN0KFJlcGFja0Rlc3QgKmRlc3QsIFJlbGF0aW9uIHJlbGF0aW9uLAogc3RhdGljIHZvaWQK IHJlbGVhc2VfY2hhbmdlX2Rlc3QoUmVwYWNrRGVzdCAqZGVzdCkKIHsKKwlGcmVlQnVsa0luc2Vy dFN0YXRlKGRlc3QtPmJpc3RhdGUpOworCisJLyogSXQncyBwb3NzaWJsZSB0aGF0IG5vIGluZGV4 ZXMgd2VyZSBvcGVuZWQgZHVyaW5nIGluaXRpYWxpemF0aW9uLiAqLworCWlmIChkZXN0LT5ycmkg PT0gTlVMTCkKKwkJcmV0dXJuOworCiAJRXhlY0Nsb3NlSW5kaWNlcyhkZXN0LT5ycmkpOwogCUZy ZWVFeGVjdXRvclN0YXRlKGRlc3QtPmVzdGF0ZSk7CiAJLyogWFhYIGFyZSB0aGVzZSBwZnJlZXMg bmVjZXNzYXJ5PyAqLwpAQCAtMzUxMCw3ICszNzY1LDggQEAgcmVsZWFzZV9jaGFuZ2VfZGVzdChS ZXBhY2tEZXN0ICpkZXN0KQogc3RhdGljIHZvaWQKIHJlYnVpbGRfcmVsYXRpb25fZmluaXNoX2Nv bmN1cnJlbnQoUmVsYXRpb24gTmV3SGVhcCwgUmVsYXRpb24gT2xkSGVhcCwKIAkJCQkJCQkJICAg T2lkIGlkZW50SWR4LCBUcmFuc2FjdGlvbklkIGZyb3plblhpZCwKLQkJCQkJCQkJICAgTXVsdGlY YWN0SWQgY3V0b2ZmTXVsdGkpCisJCQkJCQkJCSAgIE11bHRpWGFjdElkIGN1dG9mZk11bHRpLAor CQkJCQkJCQkgICBDaGFuZ2VDb250ZXh0ICpjaGdjeHQpCiB7CiAJTGlzdAkgICAqaW5kX29pZHNf bmV3OwogCU9pZAkJCW9sZF90YWJsZV9vaWQgPSBSZWxhdGlvbkdldFJlbGlkKE9sZEhlYXApOwpA QCAtMzUyMCwxNCArMzc3NiwxNyBAQCByZWJ1aWxkX3JlbGF0aW9uX2ZpbmlzaF9jb25jdXJyZW50 KFJlbGF0aW9uIE5ld0hlYXAsIFJlbGF0aW9uIE9sZEhlYXAsCiAJCQkgICAqbGMyOwogCWNoYXIJ CXJlbHBlcnNpc3RlbmNlOwogCWJvb2wJCWlzX3N5c3RlbV9jYXRhbG9nOwotCU9pZAkJCWlkZW50 X2lkeF9uZXc7CiAJWExvZ1JlY1B0cgllbmRfb2Zfd2FsOwogCUxpc3QJICAgKmluZGV4cmVsczsK LQlDaGFuZ2VDb250ZXh0IGNoZ2N4dDsKKwlMaXN0CSAgICppbmRzX3RtcCA9IE5JTDsKIAogCUFz c2VydChDaGVja1JlbGF0aW9uTG9ja2VkQnlNZShPbGRIZWFwLCBTaGFyZVVwZGF0ZUV4Y2x1c2l2 ZUxvY2ssIGZhbHNlKSk7CiAJQXNzZXJ0KENoZWNrUmVsYXRpb25Mb2NrZWRCeU1lKE5ld0hlYXAs IEFjY2Vzc0V4Y2x1c2l2ZUxvY2ssIGZhbHNlKSk7CiAKKwkvKiBJZiB3ZSBoYXZlIHRoZSBhdXhp bGlhcnkgdGFibGUsIHRoaXMgaXMgdGhlIG1vbWVudCB3ZSBzaG91bGQgdXNlIGl0LiAqLworCWlm IChjaGdjeHQtPmNjX2Rlc3RfYXV4KQorCQlwcm9jZXNzX2F1eGlsaWFyeV90YWJsZShjaGdjeHQs IE9sZEhlYXAsIGlkZW50SWR4KTsKKwogCS8qCiAJICogVW5saWtlIHRoZSBleGNsdXNpdmUgY2Fz ZSwgd2UgYnVpbGQgbmV3IGluZGV4ZXMgZm9yIHRoZSBuZXcgcmVsYXRpb24KIAkgKiByYXRoZXIg dGhhbiBzd2FwcGluZyB0aGUgc3RvcmFnZSBhbmQgcmVpbmRleGluZyB0aGUgb2xkIHJlbGF0aW9u LiBUaGUKQEAgLTM1NDMsMzIgKzM4MDIsMjYgQEAgcmVidWlsZF9yZWxhdGlvbl9maW5pc2hfY29u Y3VycmVudChSZWxhdGlvbiBOZXdIZWFwLCBSZWxhdGlvbiBPbGRIZWFwLAogCSAqIG1pZ2h0IG5v dCBiZSBlbm91Z2ggZm9yIGNvbW1hbmRzIGxpa2UgQUxURVIgSU5ERVggLi4uIFNFVCAuLi4gKFRo b3NlCiAJICogYXJlIG5vdCBuZWNlc3NhcmlseSBkYW5nZXJvdXMsIGJ1dCBjYW4gbWFrZSB1c2Vy IGNvbmZ1c2VkIGlmIHRoZQogCSAqIGNoYW5nZXMgdGhleSBkbyBnZXQgbG9zdCBkdWUgdG8gUkVQ QUNLLikKKwkgKgorCSAqIEFzIHRoZSBpZGVudGl0eSBpbmRleCBhbHJlYWR5IGhhZCB0byBiZSBi dWlsdCwgc2tpcCBpdCBoZXJlLiBYWFgKKwkgKiBDb25zaWRlciBpZiB0aGUgcmV0YWlsIGluc2Vy dHMgZHVyaW5nIGRhdGEgY29weWluZyAoaW4gdGhlIGNhc2Ugdy9vCisJICogYXV4aWxpYXJ5IHRh YmxlKSBjYW4gYmUgYSBwcm9ibGVtIGluIHRlcm1zIG9mIGluZGV4IGxheW91dC4gU2hvdWxkbid0 CisJICogd2UgZHJvcCB0aGUgaWRlbnRpdHkgaW5kZXggYW5kIGJ1aWxkIGl0IHVzaW5nIGJ1bGsg aW5zZXJ0IHRvbz8KIAkgKi8KKwlmb3JlYWNoX29pZChpbmRfb2lkLCBpbmRfb2lkc19vbGQpCisJ eworCQlpZiAoaW5kX29pZCAhPSBpZGVudElkeCkKKwkJCWluZHNfdG1wID0gbGFwcGVuZF9vaWQo aW5kc190bXAsIGluZF9vaWQpOworCX0KKwlpbmRfb2lkc19vbGQgPSBpbmRzX3RtcDsKIAlpbmRf b2lkc19uZXcgPSBidWlsZF9uZXdfaW5kZXhlcyhOZXdIZWFwLCBpbmRfb2lkc19vbGQpOwogCiAJ LyoKLQkgKiBUaGUgaWRlbnRpdHkgaW5kZXggaW4gdGhlIG5ldyByZWxhdGlvbiBhcHBlYXJzIGlu IHRoZSBzYW1lIHJlbGF0aXZlCi0JICogcG9zaXRpb24gYXMgdGhlIGNvcnJlc3BvbmRpbmcgaW5k ZXggaW4gdGhlIG9sZCByZWxhdGlvbi4gIEZpbmQgaXQuCisJICogVGhlIGlkZW50aXR5IGluZGV4 IHdpbGwgYmUgaW52b2x2ZWQgaW4gdGhlIGZvbGxvd2luZyBwcm9jZXNzaW5nLgogCSAqLwotCWlk ZW50X2lkeF9uZXcgPSBJbnZhbGlkT2lkOwotCWZvcmVhY2hfb2lkKGluZF9vbGQsIGluZF9vaWRz X29sZCkKLQl7Ci0JCWlmIChpZGVudElkeCA9PSBpbmRfb2xkKQotCQl7Ci0JCQlpbnQJCQlwb3Mg PSBmb3JlYWNoX2N1cnJlbnRfaW5kZXgoaW5kX29sZCk7Ci0KLQkJCWlmIChsaXN0X2xlbmd0aChp bmRfb2lkc19uZXcpIDw9IHBvcykKLQkJCQllbG9nKEVSUk9SLCAibGlzdCBvZiBuZXcgaW5kZXhl cyB0b28gc2hvcnQiKTsKLQkJCWlkZW50X2lkeF9uZXcgPSBsaXN0X250aF9vaWQoaW5kX29pZHNf bmV3LCBwb3MpOwotCQkJYnJlYWs7Ci0JCX0KLQl9Ci0JaWYgKCFPaWRJc1ZhbGlkKGlkZW50X2lk eF9uZXcpKQotCQllbG9nKEVSUk9SLCAiY291bGQgbm90IGZpbmQgaW5kZXggbWF0Y2hpbmcgXCIl c1wiIGF0IHRoZSBuZXcgcmVsYXRpb24iLAotCQkJIGdldF9yZWxfbmFtZShpZGVudElkeCkpOwot Ci0JLyogR2F0aGVyIGluZm9ybWF0aW9uIHRvIGFwcGx5IGNvbmN1cnJlbnQgY2hhbmdlcy4gKi8K LQlpbml0aWFsaXplX2NoYW5nZV9jb250ZXh0KCZjaGdjeHQsIE9sZEhlYXAsIE5ld0hlYXAsIGlk ZW50X2lkeF9uZXcpOworCWluZF9vaWRzX29sZCA9IGxhcHBlbmRfb2lkKGluZF9vaWRzX29sZCwg aWRlbnRJZHgpOworCWluZF9vaWRzX25ldyA9IGxhcHBlbmRfb2lkKGluZF9vaWRzX25ldywKKwkJ CQkJCQkgICBSZWxhdGlvbkdldFJlbGlkKGNoZ2N4dC0+Y2NfZGVzdC5pZGVudF9pbmRleCkpOwog CiAJLyoKIAkgKiBEdXJpbmcgdGVzdGluZywgd2FpdCBmb3IgYW5vdGhlciBiYWNrZW5kIHRvIHBl cmZvcm0gY29uY3VycmVudCBkYXRhCkBAIC0zNTg1LDExICszODM4LDE0IEBAIHJlYnVpbGRfcmVs YXRpb25fZmluaXNoX2NvbmN1cnJlbnQoUmVsYXRpb24gTmV3SGVhcCwgUmVsYXRpb24gT2xkSGVh cCwKIAllbmRfb2Zfd2FsID0gR2V0Rmx1c2hSZWNQdHIoTlVMTCk7CiAKIAkvKgotCSAqIEFwcGx5 IGNvbmN1cnJlbnQgY2hhbmdlcyBmaXJzdCB0aW1lLCB0byBtaW5pbWl6ZSB0aGUgdGltZSB3ZSBu ZWVkIHRvCi0JICogaG9sZCBBY2Nlc3NFeGNsdXNpdmVMb2NrLiAoUXVpdGUgc29tZSBhbW91bnQg b2YgV0FMIGNvdWxkIGhhdmUgYmVlbgorCSAqIERlY29kZSBhbmQgYXBwbHkgY29uY3VycmVudCBj aGFuZ2VzIGFnYWluLCB0byBtaW5pbWl6ZSB0aGUgdGltZSB3ZSBuZWVkCisJICogdG8gaG9sZCBB Y2Nlc3NFeGNsdXNpdmVMb2NrLiAoUXVpdGUgc29tZSBhbW91bnQgb2YgV0FMIGNvdWxkIGhhdmUg YmVlbgogCSAqIHdyaXR0ZW4gZHVyaW5nIHRoZSBkYXRhIGNvcHlpbmcgYW5kIGluZGV4IGNyZWF0 aW9uLikKIAkgKi8KLQlwcm9jZXNzX2NvbmN1cnJlbnRfY2hhbmdlcyhlbmRfb2Zfd2FsLCAmY2hn Y3h0LCBmYWxzZSk7CisJcmVwYWNrX3Byb2Nlc3NfY29uY3VycmVudF9jaGFuZ2VzKGNoZ2N4dCwg ZW5kX29mX3dhbCwKKwkJCQkJCQkJCSAgSW52YWxpZEJsb2NrTnVtYmVyLCBJbnZhbGlkQmxvY2tO dW1iZXIsCisJCQkJCQkJCQkgIEludmFsaWRCbG9ja051bWJlciwKKwkJCQkJCQkJCSAgZmFsc2Us IGZhbHNlKTsKIAogCS8qCiAJICogQWNxdWlyZSBBY2Nlc3NFeGNsdXNpdmVMb2NrIG9uIHRoZSB0 YWJsZSwgaXRzIFRPQVNUIHJlbGF0aW9uIChpZiB0aGVyZQpAQCAtMzY0MywxMCArMzg5OSwxMyBA QCByZWJ1aWxkX3JlbGF0aW9uX2ZpbmlzaF9jb25jdXJyZW50KFJlbGF0aW9uIE5ld0hlYXAsIFJl bGF0aW9uIE9sZEhlYXAsCiAJZW5kX29mX3dhbCA9IEdldEZsdXNoUmVjUHRyKE5VTEwpOwogCiAJ LyoKLQkgKiBBcHBseSB0aGUgY29uY3VycmVudCBjaGFuZ2VzIGFnYWluLiBJbmRpY2F0ZSB0aGF0 IHRoZSBkZWNvZGluZyB3b3JrZXIKLQkgKiB3b24ndCBiZSBuZWVkZWQgYW55bW9yZS4KKwkgKiBE ZWNvZGUgYW5kIGFwcGx5IHRoZSBjb25jdXJyZW50IGNoYW5nZXMgYWdhaW4uIEluZGljYXRlIHRo YXQgdGhlCisJICogZGVjb2Rpbmcgd29ya2VyIHdvbid0IGJlIG5lZWRlZCBhbnltb3JlLgogCSAq LwotCXByb2Nlc3NfY29uY3VycmVudF9jaGFuZ2VzKGVuZF9vZl93YWwsICZjaGdjeHQsIHRydWUp OworCXJlcGFja19wcm9jZXNzX2NvbmN1cnJlbnRfY2hhbmdlcyhjaGdjeHQsIGVuZF9vZl93YWws CisJCQkJCQkJCQkgIEludmFsaWRCbG9ja051bWJlciwgSW52YWxpZEJsb2NrTnVtYmVyLAorCQkJ CQkJCQkJICBJbnZhbGlkQmxvY2tOdW1iZXIsCisJCQkJCQkJCQkgIGZhbHNlLCB0cnVlKTsKIAog CS8qIFJlbWVtYmVyIGluZm8gYWJvdXQgcmVsIGJlZm9yZSBjbG9zaW5nIE9sZEhlYXAgKi8KIAly ZWxwZXJzaXN0ZW5jZSA9IE9sZEhlYXAtPnJkX3JlbC0+cmVscGVyc2lzdGVuY2U7CkBAIC0zNjk0 LDcgKzM5NTMsNyBAQCByZWJ1aWxkX3JlbGF0aW9uX2ZpbmlzaF9jb25jdXJyZW50KFJlbGF0aW9u IE5ld0hlYXAsIFJlbGF0aW9uIE9sZEhlYXAsCiAJdGFibGVfY2xvc2UoTmV3SGVhcCwgTm9Mb2Nr KTsKIAogCS8qIENsZWFudXAgd2hhdCB3ZSBkb24ndCBuZWVkIGFueW1vcmUuIChBbmQgY2xvc2Ug dGhlIGlkZW50aXR5IGluZGV4LikgKi8KLQlyZWxlYXNlX2NoYW5nZV9jb250ZXh0KCZjaGdjeHQp OworCXJlbGVhc2VfY2hhbmdlX2NvbnRleHQoY2hnY3h0KTsKIAogCS8qCiAJICogU3dhcCB0aGUg cmVsYXRpb25zIGFuZCB0aGVpciBUT0FTVCByZWxhdGlvbnMgYW5kIFRPQVNUIGluZGV4ZXMuIFRo aXMKQEAgLTM3MTMsNiArMzk3MiwxMDQgQEAgcmVidWlsZF9yZWxhdGlvbl9maW5pc2hfY29uY3Vy cmVudChSZWxhdGlvbiBOZXdIZWFwLCBSZWxhdGlvbiBPbGRIZWFwLAogCQkJCQkgcmVscGVyc2lz dGVuY2UpOwogfQogCisvKgorICogQ29weSB0aGUgY29udGVudHMgb2YgdGhlIGF1eGlsaWFyeSB0 YWJsZSB0byB0aGUgbmV3IHRhYmxlIGluIHRoZSBkZXNpcmVkCisgKiBvcmRlciwgdGhlbiBkcm9w IHRoZSBhdXhpbGlhcnkgdGFibGUuCisgKi8KK3N0YXRpYyB2b2lkCitwcm9jZXNzX2F1eGlsaWFy eV90YWJsZShDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIFJlbGF0aW9uIE9sZEhlYXAsIE9pZCBpZGVu dElkeCkKK3sKKwlSZXBhY2tEZXN0ICpkZXN0ID0gY2hnY3h0LT5jY19kZXN0X2F1eDsKKwlPaWQJ CQlpZGVudF9pZHhfbmV3OworCVJlbGF0aW9uCWNsdXN0ZXJpbmdfaW5kZXg7CisJSW5kZXhTY2Fu RGVzYyBzY2FuOworCVR1cGxlVGFibGVTbG90ICpzbG90OworCU9pZAkJCWF1eF9vaWQ7CisJT2Jq ZWN0QWRkcmVzcyBvYmplY3Q7CisJUmVsYXRpb24JcmVsOworCisJLyoKKwkgKiBGaXJzdCwgbWFr ZSBzdXJlIHRoZSBjbHVzdGVyaW5nIGluZGV4IGV4aXN0cy4KKwkgKi8KKwlpZiAoT2lkSXNWYWxp ZChjaGdjeHQtPmNjX2NsdXN0ZXJpbmdfaW5kZXgpKQorCXsKKwkJT2lkCQkJY2xfaW5kX29pZDsK KworCQkvKgorCQkgKiBDcmVhdGUgaXQgYWNjb3JkaW5nIHRvIHRoZSBjbHVzdGVyaW5nIGluZGV4 IG9uIHRoZSBvbGQgcmVsYXRpb24uCisJCSAqLworCQljbF9pbmRfb2lkID0gYnVpbGRfbmV3X2lu ZGV4KGRlc3QtPnJlbCwKKwkJCQkJCQkJCSBjaGdjeHQtPmNjX2NsdXN0ZXJpbmdfaW5kZXgsCisJ CQkJCQkJCQkgdHJ1ZSk7CisJCWNsdXN0ZXJpbmdfaW5kZXggPSBpbmRleF9vcGVuKGNsX2luZF9v aWQsIE5vTG9jayk7CisJfQorCWVsc2UKKwl7CisJCS8qIFRoZSBpZGVudGl0eSBpbmRleCBpcyBh bHNvIHRoZSBjbHVzdGVyaW5nIGluZGV4LiAqLworCQljbHVzdGVyaW5nX2luZGV4ID0gZGVzdC0+ aWRlbnRfaW5kZXg7CisJfQorCisJLyoKKwkgKiBOb3cgZG8gdGhlIGNvcHlpbmcuIEJlZm9yZSBz dGFydGluZywgY2xlYXIgLT5jY19kZXN0X2F1eCBzbyB0aGF0CisJICogaW5zZXJ0aW9ucyBnbyB0 byB0aGUgZmluYWwgdGFibGUsIHJhdGhlciB0aGFuIHRoZSBhdXhpbGlhcnkgb25lLgorCSAqLwor CWNoZ2N4dC0+Y2NfZGVzdF9hdXggPSBOVUxMOworCXNsb3QgPSB0YWJsZV9zbG90X2NyZWF0ZShk ZXN0LT5yZWwsIE5VTEwpOworCisJLyoKKwkgKiBOb3RlOiB0aGUgY3VycmVudCBhY3RpdmUgc25h cHNob3QgYmxvY2tzIHRoZSBwcm9ncmVzcyBvZiB4bWluCisJICogaG9yaXpvbihzKS4gVGhlIG5l eHQgcGF0Y2hlcyBpbiB0aGUgc2VyaWVzIHNob3VsZCBmaXggdGhpcyBieSB1c2luZyBhCisJICog bmV3IGtpbmQgb2Ygc25hcHNob3QgKHdoaWNoIHdlIGNhbiB1c2UgaGVyZSBiZWNhdXNlIHRoZXJl IGFyZSBubworCSAqIHRyYW5zYWN0aW9uIGFib3J0cyBpbiB0aGUgYXV4aWxpYXJ5IHRhYmxlKS4K KwkgKi8KKwlzY2FuID0gaW5kZXhfYmVnaW5zY2FuKGRlc3QtPnJlbCwgY2x1c3RlcmluZ19pbmRl eCwgZmFsc2UsCisJCQkJCQkgICBHZXRBY3RpdmVTbmFwc2hvdCgpLCBOVUxMLCAwLCAwLCBTT19O T05FKTsKKwlpbmRleF9yZXNjYW4oc2NhbiwgTlVMTCwgMCwgTlVMTCwgMCk7CisJZm9yICg7OykK Kwl7CisJCUNIRUNLX0ZPUl9JTlRFUlJVUFRTKCk7CisKKwkJaWYgKCF0YWJsZV9pbmRleF9nZXRu ZXh0X3Nsb3Qoc2NhbiwgRm9yd2FyZFNjYW5EaXJlY3Rpb24sIHNsb3QpKQorCQkJYnJlYWs7CisK KwkJLyoKKwkJICogUmVmb3JtaW5nIHNob3VsZCBoYXZlIGJlZW4gcGVyZm9ybWVkIGR1cmluZyBp bnNlcnRpb25zIGludG8gdGhlCisJCSAqIGF1eGlsaWFyeSB0YWJsZS4KKwkJICovCisJCWhlYXBf aW5zZXJ0X2Zvcl9yZXBhY2soY2hnY3h0LCBzbG90LCBOVUxMKTsKKwl9CisJaW5kZXhfZW5kc2Nh bihzY2FuKTsKKwlFeGVjRHJvcFNpbmdsZVR1cGxlVGFibGVTbG90KHNsb3QpOworCisJLyoKKwkg KiBDbG9zZSB0aGUgcmVsYXRpb24sIGl0cyBpZGVudGl0eSBpbmRleCBhbmQgY2x1c3RlcmluZyBp bmRleCBpZiB3ZSBoYWQKKwkgKiB0byBvcGVuIGl0IGFib3ZlLiBMb2NrIHdpbGwgYmUgcmVsZWFz ZWQgb24gY29tbWl0LgorCSAqLworCWF1eF9vaWQgPSBSZWxhdGlvbkdldFJlbGlkKGRlc3QtPnJl bCk7CisJdGFibGVfY2xvc2UoZGVzdC0+cmVsLCBOb0xvY2spOworCWlmIChPaWRJc1ZhbGlkKGNo Z2N4dC0+Y2NfY2x1c3RlcmluZ19pbmRleCkpCisJCWluZGV4X2Nsb3NlKGNsdXN0ZXJpbmdfaW5k ZXgsIE5vTG9jayk7CisJLyogSGVyZSB3ZSBjbG9zZSB0aGUgb3RoZXIgaW5kZXhlcy4gKi8KKwly ZWxlYXNlX2NoYW5nZV9kZXN0KGRlc3QpOworCisJLyogRHJvcCB0aGUgYXV4aWxpYXJ5IHRhYmxl LiAqLworCW9iamVjdC5jbGFzc0lkID0gUmVsYXRpb25SZWxhdGlvbklkOworCW9iamVjdC5vYmpl Y3RJZCA9IGF1eF9vaWQ7CisJb2JqZWN0Lm9iamVjdFN1YklkID0gMDsKKwlwZXJmb3JtRGVsZXRp b24oJm9iamVjdCwgRFJPUF9SRVNUUklDVCwgUEVSRk9STV9ERUxFVElPTl9JTlRFUk5BTCk7CisK KwkvKiBCdWlsZCB0aGUgaWRlbnRpdHkgaW5kZXggb24gdGhlIG5ldyByZWxhdGlvbi4gKi8KKwlp ZGVudF9pZHhfbmV3ID0gYnVpbGRfbmV3X2luZGV4KGNoZ2N4dC0+Y2NfZGVzdC5yZWwsIGlkZW50 SWR4LCBmYWxzZSk7CisKKwkvKgorCSAqIE1ha2UgdGhlIG5ldyBoZWFwIHJlYWR5IHRvIHVzZSB0 aGUgaW5kZXggZm9yIGZ1dHVyZSByZXBsYXlpbmcgb2YKKwkgKiBjb25jdXJyZW50IGNoYW5nZXMu CisJICovCisJcmVsID0gY2hnY3h0LT5jY19kZXN0LnJlbDsKKwlyZWxlYXNlX2NoYW5nZV9kZXN0 KCZjaGdjeHQtPmNjX2Rlc3QpOworCWluaXRpYWxpemVfY2hhbmdlX2Rlc3QoJmNoZ2N4dC0+Y2Nf ZGVzdCwgcmVsLCBpZGVudF9pZHhfbmV3KTsKK30KKwogLyoKICAqIEJ1aWxkIGluZGV4ZXMgb24g TmV3SGVhcCBhY2NvcmRpbmcgdG8gdGhvc2Ugb24gdGhlIG9sZCBoZWFwLgogICoKQEAgLTM3Mjgs MzQgKzQwODUsNjAgQEAgYnVpbGRfbmV3X2luZGV4ZXMoUmVsYXRpb24gTmV3SGVhcCwgTGlzdCAq T2xkSW5kZXhlcykKIHsKIAlMaXN0CSAgICpyZXN1bHQgPSBOSUw7CiAKLQlwZ3N0YXRfcHJvZ3Jl c3NfdXBkYXRlX3BhcmFtKFBST0dSRVNTX1JFUEFDS19QSEFTRSwKLQkJCQkJCQkJIFBST0dSRVNT X1JFUEFDS19QSEFTRV9SRUJVSUxEX0lOREVYKTsKLQogCWZvcmVhY2hfb2lkKG9sZGluZGV4LCBP bGRJbmRleGVzKQogCXsKIAkJT2lkCQkJbmV3aW5kZXg7Ci0JCWNoYXIJICAgKm5ld05hbWU7Ci0J CVJlbGF0aW9uCWluZDsKLQotCQlpbmQgPSBpbmRleF9vcGVuKG9sZGluZGV4LCBTaGFyZVVwZGF0 ZUV4Y2x1c2l2ZUxvY2spOwotCi0JCW5ld05hbWUgPSBDaG9vc2VSZWxhdGlvbk5hbWUoZ2V0X3Jl bF9uYW1lKG9sZGluZGV4KSwKLQkJCQkJCQkJCSBOVUxMLAotCQkJCQkJCQkJICJyZXBhY2tuZXci LAotCQkJCQkJCQkJIGdldF9yZWxfbmFtZXNwYWNlKGluZC0+cmRfaW5kZXgtPmluZHJlbGlkKSwK LQkJCQkJCQkJCSBmYWxzZSk7Ci0JCW5ld2luZGV4ID0gaW5kZXhfY3JlYXRlX2NvcHkoTmV3SGVh cCwgSU5ERVhfQ1JFQVRFX1NVUFBSRVNTX1BST0dSRVNTLAotCQkJCQkJCQkJIG9sZGluZGV4LCBp bmQtPnJkX3JlbC0+cmVsdGFibGVzcGFjZSwKLQkJCQkJCQkJCSBuZXdOYW1lKTsKLQkJY29weV9p bmRleF9jb25zdHJhaW50cyhpbmQsIG5ld2luZGV4LCBSZWxhdGlvbkdldFJlbGlkKE5ld0hlYXAp KTsKKworCQluZXdpbmRleCA9IGJ1aWxkX25ld19pbmRleChOZXdIZWFwLCBvbGRpbmRleCwgZmFs c2UpOwogCQlyZXN1bHQgPSBsYXBwZW5kX29pZChyZXN1bHQsIG5ld2luZGV4KTsKKwl9CiAKLQkJ aW5kZXhfY2xvc2UoaW5kLCBOb0xvY2spOworCXJldHVybiByZXN1bHQ7Cit9CiAKKy8qCisgKiBT dWJyb3V0aW5lIG9mIGJ1aWxkX25ld19pbmRleGVzKCkuCisgKgorICogJ2lzX2F1eCcgdGVsbHMg aWYgTmV3SGVhcCBpcyB0aGUgYXV4aWxpYXJ5IHRhYmxlIGZvciBSRVBBQ0sgKENPTkNVUlJFTlRM WSkuCisgKi8KK3N0YXRpYyBPaWQKK2J1aWxkX25ld19pbmRleChSZWxhdGlvbiBOZXdIZWFwLCBP aWQgb2xkaW5kZXgsIGJvb2wgaXNfYXV4KQoreworCU9pZAkJCW5ld2luZGV4OworCWNoYXIJICAg Km5ld05hbWU7CisJUmVsYXRpb24JaW5kOworCisJcGdzdGF0X3Byb2dyZXNzX3VwZGF0ZV9wYXJh bShQUk9HUkVTU19SRVBBQ0tfUEhBU0UsCisJCQkJCQkJCSAhaXNfYXV4ID8gUFJPR1JFU1NfUkVQ QUNLX1BIQVNFX1JFQlVJTERfSU5ERVggOgorCQkJCQkJCQkgUFJPR1JFU1NfUkVQQUNLX1BIQVNF X0JVSUxEX0lOREVYX0FVWCk7CisKKwlpbmQgPSBpbmRleF9vcGVuKG9sZGluZGV4LCBTaGFyZVVw ZGF0ZUV4Y2x1c2l2ZUxvY2spOworCisJbmV3TmFtZSA9IENob29zZVJlbGF0aW9uTmFtZShnZXRf cmVsX25hbWUob2xkaW5kZXgpLAorCQkJCQkJCQkgTlVMTCwKKwkJCQkJCQkJICJyZXBhY2tuZXci LAorCQkJCQkJCQkgZ2V0X3JlbF9uYW1lc3BhY2UoaW5kLT5yZF9pbmRleC0+aW5kcmVsaWQpLAor CQkJCQkJCQkgZmFsc2UpOworCS8qIEZ1bmN0aW9ucyBpbiBpbmRleGVzIG1heSB3YW50IGEgc25h cHNob3Qgc2V0LiAqLworCUFzc2VydChBY3RpdmVTbmFwc2hvdFNldCgpKTsKKwluZXdpbmRleCA9 IGluZGV4X2NyZWF0ZV9jb3B5KE5ld0hlYXAsIElOREVYX0NSRUFURV9TVVBQUkVTU19QUk9HUkVT UywKKwkJCQkJCQkJIG9sZGluZGV4LCBpbmQtPnJkX3JlbC0+cmVsdGFibGVzcGFjZSwKKwkJCQkJ CQkJIG5ld05hbWUpOworCWNvcHlfaW5kZXhfY29uc3RyYWludHMoaW5kLCBuZXdpbmRleCwgUmVs YXRpb25HZXRSZWxpZChOZXdIZWFwKSk7CisJaW5kZXhfY2xvc2UoaW5kLCBOb0xvY2spOworCisJ LyoKKwkgKiBJbmNyZW1lbnQgY291bnRlciBmb3IgZmluaXNoZWQgYnVpbGRzLgorCSAqCisJICog VGhlIGF1eGlsaWFyeSB0YWJsZSB1c3VhbGx5IGhhcyBhIHNpbmdsZSBpbmRleCwgb3IgdHdvIGlm IHRoZSBpZGVudGl0eQorCSAqIGluZGV4IGlzIG5vdCBzdWl0YWJsZSBmb3IgY2x1c3RlcmluZy4g Tm90IHN1cmUgdXNlcnMgbmVlZCB0bworCSAqIGRpc3Rpbmd1aXNoIHRoZXNlIGNhc2VzLCB0aGVy ZWZvcmUgYSBzZXBhcmF0ZSBjb3VudGVyIHdvdWxkIGxpa2VseSBiZQorCSAqIHVzZWxlc3MuCisJ ICovCisJaWYgKCFpc19hdXgpCiAJCXBnc3RhdF9wcm9ncmVzc19pbmNyX3BhcmFtKFBST0dSRVNT X1JFUEFDS19JTkRFWF9SRUJVSUxEX0NPVU5ULCAxKTsKLQl9CiAKLQlyZXR1cm4gcmVzdWx0Owor CXJldHVybiBuZXdpbmRleDsKIH0KIAogLyoKQEAgLTM5NDgsMTAgKzQzMzEsMTMgQEAgc3RhcnRf cmVwYWNrX2RlY29kaW5nX3dvcmtlcihPaWQgcmVsaWQpCiAJc2hhcmVkID0gKERlY29kaW5nV29y a2VyU2hhcmVkICopIGRzbV9zZWdtZW50X2FkZHJlc3MoZGVjb2Rpbmdfd29ya2VyLT5zZWcpOwog CXNoYXJlZC0+aW5pdGlhbGl6ZWQgPSBmYWxzZTsKIAlzaGFyZWQtPnNldHVwX3BoYXNlID0gMDsK KwkvKiBTbmFwc2hvdCBpcyB0aGUgZmlyc3QgdGhpbmcgd2UgbmVlZCBmcm9tIHRoZSB3b3JrZXIu ICovCisJc2hhcmVkLT5zbmFwc2hvdF9yZXF1ZXN0ZWQgPSB0cnVlOwogCXNoYXJlZC0+bHNuX3Vw dG8gPSBJbnZhbGlkWExvZ1JlY1B0cjsKIAlzaGFyZWQtPmRvbmUgPSBmYWxzZTsKIAlTaGFyZWRG aWxlU2V0SW5pdCgmc2hhcmVkLT5zZnMsIGRlY29kaW5nX3dvcmtlci0+c2VnKTsKLQlzaGFyZWQt Pmxhc3RfZXhwb3J0ZWQgPSAtMTsKKwlzaGFyZWQtPmxhc3RfZXhwb3J0ZWRfc25hcHNob3QgPSAt MTsKKwlzaGFyZWQtPmxhc3RfZXhwb3J0ZWRfY2hhbmdlcyA9IC0xOwogCVNwaW5Mb2NrSW5pdCgm c2hhcmVkLT5tdXRleCk7CiAJc2hhcmVkLT5kYmlkID0gTXlEYXRhYmFzZUlkOwogCkBAIC00MTg2 LDEwICs0NTcyLDEwIEBAIHN0b3BfcmVwYWNrX2RlY29kaW5nX3dvcmtlcl9jYihpbnQgY29kZSwg RGF0dW0gYXJnKQogfQogCiAvKgotICogR2V0IHRoZSBpbml0aWFsIHNuYXBzaG90IGZyb20gdGhl IGRlY29kaW5nIHdvcmtlci4KKyAqIEdldCBzbmFwc2hvdCBmcm9tIHRoZSBkZWNvZGluZyB3b3Jr ZXIuCiAgKi8KLXN0YXRpYyBTbmFwc2hvdAotZ2V0X2luaXRpYWxfc25hcHNob3QoRGVjb2RpbmdX b3JrZXIgKndvcmtlcikKK1NuYXBzaG90CityZXBhY2tfZ2V0X3NuYXBzaG90KENoYW5nZUNvbnRl eHQgKmNoZ2N4dCkKIHsKIAlEZWNvZGluZ1dvcmtlclNoYXJlZCAqc2hhcmVkOwogCWNoYXIJCWZu YW1lW01BWFBHUEFUSF07CkBAIC00MTk4LDEyICs0NTg0LDEzIEBAIGdldF9pbml0aWFsX3NuYXBz aG90KERlY29kaW5nV29ya2VyICp3b3JrZXIpCiAJY2hhcgkgICAqc25hcF9zcGFjZTsKIAlTbmFw c2hvdAlzbmFwc2hvdDsKIAotCXNoYXJlZCA9IChEZWNvZGluZ1dvcmtlclNoYXJlZCAqKSBkc21f c2VnbWVudF9hZGRyZXNzKHdvcmtlci0+c2VnKTsKKwlzaGFyZWQgPSAoRGVjb2RpbmdXb3JrZXJT aGFyZWQgKikgZHNtX3NlZ21lbnRfYWRkcmVzcyhkZWNvZGluZ193b3JrZXItPnNlZyk7CiAKIAkv KgotCSAqIFRoZSB3b3JrZXIgbmVlZHMgdG8gaW5pdGlhbGl6ZSB0aGUgbG9naWNhbCBkZWNvZGlu Zywgd2hpY2ggdXN1YWxseQotCSAqIHRha2VzIHNvbWUgdGltZS4gVGhlcmVmb3JlIGl0IG1ha2Vz IHNlbnNlIHRvIHByZXBhcmUgZm9yIHRoZSBzbGVlcAotCSAqIGZpcnN0LgorCSAqIEZvciB0aGUg Zmlyc3Qgc25hcHNob3QgcmVxdWVzdCwgdGhlIHdvcmtlciBuZWVkcyB0byBpbml0aWFsaXplIHRo ZQorCSAqIGxvZ2ljYWwgZGVjb2RpbmcsIHdoaWNoIHVzdWFsbHkgdGFrZXMgc29tZSB0aW1lLiBU aGVyZWZvcmUgaXQgbWFrZXMKKwkgKiBzZW5zZSB0byBwcmVwYXJlIGZvciB0aGUgc2xlZXAgZmly c3QuIERvZXMgaXQgbWFrZSBzZW5zZSB0byBza2lwIHRoZQorCSAqIHByZXBhcmF0aW9uIG9uIHRo ZSBuZXh0IHJlcXVlc3RzPwogCSAqLwogCUNvbmRpdGlvblZhcmlhYmxlUHJlcGFyZVRvU2xlZXAo JnNoYXJlZC0+Y3YpOwogCWZvciAoOzspCkBAIC00MjExLDEzICs0NTk4LDEzIEBAIGdldF9pbml0 aWFsX3NuYXBzaG90KERlY29kaW5nV29ya2VyICp3b3JrZXIpCiAJCWludAkJCWxhc3RfZXhwb3J0 ZWQ7CiAKIAkJU3BpbkxvY2tBY3F1aXJlKCZzaGFyZWQtPm11dGV4KTsKLQkJbGFzdF9leHBvcnRl ZCA9IHNoYXJlZC0+bGFzdF9leHBvcnRlZDsKKwkJbGFzdF9leHBvcnRlZCA9IHNoYXJlZC0+bGFz dF9leHBvcnRlZF9zbmFwc2hvdDsKIAkJU3BpbkxvY2tSZWxlYXNlKCZzaGFyZWQtPm11dGV4KTsK IAogCQkvKgogCQkgKiBIYXMgdGhlIHdvcmtlciBleHBvcnRlZCB0aGUgZmlsZSB3ZSBhcmUgd2Fp dGluZyBmb3I/CiAJCSAqLwotCQlpZiAobGFzdF9leHBvcnRlZCA9PSBXT1JLRVJfRklMRV9TTkFQ U0hPVCkKKwkJaWYgKGxhc3RfZXhwb3J0ZWQgPT0gY2hnY3h0LT5jY19maWxlX3NlcV9zbmFwc2hv dCkKIAkJCWJyZWFrOwogCiAJCUNvbmRpdGlvblZhcmlhYmxlU2xlZXAoJnNoYXJlZC0+Y3YsIFdB SVRfRVZFTlRfUkVQQUNLX1dPUktFUl9FWFBPUlQpOwpAQCAtNDIyNSwyMCArNDYxMiwxMDAgQEAg Z2V0X2luaXRpYWxfc25hcHNob3QoRGVjb2RpbmdXb3JrZXIgKndvcmtlcikKIAlDb25kaXRpb25W YXJpYWJsZUNhbmNlbFNsZWVwKCk7CiAKIAkvKiBSZWFkIHRoZSBzbmFwc2hvdCBmcm9tIGEgZmls ZS4gKi8KLQlEZWNvZGluZ1dvcmtlckZpbGVOYW1lKGZuYW1lLCBzaGFyZWQtPnJlbGlkLCBXT1JL RVJfRklMRV9TTkFQU0hPVCk7CisJRGVjb2RpbmdXb3JrZXJGaWxlTmFtZShmbmFtZSwgc2hhcmVk LT5yZWxpZCwgY2hnY3h0LT5jY19maWxlX3NlcV9zbmFwc2hvdCwKKwkJCQkJCSAgIHRydWUpOwog CWZpbGUgPSBCdWZGaWxlT3BlbkZpbGVTZXQoJnNoYXJlZC0+c2ZzLmZzLCBmbmFtZSwgT19SRE9O TFksIGZhbHNlKTsKIAlCdWZGaWxlUmVhZEV4YWN0KGZpbGUsICZzbmFwX3NpemUsIHNpemVvZihz bmFwX3NpemUpKTsKIAlzbmFwX3NwYWNlID0gKGNoYXIgKikgcGFsbG9jKHNuYXBfc2l6ZSk7CiAJ QnVmRmlsZVJlYWRFeGFjdChmaWxlLCBzbmFwX3NwYWNlLCBzbmFwX3NpemUpOwogCUJ1ZkZpbGVD bG9zZShmaWxlKTsKIAorI2lmZGVmIFVTRV9BU1NFUlRfQ0hFQ0tJTkcKKwlTcGluTG9ja0FjcXVp cmUoJnNoYXJlZC0+bXV0ZXgpOworCUFzc2VydCghc2hhcmVkLT5zbmFwc2hvdF9yZXF1ZXN0ZWQp OworCXNoYXJlZC0+c25hcHNob3RfcmVxdWVzdGVkID0gZmFsc2U7CisJU3BpbkxvY2tSZWxlYXNl KCZzaGFyZWQtPm11dGV4KTsKKyNlbmRpZgorCiAJLyogUmVzdG9yZSBpdC4gKi8KIAlzbmFwc2hv dCA9IFJlc3RvcmVTbmFwc2hvdChzbmFwX3NwYWNlKTsKIAlwZnJlZShzbmFwX3NwYWNlKTsKIAor CS8qIEdldCByZWFkeSBmb3IgdGhlIG5leHQgc25hcHNob3QuICovCisJY2hnY3h0LT5jY19maWxl X3NlcV9zbmFwc2hvdCsrOworCiAJcmV0dXJuIHNuYXBzaG90OwogfQogCisvKgorICogR2V0IGNv bmN1cnJlbnQgY2hhbmdlcywgdXAgdG8gKGFuZCBpbmNsdWRpbmcpIHRoZSByZWNvcmQgd2hvc2Ug TFNOIGlzCisgKiAnZW5kX29mX3dhbCcsIGZyb20gdGhlIGRlY29kaW5nIHdvcmtlciwgYW5kIGFw cGx5IHRoZW0gdG8gdGhlIG5ldyB0YWJsZS4gSWYKKyAqIGJsb2NrIHJhbmdlIGlzIHNwZWNpZmll ZCwgb25seSBhcHBseSBjaGFuZ2VzIHJlbGF0ZWQgdG8gdGhhdCByYW5nZSwgcGx1cworICogY2hh bmdlcyBpbiBibG9ja3MgPj0gbmJsb2Nrcy4KKyAqCisgKiBJZiAncmVxdWVzdF9zbmFwc2hvdCcg aXMgdHJ1ZSwgdGhlIHNuYXBzaG90IGJ1aWx0IGF0IExTTiBmb2xsb3dpbmcgdGhlIGxhc3QKKyAq IGRhdGEgY2hhbmdlIG5lZWRzIHRvIGJlIGV4cG9ydGVkIHRvby4KKyAqLwordm9pZAorcmVwYWNr X3Byb2Nlc3NfY29uY3VycmVudF9jaGFuZ2VzKENoYW5nZUNvbnRleHQgKmNoZ2N4dCwKKwkJCQkJ CQkJICBYTG9nUmVjUHRyIGVuZF9vZl93YWwsCisJCQkJCQkJCSAgQmxvY2tOdW1iZXIgcmFuZ2Vf c3RhcnQsCisJCQkJCQkJCSAgQmxvY2tOdW1iZXIgcmFuZ2VfZW5kLAorCQkJCQkJCQkgIEJsb2Nr TnVtYmVyIG5ibG9ja3MsCisJCQkJCQkJCSAgYm9vbCByZXF1ZXN0X3NuYXBzaG90LCBib29sIGRv bmUpCit7CisJRGVjb2RpbmdXb3JrZXJTaGFyZWQgKnNoYXJlZDsKKworCXBnc3RhdF9wcm9ncmVz c191cGRhdGVfcGFyYW0oUFJPR1JFU1NfUkVQQUNLX1BIQVNFLAorCQkJCQkJCQkgUFJPR1JFU1Nf UkVQQUNLX1BIQVNFX0NBVENIX1VQKTsKKworCS8qIEFzayB0aGUgd29ya2VyIGZvciB0aGUgZmls ZS4gKi8KKwlzaGFyZWQgPSAoRGVjb2RpbmdXb3JrZXJTaGFyZWQgKikgZHNtX3NlZ21lbnRfYWRk cmVzcyhkZWNvZGluZ193b3JrZXItPnNlZyk7CisJU3BpbkxvY2tBY3F1aXJlKCZzaGFyZWQtPm11 dGV4KTsKKwlzaGFyZWQtPmxzbl91cHRvID0gZW5kX29mX3dhbDsKKwlBc3NlcnQoIXNoYXJlZC0+ c25hcHNob3RfcmVxdWVzdGVkKTsKKwlzaGFyZWQtPnNuYXBzaG90X3JlcXVlc3RlZCA9IHJlcXVl c3Rfc25hcHNob3Q7CisJc2hhcmVkLT5kb25lID0gZG9uZTsKKwlTcGluTG9ja1JlbGVhc2UoJnNo YXJlZC0+bXV0ZXgpOworCisJLyoKKwkgKiBUaGUgd29ya2VyIG5lZWRzIHRvIGZpbmlzaCBwcm9j ZXNzaW5nIG9mIHRoZSBjdXJyZW50IFdBTCByZWNvcmQuIEV2ZW4KKwkgKiBpZiBpdCdzIGlkbGUs IGl0J2xsIG5lZWQgdG8gY2xvc2UgdGhlIG91dHB1dCBmaWxlLiBUaHVzIHdlJ3JlIGxpa2VseSB0 bworCSAqIHdhaXQsIHNvIHByZXBhcmUgZm9yIHNsZWVwLgorCSAqLworCUNvbmRpdGlvblZhcmlh YmxlUHJlcGFyZVRvU2xlZXAoJnNoYXJlZC0+Y3YpOworCWZvciAoOzspCisJeworCQlpbnQJCQls YXN0X2V4cG9ydGVkOworCisJCVNwaW5Mb2NrQWNxdWlyZSgmc2hhcmVkLT5tdXRleCk7CisJCWxh c3RfZXhwb3J0ZWQgPSBzaGFyZWQtPmxhc3RfZXhwb3J0ZWRfY2hhbmdlczsKKwkJU3BpbkxvY2tS ZWxlYXNlKCZzaGFyZWQtPm11dGV4KTsKKworCQkvKgorCQkgKiBIYXMgdGhlIHdvcmtlciBleHBv cnRlZCB0aGUgZmlsZSB3ZSBhcmUgd2FpdGluZyBmb3I/CisJCSAqLworCQlpZiAobGFzdF9leHBv cnRlZCA9PSBjaGdjeHQtPmNjX2ZpbGVfc2VxX2NoYW5nZXMpCisJCQlicmVhazsKKworCQlDb25k aXRpb25WYXJpYWJsZVNsZWVwKCZzaGFyZWQtPmN2LCBXQUlUX0VWRU5UX1JFUEFDS19XT1JLRVJf RVhQT1JUKTsKKwl9CisJQ29uZGl0aW9uVmFyaWFibGVDYW5jZWxTbGVlcCgpOworCisjaWZkZWYg VVNFX0FTU0VSVF9DSEVDS0lORworCS8qIE5vIGZpbGUgaXMgZXhwb3J0ZWQgdW50aWwgdGhlIHdv cmtlciBleHBvcnRzIHRoZSBuZXh0IG9uZS4gKi8KKwlTcGluTG9ja0FjcXVpcmUoJnNoYXJlZC0+ bXV0ZXgpOworCUFzc2VydChYTG9nUmVjUHRySXNJbnZhbGlkKHNoYXJlZC0+bHNuX3VwdG8pKTsK KwlTcGluTG9ja1JlbGVhc2UoJnNoYXJlZC0+bXV0ZXgpOworI2VuZGlmCisKKwkvKiBBcHBseSB0 aGUgY2hhbmdlcyB0byB0aGUgbmV3IHRhYmxlLiAqLworCWFwcGx5X2NvbmN1cnJlbnRfY2hhbmdl cyhjaGdjeHQsIHJhbmdlX3N0YXJ0LCByYW5nZV9lbmQsIG5ibG9ja3MpOworCisJLyogR2V0IHJl YWR5IGZvciB0aGUgbmV4dCBzZXQgb2YgY2hhbmdlcy4gKi8KKwljaGdjeHQtPmNjX2ZpbGVfc2Vx X2NoYW5nZXMrKzsKK30KKwogLyoKICAqIEdlbmVyYXRlIHdvcmtlcidzIGZpbGUgbmFtZSBpbnRv ICdmbmFtZScsIHdoaWNoIG11c3QgYmUgb2Ygc2l6ZSBNQVhQR1BBVEguCiAgKiBJZiByZWxhdGlv bnMgb2YgdGhlIHNhbWUgJ3JlbGlkJyBoYXBwZW4gdG8gYmUgcHJvY2Vzc2VkIGF0IHRoZSBzYW1l IHRpbWUsCkBAIC00MjQ2LDEwICs0NzEzLDEzIEBAIGdldF9pbml0aWFsX3NuYXBzaG90KERlY29k aW5nV29ya2VyICp3b3JrZXIpCiAgKiBiZSBpbnZvbHZlZC4KICAqLwogdm9pZAotRGVjb2RpbmdX b3JrZXJGaWxlTmFtZShjaGFyICpmbmFtZSwgT2lkIHJlbGlkLCB1aW50MzIgc2VxKQorRGVjb2Rp bmdXb3JrZXJGaWxlTmFtZShjaGFyICpmbmFtZSwgT2lkIHJlbGlkLCB1aW50MzIgc2VxLCBib29s IHNuYXBzaG90KQogewogCS8qIFRoZSBQSUQgaXMgYWxyZWFkeSBwcmVzZW50IGluIHRoZSBmaWxl c2V0IG5hbWUsIHNvIHdlIG5lZWRuJ3QgYWRkIGl0ICovCi0Jc25wcmludGYoZm5hbWUsIE1BWFBH UEFUSCwgIiV1LSV1IiwgcmVsaWQsIHNlcSk7CisJaWYgKCFzbmFwc2hvdCkKKwkJc25wcmludGYo Zm5hbWUsIE1BWFBHUEFUSCwgIiV1LSV1IiwgcmVsaWQsIHNlcSk7CisJZWxzZQorCQlzbnByaW50 ZihmbmFtZSwgTUFYUEdQQVRILCAiJXUtJXUtc25hcHNob3QiLCByZWxpZCwgc2VxKTsKIH0KIAog LyoKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFja193b3JrZXIuYyBiL3Ny Yy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFja193b3JrZXIuYwppbmRleCBlNDQzYWJmNWVhMS4uNDU4 ZTRiZmQ0NjMgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFja193b3JrZXIu YworKysgYi9zcmMvYmFja2VuZC9jb21tYW5kcy9yZXBhY2tfd29ya2VyLmMKQEAgLTM5LDggKzM5 LDcgQEAgc3RhdGljIHZvaWQgc2V0X3JlcGFja193b3JrZXJfc2V0dXBfcGhhc2UoRGVjb2RpbmdX b3JrZXJTaGFyZWQgKnNoYXJlZCwKIHN0YXRpYyBMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICpyZXBh Y2tfc2V0dXBfbG9naWNhbF9kZWNvZGluZyhPaWQgcmVsaWQsCiAJCQkJCQkJCQkJCQkJCQkgRGVj b2RpbmdXb3JrZXJTaGFyZWQgKnNoYXJlZCk7CiBzdGF0aWMgdm9pZCByZXBhY2tfY2xlYW51cF9s b2dpY2FsX2RlY29kaW5nKExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCk7Ci1zdGF0aWMgdm9p ZCBleHBvcnRfaW5pdGlhbF9zbmFwc2hvdChTbmFwc2hvdCBzbmFwc2hvdCwKLQkJCQkJCQkJCURl Y29kaW5nV29ya2VyU2hhcmVkICpzaGFyZWQpOworc3RhdGljIHZvaWQgZXhwb3J0X3NuYXBzaG90 KFNuYXBzaG90IHNuYXBzaG90LCBEZWNvZGluZ1dvcmtlclNoYXJlZCAqc2hhcmVkKTsKIHN0YXRp YyBib29sIGRlY29kZV9jb25jdXJyZW50X2NoYW5nZXMoTG9naWNhbERlY29kaW5nQ29udGV4dCAq Y3R4LAogCQkJCQkJCQkJICBEZWNvZGluZ1dvcmtlclNoYXJlZCAqc2hhcmVkKTsKIApAQCAtNjgs NiArNjcsOCBAQCBSZXBhY2tXb3JrZXJNYWluKERhdHVtIG1haW5fYXJnKQogCXNobV9tcV9oYW5k bGUgKm1xaDsKIAlMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICpkZWNvZGluZ19jdHg7CiAJU2hhcmVk RmlsZVNldCAqc2ZzOworCVJlcGFja0RlY29kaW5nU3RhdGUgKmRzdGF0ZTsKKwlNZW1vcnlDb250 ZXh0IG9sZGN4dDsKIAlTbmFwc2hvdAlzbmFwc2hvdDsKIAljaGFyCQlidWZbMzJdOwogCkBAIC0x MzQsNyArMTM1LDkgQEAgUmVwYWNrV29ya2VyTWFpbihEYXR1bSBtYWluX2FyZykKIAkgKiBhbnl0 aGluZyBpbiB0aGUgc2hhcmVkIG1lbW9yeSB1bnRpbCB3ZSBoYXZlIHNlcmlhbGl6ZWQgdGhlIHNu YXBzaG90LgogCSAqLwogCVNwaW5Mb2NrQWNxdWlyZSgmc2hhcmVkLT5tdXRleCk7Ci0JQXNzZXJ0 KCFYTG9nUmVjUHRySXNWYWxpZChzaGFyZWQtPmxzbl91cHRvKSk7CisJLyogSW5pdGlhbGx5IHdl J3JlIGV4cGVjdGVkIHRvIHByb3ZpZGUgYSBzbmFwc2hvdCBhbmQgb25seSB0aGF0LiAqLworCUFz c2VydChzaGFyZWQtPnNuYXBzaG90X3JlcXVlc3RlZCAmJgorCQkgICBYTG9nUmVjUHRySXNJbnZh bGlkKHNoYXJlZC0+bHNuX3VwdG8pKTsKIAlzZnMgPSAmc2hhcmVkLT5zZnM7CiAJU3BpbkxvY2tS ZWxlYXNlKCZzaGFyZWQtPm11dGV4KTsKIApAQCAtMTU1LDkgKzE1OCwyNSBAQCBSZXBhY2tXb3Jr ZXJNYWluKERhdHVtIG1haW5fYXJnKQogCVhhY3RJc29MZXZlbCA9IFhBQ1RfUkVQRUFUQUJMRV9S RUFEOwogCVhhY3RSZWFkT25seSA9IHRydWU7CiAKLQkvKiBCdWlsZCB0aGUgaW5pdGlhbCBzbmFw c2hvdCBhbmQgZXhwb3J0IGl0LiAqLworCS8qCisJICogQnVpbGQgdGhlIGluaXRpYWwgc25hcHNo b3QgYW5kIGV4cG9ydCBpdC4KKwkgKgorCSAqIFNpbmNlIHRoZXJlIGlzIG5vIEFQSSB0byBmcmVl IHRoZSAiZXh0ZXJuYWwgc25hcHNob3QiLCBhbmQgc2luY2Ugc3VjaAorCSAqIHNuYXBzaG90IGlz IG5vdCBndWFyYW50ZWVkIHRvIGJlIGZsYXQgKGkuZS4gcGZyZWUoKSBpcyBub3QgYXBwcm9wcmlh dGUpCisJICogdGhlIGVhc2llc3Qgd2F5IHRvIGNsZWFuIGl0IHVwIGlzIHRvIHVzZSBhIHNlcGFy YXRlIG1lbW9yeSBjb250ZXh0IGZvcgorCSAqIGl0LgorCSAqLworCWRzdGF0ZSA9IChSZXBhY2tE ZWNvZGluZ1N0YXRlICopIGRlY29kaW5nX2N0eC0+b3V0cHV0X3dyaXRlcl9wcml2YXRlOworCU1l bW9yeUNvbnRleHRSZXNldChkc3RhdGUtPnNuYXBzaG90X2N4dCk7CisJb2xkY3h0ID0gTWVtb3J5 Q29udGV4dFN3aXRjaFRvKGRzdGF0ZS0+c25hcHNob3RfY3h0KTsKIAlzbmFwc2hvdCA9IFNuYXBC dWlsZEluaXRpYWxTbmFwc2hvdChkZWNvZGluZ19jdHgtPnNuYXBzaG90X2J1aWxkZXIpOwotCWV4 cG9ydF9pbml0aWFsX3NuYXBzaG90KHNuYXBzaG90LCBzaGFyZWQpOworCU1lbW9yeUNvbnRleHRT d2l0Y2hUbyhvbGRjeHQpOworCWV4cG9ydF9zbmFwc2hvdChzbmFwc2hvdCwgc2hhcmVkKTsKKwor CS8qCisJICogQWRqdXN0IHRoZSByZXBsaWNhdGlvbiBzbG90J3MgeG1pbiBzbyB0aGF0IFZBQ1VV TSBjYW4gZG8gbW9yZSB3b3JrLgorCSAqLworCUxvZ2ljYWxJbmNyZWFzZVhtaW5Gb3JTbG90KElu dmFsaWRYTG9nUmVjUHRyLCBzbmFwc2hvdC0+eG1pbiwgZmFsc2UpOwogCiAJLyoKIAkgKiBPbmx5 IGhpc3RvcmljIHNuYXBzaG90cyBzaG91bGQgYmUgdXNlZCBub3cuIERvIG5vdCBsZXQgdXMgcmVz dHJpY3QgdGhlCkBAIC0zNjAsNyArMzc5LDcgQEAgcmVwYWNrX2NsZWFudXBfbG9naWNhbF9kZWNv ZGluZyhMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICpjdHgpCiAgKiBNYWtlIHNuYXBzaG90IGF2YWls YWJsZSB0byB0aGUgYmFja2VuZCB0aGF0IGxhdW5jaGVkIHRoZSBkZWNvZGluZyB3b3JrZXIuCiAg Ki8KIHN0YXRpYyB2b2lkCi1leHBvcnRfaW5pdGlhbF9zbmFwc2hvdChTbmFwc2hvdCBzbmFwc2hv dCwgRGVjb2RpbmdXb3JrZXJTaGFyZWQgKnNoYXJlZCkKK2V4cG9ydF9zbmFwc2hvdChTbmFwc2hv dCBzbmFwc2hvdCwgRGVjb2RpbmdXb3JrZXJTaGFyZWQgKnNoYXJlZCkKIHsKIAljaGFyCQlmbmFt ZVtNQVhQR1BBVEhdOwogCUJ1ZkZpbGUgICAgKmZpbGU7CkBAIC0zNzEsNyArMzkwLDkgQEAgZXhw b3J0X2luaXRpYWxfc25hcHNob3QoU25hcHNob3Qgc25hcHNob3QsIERlY29kaW5nV29ya2VyU2hh cmVkICpzaGFyZWQpCiAJc25hcF9zcGFjZSA9IChjaGFyICopIHBhbGxvYyhzbmFwX3NpemUpOwog CVNlcmlhbGl6ZVNuYXBzaG90KHNuYXBzaG90LCBzbmFwX3NwYWNlKTsKIAotCURlY29kaW5nV29y a2VyRmlsZU5hbWUoZm5hbWUsIHNoYXJlZC0+cmVsaWQsIHNoYXJlZC0+bGFzdF9leHBvcnRlZCAr IDEpOworCURlY29kaW5nV29ya2VyRmlsZU5hbWUoZm5hbWUsIHNoYXJlZC0+cmVsaWQsCisJCQkJ CQkgICBzaGFyZWQtPmxhc3RfZXhwb3J0ZWRfc25hcHNob3QgKyAxLAorCQkJCQkJICAgdHJ1ZSk7 CiAJZmlsZSA9IEJ1ZkZpbGVDcmVhdGVGaWxlU2V0KCZzaGFyZWQtPnNmcy5mcywgZm5hbWUpOwog CS8qIFRvIG1ha2UgcmVzdG9yYXRpb24gZWFzaWVyLCB3cml0ZSB0aGUgc25hcHNob3Qgc2l6ZSBm aXJzdC4gKi8KIAlCdWZGaWxlV3JpdGUoZmlsZSwgJnNuYXBfc2l6ZSwgc2l6ZW9mKHNuYXBfc2l6 ZSkpOwpAQCAtMzgxLDcgKzQwMiw4IEBAIGV4cG9ydF9pbml0aWFsX3NuYXBzaG90KFNuYXBzaG90 IHNuYXBzaG90LCBEZWNvZGluZ1dvcmtlclNoYXJlZCAqc2hhcmVkKQogCiAJLyogSW5jcmVhc2Ug dGhlIGNvdW50ZXIgdG8gdGVsbCB0aGUgYmFja2VuZCB0aGF0IHRoZSBmaWxlIGlzIGF2YWlsYWJs ZS4gKi8KIAlTcGluTG9ja0FjcXVpcmUoJnNoYXJlZC0+bXV0ZXgpOwotCXNoYXJlZC0+bGFzdF9l eHBvcnRlZCsrOworCXNoYXJlZC0+bGFzdF9leHBvcnRlZF9zbmFwc2hvdCsrOworCXNoYXJlZC0+ c25hcHNob3RfcmVxdWVzdGVkID0gZmFsc2U7CiAJU3BpbkxvY2tSZWxlYXNlKCZzaGFyZWQtPm11 dGV4KTsKIAlDb25kaXRpb25WYXJpYWJsZVNpZ25hbCgmc2hhcmVkLT5jdik7CiB9CkBAIC0zOTYs NiArNDE4LDcgQEAgZGVjb2RlX2NvbmN1cnJlbnRfY2hhbmdlcyhMb2dpY2FsRGVjb2RpbmdDb250 ZXh0ICpjdHgsCiAJCQkJCQkgIERlY29kaW5nV29ya2VyU2hhcmVkICpzaGFyZWQpCiB7CiAJUmVw YWNrRGVjb2RpbmdTdGF0ZSAqZHN0YXRlOworCWJvb2wJCXNuYXBzaG90X3JlcXVlc3RlZDsKIAlY TG9nUmVjUHRyCWxzbl91cHRvOwogCWJvb2wJCWRvbmU7CiAJY2hhcgkJZm5hbWVbTUFYUEdQQVRI XTsKQEAgLTQwMywxMSArNDI2LDE0IEBAIGRlY29kZV9jb25jdXJyZW50X2NoYW5nZXMoTG9naWNh bERlY29kaW5nQ29udGV4dCAqY3R4LAogCWRzdGF0ZSA9IChSZXBhY2tEZWNvZGluZ1N0YXRlICop IGN0eC0+b3V0cHV0X3dyaXRlcl9wcml2YXRlOwogCiAJLyogT3BlbiB0aGUgb3V0cHV0IGZpbGUu ICovCi0JRGVjb2RpbmdXb3JrZXJGaWxlTmFtZShmbmFtZSwgc2hhcmVkLT5yZWxpZCwgc2hhcmVk LT5sYXN0X2V4cG9ydGVkICsgMSk7CisJRGVjb2RpbmdXb3JrZXJGaWxlTmFtZShmbmFtZSwgc2hh cmVkLT5yZWxpZCwKKwkJCQkJCSAgIHNoYXJlZC0+bGFzdF9leHBvcnRlZF9jaGFuZ2VzICsgMSwK KwkJCQkJCSAgIGZhbHNlKTsKIAlkc3RhdGUtPmZpbGUgPSBCdWZGaWxlQ3JlYXRlRmlsZVNldCgm c2hhcmVkLT5zZnMuZnMsIGZuYW1lKTsKIAogCVNwaW5Mb2NrQWNxdWlyZSgmc2hhcmVkLT5tdXRl eCk7CiAJbHNuX3VwdG8gPSBzaGFyZWQtPmxzbl91cHRvOworCXNuYXBzaG90X3JlcXVlc3RlZCA9 IHNoYXJlZC0+c25hcHNob3RfcmVxdWVzdGVkOwogCWRvbmUgPSBzaGFyZWQtPmRvbmU7CiAJU3Bp bkxvY2tSZWxlYXNlKCZzaGFyZWQtPm11dGV4KTsKIApAQCAtNDkwLDYgKzUxNiw3IEBAIGRlY29k ZV9jb25jdXJyZW50X2NoYW5nZXMoTG9naWNhbERlY29kaW5nQ29udGV4dCAqY3R4LAogCQl7CiAJ CQlTcGluTG9ja0FjcXVpcmUoJnNoYXJlZC0+bXV0ZXgpOwogCQkJbHNuX3VwdG8gPSBzaGFyZWQt Pmxzbl91cHRvOworCQkJc25hcHNob3RfcmVxdWVzdGVkID0gc2hhcmVkLT5zbmFwc2hvdF9yZXF1 ZXN0ZWQ7CiAJCQkvKiAnZG9uZScgc2hvdWxkIGJlIHNldCBhdCB0aGUgc2FtZSB0aW1lIGFzICds c25fdXB0bycgKi8KIAkJCWRvbmUgPSBzaGFyZWQtPmRvbmU7CiAJCQlTcGluTG9ja1JlbGVhc2Uo JnNoYXJlZC0+bXV0ZXgpOwpAQCAtNTM2LDkgKzU2Myw1OSBAQCBkZWNvZGVfY29uY3VycmVudF9j aGFuZ2VzKExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCwKIAkgKi8KIAlCdWZGaWxlQ2xvc2Uo ZHN0YXRlLT5maWxlKTsKIAlkc3RhdGUtPmZpbGUgPSBOVUxMOworCisJLyoKKwkgKiBCZWZvcmUg cHVibGlzaGluZyB0aGUgZGF0YSBjaGFuZ2VzLCBleHBvcnQgdGhlIHNuYXBzaG90IHRvbyBpZgor CSAqIHJlcXVlc3RlZC4gUHVibGlzaGluZyBib3RoIGF0IG9uY2UgbWFrZXMgc2Vuc2UgYmVjYXVz ZSBib3RoIGFyZSBuZWVkZWQKKwkgKiBhdCB0aGUgc2FtZSB0aW1lLCBhbmQgaXQncyBzaW1wbGVy LgorCSAqLworCWlmIChzbmFwc2hvdF9yZXF1ZXN0ZWQpCisJeworCQlTbmFwc2hvdAlzbmFwc2hv dDsKKwkJTWVtb3J5Q29udGV4dCBvbGRjeHQ7CisKKwkJLyogU2VlIGNvbW1lbnRzIGFib3V0IG1l bW9yeSBjb250ZXh0IGluIFJlcGFja1dvcmtlck1haW4oKS4gKi8KKwkJTWVtb3J5Q29udGV4dFJl c2V0KGRzdGF0ZS0+c25hcHNob3RfY3h0KTsKKwkJb2xkY3h0ID0gTWVtb3J5Q29udGV4dFN3aXRj aFRvKGRzdGF0ZS0+c25hcHNob3RfY3h0KTsKKworCQkvKgorCQkgKiBTbmFwQnVpbGRJbml0aWFs U25hcHNob3QoKSBhc3N1bWVzIGludmFsaWQgWElELCBzbyBzZXQgaXQuIFdlIGRvCisJCSAqIG5v dCB1c2UgdGhlIHNuYXBzaG90LCBzbyBpdCdzIG9rLgorCQkgKi8KKwkJTXlQcm9jLT54bWluID0g SW52YWxpZFRyYW5zYWN0aW9uSWQ7CisJCXNuYXBzaG90ID0gU25hcEJ1aWxkSW5pdGlhbFNuYXBz aG90KGN0eC0+c25hcHNob3RfYnVpbGRlcik7CisJCU1lbW9yeUNvbnRleHRTd2l0Y2hUbyhvbGRj eHQpOworCQlleHBvcnRfc25hcHNob3Qoc25hcHNob3QsIHNoYXJlZCk7CisKKwkJLyoKKwkJICog QWRqdXN0IHRoZSByZXBsaWNhdGlvbiBzbG90J3MgeG1pbiBzbyB0aGF0IFZBQ1VVTSBjYW4gZG8g bW9yZSB3b3JrLgorCQkgKi8KKwkJTG9naWNhbEluY3JlYXNlWG1pbkZvclNsb3QoSW52YWxpZFhM b2dSZWNQdHIsIHNuYXBzaG90LT54bWluLCBmYWxzZSk7CisJfQorCWVsc2UKKwl7CisJCS8qCisJ CSAqIElmIGRhdGEgY2hhbmdlcyB3ZXJlIHJlcXVlc3RlZCBidXQgbm8gZm9sbG93aW5nIHNuYXBz aG90LCB3ZSBkb24ndAorCQkgKiBjYXJlIGFib3V0IHhtaW4gaG9yaXpvbiBiZWNhdXNlIHRoZSBo ZWFwIGNvcHlpbmcgc2hvdWxkIGJlIGRvbmUgYnkKKwkJICogbm93LgorCQkgKi8KKwkJTG9naWNh bEluY3JlYXNlWG1pbkZvclNsb3QoSW52YWxpZFhMb2dSZWNQdHIsIEludmFsaWRUcmFuc2FjdGlv bklkLAorCQkJCQkJCQkgICBmYWxzZSk7CisKKwl9CisKKwkvKgorCSAqIE1ha2Ugc3VyZSB0aGUg eG1pbiBvZiBvdXIgc2xvdCBpcyB0YWtlbiBpbnRvIGFjY291bnQgd2hlbiBjb21wdXRpbmcgbmV3 CisJICogVkFDVVVNIGhvcml6b25zLgorCSAqLworCVJlcGxpY2F0aW9uU2xvdHNDb21wdXRlUmVx dWlyZWRYbWluKGZhbHNlKTsKKworCS8qCisJICogTm93IGluY3JlYXNlIHRoZSBjb3VudGVyKHMp IHRvIGFubm91bmNlIHRoYXQgdGhlIG91dHB1dCBpcyBhdmFpbGFibGUuCisJICovCiAJU3Bpbkxv Y2tBY3F1aXJlKCZzaGFyZWQtPm11dGV4KTsKKwlzaGFyZWQtPmxhc3RfZXhwb3J0ZWRfY2hhbmdl cysrOwogCXNoYXJlZC0+bHNuX3VwdG8gPSBJbnZhbGlkWExvZ1JlY1B0cjsKLQlzaGFyZWQtPmxh c3RfZXhwb3J0ZWQrKzsKIAlTcGluTG9ja1JlbGVhc2UoJnNoYXJlZC0+bXV0ZXgpOwogCUNvbmRp dGlvblZhcmlhYmxlU2lnbmFsKCZzaGFyZWQtPmN2KTsKIApkaWZmIC0tZ2l0IGEvc3JjL2JhY2tl bmQvcmVwbGljYXRpb24vbG9naWNhbC9kZWNvZGUuYyBiL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9u L2xvZ2ljYWwvZGVjb2RlLmMKaW5kZXggZjQ0Zjk0ZDlmMDcuLmM1YTkyMTBkZTA3IDEwMDY0NAot LS0gYS9zcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL2RlY29kZS5jCisrKyBiL3NyYy9i YWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvZGVjb2RlLmMKQEAgLTkyOCw2ICs5MjgsNyBAQCBE ZWNvZGVJbnNlcnQoTG9naWNhbERlY29kaW5nQ29udGV4dCAqY3R4LCBYTG9nUmVjb3JkQnVmZmVy ICpidWYpCiAJeGxfaGVhcF9pbnNlcnQgKnhscmVjOwogCVJlb3JkZXJCdWZmZXJDaGFuZ2UgKmNo YW5nZTsKIAlSZWxGaWxlTG9jYXRvciB0YXJnZXRfbG9jYXRvcjsKKwlCbG9ja051bWJlciBibGtu dW07CiAKIAl4bHJlYyA9ICh4bF9oZWFwX2luc2VydCAqKSBYTG9nUmVjR2V0RGF0YShyKTsKIApA QCAtOTM5LDcgKzk0MCw3IEBAIERlY29kZUluc2VydChMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICpj dHgsIFhMb2dSZWNvcmRCdWZmZXIgKmJ1ZikKIAkJcmV0dXJuOwogCiAJLyogb25seSBpbnRlcmVz dGVkIGluIG91ciBkYXRhYmFzZSAqLwotCVhMb2dSZWNHZXRCbG9ja1RhZyhyLCAwLCAmdGFyZ2V0 X2xvY2F0b3IsIE5VTEwsIE5VTEwpOworCVhMb2dSZWNHZXRCbG9ja1RhZyhyLCAwLCAmdGFyZ2V0 X2xvY2F0b3IsIE5VTEwsICZibGtudW0pOwogCWlmICh0YXJnZXRfbG9jYXRvci5kYk9pZCAhPSBj dHgtPnNsb3QtPmRhdGEuZGF0YWJhc2UpCiAJCXJldHVybjsKIApAQCAtOTU0LDcgKzk1NSw4IEBA IERlY29kZUluc2VydChMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICpjdHgsIFhMb2dSZWNvcmRCdWZm ZXIgKmJ1ZikKIAkJY2hhbmdlLT5hY3Rpb24gPSBSRU9SREVSX0JVRkZFUl9DSEFOR0VfSU5URVJO QUxfU1BFQ19JTlNFUlQ7CiAJY2hhbmdlLT5vcmlnaW5faWQgPSBYTG9nUmVjR2V0T3JpZ2luKHIp OwogCi0JbWVtY3B5KCZjaGFuZ2UtPmRhdGEudHAucmxvY2F0b3IsICZ0YXJnZXRfbG9jYXRvciwg c2l6ZW9mKFJlbEZpbGVMb2NhdG9yKSk7CisJbWVtY3B5KCZjaGFuZ2UtPmRhdGEudHAucmxvY2F0 b3IsICZ0YXJnZXRfbG9jYXRvciwKKwkJICAgc2l6ZW9mKFJlbEZpbGVMb2NhdG9yKSk7CiAKIAl0 dXBsZWRhdGEgPSBYTG9nUmVjR2V0QmxvY2tEYXRhKHIsIDAsICZkYXRhbGVuKTsKIAl0dXBsZWxl biA9IGRhdGFsZW4gLSBTaXplT2ZIZWFwSGVhZGVyOwpAQCAtOTY0LDYgKzk2NiwyMCBAQCBEZWNv ZGVJbnNlcnQoTG9naWNhbERlY29kaW5nQ29udGV4dCAqY3R4LCBYTG9nUmVjb3JkQnVmZmVyICpi dWYpCiAKIAlEZWNvZGVYTG9nVHVwbGUodHVwbGVkYXRhLCBkYXRhbGVuLCBjaGFuZ2UtPmRhdGEu dHAubmV3dHVwbGUpOwogCisJLyoKKwkgKiBSRVBBQ0sgKENPTkNVUlJFTlRMWSkgbmVlZHMgYmxv Y2sgbnVtYmVyIHRvIGNoZWNrIGlmIHRoZSBjb3JyZXNwb25kaW5nCisJICogcGFydCBvZiB0aGUg dGFibGUgd2FzIGFscmVhZHkgY29waWVkLiAgWFhYIFNob3VsZCB3ZSBvbmx5IGRvIHRoaXMgaWYK KwkgKiBBbVJlcGFja1dvcmtlcigpPyBJdCBtaWdodCBzYXZlIGEgZmV3IGN5Y2xlcywgYnV0IG5v dCBzdXJlIGl0J3MgZ29vZCB0bworCSAqIGxlYXZlIHRoZSBmaWVsZHMgdW5zZXQgaW4gb3RoZXIg Y2FzZXMuCisJICovCisJeworCQlIZWFwVHVwbGVIZWFkZXIgaGVhZGVyOworCisJCWhlYWRlciA9 IGNoYW5nZS0+ZGF0YS50cC5uZXd0dXBsZS0+dF9kYXRhOworCQkvKiBvZmZudW0gaXMgbm90IHJl YWxseSBuZWVkZWQsIGJ1dCBsZXQncyBzZXQgdmFsaWQgcG9pbnRlci4gKi8KKwkJSXRlbVBvaW50 ZXJTZXQoJmhlYWRlci0+dF9jdGlkLCBibGtudW0sIHhscmVjLT5vZmZudW0pOworCX0KKwogCWNo YW5nZS0+ZGF0YS50cC5jbGVhcl90b2FzdF9hZnRlcndhcmRzID0gdHJ1ZTsKIAogCVJlb3JkZXJC dWZmZXJRdWV1ZUNoYW5nZShjdHgtPnJlb3JkZXIsIFhMb2dSZWNHZXRYaWQociksIGJ1Zi0+b3Jp Z3B0ciwKQEAgLTk4NSw2ICsxMDAxLDggQEAgRGVjb2RlVXBkYXRlKExvZ2ljYWxEZWNvZGluZ0Nv bnRleHQgKmN0eCwgWExvZ1JlY29yZEJ1ZmZlciAqYnVmKQogCVJlb3JkZXJCdWZmZXJDaGFuZ2Ug KmNoYW5nZTsKIAljaGFyCSAgICpkYXRhOwogCVJlbEZpbGVMb2NhdG9yIHRhcmdldF9sb2NhdG9y OworCUJsb2NrTnVtYmVyIG5ld19ibGtudW0sCisJCQkJb2xkX2Jsa251bTsKIAogCXhscmVjID0g KHhsX2hlYXBfdXBkYXRlICopIFhMb2dSZWNHZXREYXRhKHIpOwogCkBAIC05OTgsNyArMTAxNiw3 IEBAIERlY29kZVVwZGF0ZShMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICpjdHgsIFhMb2dSZWNvcmRC dWZmZXIgKmJ1ZikKIAkJcmV0dXJuOwogCiAJLyogb25seSBpbnRlcmVzdGVkIGluIG91ciBkYXRh YmFzZSAqLwotCVhMb2dSZWNHZXRCbG9ja1RhZyhyLCAwLCAmdGFyZ2V0X2xvY2F0b3IsIE5VTEws IE5VTEwpOworCVhMb2dSZWNHZXRCbG9ja1RhZyhyLCAwLCAmdGFyZ2V0X2xvY2F0b3IsIE5VTEws ICZuZXdfYmxrbnVtKTsKIAlpZiAodGFyZ2V0X2xvY2F0b3IuZGJPaWQgIT0gY3R4LT5zbG90LT5k YXRhLmRhdGFiYXNlKQogCQlyZXR1cm47CiAKQEAgLTEwMDYsNiArMTAyNCwxMSBAQCBEZWNvZGVV cGRhdGUoTG9naWNhbERlY29kaW5nQ29udGV4dCAqY3R4LCBYTG9nUmVjb3JkQnVmZmVyICpidWYp CiAJaWYgKEZpbHRlckJ5T3JpZ2luKGN0eCwgWExvZ1JlY0dldE9yaWdpbihyKSkpCiAJCXJldHVy bjsKIAorCWlmIChYTG9nUmVjSGFzQmxvY2tSZWYociwgMSkpCisJCVhMb2dSZWNHZXRCbG9ja1Rh ZyhyLCAxLCBOVUxMLCBOVUxMLCAmb2xkX2Jsa251bSk7CisJZWxzZQorCQlvbGRfYmxrbnVtID0g bmV3X2Jsa251bTsKKwogCWNoYW5nZSA9IFJlb3JkZXJCdWZmZXJBbGxvY0NoYW5nZShjdHgtPnJl b3JkZXIpOwogCWNoYW5nZS0+YWN0aW9uID0gUkVPUkRFUl9CVUZGRVJfQ0hBTkdFX1VQREFURTsK IAljaGFuZ2UtPm9yaWdpbl9pZCA9IFhMb2dSZWNHZXRPcmlnaW4ocik7CkBAIC0xMDI0LDYgKzEw NDcsMjAgQEAgRGVjb2RlVXBkYXRlKExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCwgWExvZ1Jl Y29yZEJ1ZmZlciAqYnVmKQogCQkJUmVvcmRlckJ1ZmZlckFsbG9jVHVwbGVCdWYoY3R4LT5yZW9y ZGVyLCB0dXBsZWxlbik7CiAKIAkJRGVjb2RlWExvZ1R1cGxlKGRhdGEsIGRhdGFsZW4sIGNoYW5n ZS0+ZGF0YS50cC5uZXd0dXBsZSk7CisKKwkJLyoKKwkJICogUkVQQUNLIChDT05DVVJSRU5UTFkp IG5lZWRzIGJsb2NrIG51bWJlcnMgdG8gY2hlY2sgaWYgdGhlCisJCSAqIGNvcnJlc3BvbmRpbmcg cGFydCBvZiB0aGUgdGFibGUgd2FzIGFscmVhZHkgY29waWVkLiBYWFggRG8gdGhpcworCQkgKiBv bmx5IGlmIEFtUmVwYWNrV29ya2VyKCk/CisJCSAqLworCQl7CisJCQlIZWFwVHVwbGVIZWFkZXIg aGVhZGVyOworCisJCQloZWFkZXIgPSBjaGFuZ2UtPmRhdGEudHAubmV3dHVwbGUtPnRfZGF0YTsK KwkJCS8qIG9mZm51bSBpcyBub3QgcmVhbGx5IG5lZWRlZCwgYnV0IGxldCdzIHNldCB2YWxpZCBw b2ludGVyLiAqLworCQkJSXRlbVBvaW50ZXJTZXQoJmhlYWRlci0+dF9jdGlkLCBuZXdfYmxrbnVt LCB4bHJlYy0+bmV3X29mZm51bSk7CisJCQljaGFuZ2UtPmRhdGEudHAub2xkX2Jsa251bSA9IG9s ZF9ibGtudW07CisJCX0KIAl9CiAKIAlpZiAoeGxyZWMtPmZsYWdzICYgWExIX1VQREFURV9DT05U QUlOU19PTEQpCkBAIC0xMDYwLDYgKzEwOTcsNyBAQCBEZWNvZGVEZWxldGUoTG9naWNhbERlY29k aW5nQ29udGV4dCAqY3R4LCBYTG9nUmVjb3JkQnVmZmVyICpidWYpCiAJeGxfaGVhcF9kZWxldGUg KnhscmVjOwogCVJlb3JkZXJCdWZmZXJDaGFuZ2UgKmNoYW5nZTsKIAlSZWxGaWxlTG9jYXRvciB0 YXJnZXRfbG9jYXRvcjsKKwlCbG9ja051bWJlciBibGtudW07CiAKIAl4bHJlYyA9ICh4bF9oZWFw X2RlbGV0ZSAqKSBYTG9nUmVjR2V0RGF0YShyKTsKIApAQCAtMTA3Myw3ICsxMTExLDcgQEAgRGVj b2RlRGVsZXRlKExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCwgWExvZ1JlY29yZEJ1ZmZlciAq YnVmKQogCQlyZXR1cm47CiAKIAkvKiBvbmx5IGludGVyZXN0ZWQgaW4gb3VyIGRhdGFiYXNlICov Ci0JWExvZ1JlY0dldEJsb2NrVGFnKHIsIDAsICZ0YXJnZXRfbG9jYXRvciwgTlVMTCwgTlVMTCk7 CisJWExvZ1JlY0dldEJsb2NrVGFnKHIsIDAsICZ0YXJnZXRfbG9jYXRvciwgTlVMTCwgJmJsa251 bSk7CiAJaWYgKHRhcmdldF9sb2NhdG9yLmRiT2lkICE9IGN0eC0+c2xvdC0+ZGF0YS5kYXRhYmFz ZSkKIAkJcmV0dXJuOwogCkBAIC0xMTA1LDYgKzExNDMsMTkgQEAgRGVjb2RlRGVsZXRlKExvZ2lj YWxEZWNvZGluZ0NvbnRleHQgKmN0eCwgWExvZ1JlY29yZEJ1ZmZlciAqYnVmKQogCiAJCURlY29k ZVhMb2dUdXBsZSgoY2hhciAqKSB4bHJlYyArIFNpemVPZkhlYXBEZWxldGUsCiAJCQkJCQlkYXRh bGVuLCBjaGFuZ2UtPmRhdGEudHAub2xkdHVwbGUpOworCisJCS8qCisJCSAqIFJFUEFDSyAoQ09O Q1VSUkVOVExZKSBuZWVkcyBibG9jayBudW1iZXIgdG8gY2hlY2sgaWYgdGhlCisJCSAqIGNvcnJl c3BvbmRpbmcgcGFydCBvZiB0aGUgdGFibGUgd2FzIGFscmVhZHkgY29waWVkLiBYWFggRG8gdGhp cworCQkgKiBvbmx5IGlmIEFtUmVwYWNrV29ya2VyKCk/CisJCSAqLworCQl7CisJCQlIZWFwVHVw bGVIZWFkZXIgaGVhZGVyOworCisJCQloZWFkZXIgPSBjaGFuZ2UtPmRhdGEudHAub2xkdHVwbGUt PnRfZGF0YTsKKwkJCS8qIG9mZm51bSBpcyBub3QgcmVhbGx5IG5lZWRlZCwgYnV0IGxldCdzIHNl dCB2YWxpZCBwb2ludGVyLiAqLworCQkJSXRlbVBvaW50ZXJTZXQoJmhlYWRlci0+dF9jdGlkLCBi bGtudW0sIHhscmVjLT5vZmZudW0pOworCQl9CiAJfQogCiAJY2hhbmdlLT5kYXRhLnRwLmNsZWFy X3RvYXN0X2FmdGVyd2FyZHMgPSB0cnVlOwpAQCAtMTE2NCw4ICsxMjE1LDExIEBAIERlY29kZU11 bHRpSW5zZXJ0KExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCwgWExvZ1JlY29yZEJ1ZmZlciAq YnVmKQogCWNoYXIJICAgKnR1cGxlZGF0YTsKIAlTaXplCQl0dXBsZWxlbjsKIAlSZWxGaWxlTG9j YXRvciBybG9jYXRvcjsKKwlCbG9ja051bWJlciBibGtudW07CisJYm9vbAkJaXNpbml0OwogCiAJ eGxyZWMgPSAoeGxfaGVhcF9tdWx0aV9pbnNlcnQgKikgWExvZ1JlY0dldERhdGEocik7CisJaXNp bml0ID0gKFhMb2dSZWNHZXRJbmZvKHIpICYgWExPR19IRUFQX0lOSVRfUEFHRSkgIT0gMDsKIAog CS8qCiAJICogSWdub3JlIGluc2VydCByZWNvcmRzIHdpdGhvdXQgbmV3IHR1cGxlcy4gIFRoaXMg aGFwcGVucyB3aGVuIGEKQEAgLTExNzUsNyArMTIyOSw3IEBAIERlY29kZU11bHRpSW5zZXJ0KExv Z2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCwgWExvZ1JlY29yZEJ1ZmZlciAqYnVmKQogCQlyZXR1 cm47CiAKIAkvKiBvbmx5IGludGVyZXN0ZWQgaW4gb3VyIGRhdGFiYXNlICovCi0JWExvZ1JlY0dl dEJsb2NrVGFnKHIsIDAsICZybG9jYXRvciwgTlVMTCwgTlVMTCk7CisJWExvZ1JlY0dldEJsb2Nr VGFnKHIsIDAsICZybG9jYXRvciwgTlVMTCwgJmJsa251bSk7CiAJaWYgKHJsb2NhdG9yLmRiT2lk ICE9IGN0eC0+c2xvdC0+ZGF0YS5kYXRhYmFzZSkKIAkJcmV0dXJuOwogCkBAIC0xMjQzLDYgKzEy OTcsMjUgQEAgRGVjb2RlTXVsdGlJbnNlcnQoTG9naWNhbERlY29kaW5nQ29udGV4dCAqY3R4LCBY TG9nUmVjb3JkQnVmZmVyICpidWYpCiAJCWVsc2UKIAkJCWNoYW5nZS0+ZGF0YS50cC5jbGVhcl90 b2FzdF9hZnRlcndhcmRzID0gZmFsc2U7CiAKKwkJLyoKKwkJICogUkVQQUNLIChDT05DVVJSRU5U TFkpIG5lZWRzIGJsb2NrIG51bWJlciB0byBjaGVjayBpZiB0aGUKKwkJICogY29ycmVzcG9uZGlu ZyBwYXJ0IG9mIHRoZSB0YWJsZSB3YXMgYWxyZWFkeSBjb3BpZWQuCisJCSAqLworCQlpZiAoQW1S ZXBhY2tXb3JrZXIoKSkKKwkJeworCQkJT2Zmc2V0TnVtYmVyIG9mZm51bTsKKworCQkJLyoKKwkJ CSAqIG9mZm51bSBpcyBub3QgcmVhbGx5IG5lZWRlZCwgYnV0IGxldCdzIHNldCB2YWxpZCBwb2lu dGVyLiAoSXQKKwkJCSAqIHdpbGwgYmUgaW52YWxpZCBhbnl3YXkgaWYgdGhlIHBhZ2Ugd2FzIGlu aXRpYWxseSBlbXB0eS4pCisJCQkgKi8KKwkJCWlmIChpc2luaXQpCisJCQkJb2ZmbnVtID0gRmly c3RPZmZzZXROdW1iZXIgKyBpOworCQkJZWxzZQorCQkJCW9mZm51bSA9IHhscmVjLT5vZmZzZXRz W2ldOworCQkJSXRlbVBvaW50ZXJTZXQoJmhlYWRlci0+dF9jdGlkLCBibGtudW0sIG9mZm51bSk7 CisJCX0KKwogCQlSZW9yZGVyQnVmZmVyUXVldWVDaGFuZ2UoY3R4LT5yZW9yZGVyLCBYTG9nUmVj R2V0WGlkKHIpLAogCQkJCQkJCQkgYnVmLT5vcmlncHRyLCBjaGFuZ2UsIGZhbHNlKTsKIApkaWZm IC0tZ2l0IGEvc3JjL2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC9sb2dpY2FsLmMgYi9zcmMv YmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL2xvZ2ljYWwuYwppbmRleCA4ZmUyNTVmYTk2MC4u MGIzN2QyYWRiMzAgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwv bG9naWNhbC5jCisrKyBiL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvbG9naWNhbC5j CkBAIC0xNzc0LDE0ICsxNzc0LDE3IEBAIHVwZGF0ZV9wcm9ncmVzc190eG5fY2Jfd3JhcHBlcihS ZW9yZGVyQnVmZmVyICpjYWNoZSwgUmVvcmRlckJ1ZmZlclRYTiAqdHhuLAogCiAvKgogICogU2V0 IHRoZSByZXF1aXJlZCBjYXRhbG9nIHhtaW4gaG9yaXpvbiBmb3IgaGlzdG9yaWMgc25hcHNob3Rz IGluIHRoZSBjdXJyZW50Ci0gKiByZXBsaWNhdGlvbiBzbG90LgorICogcmVwbGljYXRpb24gc2xv dCBpZiBjYXRhbG9nIGlzIFRSVUUsIG9yIHhtaW4gaWYgY2F0YWxvZyBpcyBGQUxTRS4KICAqCiAg KiBOb3RlIHRoYXQgaW4gdGhlIG1vc3QgY2FzZXMsIHdlIHdvbid0IGJlIGFibGUgdG8gaW1tZWRp YXRlbHkgdXNlIHRoZSB4bWluCiAgKiB0byBpbmNyZWFzZSB0aGUgeG1pbiBob3Jpem9uOiB3ZSBu ZWVkIHRvIHdhaXQgdGlsbCB0aGUgY2xpZW50IGhhcyBjb25maXJtZWQKLSAqIHJlY2VpdmluZyBj dXJyZW50X2xzbiB3aXRoIExvZ2ljYWxDb25maXJtUmVjZWl2ZWRMb2NhdGlvbigpLgorICogcmVj ZWl2aW5nIGN1cnJlbnRfbHNuIHdpdGggTG9naWNhbENvbmZpcm1SZWNlaXZlZExvY2F0aW9uKCku IEhvd2V2ZXIsCisgKiBjYXRhbG9nPUZBTFNFIGlzIG9ubHkgYWxsb3dlZCBmb3IgdGVtcG9yYXJ5 IHJlcGxpY2F0aW9uIHNsb3RzLCBzbyB0aGUKKyAqIGhvcml6b24gaXMgYXBwbGllZCBpbW1lZGlh dGVseS4KICAqLwogdm9pZAotTG9naWNhbEluY3JlYXNlWG1pbkZvclNsb3QoWExvZ1JlY1B0ciBj dXJyZW50X2xzbiwgVHJhbnNhY3Rpb25JZCB4bWluKQorTG9naWNhbEluY3JlYXNlWG1pbkZvclNs b3QoWExvZ1JlY1B0ciBjdXJyZW50X2xzbiwgVHJhbnNhY3Rpb25JZCB4bWluLAorCQkJCQkJICAg Ym9vbCBjYXRhbG9nKQogewogCWJvb2wJCXVwZGF0ZWRfeG1pbiA9IGZhbHNlOwogCVJlcGxpY2F0 aW9uU2xvdCAqc2xvdDsKQEAgLTE3OTIsNiArMTc5NSwyNyBAQCBMb2dpY2FsSW5jcmVhc2VYbWlu Rm9yU2xvdChYTG9nUmVjUHRyIGN1cnJlbnRfbHNuLCBUcmFuc2FjdGlvbklkIHhtaW4pCiAJQXNz ZXJ0KHNsb3QgIT0gTlVMTCk7CiAKIAlTcGluTG9ja0FjcXVpcmUoJnNsb3QtPm11dGV4KTsKKwlp ZiAoIWNhdGFsb2cpCisJeworCQkvKgorCQkgKiBUaGUgbm9uLWNhdGFsb2cgaG9yaXpvbiBjYW4g b25seSBhZHZhbmNlIGluIHRlbXBvcmFyeSBzbG90cywgc28KKwkJICogdXBkYXRlIGl0IGluIHRo ZSBzaGFyZWQgbWVtb3J5IGltbWVkaWF0ZWx5ICh3L28gcmVxdWlyaW5nIHByaW9yCisJCSAqIHNh dmluZyB0byBkaXNrKS4KKwkJICovCisJCUFzc2VydChzbG90LT5kYXRhLnBlcnNpc3RlbmN5ID09 IFJTX1RFTVBPUkFSWSk7CisKKwkJLyoKKwkJICogVGhlIGhvcml6b24gbXVzdCBub3QgZ28gYmFj a3dhcmRzLCBob3dldmVyIGl0J3Mgby5rLiB0byBiZWNvbWUKKwkJICogaW52YWxpZC4KKwkJICov CisJCUFzc2VydCghVHJhbnNhY3Rpb25JZElzVmFsaWQoc2xvdC0+ZWZmZWN0aXZlX3htaW4pIHx8 CisJCQkgICAhVHJhbnNhY3Rpb25JZElzVmFsaWQoeG1pbikgfHwKKwkJCSAgIFRyYW5zYWN0aW9u SWRGb2xsb3dzT3JFcXVhbHMoeG1pbiwgc2xvdC0+ZWZmZWN0aXZlX3htaW4pKTsKKworCQlzbG90 LT5lZmZlY3RpdmVfeG1pbiA9IHhtaW47CisJCVNwaW5Mb2NrUmVsZWFzZSgmc2xvdC0+bXV0ZXgp OworCQlyZXR1cm47CisJfQogCiAJLyoKIAkgKiBkb24ndCBvdmVyd3JpdGUgaWYgd2UgYWxyZWFk eSBoYXZlIGEgbmV3ZXIgeG1pbi4gVGhpcyBjYW4gaGFwcGVuIGlmIHdlCmRpZmYgLS1naXQgYS9z cmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL3Jlb3JkZXJidWZmZXIuYyBiL3NyYy9iYWNr ZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvcmVvcmRlcmJ1ZmZlci5jCmluZGV4IDQ2ODQzOTg1MzE3 Li4xNTJlN2QzNDQwMCAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNh bC9yZW9yZGVyYnVmZmVyLmMKKysrIGIvc3JjL2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC9y ZW9yZGVyYnVmZmVyLmMKQEAgLTM4NzEsNiArMzg3MSw0MCBAQCBSZW9yZGVyQnVmZmVyWGlkSGFz Q2F0YWxvZ0NoYW5nZXMoUmVvcmRlckJ1ZmZlciAqcmIsIFRyYW5zYWN0aW9uSWQgeGlkKQogCXJl dHVybiByYnR4bl9oYXNfY2F0YWxvZ19jaGFuZ2VzKHR4bik7CiB9CiAKKy8qCisgKiBDaGVjayBp ZiBhIHRyYW5zYWN0aW9uIChvciBpdHMgc3VidHJhbnNhY3Rpb24pIGNvbnRhaW5zIGEgaGVhcCBj aGFuZ2UuCisgKi8KK2Jvb2wKK1Jlb3JkZXJCdWZmZXJYaWRIYXNIZWFwQ2hhbmdlcyhSZW9yZGVy QnVmZmVyICpyYiwgVHJhbnNhY3Rpb25JZCB4aWQpCit7CisJUmVvcmRlckJ1ZmZlclRYTiAqdHhu OworCWRsaXN0X2l0ZXIJaXRlcjsKKworCXR4biA9IFJlb3JkZXJCdWZmZXJUWE5CeVhpZChyYiwg eGlkLCBmYWxzZSwgTlVMTCwgSW52YWxpZFhMb2dSZWNQdHIsCisJCQkJCQkJCWZhbHNlKTsKKwlp ZiAodHhuID09IE5VTEwpCisJCXJldHVybiBmYWxzZTsKKworCWRsaXN0X2ZvcmVhY2goaXRlciwg JnR4bi0+Y2hhbmdlcykKKwl7CisJCVJlb3JkZXJCdWZmZXJDaGFuZ2UgKmNoYW5nZTsKKworCQlj aGFuZ2UgPSBkbGlzdF9jb250YWluZXIoUmVvcmRlckJ1ZmZlckNoYW5nZSwgbm9kZSwgaXRlci5j dXIpOworCisJCXN3aXRjaCAoY2hhbmdlLT5hY3Rpb24pCisJCXsKKwkJCWNhc2UgUkVPUkRFUl9C VUZGRVJfQ0hBTkdFX0lOU0VSVDoKKwkJCWNhc2UgUkVPUkRFUl9CVUZGRVJfQ0hBTkdFX1VQREFU RToKKwkJCWNhc2UgUkVPUkRFUl9CVUZGRVJfQ0hBTkdFX0RFTEVURToKKwkJCQlyZXR1cm4gdHJ1 ZTsKKwkJCWRlZmF1bHQ6CisJCQkJYnJlYWs7CisJCX0KKwl9CisKKwlyZXR1cm4gZmFsc2U7Cit9 CisKIC8qCiAgKiBSZW9yZGVyQnVmZmVyWGlkSGFzQmFzZVNuYXBzaG90CiAgKgkJSGF2ZSB3ZSBh bHJlYWR5IHNldCB0aGUgYmFzZSBzbmFwc2hvdCBmb3IgdGhlIGdpdmVuIHR4bi9zdWJ0eG4/CkBA IC01Mzc3LDYgKzU0MTEsMTIgQEAgUmVvcmRlckJ1ZmZlclRvYXN0UmVwbGFjZShSZW9yZGVyQnVm ZmVyICpyYiwgUmVvcmRlckJ1ZmZlclRYTiAqdHhuLAogCUFzc2VydChuZXd0dXAtPnRfbGVuIDw9 IE1heEhlYXBUdXBsZVNpemUpOwogCUFzc2VydChuZXd0dXAtPnRfZGF0YSA9PSAoSGVhcFR1cGxl SGVhZGVyKSAoKGNoYXIgKikgbmV3dHVwICsgSEVBUFRVUExFU0laRSkpOwogCisJLyoKKwkgKiBQ cmVzZXJ2ZSBUSUQgLSBSRVBBQ0sgcmVsaWVzIG9uIGl0IHdoZW4gZGVhbGluZyB3aXRoIGJsb2Nr IHJhbmdlcy4gWFhYCisJICogU2hvdWxkbid0IHdlIGFkZCBhIG5ldyBmaWVsZCB0byBSZW9yZGVy QnVmZmVyQ2hhbmdlIGluc3RlYWQ/CisJICovCisJdG1waHR1cC0+dF9kYXRhLT50X2N0aWQgPSBu ZXd0dXAtPnRfZGF0YS0+dF9jdGlkOworCiAJbWVtY3B5KG5ld3R1cC0+dF9kYXRhLCB0bXBodHVw LT50X2RhdGEsIHRtcGh0dXAtPnRfbGVuKTsKIAluZXd0dXAtPnRfbGVuID0gdG1waHR1cC0+dF9s ZW47CiAKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvc25hcGJ1 aWxkLmMgYi9zcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL3NuYXBidWlsZC5jCmluZGV4 IDc2NWUyNWIwM2YxLi5kNDkwNzdlYjJlOSAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvcmVwbGlj YXRpb24vbG9naWNhbC9zbmFwYnVpbGQuYworKysgYi9zcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9s b2dpY2FsL3NuYXBidWlsZC5jCkBAIC0xMjgsNiArMTI4LDcgQEAKICNpbmNsdWRlICJhY2Nlc3Mv aGVhcGFtX3hsb2cuaCIKICNpbmNsdWRlICJhY2Nlc3MvdHJhbnNhbS5oIgogI2luY2x1ZGUgImFj Y2Vzcy94YWN0LmgiCisjaW5jbHVkZSAiY29tbWFuZHMvcmVwYWNrLmgiCiAjaW5jbHVkZSAiY29t bW9uL2ZpbGVfdXRpbHMuaCIKICNpbmNsdWRlICJtaXNjYWRtaW4uaCIKICNpbmNsdWRlICJwZ3N0 YXQuaCIKQEAgLTEwMjMsNiArMTAyNCwxMyBAQCBTbmFwQnVpbGRDb21taXRUeG4oU25hcEJ1aWxk ICpidWlsZGVyLCBYTG9nUmVjUHRyIGxzbiwgVHJhbnNhY3Rpb25JZCB4aWQsCiAJCX0KIAl9CiAK KwkvKgorCSAqIFJFUEFDSyBkZWNvZGluZyB3b3JrZXIgbWF5IG5lZWQgdGltZXRyYXZlbCBhbnl0 aW1lLiBJdCB0YWtlcworCSAqIHJlc3BvbnNpYmlsaXR5IGZvciB0cmFja2luZyB0cmFuc2FjdGlv biBjb21taXRzLCBzZWUgYmVsb3cuCisJICovCisJZWxzZSBpZiAoQW1SZXBhY2tXb3JrZXIoKSkK KwkJbmVlZHNfdGltZXRyYXZlbCA9IHRydWU7CisKIAlmb3IgKG54YWN0ID0gMDsgbnhhY3QgPCBu c3VieGFjdHM7IG54YWN0KyspCiAJewogCQlUcmFuc2FjdGlvbklkIHN1YnhpZCA9IHN1YnhhY3Rz W254YWN0XTsKQEAgLTEwMzAsOCArMTAzOCwxMiBAQCBTbmFwQnVpbGRDb21taXRUeG4oU25hcEJ1 aWxkICpidWlsZGVyLCBYTG9nUmVjUHRyIGxzbiwgVHJhbnNhY3Rpb25JZCB4aWQsCiAJCS8qCiAJ CSAqIEFkZCBzdWJ0cmFuc2FjdGlvbiB0byBiYXNlIHNuYXBzaG90IGlmIGNhdGFsb2cgbW9kaWZ5 aW5nLCB3ZSBkb24ndAogCQkgKiBkaXN0aW5ndWlzaCB0byB0b3BsZXZlbCB0cmFuc2FjdGlvbnMg dGhlcmUuCisJCSAqCisJCSAqIFNlZSBjb21tZW50cyBvbiBSRVBBQ0sgd29ya2VyIGJlbG93Lgog CQkgKi8KLQkJaWYgKFNuYXBCdWlsZFhpZEhhc0NhdGFsb2dDaGFuZ2VzKGJ1aWxkZXIsIHN1Ynhp ZCwgeGluZm8pKQorCQlpZiAoU25hcEJ1aWxkWGlkSGFzQ2F0YWxvZ0NoYW5nZXMoYnVpbGRlciwg c3VieGlkLCB4aW5mbykgfHwKKwkJCShBbVJlcGFja1dvcmtlcigpICYmCisJCQkgUmVvcmRlckJ1 ZmZlclhpZEhhc0hlYXBDaGFuZ2VzKGJ1aWxkZXItPnJlb3JkZXIsIHhpZCkpKQogCQl7CiAJCQlz dWJfbmVlZHNfdGltZXRyYXZlbCA9IHRydWU7CiAJCQluZWVkc19zbmFwc2hvdCA9IHRydWU7CkBA IC0xMDU5LDggKzEwNzEsMTggQEAgU25hcEJ1aWxkQ29tbWl0VHhuKFNuYXBCdWlsZCAqYnVpbGRl ciwgWExvZ1JlY1B0ciBsc24sIFRyYW5zYWN0aW9uSWQgeGlkLAogCQl9CiAJfQogCi0JLyogaWYg dG9wLWxldmVsIG1vZGlmaWVkIGNhdGFsb2csIGl0J2xsIG5lZWQgYSBzbmFwc2hvdCAqLwotCWlm IChTbmFwQnVpbGRYaWRIYXNDYXRhbG9nQ2hhbmdlcyhidWlsZGVyLCB4aWQsIHhpbmZvKSkKKwkv KgorCSAqIElmIHRvcC1sZXZlbCBtb2RpZmllZCBjYXRhbG9nLCBpdCdsbCBuZWVkIGEgc25hcHNo b3QuCisJICoKKwkgKiBJZiB3ZSdyZSBkZWNvZGluZyBjaGFuZ2VzIG9uIGJlaGFsZiBvZiBSRVBB Q0sgKENPTkNVUlJFTlRMWSksIG9ubHkKKwkgKiBjaGFuZ2VzIG9mIHRoZSByZWxhdGlvbiBiZWlu ZyBwcm9jZXNzZWQgYXJlIGRlY29kZWQgLSBzZWUKKwkgKiBoZWFwX2RlY29kZSgpLiBUaHVzIGFu eSBoZWFwIGNoYW5nZSB3ZSBmaW5kIGhlcmUgbXVzdCBiZWxvbmcgdG8gdGhhdAorCSAqIHJlbGF0 aW9uLiBBZGQgdGhlIHRyYW5zYWN0aW9uIHNvIHRoYXQgd2UgY2FuIGtlZXAgYnVpbGRpbmcgc25h cHNob3RzIHRvCisJICogc2NhbiB0aGF0IHJlbGF0aW9uLgorCSAqLworCWlmIChTbmFwQnVpbGRY aWRIYXNDYXRhbG9nQ2hhbmdlcyhidWlsZGVyLCB4aWQsIHhpbmZvKSB8fAorCQkoQW1SZXBhY2tX b3JrZXIoKSAmJgorCQkgUmVvcmRlckJ1ZmZlclhpZEhhc0hlYXBDaGFuZ2VzKGJ1aWxkZXItPnJl b3JkZXIsIHhpZCkpKQogCXsKIAkJZWxvZyhERUJVRzIsICJmb3VuZCB0b3AgbGV2ZWwgdHJhbnNh Y3Rpb24gJXUsIHdpdGggY2F0YWxvZyBjaGFuZ2VzIiwKIAkJCSB4aWQpOwpAQCAtMTIyOCw3ICsx MjUwLDcgQEAgU25hcEJ1aWxkUHJvY2Vzc1J1bm5pbmdYYWN0cyhTbmFwQnVpbGQgKmJ1aWxkZXIs IFhMb2dSZWNQdHIgbHNuLCB4bF9ydW5uaW5nX3hhY3QKIAkJeG1pbiA9IHJ1bm5pbmctPm9sZGVz dFJ1bm5pbmdYaWQ7CiAJZWxvZyhERUJVRzMsICJ4bWluOiAldSwgeG1heDogJXUsIG9sZGVzdCBy dW5uaW5nOiAldSwgb2xkZXN0IHhtaW46ICV1IiwKIAkJIGJ1aWxkZXItPnhtaW4sIGJ1aWxkZXIt PnhtYXgsIHJ1bm5pbmctPm9sZGVzdFJ1bm5pbmdYaWQsIHhtaW4pOwotCUxvZ2ljYWxJbmNyZWFz ZVhtaW5Gb3JTbG90KGxzbiwgeG1pbik7CisJTG9naWNhbEluY3JlYXNlWG1pbkZvclNsb3QobHNu LCB4bWluLCB0cnVlKTsKIAogCS8qCiAJICogQWxzbyB0ZWxsIHRoZSBzbG90IHdoZXJlIHdlIGNh biByZXN0YXJ0IGRlY29kaW5nIGZyb20uIFdlIGRvbid0IHdhbnQgdG8KZGlmZiAtLWdpdCBhL3Ny Yy9iYWNrZW5kL3JlcGxpY2F0aW9uL3BncmVwYWNrL3BncmVwYWNrLmMgYi9zcmMvYmFja2VuZC9y ZXBsaWNhdGlvbi9wZ3JlcGFjay9wZ3JlcGFjay5jCmluZGV4IDYwMDYxMjA1NDhhLi42YjcyYWEy ZDJhMSAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvcmVwbGljYXRpb24vcGdyZXBhY2svcGdyZXBh Y2suYworKysgYi9zcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9wZ3JlcGFjay9wZ3JlcGFjay5jCkBA IC0zMyw3ICszMyw4IEBAIHN0YXRpYyB2b2lkIHJlcGFja19jb21taXRfdHhuKExvZ2ljYWxEZWNv ZGluZ0NvbnRleHQgKmN0eCwKIHN0YXRpYyB2b2lkIHJlcGFja19wcm9jZXNzX2NoYW5nZShMb2dp Y2FsRGVjb2RpbmdDb250ZXh0ICpjdHgsIFJlb3JkZXJCdWZmZXJUWE4gKnR4biwKIAkJCQkJCQkJ ICBSZWxhdGlvbiByZWxhdGlvbiwgUmVvcmRlckJ1ZmZlckNoYW5nZSAqY2hhbmdlKTsKIHN0YXRp YyB2b2lkIHJlcGFja19zdG9yZV9jaGFuZ2UoTG9naWNhbERlY29kaW5nQ29udGV4dCAqY3R4LCBS ZWxhdGlvbiByZWxhdGlvbiwKLQkJCQkJCQkJQ29uY3VycmVudENoYW5nZUtpbmQga2luZCwgSGVh cFR1cGxlIHR1cGxlKTsKKwkJCQkJCQkJQ29uY3VycmVudENoYW5nZUtpbmQga2luZCwgSGVhcFR1 cGxlIHR1cGxlLAorCQkJCQkJCQlCbG9ja051bWJlciBvbGRfYmxrbnVtKTsKIAogdm9pZAogX1BH X291dHB1dF9wbHVnaW5faW5pdChPdXRwdXRQbHVnaW5DYWxsYmFja3MgKmNiKQpAQCAtNjUsNiAr NjYsOSBAQCByZXBhY2tfc3RhcnR1cChMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICpjdHgsIE91dHB1 dFBsdWdpbk9wdGlvbnMgKm9wdCwKIAlkc3RhdGUtPmNoYW5nZV9jeHQgPSBBbGxvY1NldENvbnRl eHRDcmVhdGUoY3R4LT5jb250ZXh0LAogCQkJCQkJCQkJCQkgICAiUkVQQUNLIC0gY2hhbmdlIiwK IAkJCQkJCQkJCQkJICAgQUxMT0NTRVRfREVGQVVMVF9TSVpFUyk7CisJZHN0YXRlLT5zbmFwc2hv dF9jeHQgPSBBbGxvY1NldENvbnRleHRDcmVhdGUoY3R4LT5jb250ZXh0LAorCQkJCQkJCQkJCQkJ ICJSRVBBQ0sgLSBzbmFwc2hvdCIsCisJCQkJCQkJCQkJCQkgQUxMT0NTRVRfREVGQVVMVF9TSVpF Uyk7CiAJLyogcmVwYWNrX3NldHVwX2xvZ2ljYWxfZGVjb2RpbmcgZmlsbHMgaW4gdGhlIHJlc3Qg Ki8KIAljdHgtPm91dHB1dF93cml0ZXJfcHJpdmF0ZSA9IGRzdGF0ZTsKIApAQCAtMTM0LDcgKzEz OCw4IEBAIHJlcGFja19wcm9jZXNzX2NoYW5nZShMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICpjdHgs IFJlb3JkZXJCdWZmZXJUWE4gKnR4biwKIAkJCQlpZiAobmV3dHVwbGUgPT0gTlVMTCkKIAkJCQkJ ZWxvZyhFUlJPUiwgImluY29tcGxldGUgaW5zZXJ0IGluZm8iKTsKIAotCQkJCXJlcGFja19zdG9y ZV9jaGFuZ2UoY3R4LCByZWxhdGlvbiwgQ0hBTkdFX0lOU0VSVCwgbmV3dHVwbGUpOworCQkJCXJl cGFja19zdG9yZV9jaGFuZ2UoY3R4LCByZWxhdGlvbiwgQ0hBTkdFX0lOU0VSVCwgbmV3dHVwbGUs CisJCQkJCQkJCQlJbnZhbGlkQmxvY2tOdW1iZXIpOwogCQkJfQogCQkJYnJlYWs7CiAJCWNhc2Ug UkVPUkRFUl9CVUZGRVJfQ0hBTkdFX1VQREFURToKQEAgLTE0OSw5ICsxNTQsMTEgQEAgcmVwYWNr X3Byb2Nlc3NfY2hhbmdlKExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCwgUmVvcmRlckJ1ZmZl clRYTiAqdHhuLAogCQkJCQllbG9nKEVSUk9SLCAiaW5jb21wbGV0ZSB1cGRhdGUgaW5mbyIpOwog CiAJCQkJaWYgKG9sZHR1cGxlICE9IE5VTEwpCi0JCQkJCXJlcGFja19zdG9yZV9jaGFuZ2UoY3R4 LCByZWxhdGlvbiwgQ0hBTkdFX1VQREFURV9PTEQsIG9sZHR1cGxlKTsKKwkJCQkJcmVwYWNrX3N0 b3JlX2NoYW5nZShjdHgsIHJlbGF0aW9uLCBDSEFOR0VfVVBEQVRFX09MRCwgb2xkdHVwbGUsCisJ CQkJCQkJCQkJSW52YWxpZEJsb2NrTnVtYmVyKTsKIAotCQkJCXJlcGFja19zdG9yZV9jaGFuZ2Uo Y3R4LCByZWxhdGlvbiwgQ0hBTkdFX1VQREFURV9ORVcsIG5ld3R1cGxlKTsKKwkJCQlyZXBhY2tf c3RvcmVfY2hhbmdlKGN0eCwgcmVsYXRpb24sIENIQU5HRV9VUERBVEVfTkVXLCBuZXd0dXBsZSwK KwkJCQkJCQkJCWNoYW5nZS0+ZGF0YS50cC5vbGRfYmxrbnVtKTsKIAkJCX0KIAkJCWJyZWFrOwog CQljYXNlIFJFT1JERVJfQlVGRkVSX0NIQU5HRV9ERUxFVEU6CkBAIC0xNjMsNyArMTcwLDggQEAg cmVwYWNrX3Byb2Nlc3NfY2hhbmdlKExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCwgUmVvcmRl ckJ1ZmZlclRYTiAqdHhuLAogCQkJCWlmIChvbGR0dXBsZSA9PSBOVUxMKQogCQkJCQllbG9nKEVS Uk9SLCAiaW5jb21wbGV0ZSBkZWxldGUgaW5mbyIpOwogCi0JCQkJcmVwYWNrX3N0b3JlX2NoYW5n ZShjdHgsIHJlbGF0aW9uLCBDSEFOR0VfREVMRVRFLCBvbGR0dXBsZSk7CisJCQkJcmVwYWNrX3N0 b3JlX2NoYW5nZShjdHgsIHJlbGF0aW9uLCBDSEFOR0VfREVMRVRFLCBvbGR0dXBsZSwKKwkJCQkJ CQkJCUludmFsaWRCbG9ja051bWJlcik7CiAJCQl9CiAJCQlicmVhazsKIAkJZGVmYXVsdDoKQEAg LTE5MCw3ICsxOTgsOCBAQCByZXBhY2tfcHJvY2Vzc19jaGFuZ2UoTG9naWNhbERlY29kaW5nQ29u dGV4dCAqY3R4LCBSZW9yZGVyQnVmZmVyVFhOICp0eG4sCiAgKi8KIHN0YXRpYyB2b2lkCiByZXBh Y2tfc3RvcmVfY2hhbmdlKExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCwgUmVsYXRpb24gcmVs YXRpb24sCi0JCQkJCUNvbmN1cnJlbnRDaGFuZ2VLaW5kIGtpbmQsIEhlYXBUdXBsZSB0dXBsZSkK KwkJCQkJQ29uY3VycmVudENoYW5nZUtpbmQga2luZCwgSGVhcFR1cGxlIHR1cGxlLAorCQkJCQlC bG9ja051bWJlciBvbGRfYmxrbnVtKQogewogCVJlcGFja0RlY29kaW5nU3RhdGUgKmRzdGF0ZTsK IAlNZW1vcnlDb250ZXh0IG9sZGN4dDsKQEAgLTI4Niw2ICsyOTUsOSBAQCByZXBhY2tfc3RvcmVf Y2hhbmdlKExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCwgUmVsYXRpb24gcmVsYXRpb24sCiAJ ICovCiAJQnVmRmlsZVdyaXRlKGZpbGUsICZ0dXBsZS0+dF9sZW4sIHNpemVvZih0dXBsZS0+dF9s ZW4pKTsKIAlCdWZGaWxlV3JpdGUoZmlsZSwgdHVwbGUtPnRfZGF0YSwgdHVwbGUtPnRfbGVuKTsK KwkvKiBJZiBvbGRfYmxrbnVtIGlzIHNwZWNpZmllZCwgd3JpdGUgaXQgdG9vLiAqLworCWlmIChv bGRfYmxrbnVtICE9IEludmFsaWRCbG9ja051bWJlcikKKwkJQnVmRmlsZVdyaXRlKGZpbGUsICZv bGRfYmxrbnVtLCBzaXplb2Yob2xkX2Jsa251bSkpOwogCiAJLyogVGhlbiwgd3JpdGUgdGhlIG51 bWJlciBvZiBleHRlcm5hbCBhdHRyaWJ1dGVzIHdlIGZvdW5kLiAqLwogCW5hdHRfZXh0ID0gbGlz dF9sZW5ndGgoYXR0cnNfZXh0KTsKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3V0aWxzL21pc2Mv Z3VjX3BhcmFtZXRlcnMuZGF0IGIvc3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9ndWNfcGFyYW1ldGVy cy5kYXQKaW5kZXggNzVkODMyZWI1NzAuLjZjNjMxOWU2ZGJmIDEwMDY0NAotLS0gYS9zcmMvYmFj a2VuZC91dGlscy9taXNjL2d1Y19wYXJhbWV0ZXJzLmRhdAorKysgYi9zcmMvYmFja2VuZC91dGls cy9taXNjL2d1Y19wYXJhbWV0ZXJzLmRhdApAQCAtMjU1NCw2ICsyNTU0LDE2IEBACiAgIGJvb3Rf dmFsID0+ICd0cnVlJywKIH0sCiAKKyMgVE9ETyBUdW5lIGJvb3RfdmFsLCAxMDI0IGlzIHByb2Jh Ymx5IHRvbyBsb3cuCit7IG5hbWUgPT4gJ3JlcGFja19zbmFwc2hvdF9hZnRlcicsIHR5cGUgPT4g J2ludCcsIGNvbnRleHQgPT4gJ1BHQ19VU0VSU0VUJywgZ3JvdXAgPT4gJ0RFVkVMT1BFUl9PUFRJ T05TJywKKyAgc2hvcnRfZGVzYyA9PiAnTnVtYmVyIG9mIHBhZ2VzIFJFUEFDSyAoQ09OQ1VSUkVO VExZKSBjYW4gcmVhZCB1c2luZyBhIHNpbmdsZSBzbmFwc2hvdC4nLAorICBmbGFncyA9PiAnR1VD X1VOSVRfQkxPQ0tTIHwgR1VDX05PVF9JTl9TQU1QTEUnLAorICB2YXJpYWJsZSA9PiAncmVwYWNr X3BhZ2VzX3Blcl9zbmFwc2hvdCcsCisgIGJvb3RfdmFsID0+ICcxMDI0JywKKyAgbWluID0+ICcx JywKKyAgbWF4ID0+ICdJTlRfTUFYJywKK30KKwogeyBuYW1lID0+ICdyZXNlcnZlZF9jb25uZWN0 aW9ucycsIHR5cGUgPT4gJ2ludCcsIGNvbnRleHQgPT4gJ1BHQ19QT1NUTUFTVEVSJywgZ3JvdXAg PT4gJ0NPTk5fQVVUSF9TRVRUSU5HUycsCiAgIHNob3J0X2Rlc2MgPT4gJ1NldHMgdGhlIG51bWJl ciBvZiBjb25uZWN0aW9uIHNsb3RzIHJlc2VydmVkIGZvciByb2xlcyB3aXRoIHByaXZpbGVnZXMg b2YgcGdfdXNlX3Jlc2VydmVkX2Nvbm5lY3Rpb25zLicsCiAgIHZhcmlhYmxlID0+ICdSZXNlcnZl ZENvbm5lY3Rpb25zJywKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3V0aWxzL21pc2MvZ3VjX3Rh Ymxlcy5jIGIvc3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9ndWNfdGFibGVzLmMKaW5kZXggYTA1ZmMz NTZmYzMuLjI5YWM1ZTQyZjdiIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC91dGlscy9taXNjL2d1 Y190YWJsZXMuYworKysgYi9zcmMvYmFja2VuZC91dGlscy9taXNjL2d1Y190YWJsZXMuYwpAQCAt NDUsNiArNDUsNyBAQAogI2luY2x1ZGUgImNvbW1hbmRzL2FzeW5jLmgiCiAjaW5jbHVkZSAiY29t bWFuZHMvZXh0ZW5zaW9uLmgiCiAjaW5jbHVkZSAiY29tbWFuZHMvZXZlbnRfdHJpZ2dlci5oIgor I2luY2x1ZGUgImNvbW1hbmRzL3JlcGFjay5oIgogI2luY2x1ZGUgImNvbW1hbmRzL3RhYmxlc3Bh Y2UuaCIKICNpbmNsdWRlICJjb21tYW5kcy90cmlnZ2VyLmgiCiAjaW5jbHVkZSAiY29tbWFuZHMv dXNlci5oIgpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvYWNjZXNzL3RhYmxlYW0uaCBiL3NyYy9p bmNsdWRlL2FjY2Vzcy90YWJsZWFtLmgKaW5kZXggOWQyZmM3ZjlhY2IuLmE1YWQ3NmQzNzIxIDEw MDY0NAotLS0gYS9zcmMvaW5jbHVkZS9hY2Nlc3MvdGFibGVhbS5oCisrKyBiL3NyYy9pbmNsdWRl L2FjY2Vzcy90YWJsZWFtLmgKQEAgLTY2NiwxMiArNjY2LDEyIEBAIHR5cGVkZWYgc3RydWN0IFRh YmxlQW1Sb3V0aW5lCiAJCQkJCQkJCQkJCSAgUmVsYXRpb24gT2xkSW5kZXgsCiAJCQkJCQkJCQkJ CSAgYm9vbCB1c2Vfc29ydCwKIAkJCQkJCQkJCQkJICBUcmFuc2FjdGlvbklkIE9sZGVzdFhtaW4s Ci0JCQkJCQkJCQkJCSAgU25hcHNob3Qgc25hcHNob3QsCiAJCQkJCQkJCQkJCSAgVHJhbnNhY3Rp b25JZCAqeGlkX2N1dG9mZiwKIAkJCQkJCQkJCQkJICBNdWx0aVhhY3RJZCAqbXVsdGlfY3V0b2Zm LAogCQkJCQkJCQkJCQkgIGRvdWJsZSAqbnVtX3R1cGxlcywKIAkJCQkJCQkJCQkJICBkb3VibGUg KnR1cHNfdmFjdXVtZWQsCi0JCQkJCQkJCQkJCSAgZG91YmxlICp0dXBzX3JlY2VudGx5X2RlYWQp OworCQkJCQkJCQkJCQkgIGRvdWJsZSAqdHVwc19yZWNlbnRseV9kZWFkLAorCQkJCQkJCQkJCQkg IHZvaWQgKnRhYmxlYW1fZGF0YSk7CiAKIAkvKgogCSAqIFJlYWN0IHRvIFZBQ1VVTSBjb21tYW5k IG9uIHRoZSByZWxhdGlvbi4gVGhlIFZBQ1VVTSBjYW4gYmUgdHJpZ2dlcmVkIGJ5CkBAIC0xNzU1 LDggKzE3NTUsNiBAQCB0YWJsZV9yZWxhdGlvbl9jb3B5X2RhdGEoUmVsYXRpb24gcmVsLCBjb25z dCBSZWxGaWxlTG9jYXRvciAqbmV3cmxvY2F0b3IpCiAgKiAgIG5vdCBuZWVkZWQgZm9yIHRoZSBy ZWxhdGlvbidzIEFNCiAgKiAtICp4aWRfY3V0b2ZmIC0gZGl0dG8KICAqIC0gKm11bHRpX2N1dG9m ZiAtIGRpdHRvCi0gKiAtIHNuYXBzaG90IC0gaWYgIT0gTlVMTCwgaWdub3JlIGRhdGEgY2hhbmdl cyBkb25lIGJ5IHRyYW5zYWN0aW9ucyB0aGF0IHRoaXMKLSAqCSAoTVZDQykgc25hcHNob3QgY29u c2lkZXJzIHN0aWxsIGluLXByb2dyZXNzIG9yIGluIHRoZSBmdXR1cmUuCiAgKgogICogT3V0cHV0 IHBhcmFtZXRlcnM6CiAgKiAtICp4aWRfY3V0b2ZmIC0gcmVsJ3MgbmV3IHJlbGZyb3plbnhpZCB2 YWx1ZSwgbWF5IGJlIGludmFsaWQKQEAgLTE3NjksMTkgKzE3NjcsMTkgQEAgdGFibGVfcmVsYXRp b25fY29weV9mb3JfY2x1c3RlcihSZWxhdGlvbiBPbGRUYWJsZSwgUmVsYXRpb24gTmV3VGFibGUs CiAJCQkJCQkJCVJlbGF0aW9uIE9sZEluZGV4LAogCQkJCQkJCQlib29sIHVzZV9zb3J0LAogCQkJ CQkJCQlUcmFuc2FjdGlvbklkIE9sZGVzdFhtaW4sCi0JCQkJCQkJCVNuYXBzaG90IHNuYXBzaG90 LAogCQkJCQkJCQlUcmFuc2FjdGlvbklkICp4aWRfY3V0b2ZmLAogCQkJCQkJCQlNdWx0aVhhY3RJ ZCAqbXVsdGlfY3V0b2ZmLAogCQkJCQkJCQlkb3VibGUgKm51bV90dXBsZXMsCiAJCQkJCQkJCWRv dWJsZSAqdHVwc192YWN1dW1lZCwKLQkJCQkJCQkJZG91YmxlICp0dXBzX3JlY2VudGx5X2RlYWQp CisJCQkJCQkJCWRvdWJsZSAqdHVwc19yZWNlbnRseV9kZWFkLAorCQkJCQkJCQl2b2lkICp0YWJs ZWFtX2RhdGEpCiB7CiAJT2xkVGFibGUtPnJkX3RhYmxlYW0tPnJlbGF0aW9uX2NvcHlfZm9yX2Ns dXN0ZXIoT2xkVGFibGUsIE5ld1RhYmxlLCBPbGRJbmRleCwKIAkJCQkJCQkJCQkJCQl1c2Vfc29y dCwgT2xkZXN0WG1pbiwKLQkJCQkJCQkJCQkJCQlzbmFwc2hvdCwKIAkJCQkJCQkJCQkJCQl4aWRf Y3V0b2ZmLCBtdWx0aV9jdXRvZmYsCiAJCQkJCQkJCQkJCQkJbnVtX3R1cGxlcywgdHVwc192YWN1 dW1lZCwKLQkJCQkJCQkJCQkJCQl0dXBzX3JlY2VudGx5X2RlYWQpOworCQkJCQkJCQkJCQkJCXR1 cHNfcmVjZW50bHlfZGVhZCwKKwkJCQkJCQkJCQkJCQl0YWJsZWFtX2RhdGEpOwogfQogCiAvKgpk aWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvY29tbWFuZHMvcHJvZ3Jlc3MuaCBiL3NyYy9pbmNsdWRl L2NvbW1hbmRzL3Byb2dyZXNzLmgKaW5kZXggZGY4YWYyM2Y1NGEuLjZiZjAwMzZkNTY5IDEwMDY0 NAotLS0gYS9zcmMvaW5jbHVkZS9jb21tYW5kcy9wcm9ncmVzcy5oCisrKyBiL3NyYy9pbmNsdWRl L2NvbW1hbmRzL3Byb2dyZXNzLmgKQEAgLTg5LDExICs4OSwxMiBAQAogI2RlZmluZSBQUk9HUkVT U19SRVBBQ0tfSU5ERVhfUkVMSUQJCQkJMgogI2RlZmluZSBQUk9HUkVTU19SRVBBQ0tfSEVBUF9U VVBMRVNfU0NBTk5FRAkJMwogI2RlZmluZSBQUk9HUkVTU19SRVBBQ0tfSEVBUF9UVVBMRVNfSU5T RVJURUQJNAotI2RlZmluZSBQUk9HUkVTU19SRVBBQ0tfSEVBUF9UVVBMRVNfVVBEQVRFRAkJNQot I2RlZmluZSBQUk9HUkVTU19SRVBBQ0tfSEVBUF9UVVBMRVNfREVMRVRFRAkJNgotI2RlZmluZSBQ Uk9HUkVTU19SRVBBQ0tfVE9UQUxfSEVBUF9CTEtTCQkJNwotI2RlZmluZSBQUk9HUkVTU19SRVBB Q0tfSEVBUF9CTEtTX1NDQU5ORUQJCTgKLSNkZWZpbmUgUFJPR1JFU1NfUkVQQUNLX0lOREVYX1JF QlVJTERfQ09VTlQJCTkKKyNkZWZpbmUgUFJPR1JFU1NfUkVQQUNLX0hFQVBfVFVQTEVTX0lOU0VS VEVEX0FVWAk1CisjZGVmaW5lIFBST0dSRVNTX1JFUEFDS19IRUFQX1RVUExFU19VUERBVEVECQk2 CisjZGVmaW5lIFBST0dSRVNTX1JFUEFDS19IRUFQX1RVUExFU19ERUxFVEVECQk3CisjZGVmaW5l IFBST0dSRVNTX1JFUEFDS19UT1RBTF9IRUFQX0JMS1MJCQk4CisjZGVmaW5lIFBST0dSRVNTX1JF UEFDS19IRUFQX0JMS1NfU0NBTk5FRAkJOQorI2RlZmluZSBQUk9HUkVTU19SRVBBQ0tfSU5ERVhf UkVCVUlMRF9DT1VOVAkJMTAKIAogLyoKICAqIFBoYXNlcyBvZiByZXBhY2sgKGFzIGFkdmVydGlz ZWQgdmlhIFBST0dSRVNTX1JFUEFDS19QSEFTRSkuCkBAIC0xMDgsNiArMTA5LDcgQEAKICNkZWZp bmUgUFJPR1JFU1NfUkVQQUNLX1BIQVNFX0ZJTkFMX0NMRUFOVVAJCTgKICNkZWZpbmUgUFJPR1JF U1NfUkVQQUNLX1BIQVNFX0VOQUJMRV9MT0dJQ0FMX0RFQ09ESU5HCTkKICNkZWZpbmUgUFJPR1JF U1NfUkVQQUNLX1BIQVNFX0lOSVRfTE9HSUNBTF9ERUNPRElORwkJMTAKKyNkZWZpbmUgUFJPR1JF U1NfUkVQQUNLX1BIQVNFX0JVSUxEX0lOREVYX0FVWAkxMQogCiAvKiBQcm9ncmVzcyBwYXJhbWV0 ZXJzIGZvciBDUkVBVEUgSU5ERVggKi8KIC8qIDMsIDQgYW5kIDUgcmVzZXJ2ZWQgZm9yICJ3YWl0 Zm9yIiBtZXRyaWNzICovCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9jb21tYW5kcy9yZXBhY2su aCBiL3NyYy9pbmNsdWRlL2NvbW1hbmRzL3JlcGFjay5oCmluZGV4IGUxNzlhYjIzYjAyLi4yMTE5 YmEwMWQ4YyAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvY29tbWFuZHMvcmVwYWNrLmgKKysrIGIv c3JjL2luY2x1ZGUvY29tbWFuZHMvcmVwYWNrLmgKQEAgLTE3LDExICsxNywxNCBAQAogCiAjaW5j bHVkZSAiYWNjZXNzL2hpby5oIgogI2luY2x1ZGUgImFjY2Vzcy9za2V5LmgiCisjaW5jbHVkZSAi YWNjZXNzL3hsb2dkZWZzLmgiCiAjaW5jbHVkZSAibm9kZXMvZXhlY25vZGVzLmgiCiAjaW5jbHVk ZSAibm9kZXMvcGFyc2Vub2Rlcy5oIgogI2luY2x1ZGUgInBhcnNlci9wYXJzZV9ub2RlLmgiCisj aW5jbHVkZSAic3RvcmFnZS9ibG9jay5oIgogI2luY2x1ZGUgInN0b3JhZ2UvbG9ja2RlZnMuaCIK ICNpbmNsdWRlICJ1dGlscy9yZWxjYWNoZS5oIgorI2luY2x1ZGUgInV0aWxzL3NuYXBzaG90Lmgi CiAKIAogLyogZmxhZyBiaXRzIGZvciBDbHVzdGVyUGFyYW1zLT5vcHRpb25zICovCkBAIC00OCw2 ICs1MSw4IEBAIHR5cGVkZWYgc3RydWN0IFJlcGFja0Rlc3QKIAkvKiBUaGUgcmVsYXRpb24gdGhl IGNoYW5nZXMgYXJlIGFwcGxpZWQgdG8uICovCiAJUmVsYXRpb24JcmVsOwogCisJQnVsa0luc2Vy dFN0YXRlRGF0YSAqYmlzdGF0ZTsKKwogCS8qIE5lZWRlZCB0byB1cGRhdGUgaW5kZXhlcyBvZiBj Y19yZWwuICovCiAJUmVzdWx0UmVsSW5mbyAqcnJpOwogCUVTdGF0ZQkgICAqZXN0YXRlOwpAQCAt NjQsMTMgKzY5LDE0IEBAIHR5cGVkZWYgc3RydWN0IFJlcGFja0Rlc3QKIAogCS8qIFRoZSBsYXRl c3QgY29sdW1uIHdlIG5lZWQgdG8gZGVmb3JtIHRvIGhhdmUgdGhlIHR1cGxlIGlkZW50aXR5ICov CiAJQXR0ck51bWJlcglsYXN0X2tleV9hdHRubzsKLX0gUmVwYWNrRGVzdDsKIAotLyoKLSAqIFRo ZSBmaXJzdCBmaWxlIGV4cG9ydGVkIGJ5IHRoZSBkZWNvZGluZyB3b3JrZXIgbXVzdCBjb250YWlu IGEgc25hcHNob3QsIHRoZQotICogZm9sbG93aW5nIG9uZXMgY29udGFpbiB0aGUgZGF0YSBjaGFu Z2VzLgotICovCi0jZGVmaW5lIFdPUktFUl9GSUxFX1NOQVBTSE9UCTAKKwkvKgorCSAqIFJhbmdl IG9mIGJsb2NrcyBpbiB0aGUgb2xkIHRhYmxlIHRoZSBjb250ZW50cyBvZiB0aGlzIHRhYmxlIGNv bWVzIGZyb20uCisJICogTm90ZSB0aGF0IHJhbmdlX2VuZCBpcyB0aGUgZmlyc3QgYmxvY2sgb2Yg dGhlIG5leHQgcmFuZ2UuCisJICovCisJQmxvY2tOdW1iZXIgcmFuZ2Vfc3RhcnQ7CisJQmxvY2tO dW1iZXIgcmFuZ2VfZW5kOworfSBSZXBhY2tEZXN0OwogCiAvKgogICogSW5mb3JtYXRpb24gbmVl ZGVkIHRvIGFwcGx5IGNvbmN1cnJlbnQgZGF0YSBjaGFuZ2VzLgpAQCAtODgsMTAgKzk0LDQyIEBA IHR5cGVkZWYgc3RydWN0IENoYW5nZUNvbnRleHQKIAkvKiBUaGUgZGVzdGluYXRpb24gdGFibGUu ICovCiAJUmVwYWNrRGVzdAljY19kZXN0OwogCi0JLyogU2VxdWVudGlhbCBudW1iZXIgb2YgdGhl IGZpbGUgY29udGFpbmluZyB0aGUgY2hhbmdlcy4gKi8KLQlpbnQJCQljY19maWxlX3NlcTsKKwkv KiBTZXF1ZW50aWFsIG51bWJlciBvZiB0aGUgZmlsZSBjb250YWluaW5nIHNuYXBzaG90LiAqLwor CWludAkJCWNjX2ZpbGVfc2VxX3NuYXBzaG90OworCS8qIFNlcXVlbnRpYWwgbnVtYmVyIG9mIHRo ZSBmaWxlIGNvbnRhaW5pbmcgZGF0YSBjaGFuZ2VzLiAqLworCWludAkJCWNjX2ZpbGVfc2VxX2No YW5nZXM7CisKKwkvKgorCSAqIEF1eGlsaWFyeSB0YWJsZSB0byBzdG9yZSBvcmRlcmVkIHR1cGxl cyB0ZW1wb3JhcmlseS4KKwkgKgorCSAqIFdoZW4gdGhlIG5ldyByZWxhdGlvbiBuZWVkcyB0byBi ZSBjbHVzdGVyZWQsIHdlIHVzZSB0aGlzIHRhYmxlIGluc3RlYWQKKwkgKiBvZiB0dXBsZXNvcnQu IFRoZSBwcm9ibGVtIHdpdGggYSB0dXBsZXNvcnQgaXMgdGhhdCBkYXRhIGNoYW5nZXMgbmVlZCB0 bworCSAqIGJlIGFwcGxpZWQgYXQgcmFuZ2UgYm91bmRhcnkgKHNlZSBoZWFwYW1fcmVsYXRpb25f Y29weV9mb3JfY2x1c3RlcigpCisJICogZm9yIG1vcmUgaW5mb3JtYXRpb24pLCBob3dldmVyIGl0 J3Mgbm90IHBvc3NpYmxlIHRvIGxvb2stdXAgYW5kIGNoYW5nZQorCSAqIHR1cGxlcyBpbiB0dXBs ZXN0b3JlLgorCSAqCisJICogT25jZSB0aGUgY29udGVudHMgb2YgdGhlIFJFUEFDS2VkIHRhYmxl IGhhcyBiZWVuIGNvcGllZCBpbnRvIHRoZQorCSAqIGF1eGlsaWFyeSB0YWJsZSwgd2UgYnVpbGQg dGhlIGNsdXN0ZXJpbmcgaW5kZXggKHVubGVzcyBpdCdzIHRoZSBzYW1lIGFzCisJICogdGhlIGlk ZW50aXR5IGluZGV4KSBhbmQgc2NhbiBpdCB0byBnZXQgdGhlIHR1cGxlIGluIHRoZSBkZXNpcmVk IG9yZGVyLgorCSAqIFhYWCBJcyBpdCB3b3J0aCBwdXR0aW5nIHRoZSBjb250ZW50cyBpbnRvIGEg dHVwbGVzdG9yZSBhbmQgc29ydGluZyBpdD8KKwkgKiBOb3Qgc3VyZSwgaXQnZCByZXF1aXJlIGRp c2sgc3BhY2UgZm9yIG9uZSBtb3JlIGNvcHkgYW5kIHRoZSBjb3B5aW5nCisJICogaXRzZWxmIGlz IG5vdCBmcmVlLgorCSAqCisJICogVE9ETyAxKSBtYWtlIHRoZSB0YWJsZXMgdW5sb2dnZWQsIDIp IGlmIFJFUEFDSyBsb2NrcyB0aGUgVE9BU1QgcmVsYXRpb24KKwkgKiB0b28gKG5vdCBzdXJlIGl0 IGRvZXMpIHRyeSB0byBwcmVzZXJ2ZSBUT0FTVCBwb2ludGVycywgaW5zdGVhZCBvZgorCSAqIHN0 b3JpbmcgdGhlbSB0byBUT0FTVCByZWxhdGlvbnMgb2YgdGhlc2UgdGFibGVzLCAzKSBDaGVjayB0 aGF0IHRoZQorCSAqIHRhYmxlcyBhcmUgZHJvcHBlZCBvbiB0cmFuc2FjdGlvbiBhYm9ydC4KKwkg Ki8KKwlSZXBhY2tEZXN0ICpjY19kZXN0X2F1eDsKKworCS8qCisJICogVGhlIGluZGV4IHRoYXQg ZGVmaW5lcyBvcmRlcmluZyBvZiB0aGUgb2xkIHRhYmxlLgorCSAqLworCU9pZAkJCWNjX2NsdXN0 ZXJpbmdfaW5kZXg7CiB9IENoYW5nZUNvbnRleHQ7CiAKK2V4dGVybiBQR0RMTElNUE9SVCBpbnQg cmVwYWNrX3BhZ2VzX3Blcl9zbmFwc2hvdDsKKwogZXh0ZXJuIHZvaWQgRXhlY1JlcGFjayhQYXJz ZVN0YXRlICpwc3RhdGUsIFJlcGFja1N0bXQgKnN0bXQsIGJvb2wgaXNUb3BMZXZlbCk7CiAKIGV4 dGVybiB2b2lkIGNsdXN0ZXJfcmVsKFJlcGFja0NvbW1hbmQgY21kLCBSZWxhdGlvbiBPbGRIZWFw LCBPaWQgaW5kZXhPaWQsCkBAIC0xMDIsOSArMTQwLDggQEAgZXh0ZXJuIHZvaWQgbWFya19pbmRl eF9jbHVzdGVyZWQoUmVsYXRpb24gcmVsLCBPaWQgaW5kZXhPaWQsIGJvb2wgaXNfaW50ZXJuYWwp OwogCiBleHRlcm4gT2lkCW1ha2VfbmV3X2hlYXAoT2lkIE9JRE9sZEhlYXAsIE9pZCBOZXdUYWJs ZVNwYWNlLCBPaWQgTmV3QWNjZXNzTWV0aG9kLAogCQkJCQkJICBjaGFyIHJlbHBlcnNpc3RlbmNl LCBMT0NLTU9ERSBsb2NrbW9kZSk7Ci1leHRlcm4gdm9pZCBoZWFwX2luc2VydF9mb3JfcmVwYWNr KFJlbGF0aW9uIHJlbCwgVHVwbGVUYWJsZVNsb3QgKnNyYywKLQkJCQkJCQkJICAgVHVwbGVUYWJs ZVNsb3QgKnJlZm9ybSwKLQkJCQkJCQkJICAgQnVsa0luc2VydFN0YXRlRGF0YSAqYmlzdGF0ZSk7 CitleHRlcm4gdm9pZCBoZWFwX2luc2VydF9mb3JfcmVwYWNrKENoYW5nZUNvbnRleHQgKmNoZ2N4 dCwgVHVwbGVUYWJsZVNsb3QgKnNyYywKKwkJCQkJCQkJICAgVHVwbGVUYWJsZVNsb3QgKnJlZm9y bSk7CiBleHRlcm4gYm9vbCB0dXBsZV9uZWVkc19yZWZvcm0oSGVhcFR1cGxlIHR1cGxlLCBUdXBs ZURlc2MgdHVwRGVzYyk7CiBleHRlcm4gdm9pZCBjbGVhcl9kcm9wcGVkX2F0dHJpYnV0ZXMoSGVh cFR1cGxlIHR1cGxlLCBUdXBsZVRhYmxlU2xvdCAqcmVmb3JtKTsKIGV4dGVybiB2b2lkIGZpbmlz aF9oZWFwX3N3YXAoT2lkIE9JRE9sZEhlYXAsIE9pZCBPSUROZXdIZWFwLApAQCAtMTE2LDcgKzE1 MywxNSBAQCBleHRlcm4gdm9pZCBmaW5pc2hfaGVhcF9zd2FwKE9pZCBPSURPbGRIZWFwLCBPaWQg T0lETmV3SGVhcCwKIAkJCQkJCQkgVHJhbnNhY3Rpb25JZCBmcm96ZW5YaWQsCiAJCQkJCQkJIE11 bHRpWGFjdElkIGN1dG9mZk11bHRpLAogCQkJCQkJCSBjaGFyIG5ld3JlbHBlcnNpc3RlbmNlKTsK LQorZXh0ZXJuIGJvb2wgcmVwYWNrX2Jsb2NrX2luX3JhbmdlKEJsb2NrTnVtYmVyIGJsa251bSwg QmxvY2tOdW1iZXIgc3RhcnQsCisJCQkJCQkJCSAgQmxvY2tOdW1iZXIgZW5kLCBCbG9ja051bWJl ciBuYmxvY2tzKTsKK2V4dGVybiBTbmFwc2hvdCByZXBhY2tfZ2V0X3NuYXBzaG90KENoYW5nZUNv bnRleHQgKmNoZ2N4dCk7CitleHRlcm4gdm9pZCByZXBhY2tfcHJvY2Vzc19jb25jdXJyZW50X2No YW5nZXMoQ2hhbmdlQ29udGV4dCAqY2hnY3h0LAorCQkJCQkJCQkJCQkgIFhMb2dSZWNQdHIgZW5k X29mX3dhbCwKKwkJCQkJCQkJCQkJICBCbG9ja051bWJlciByYW5nZV9zdGFydCwKKwkJCQkJCQkJ CQkJICBCbG9ja051bWJlciByYW5nZV9lbmQsCisJCQkJCQkJCQkJCSAgQmxvY2tOdW1iZXIgbmJs b2NrcywKKwkJCQkJCQkJCQkJICBib29sIHJlcXVlc3Rfc25hcHNob3QsIGJvb2wgZG9uZSk7CiBl eHRlcm4gdm9pZCBIYW5kbGVSZXBhY2tNZXNzYWdlSW50ZXJydXB0KHZvaWQpOwogZXh0ZXJuIHZv aWQgUHJvY2Vzc1JlcGFja01lc3NhZ2VzKHZvaWQpOwogCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVk ZS9jb21tYW5kcy9yZXBhY2tfaW50ZXJuYWwuaCBiL3NyYy9pbmNsdWRlL2NvbW1hbmRzL3JlcGFj a19pbnRlcm5hbC5oCmluZGV4IGMxNDEwN2I2NjNmLi5mYjhkMjYzYTc2MiAxMDA2NDQKLS0tIGEv c3JjL2luY2x1ZGUvY29tbWFuZHMvcmVwYWNrX2ludGVybmFsLmgKKysrIGIvc3JjL2luY2x1ZGUv Y29tbWFuZHMvcmVwYWNrX2ludGVybmFsLmgKQEAgLTQ0LDYgKzQ0LDggQEAgdHlwZWRlZiBzdHJ1 Y3QgUmVwYWNrRGVjb2RpbmdTdGF0ZQogCiAJLyogUGVyLWNoYW5nZSBtZW1vcnkgY29udGV4dC4g Ki8KIAlNZW1vcnlDb250ZXh0IGNoYW5nZV9jeHQ7CisJLyogUGVyLXNuYXBzaG90IG1lbW9yeSBj b250ZXh0LiAqLworCU1lbW9yeUNvbnRleHQgc25hcHNob3RfY3h0OwogCiAJLyogQSB0dXBsZSBz bG90IHVzZWQgdG8gcGFzcyB0dXBsZXMgYmFjayBhbmQgZm9ydGggKi8KIAlUdXBsZVRhYmxlU2xv dCAqc2xvdDsKQEAgLTc0LDYgKzc2LDkgQEAgdHlwZWRlZiBzdHJ1Y3QgRGVjb2RpbmdXb3JrZXJT aGFyZWQKIAkgKi8KIAlpbnQJCQlzZXR1cF9waGFzZTsKIAorCS8qIFNldCB0byByZXF1ZXN0IGEg c25hcHNob3QuICovCisJYm9vbAkJc25hcHNob3RfcmVxdWVzdGVkOworCiAJLyoKIAkgKiBPbmNl IHRoZSB3b3JrZXIgaGFzIHJlYWNoZWQgdGhpcyBMU04sIGl0IHNob3VsZCBjbG9zZSB0aGUgY3Vy cmVudAogCSAqIG91dHB1dCBmaWxlIGFuZCBlaXRoZXIgY3JlYXRlIGEgbmV3IG9uZSBvciBleGl0 LCBhY2NvcmRpbmcgdG8gdGhlIGZpZWxkCkBAIC04MSw2ICs4Niw4IEBAIHR5cGVkZWYgc3RydWN0 IERlY29kaW5nV29ya2VyU2hhcmVkCiAJICogdGhlIFdBTCBhdmFpbGFibGUgYW5kIGtlZXAgY2hl Y2tpbmcgdGhpcyBmaWVsZC4gSXQgaXMgb2sgaWYgdGhlIHdvcmtlcgogCSAqIGhhZCBhbHJlYWR5 IGRlY29kZWQgcmVjb3JkcyB3aG9zZSBMU04gaXMgPj0gbHNuX3VwdG8gYmVmb3JlIHRoaXMgZmll bGQKIAkgKiBoYXMgYmVlbiBzZXQuCisJICoKKwkgKiBTZXQgYSB2YWxpZCBMU04gdG8gcmVxdWVz dCBkYXRhIGNoYW5nZXMuCiAJICovCiAJWExvZ1JlY1B0cglsc25fdXB0bzsKIApAQCAtOTEsNyAr OTgsOCBAQCB0eXBlZGVmIHN0cnVjdCBEZWNvZGluZ1dvcmtlclNoYXJlZAogCVNoYXJlZEZpbGVT ZXQgc2ZzOwogCiAJLyogTnVtYmVyIG9mIHRoZSBsYXN0IGZpbGUgZXhwb3J0ZWQgYnkgdGhlIHdv cmtlci4gKi8KLQlpbnQJCQlsYXN0X2V4cG9ydGVkOworCWludAkJCWxhc3RfZXhwb3J0ZWRfc25h cHNob3Q7CisJaW50CQkJbGFzdF9leHBvcnRlZF9jaGFuZ2VzOwogCiAJLyogU3luY2hyb25pemUg YWNjZXNzIHRvIHRoZSBmaWVsZHMgYWJvdmUuICovCiAJc2xvY2tfdAkJbXV0ZXg7CkBAIC0xMjYs NyArMTM0LDggQEAgdHlwZWRlZiBzdHJ1Y3QgRGVjb2RpbmdXb3JrZXJTaGFyZWQKIAljaGFyCQll cnJvcl9xdWV1ZVtGTEVYSUJMRV9BUlJBWV9NRU1CRVJdOwogfSBEZWNvZGluZ1dvcmtlclNoYXJl ZDsKIAotZXh0ZXJuIHZvaWQgRGVjb2RpbmdXb3JrZXJGaWxlTmFtZShjaGFyICpmbmFtZSwgT2lk IHJlbGlkLCB1aW50MzIgc2VxKTsKK2V4dGVybiB2b2lkIERlY29kaW5nV29ya2VyRmlsZU5hbWUo Y2hhciAqZm5hbWUsIE9pZCByZWxpZCwgdWludDMyIHNlcSwKKwkJCQkJCQkJICAgYm9vbCBzbmFw c2hvdCk7CiAKIAogI2VuZGlmCQkJCQkJCS8qIFJFUEFDS19JTlRFUk5BTF9IICovCmRpZmYgLS1n aXQgYS9zcmMvaW5jbHVkZS9yZXBsaWNhdGlvbi9sb2dpY2FsLmggYi9zcmMvaW5jbHVkZS9yZXBs aWNhdGlvbi9sb2dpY2FsLmgKaW5kZXggYWJjODhjNDlhZGUuLmE0YjZjOGQ3OWIzIDEwMDY0NAot LS0gYS9zcmMvaW5jbHVkZS9yZXBsaWNhdGlvbi9sb2dpY2FsLmgKKysrIGIvc3JjL2luY2x1ZGUv cmVwbGljYXRpb24vbG9naWNhbC5oCkBAIC0xMzgsNyArMTM4LDcgQEAgZXh0ZXJuIGJvb2wgRGVj b2RpbmdDb250ZXh0UmVhZHkoTG9naWNhbERlY29kaW5nQ29udGV4dCAqY3R4KTsKIGV4dGVybiB2 b2lkIEZyZWVEZWNvZGluZ0NvbnRleHQoTG9naWNhbERlY29kaW5nQ29udGV4dCAqY3R4KTsKIAog ZXh0ZXJuIHZvaWQgTG9naWNhbEluY3JlYXNlWG1pbkZvclNsb3QoWExvZ1JlY1B0ciBjdXJyZW50 X2xzbiwKLQkJCQkJCQkJCSAgIFRyYW5zYWN0aW9uSWQgeG1pbik7CisJCQkJCQkJCQkgICBUcmFu c2FjdGlvbklkIHhtaW4sIGJvb2wgY2F0YWxvZyk7CiBleHRlcm4gdm9pZCBMb2dpY2FsSW5jcmVh c2VSZXN0YXJ0RGVjb2RpbmdGb3JTbG90KFhMb2dSZWNQdHIgY3VycmVudF9sc24sCiAJCQkJCQkJ CQkJCQkgIFhMb2dSZWNQdHIgcmVzdGFydF9sc24pOwogZXh0ZXJuIHZvaWQgTG9naWNhbENvbmZp cm1SZWNlaXZlZExvY2F0aW9uKFhMb2dSZWNQdHIgbHNuKTsKZGlmZiAtLWdpdCBhL3NyYy9pbmNs dWRlL3JlcGxpY2F0aW9uL3Jlb3JkZXJidWZmZXIuaCBiL3NyYy9pbmNsdWRlL3JlcGxpY2F0aW9u L3Jlb3JkZXJidWZmZXIuaAppbmRleCBjYzQ3YjQ3MmRiMy4uMWUyMTFhZTRkYjkgMTAwNjQ0Ci0t LSBhL3NyYy9pbmNsdWRlL3JlcGxpY2F0aW9uL3Jlb3JkZXJidWZmZXIuaAorKysgYi9zcmMvaW5j bHVkZS9yZXBsaWNhdGlvbi9yZW9yZGVyYnVmZmVyLmgKQEAgLTEwNCw2ICsxMDQsMTIgQEAgdHlw ZWRlZiBzdHJ1Y3QgUmVvcmRlckJ1ZmZlckNoYW5nZQogCQkJSGVhcFR1cGxlCW9sZHR1cGxlOwog CQkJLyogdmFsaWQgZm9yIElOU0VSVCB8fCBVUERBVEUgKi8KIAkJCUhlYXBUdXBsZQluZXd0dXBs ZTsKKworCQkJLyoKKwkJCSAqIHZhbGlkIGZvciBVUERBVEUgLSB0aGlzIGlzIHRoZSBwaHlzaWNh bCBsb2NhdGlvbiBvZiB0aGUgb2xkCisJCQkgKiB0dXBsZSB2ZXJzaW9uLCB2YWxpZCBldmVuIGlm ICdvbGR0dXBsZScgaXMgTlVMTC4KKwkJCSAqLworCQkJQmxvY2tOdW1iZXIgb2xkX2Jsa251bTsK IAkJfQkJCXRwOwogCiAJCS8qCkBAIC03NzMsNiArNzc5LDcgQEAgZXh0ZXJuIHZvaWQgUmVvcmRl ckJ1ZmZlclByb2Nlc3NYaWQoUmVvcmRlckJ1ZmZlciAqcmIsIFRyYW5zYWN0aW9uSWQgeGlkLCBY TG9nUmUKIAogZXh0ZXJuIHZvaWQgUmVvcmRlckJ1ZmZlclhpZFNldENhdGFsb2dDaGFuZ2VzKFJl b3JkZXJCdWZmZXIgKnJiLCBUcmFuc2FjdGlvbklkIHhpZCwgWExvZ1JlY1B0ciBsc24pOwogZXh0 ZXJuIGJvb2wgUmVvcmRlckJ1ZmZlclhpZEhhc0NhdGFsb2dDaGFuZ2VzKFJlb3JkZXJCdWZmZXIg KnJiLCBUcmFuc2FjdGlvbklkIHhpZCk7CitleHRlcm4gYm9vbCBSZW9yZGVyQnVmZmVyWGlkSGFz SGVhcENoYW5nZXMoUmVvcmRlckJ1ZmZlciAqcmIsIFRyYW5zYWN0aW9uSWQgeGlkKTsKIGV4dGVy biBib29sIFJlb3JkZXJCdWZmZXJYaWRIYXNCYXNlU25hcHNob3QoUmVvcmRlckJ1ZmZlciAqcmIs IFRyYW5zYWN0aW9uSWQgeGlkKTsKIAogZXh0ZXJuIGJvb2wgUmVvcmRlckJ1ZmZlclJlbWVtYmVy UHJlcGFyZUluZm8oUmVvcmRlckJ1ZmZlciAqcmIsIFRyYW5zYWN0aW9uSWQgeGlkLApkaWZmIC0t Z2l0IGEvc3JjL3Rlc3QvbW9kdWxlcy9pbmplY3Rpb25fcG9pbnRzL01ha2VmaWxlIGIvc3JjL3Rl c3QvbW9kdWxlcy9pbmplY3Rpb25fcG9pbnRzL01ha2VmaWxlCmluZGV4IGE3YTE2ZDUwMTZhLi42 MDVlOWFmMjkxNSAxMDA2NDQKLS0tIGEvc3JjL3Rlc3QvbW9kdWxlcy9pbmplY3Rpb25fcG9pbnRz L01ha2VmaWxlCisrKyBiL3NyYy90ZXN0L21vZHVsZXMvaW5qZWN0aW9uX3BvaW50cy9NYWtlZmls ZQpAQCAtMjgsNiArMjgsNyBAQCBJU09MQVRJT04gPSBiYXNpYyBcCiAJICAgIHJlcGFja19kZWNv ZGUgXAogCSAgICByZXBhY2tfZHJvcHBlZCBcCiAJICAgIHJlcGFja19taXNzaW5ndmFsIFwKKwkg ICAgcmVwYWNrX3NuYXBzaG90cyBcCiAJICAgIHJlcGFja190ZW1wb3JhbCBcCiAJICAgIHJlcGFj a190ZW1wb3JhbF9tdWx0aXJhbmdlIFwKIAkgICAgcmVwYWNrX3RvYXN0IFwKZGlmZiAtLWdpdCBh L3NyYy90ZXN0L21vZHVsZXMvaW5qZWN0aW9uX3BvaW50cy9leHBlY3RlZC9yZXBhY2tfc25hcHNo b3RzLm91dCBiL3NyYy90ZXN0L21vZHVsZXMvaW5qZWN0aW9uX3BvaW50cy9leHBlY3RlZC9yZXBh Y2tfc25hcHNob3RzLm91dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4u OThiYWM5ZWE4ODIKLS0tIC9kZXYvbnVsbAorKysgYi9zcmMvdGVzdC9tb2R1bGVzL2luamVjdGlv bl9wb2ludHMvZXhwZWN0ZWQvcmVwYWNrX3NuYXBzaG90cy5vdXQKQEAgLTAsMCArMSw0MDEgQEAK K1BhcnNlZCB0ZXN0IHNwZWMgd2l0aCAyIHNlc3Npb25zCisKK3N0YXJ0aW5nIHBlcm11dGF0aW9u OiBsb2FkIHJlcGFjayBjaGFuZ2VfbmV3X2JleW9uZCBjaGFuZ2Vfb2xkX2JleW9uZCBjaGVjazIg d2FrZXVwX25ld19yYW5nZSBjaGVjazEKK2luamVjdGlvbl9wb2ludHNfYXR0YWNoCistLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQorICAgICAgICAgICAgICAgICAgICAgICAKKygxIHJvdykKKworc3Rl cCBsb2FkOiAKKwlTRUxFQ1QgbG9hZCgxKTsKKworbG9hZAorLS0tLQorICAgIAorKDEgcm93KQor CitzdGVwIHJlcGFjazogCisJUkVQQUNLIChDT05DVVJSRU5UTFkpIHJlcGFja190ZXN0OworIDx3 YWl0aW5nIC4uLj4KK3N0ZXAgY2hhbmdlX25ld19iZXlvbmQ6IAorCUlOU0VSVCBJTlRPIHJlcGFj a190ZXN0CisJU0VMRUNUIG1heChpKSArIDEsIGdlbl9leHRlcm5hbCgpCisJRlJPTSByZXBhY2tf dGVzdAorCVJFVFVSTklORyB0aWRfYmxvY2soY3RpZCk7CisKKwlVUERBVEUgcmVwYWNrX3Rlc3Qg U0VUIGogPSBnZW5fZXh0ZXJuYWwoKQorCVdIRVJFIGN0aWQ9KFNFTEVDVCBtaW4oY3RpZCkgRlJP TSByZXBhY2tfdGVzdCkKKwlSRVRVUk5JTkcgdGlkX2Jsb2NrKE9MRC5jdGlkKSwgdGlkX2Jsb2Nr KE5FVy5jdGlkKTsKKwordGlkX2Jsb2NrCistLS0tLS0tLS0KKyAgICAgICAgMQorKDEgcm93KQor Cit0aWRfYmxvY2t8dGlkX2Jsb2NrCistLS0tLS0tLS0rLS0tLS0tLS0tCisgICAgICAgIDB8ICAg ICAgICAxCisoMSByb3cpCisKK3N0ZXAgY2hhbmdlX29sZF9iZXlvbmQ6IAorCURFTEVURSBGUk9N IHJlcGFja190ZXN0CisJV0hFUkUgY3RpZD0oU0VMRUNUIG1heChjdGlkKSBGUk9NIHJlcGFja190 ZXN0KQorCVJFVFVSTklORyB0aWRfYmxvY2soY3RpZCk7CisKKwlVUERBVEUgcmVwYWNrX3Rlc3Qg U0VUIGogPSBnZW5fZXh0ZXJuYWwoKQorCVdIRVJFIGN0aWQ9KFNFTEVDVCBtYXgoY3RpZCkgRlJP TSByZXBhY2tfdGVzdCkKKwlSRVRVUk5JTkcgdGlkX2Jsb2NrKE9MRC5jdGlkKSwgdGlkX2Jsb2Nr KE5FVy5jdGlkKTsKKwordGlkX2Jsb2NrCistLS0tLS0tLS0KKyAgICAgICAgMQorKDEgcm93KQor Cit0aWRfYmxvY2t8dGlkX2Jsb2NrCistLS0tLS0tLS0rLS0tLS0tLS0tCisgICAgICAgIDF8ICAg ICAgICAxCisoMSByb3cpCisKK3N0ZXAgY2hlY2syOiAKKwlJTlNFUlQgSU5UTyBkYXRhX3MyKGks IGopCisJU0VMRUNUIGksIGogRlJPTSByZXBhY2tfdGVzdDsKKworc3RlcCB3YWtldXBfbmV3X3Jh bmdlOiAKKwlTRUxFQ1QgaW5qZWN0aW9uX3BvaW50c193YWtldXAoJ3JlcGFjay1jb25jdXJyZW50 bHktbmV3LXJhbmdlJyk7CisKK2luamVjdGlvbl9wb2ludHNfd2FrZXVwCistLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQorICAgICAgICAgICAgICAgICAgICAgICAKKygxIHJvdykKKworc3RlcCByZXBh Y2s6IDwuLi4gY29tcGxldGVkPgorc3RlcCBjaGVjazE6IAorCUlOU0VSVCBJTlRPIGRhdGFfczEo aSwgaikKKwlTRUxFQ1QgaSwgaiBGUk9NIHJlcGFja190ZXN0OworCisJU0VMRUNUIGNvdW50KCop ID4gMCBGUk9NIHJlcGFja190ZXN0OworCisJU0VMRUNUIGNvdW50KCopCisJRlJPTSBkYXRhX3Mx IGQxIEZVTEwgSk9JTiBkYXRhX3MyIGQyIFVTSU5HIChpLCBqKQorCVdIRVJFIGQxLmkgSVNOVUxM IE9SIGQyLmkgSVNOVUxMOworCis/Y29sdW1uPworLS0tLS0tLS0KK3QgICAgICAgCisoMSByb3cp CisKK2NvdW50CistLS0tLQorICAgIDAKKygxIHJvdykKKworaW5qZWN0aW9uX3BvaW50c19kZXRh Y2gKKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisgICAgICAgICAgICAgICAgICAgICAgIAorKDEg cm93KQorCisKK3N0YXJ0aW5nIHBlcm11dGF0aW9uOiBsb2FkMiBsb2FkMl92YWN1dW0gcmVwYWNr IGNoYW5nZV9vbGRfYmV5b25kMiBjaGVjazIgd2FrZXVwX25ld19yYW5nZSB3YWl0X25ld19yYW5n ZSB3YWtldXBfbmV3X3JhbmdlIGNoZWNrMQoraW5qZWN0aW9uX3BvaW50c19hdHRhY2gKKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCisgICAgICAgICAgICAgICAgICAgICAgIAorKDEgcm93KQorCitz dGVwIGxvYWQyOiAKKwlTRUxFQ1QgbG9hZCgyKTsKKworCURFTEVURSBGUk9NIHJlcGFja190ZXN0 IFdIRVJFIGkgPCAxMDA7CisKK2xvYWQKKy0tLS0KKyAgICAKKygxIHJvdykKKworc3RlcCBsb2Fk Ml92YWN1dW06IAorCVZBQ1VVTSByZXBhY2tfdGVzdDsKKworc3RlcCByZXBhY2s6IAorCVJFUEFD SyAoQ09OQ1VSUkVOVExZKSByZXBhY2tfdGVzdDsKKyA8d2FpdGluZyAuLi4+CitzdGVwIGNoYW5n ZV9vbGRfYmV5b25kMjogCisJVVBEQVRFIHJlcGFja190ZXN0IFNFVCBqID0gZ2VuX2V4dGVybmFs KCkKKwlXSEVSRSBjdGlkPShTRUxFQ1QgbWF4KGN0aWQpIEZST00gcmVwYWNrX3Rlc3QgV0hFUkUg dGlkX2Jsb2NrKGN0aWQpID0gMSkKKwlSRVRVUk5JTkcgdGlkX2Jsb2NrKE9MRC5jdGlkKSwgdGlk X2Jsb2NrKE5FVy5jdGlkKTsKKwordGlkX2Jsb2NrfHRpZF9ibG9jaworLS0tLS0tLS0tKy0tLS0t LS0tLQorICAgICAgICAxfCAgICAgICAgMAorKDEgcm93KQorCitzdGVwIGNoZWNrMjogCisJSU5T RVJUIElOVE8gZGF0YV9zMihpLCBqKQorCVNFTEVDVCBpLCBqIEZST00gcmVwYWNrX3Rlc3Q7CisK K3N0ZXAgd2FrZXVwX25ld19yYW5nZTogCisJU0VMRUNUIGluamVjdGlvbl9wb2ludHNfd2FrZXVw KCdyZXBhY2stY29uY3VycmVudGx5LW5ldy1yYW5nZScpOworCitpbmplY3Rpb25fcG9pbnRzX3dh a2V1cAorLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAgICAgICAgICAgICAgICAgICAgICAgCiso MSByb3cpCisKK3N0ZXAgd2FpdF9uZXdfcmFuZ2U6IAorCVNFTEVDVCB3YWl0X2Zvcl9ibG9ja3Nf c2Nhbm5lZCgncmVwYWNrX3Rlc3QnOjpyZWdjbGFzcywgMyk7CisKK3dhaXRfZm9yX2Jsb2Nrc19z Y2FubmVkCistLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorICAgICAgICAgICAgICAgICAgICAgICAK KygxIHJvdykKKworc3RlcCB3YWtldXBfbmV3X3JhbmdlOiAKKwlTRUxFQ1QgaW5qZWN0aW9uX3Bv aW50c193YWtldXAoJ3JlcGFjay1jb25jdXJyZW50bHktbmV3LXJhbmdlJyk7CisKK2luamVjdGlv bl9wb2ludHNfd2FrZXVwCistLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorICAgICAgICAgICAgICAg ICAgICAgICAKKygxIHJvdykKKworc3RlcCByZXBhY2s6IDwuLi4gY29tcGxldGVkPgorc3RlcCBj aGVjazE6IAorCUlOU0VSVCBJTlRPIGRhdGFfczEoaSwgaikKKwlTRUxFQ1QgaSwgaiBGUk9NIHJl cGFja190ZXN0OworCisJU0VMRUNUIGNvdW50KCopID4gMCBGUk9NIHJlcGFja190ZXN0OworCisJ U0VMRUNUIGNvdW50KCopCisJRlJPTSBkYXRhX3MxIGQxIEZVTEwgSk9JTiBkYXRhX3MyIGQyIFVT SU5HIChpLCBqKQorCVdIRVJFIGQxLmkgSVNOVUxMIE9SIGQyLmkgSVNOVUxMOworCis/Y29sdW1u PworLS0tLS0tLS0KK3QgICAgICAgCisoMSByb3cpCisKK2NvdW50CistLS0tLQorICAgIDAKKygx IHJvdykKKworaW5qZWN0aW9uX3BvaW50c19kZXRhY2gKKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CisgICAgICAgICAgICAgICAgICAgICAgIAorKDEgcm93KQorCisKK3N0YXJ0aW5nIHBlcm11dGF0 aW9uOiBsb2FkIHJlcGFja19wa2V5IGNoYW5nZV9uZXdfYmV5b25kIGNoYW5nZV9vbGRfYmV5b25k IGNoZWNrMiB3YWtldXBfbmV3X3JhbmdlIGNoZWNrMSBjaGVjazFfb3JkZXJfYXNjCitpbmplY3Rp b25fcG9pbnRzX2F0dGFjaAorLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAgICAgICAgICAgICAg ICAgICAgICAgCisoMSByb3cpCisKK3N0ZXAgbG9hZDogCisJU0VMRUNUIGxvYWQoMSk7CisKK2xv YWQKKy0tLS0KKyAgICAKKygxIHJvdykKKworc3RlcCByZXBhY2tfcGtleTogCisJUkVQQUNLIChD T05DVVJSRU5UTFkpIHJlcGFja190ZXN0IFVTSU5HIElOREVYIHJlcGFja190ZXN0X3BrZXk7Cisg PHdhaXRpbmcgLi4uPgorc3RlcCBjaGFuZ2VfbmV3X2JleW9uZDogCisJSU5TRVJUIElOVE8gcmVw YWNrX3Rlc3QKKwlTRUxFQ1QgbWF4KGkpICsgMSwgZ2VuX2V4dGVybmFsKCkKKwlGUk9NIHJlcGFj a190ZXN0CisJUkVUVVJOSU5HIHRpZF9ibG9jayhjdGlkKTsKKworCVVQREFURSByZXBhY2tfdGVz dCBTRVQgaiA9IGdlbl9leHRlcm5hbCgpCisJV0hFUkUgY3RpZD0oU0VMRUNUIG1pbihjdGlkKSBG Uk9NIHJlcGFja190ZXN0KQorCVJFVFVSTklORyB0aWRfYmxvY2soT0xELmN0aWQpLCB0aWRfYmxv Y2soTkVXLmN0aWQpOworCit0aWRfYmxvY2sKKy0tLS0tLS0tLQorICAgICAgICAxCisoMSByb3cp CisKK3RpZF9ibG9ja3x0aWRfYmxvY2sKKy0tLS0tLS0tLSstLS0tLS0tLS0KKyAgICAgICAgMHwg ICAgICAgIDEKKygxIHJvdykKKworc3RlcCBjaGFuZ2Vfb2xkX2JleW9uZDogCisJREVMRVRFIEZS T00gcmVwYWNrX3Rlc3QKKwlXSEVSRSBjdGlkPShTRUxFQ1QgbWF4KGN0aWQpIEZST00gcmVwYWNr X3Rlc3QpCisJUkVUVVJOSU5HIHRpZF9ibG9jayhjdGlkKTsKKworCVVQREFURSByZXBhY2tfdGVz dCBTRVQgaiA9IGdlbl9leHRlcm5hbCgpCisJV0hFUkUgY3RpZD0oU0VMRUNUIG1heChjdGlkKSBG Uk9NIHJlcGFja190ZXN0KQorCVJFVFVSTklORyB0aWRfYmxvY2soT0xELmN0aWQpLCB0aWRfYmxv Y2soTkVXLmN0aWQpOworCit0aWRfYmxvY2sKKy0tLS0tLS0tLQorICAgICAgICAxCisoMSByb3cp CisKK3RpZF9ibG9ja3x0aWRfYmxvY2sKKy0tLS0tLS0tLSstLS0tLS0tLS0KKyAgICAgICAgMXwg ICAgICAgIDEKKygxIHJvdykKKworc3RlcCBjaGVjazI6IAorCUlOU0VSVCBJTlRPIGRhdGFfczIo aSwgaikKKwlTRUxFQ1QgaSwgaiBGUk9NIHJlcGFja190ZXN0OworCitzdGVwIHdha2V1cF9uZXdf cmFuZ2U6IAorCVNFTEVDVCBpbmplY3Rpb25fcG9pbnRzX3dha2V1cCgncmVwYWNrLWNvbmN1cnJl bnRseS1uZXctcmFuZ2UnKTsKKworaW5qZWN0aW9uX3BvaW50c193YWtldXAKKy0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCisgICAgICAgICAgICAgICAgICAgICAgIAorKDEgcm93KQorCitzdGVwIHJl cGFja19wa2V5OiA8Li4uIGNvbXBsZXRlZD4KK3N0ZXAgY2hlY2sxOiAKKwlJTlNFUlQgSU5UTyBk YXRhX3MxKGksIGopCisJU0VMRUNUIGksIGogRlJPTSByZXBhY2tfdGVzdDsKKworCVNFTEVDVCBj b3VudCgqKSA+IDAgRlJPTSByZXBhY2tfdGVzdDsKKworCVNFTEVDVCBjb3VudCgqKQorCUZST00g ZGF0YV9zMSBkMSBGVUxMIEpPSU4gZGF0YV9zMiBkMiBVU0lORyAoaSwgaikKKwlXSEVSRSBkMS5p IElTTlVMTCBPUiBkMi5pIElTTlVMTDsKKworP2NvbHVtbj8KKy0tLS0tLS0tCit0ICAgICAgIAor KDEgcm93KQorCitjb3VudAorLS0tLS0KKyAgICAwCisoMSByb3cpCisKK3N0ZXAgY2hlY2sxX29y ZGVyX2FzYzogCisJU0VMRUNUIGkgRlJPTSByZXBhY2tfdGVzdCBMSU1JVCAxMDsKKworIGkKKy0t CisgMgorIDMKKyA0CisgNQorIDYKKyA3CisgOAorIDkKKzEwCisxMQorKDEwIHJvd3MpCisKK2lu amVjdGlvbl9wb2ludHNfZGV0YWNoCistLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorICAgICAgICAg ICAgICAgICAgICAgICAKKygxIHJvdykKKworCitzdGFydGluZyBwZXJtdXRhdGlvbjogbG9hZCBy ZXBhY2tfb3RoZXJfaW5kZXggY2hhbmdlX25ld19iZXlvbmQgY2hhbmdlX29sZF9iZXlvbmQgY2hl Y2syIHdha2V1cF9uZXdfcmFuZ2UgY2hlY2sxIGNoZWNrMV9vcmRlcl9kZXNjCitpbmplY3Rpb25f cG9pbnRzX2F0dGFjaAorLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAgICAgICAgICAgICAgICAg ICAgICAgCisoMSByb3cpCisKK3N0ZXAgbG9hZDogCisJU0VMRUNUIGxvYWQoMSk7CisKK2xvYWQK Ky0tLS0KKyAgICAKKygxIHJvdykKKworc3RlcCByZXBhY2tfb3RoZXJfaW5kZXg6IAorCVJFUEFD SyAoQ09OQ1VSUkVOVExZKSByZXBhY2tfdGVzdCBVU0lORyBJTkRFWCByZXBhY2tfdGVzdF9pX2lk eDsKKyA8d2FpdGluZyAuLi4+CitzdGVwIGNoYW5nZV9uZXdfYmV5b25kOiAKKwlJTlNFUlQgSU5U TyByZXBhY2tfdGVzdAorCVNFTEVDVCBtYXgoaSkgKyAxLCBnZW5fZXh0ZXJuYWwoKQorCUZST00g cmVwYWNrX3Rlc3QKKwlSRVRVUk5JTkcgdGlkX2Jsb2NrKGN0aWQpOworCisJVVBEQVRFIHJlcGFj a190ZXN0IFNFVCBqID0gZ2VuX2V4dGVybmFsKCkKKwlXSEVSRSBjdGlkPShTRUxFQ1QgbWluKGN0 aWQpIEZST00gcmVwYWNrX3Rlc3QpCisJUkVUVVJOSU5HIHRpZF9ibG9jayhPTEQuY3RpZCksIHRp ZF9ibG9jayhORVcuY3RpZCk7CisKK3RpZF9ibG9jaworLS0tLS0tLS0tCisgICAgICAgIDEKKygx IHJvdykKKwordGlkX2Jsb2NrfHRpZF9ibG9jaworLS0tLS0tLS0tKy0tLS0tLS0tLQorICAgICAg ICAwfCAgICAgICAgMQorKDEgcm93KQorCitzdGVwIGNoYW5nZV9vbGRfYmV5b25kOiAKKwlERUxF VEUgRlJPTSByZXBhY2tfdGVzdAorCVdIRVJFIGN0aWQ9KFNFTEVDVCBtYXgoY3RpZCkgRlJPTSBy ZXBhY2tfdGVzdCkKKwlSRVRVUk5JTkcgdGlkX2Jsb2NrKGN0aWQpOworCisJVVBEQVRFIHJlcGFj a190ZXN0IFNFVCBqID0gZ2VuX2V4dGVybmFsKCkKKwlXSEVSRSBjdGlkPShTRUxFQ1QgbWF4KGN0 aWQpIEZST00gcmVwYWNrX3Rlc3QpCisJUkVUVVJOSU5HIHRpZF9ibG9jayhPTEQuY3RpZCksIHRp ZF9ibG9jayhORVcuY3RpZCk7CisKK3RpZF9ibG9jaworLS0tLS0tLS0tCisgICAgICAgIDEKKygx IHJvdykKKwordGlkX2Jsb2NrfHRpZF9ibG9jaworLS0tLS0tLS0tKy0tLS0tLS0tLQorICAgICAg ICAxfCAgICAgICAgMQorKDEgcm93KQorCitzdGVwIGNoZWNrMjogCisJSU5TRVJUIElOVE8gZGF0 YV9zMihpLCBqKQorCVNFTEVDVCBpLCBqIEZST00gcmVwYWNrX3Rlc3Q7CisKK3N0ZXAgd2FrZXVw X25ld19yYW5nZTogCisJU0VMRUNUIGluamVjdGlvbl9wb2ludHNfd2FrZXVwKCdyZXBhY2stY29u Y3VycmVudGx5LW5ldy1yYW5nZScpOworCitpbmplY3Rpb25fcG9pbnRzX3dha2V1cAorLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KKyAgICAgICAgICAgICAgICAgICAgICAgCisoMSByb3cpCisKK3N0 ZXAgcmVwYWNrX290aGVyX2luZGV4OiA8Li4uIGNvbXBsZXRlZD4KK3N0ZXAgY2hlY2sxOiAKKwlJ TlNFUlQgSU5UTyBkYXRhX3MxKGksIGopCisJU0VMRUNUIGksIGogRlJPTSByZXBhY2tfdGVzdDsK KworCVNFTEVDVCBjb3VudCgqKSA+IDAgRlJPTSByZXBhY2tfdGVzdDsKKworCVNFTEVDVCBjb3Vu dCgqKQorCUZST00gZGF0YV9zMSBkMSBGVUxMIEpPSU4gZGF0YV9zMiBkMiBVU0lORyAoaSwgaikK KwlXSEVSRSBkMS5pIElTTlVMTCBPUiBkMi5pIElTTlVMTDsKKworP2NvbHVtbj8KKy0tLS0tLS0t Cit0ICAgICAgIAorKDEgcm93KQorCitjb3VudAorLS0tLS0KKyAgICAwCisoMSByb3cpCisKK3N0 ZXAgY2hlY2sxX29yZGVyX2Rlc2M6IAorCVdJVEggdG1wKGRpZmYpIGFzICgKKwkJU0VMRUNUIGkg LSBsYWcoaSwgMSwgMTAwMDApIE9WRVIgKE9SREVSIEJZIGN0aWQpCisJCUZST00gcmVwYWNrX3Rl c3QKKwkJTElNSVQgMTApCisJU0VMRUNUICogRlJPTSB0bXAgV0hFUkUgZGlmZiA+IC0xOworCitk aWZmCistLS0tCisoMCByb3dzKQorCitpbmplY3Rpb25fcG9pbnRzX2RldGFjaAorLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KKyAgICAgICAgICAgICAgICAgICAgICAgCisoMSByb3cpCisKZGlmZiAt LWdpdCBhL3NyYy90ZXN0L21vZHVsZXMvaW5qZWN0aW9uX3BvaW50cy9tZXNvbi5idWlsZCBiL3Ny Yy90ZXN0L21vZHVsZXMvaW5qZWN0aW9uX3BvaW50cy9tZXNvbi5idWlsZAppbmRleCBjZjljYjIx OTU0OC4uZTM4MGVjZTgxMWEgMTAwNjQ0Ci0tLSBhL3NyYy90ZXN0L21vZHVsZXMvaW5qZWN0aW9u X3BvaW50cy9tZXNvbi5idWlsZAorKysgYi9zcmMvdGVzdC9tb2R1bGVzL2luamVjdGlvbl9wb2lu dHMvbWVzb24uYnVpbGQKQEAgLTM2LDYgKzM2LDcgQEAgaW5qZWN0aW9uX3BvaW50c19pc29sYXRp b24gPSBbCiAgICdyZXBhY2tfZGVjb2RlJywKICAgJ3JlcGFja19kcm9wcGVkJywKICAgJ3JlcGFj a19taXNzaW5ndmFsJywKKyAgJ3JlcGFja19zbmFwc2hvdHMnLAogICAncmVwYWNrX3RlbXBvcmFs JywKICAgJ3JlcGFja190ZW1wb3JhbF9tdWx0aXJhbmdlJywKICAgJ3JlcGFja190b2FzdCcsCmRp ZmYgLS1naXQgYS9zcmMvdGVzdC9tb2R1bGVzL2luamVjdGlvbl9wb2ludHMvc3BlY3MvcmVwYWNr X3NuYXBzaG90cy5zcGVjIGIvc3JjL3Rlc3QvbW9kdWxlcy9pbmplY3Rpb25fcG9pbnRzL3NwZWNz L3JlcGFja19zbmFwc2hvdHMuc3BlYwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMC4uMjNiNDc4ZmQ2ZjQKLS0tIC9kZXYvbnVsbAorKysgYi9zcmMvdGVzdC9tb2R1bGVzL2lu amVjdGlvbl9wb2ludHMvc3BlY3MvcmVwYWNrX3NuYXBzaG90cy5zcGVjCkBAIC0wLDAgKzEsMjcy IEBACisjIFJFUEFDSyAoQ09OQ1VSUkVOVExZKSAtIHVzZSBvbmUgc25hcHNob3QgcGVyIGJsb2Nr IHJhbmdlLgorc2V0dXAKK3sKKwlDUkVBVEUgRVhURU5TSU9OIGluamVjdGlvbl9wb2ludHM7CisK KwlDUkVBVEUgVEFCTEUgcmVwYWNrX3Rlc3QoaSBpbnQgUFJJTUFSWSBLRVksIGogdGV4dCk7CisJ Q1JFQVRFIElOREVYIE9OIHJlcGFja190ZXN0KGkgREVTQyk7CisJQ1JFQVRFIFRBQkxFIHJlbGZp bGVub2Rlcyhub2RlIG9pZCk7CisKKwlDUkVBVEUgVEFCTEUgZGF0YV9zMShpIGludCwgaiB0ZXh0 KTsKKwlDUkVBVEUgVEFCTEUgZGF0YV9zMihpIGludCwgaiB0ZXh0KTsKKworCS0tIEtlZXAgaW5z ZXJ0aW5nIHR1cGxlcyBpbnRvIHJlcGFja190ZXN0IHVudGlsIHNldmVyYWwgdHVwbGVzIG5lZWQg dG8KKyAgICAgICAgLS0gYmUgaW5zZXJ0ZWQgaW50byBibG9jayBudW1iZXIgbGFzdF9ibG9jay4K KwlDUkVBVEUgRlVOQ1RJT04gbG9hZChsYXN0X2Jsb2NrIGludCkKKwlSRVRVUk5TIHZvaWQKKwlM QU5HVUFHRSAncGxwZ3NxbCcKKwlBUyAkJAorCSAgICBERUNMQVJFCisJCWNudAlpbnQ7CisJICAg IEJFR0lOCisJCUlOU0VSVCBJTlRPIHJlcGFja190ZXN0IFZBTFVFUyAoMSwgZ2VuX2V4dGVybmFs KCkpOworCisJCUxPT1AKKwkJICAgIFdJVEggbWF4KG0pIEFTIChTRUxFQ1QgbWF4KGkpIEZST00g cmVwYWNrX3Rlc3QpCisJCSAgICBJTlNFUlQgSU5UTyByZXBhY2tfdGVzdChpLCBqKQorCQkgICAg U0VMRUNUIG0gKyB4LCBnZW5fZXh0ZXJuYWwoKQorCQkgICAgRlJPTSBnZW5lcmF0ZV9zZXJpZXMo MSwgMTAwKSBzKHgpLCBtYXg7CisKKwkJICAgIFNFTEVDVCBjb3VudCgqKQorCQkgICAgRlJPTSBy ZXBhY2tfdGVzdCBXSEVSRSB0aWRfYmxvY2soY3RpZCkgPSBsYXN0X2Jsb2NrCisJCSAgICBJTlRP IGNudDsKKworCQkgICAgSUYgY250ID49IDEwIFRIRU4KKwkJCUVYSVQ7CisJCSAgICBFTkQgSUY7 CisJCUVORCBMT09QOworCSAgICBFTkQ7CisJJCQ7CisKKwktLSBHZW5lcmF0ZSBhIHN0cmluZyBv ZiByYW5kb20gY2hhcmFjdGVycyB0aGF0IGlzIG5vdCBsaWtlbHkgdG8gYmUKKwktLSBjb21wcmVz c2VkLCBidXQgaXMgYmlnIGVub3VnaCB0byBiZSBzdG9yZWQgZXh0ZXJuYWxseS4KKwlDUkVBVEUg RlVOQ1RJT04gZ2VuX2V4dGVybmFsKCkKKwlSRVRVUk5TIHRleHQKKwlMQU5HVUFHRSBzcWwgYXMg JCQKKwkJU0VMRUNUIHN0cmluZ19hZ2coY2hyKDY1ICsgdHJ1bmMoMjUgKiByYW5kb20oKSk6Omlu dCksICcnKQorCQlGUk9NIGdlbmVyYXRlX3NlcmllcygxLCAyMDQ4KSBzKHgpOworCSQkOworCisJ LS0gV2FpdCB1bnRpbCB0aGUgbnVtYmVyIG9mIGJsb2NrcyBpbnZvbHZlZCBpbiB0aGUgc2NhbiBi eSBSRVBBQ0sgaGFzCisJLS0gcmVhY2hlZCBfYmxvY2tzLgorCUNSRUFURSBGVU5DVElPTiB3YWl0 X2Zvcl9ibG9ja3Nfc2Nhbm5lZChfcmVsaWQgb2lkLCBfYmxvY2tzIGludCkKKwlSRVRVUk5TIHZv aWQKKwlMQU5HVUFHRSAncGxwZ3NxbCcKKwlBUyAkJAorCQlERUNMQVJFCisJCQljbnQJaW50Owor CQlCRUdJTgorCQkJTE9PUAorCQkJCVBFUkZPUk0gcGdfc3RhdF9jbGVhcl9zbmFwc2hvdCgpOwor CisJCQkJU0VMRUNUIGhlYXBfYmxrc19zY2FubmVkCisJCQkJRlJPTSBwZ19zdGF0X3Byb2dyZXNz X3JlcGFjaworCQkJCVdIRVJFIHJlbGlkID0gX3JlbGlkCisJCQkJSU5UTyBjbnQ7CisKKwkJCQlJ RiBjbnQgPj0gX2Jsb2NrcyBUSEVOCisJCQkJCUVYSVQ7CisJCQkJRU5EIElGOworCisJCQkJUEVS Rk9STSBwZ19zbGVlcCgwLjEpOworCQkJRU5EIExPT1A7CisJCUVORDsKKwkkJDsKK30KKwordGVh cmRvd24KK3sKKwlEUk9QIFRBQkxFIHJlcGFja190ZXN0OworCURST1AgRVhURU5TSU9OIGluamVj dGlvbl9wb2ludHM7CisKKwlEUk9QIFRBQkxFIHJlbGZpbGVub2RlczsKKwlEUk9QIFRBQkxFIGRh dGFfczE7CisJRFJPUCBUQUJMRSBkYXRhX3MyOworCisJRFJPUCBGVU5DVElPTiBsb2FkKGludCk7 CisJRFJPUCBGVU5DVElPTiBnZW5fZXh0ZXJuYWwoKTsKKwlEUk9QIEZVTkNUSU9OIHdhaXRfZm9y X2Jsb2Nrc19zY2FubmVkKG9pZCwgaW50KTsKK30KKworc2Vzc2lvbiBzMQorc2V0dXAKK3sKKwlT RVQgcmVwYWNrX3NuYXBzaG90X2FmdGVyID0gMTsKKworCVNFTEVDVCBpbmplY3Rpb25fcG9pbnRz X3NldF9sb2NhbCgpOworCVNFTEVDVCBpbmplY3Rpb25fcG9pbnRzX2F0dGFjaCgncmVwYWNrLWNv bmN1cnJlbnRseS1uZXctcmFuZ2UnLCAnd2FpdCcpOworfQorIyBUaGUgbW9zdCBwcmFjdGljYWwg d2F5IHRvIHRlc3QgdGhlIGNvcm5lciBjYXNlcyBpcyB0byBzZXQgcmFuZ2Ugc2l6ZSB0byAxCisj IGJsb2NrLiBUbyBpbml0aWFsaXplLCBpbnNlcnQgbmV3IHR1cGxlcyB1bnRpbCB3ZSBoYXZlIHNl dmVyYWwgdHVwbGVzIGluIHRoZQorIyAybmQgYmxvY2suCitzdGVwIGxvYWQKK3sKKwlTRUxFQ1Qg bG9hZCgxKTsKK30KKyMgU3RhcnQgdGhlIGluaXRpYWwgbG9hZCBhbmQgd2FpdCB3aGVuIHRoZSBm aXJzdCByYW5nZSBoYXMgYmVlbiBjb21wbGV0ZWQuCitzdGVwIHJlcGFjaworeworCVJFUEFDSyAo Q09OQ1VSUkVOVExZKSByZXBhY2tfdGVzdDsKK30KKyMgVGhlIHNhbWUsIGJ1dCB3aXRoIGNsdXN0 ZXJpbmcuCitzdGVwIHJlcGFja19wa2V5Cit7CisJUkVQQUNLIChDT05DVVJSRU5UTFkpIHJlcGFj a190ZXN0IFVTSU5HIElOREVYIHJlcGFja190ZXN0X3BrZXk7Cit9CisjIENsdXN0ZXJpbmcgYnkg b3RoZXIgdGhhbiB0aGUgaWRlbnRpdHkgaW5kZXguCitzdGVwIHJlcGFja19vdGhlcl9pbmRleAor eworCVJFUEFDSyAoQ09OQ1VSUkVOVExZKSByZXBhY2tfdGVzdCBVU0lORyBJTkRFWCByZXBhY2tf dGVzdF9pX2lkeDsKK30KKyMgQ2hlY2sgdGhlIHRhYmxlIGZyb20gdGhlIHBlcnNwZWN0aXZlIG9m IHMxLgorc3RlcCBjaGVjazEKK3sKKwlJTlNFUlQgSU5UTyBkYXRhX3MxKGksIGopCisJU0VMRUNU IGksIGogRlJPTSByZXBhY2tfdGVzdDsKKworCVNFTEVDVCBjb3VudCgqKSA+IDAgRlJPTSByZXBh Y2tfdGVzdDsKKworCVNFTEVDVCBjb3VudCgqKQorCUZST00gZGF0YV9zMSBkMSBGVUxMIEpPSU4g ZGF0YV9zMiBkMiBVU0lORyAoaSwgaikKKwlXSEVSRSBkMS5pIElTTlVMTCBPUiBkMi5pIElTTlVM TDsKK30KKyMgQ2hlY2sgdGhlIG9yZGVyaW5nIHdoZXJlIGFwcHJvcHJpYXRlLiBXZSBkb24ndCBr bm93IHRoZSBleGFjdCBudW1iZXIgb2YKKyMgcm93cywgc28ganVzdCBjaGVjayBhIHNhbXBsZS4g KFRoZSByZXBsYXllZCBjb25jdXJyZW50IGNoYW5nZXMgYXJlIG5vdAorIyBvcmRlcmVkLCBidXQg dGhvc2Ugc2hvdWxkbid0IGZpdCBpbnRvIHRoZSBmaXJzdCAxMCByb3dzLikKK3N0ZXAgY2hlY2sx X29yZGVyX2FzYworeworCVNFTEVDVCBpIEZST00gcmVwYWNrX3Rlc3QgTElNSVQgMTA7Cit9Cisj IER1ZSB0byB0aGUgc3BlY2lhbCB3YXkgb2YgbG9hZGluZyB0aGUgZGF0YSAoc2VlIHRoZSBsb2Fk KCkgZnVuY3Rpb24gYWJvdmUpCisjIHdlIGRvbid0IGtub3cgdGhlIG1heGltdW0gdmFsdWUuIFRv IG1ha2UgdGhlIHRlc3Qgb3V0cHV0IGRldGVybWluaXN0aWMsCisjIGNoZWNrIGZvciBjYXNlcyB3 aGVyZSB0aGUgY3VycmVudCByb3cgaXMgbm90IGxvd2VyIHRoYW4gdGhlIHByZXZpb3VzIHJvdy4K K3N0ZXAgY2hlY2sxX29yZGVyX2Rlc2MKK3sKKwlXSVRIIHRtcChkaWZmKSBhcyAoCisJCVNFTEVD VCBpIC0gbGFnKGksIDEsIDEwMDAwKSBPVkVSIChPUkRFUiBCWSBjdGlkKQorCQlGUk9NIHJlcGFj a190ZXN0CisJCUxJTUlUIDEwKQorCVNFTEVDVCAqIEZST00gdG1wIFdIRVJFIGRpZmYgPiAtMTsK K30KK3RlYXJkb3duCit7CisJU0VMRUNUIGluamVjdGlvbl9wb2ludHNfZGV0YWNoKCdyZXBhY2st Y29uY3VycmVudGx5LW5ldy1yYW5nZScpOworfQorCitzZXNzaW9uIHMyCisjIFRlc3QgcHJvY2Vz c2luZyBvZiBjaGFuZ2VzIHN1Y2ggdGhhdCB0aGUgbmV3IHR1cGxlIGlzIGJleW9uZCB0aGUgY3Vy cmVudAorIyByYW5nZS4gU3BlY2lmaWNhbGx5IGZvciBVUERBVEUsIHRoZSBvbGQgdHVwbGUgc2hv dWxkIGJlIGluIHRoZSBjdXJyZW50CisjIHJhbmdlLiBTbyB3aGVuIGFwcGx5aW5nIGl0LCB3ZSBo YXZlIHRvIGNvbnZlcnQgaXQgdG8gREVMRVRFLgorc3RlcCBjaGFuZ2VfbmV3X2JleW9uZAorewor CUlOU0VSVCBJTlRPIHJlcGFja190ZXN0CisJU0VMRUNUIG1heChpKSArIDEsIGdlbl9leHRlcm5h bCgpCisJRlJPTSByZXBhY2tfdGVzdAorCVJFVFVSTklORyB0aWRfYmxvY2soY3RpZCk7CisKKwlV UERBVEUgcmVwYWNrX3Rlc3QgU0VUIGogPSBnZW5fZXh0ZXJuYWwoKQorCVdIRVJFIGN0aWQ9KFNF TEVDVCBtaW4oY3RpZCkgRlJPTSByZXBhY2tfdGVzdCkKKwlSRVRVUk5JTkcgdGlkX2Jsb2NrKE9M RC5jdGlkKSwgdGlkX2Jsb2NrKE5FVy5jdGlkKTsKK30KKyMgVGVzdCBwcm9jZXNzaW5nIG9mIGNo YW5nZXMgc3VjaCB0aGF0IHRoZSBvbGQgdHVwbGUgaXMgYmV5b25kIHRoZSBjdXJyZW50CisjIHJh bmdlLiBUaGUgVVBEQVRFIHB1dHMgYWxzbyB0aGUgbmV3IHR1cGxlIGJleW9uZCB0aGUgY3VycmVu dCByYW5nZS4KK3N0ZXAgY2hhbmdlX29sZF9iZXlvbmQKK3sKKwlERUxFVEUgRlJPTSByZXBhY2tf dGVzdAorCVdIRVJFIGN0aWQ9KFNFTEVDVCBtYXgoY3RpZCkgRlJPTSByZXBhY2tfdGVzdCkKKwlS RVRVUk5JTkcgdGlkX2Jsb2NrKGN0aWQpOworCisJVVBEQVRFIHJlcGFja190ZXN0IFNFVCBqID0g Z2VuX2V4dGVybmFsKCkKKwlXSEVSRSBjdGlkPShTRUxFQ1QgbWF4KGN0aWQpIEZST00gcmVwYWNr X3Rlc3QpCisJUkVUVVJOSU5HIHRpZF9ibG9jayhPTEQuY3RpZCksIHRpZF9ibG9jayhORVcuY3Rp ZCk7Cit9CisjIEFycmFuZ2UgZm9yIFVQREFURSB0byBwdXQgdGhlIG5ldyB0dXBsZXMgaW50byBi bG9jayAwLiBJbiBwYXJ0aWN1bGFyLCBmaWxsCisjIHRoZSBibG9jayAxIGFuZCBkZWxldGUgc29t ZSB0dXBsZXMgZnJvbSBibG9jayAxLgorc3RlcCBsb2FkMgoreworCVNFTEVDVCBsb2FkKDIpOwor CisJREVMRVRFIEZST00gcmVwYWNrX3Rlc3QgV0hFUkUgaSA8IDEwMDsKK30KKyMgTG9naWNhbGx5 IHRoaXMgYmVsb25ncyB0byB0aGUgcHJldmlvdXMgc3RlcCwgaG93ZXZlciBWQUNVVU0gY2Fubm90 IHJ1bgorIyBpbnNpZGUgYSB0cmFuc2FjdGlvbiBibG9jay4KK3N0ZXAgbG9hZDJfdmFjdXVtCit7 CisJVkFDVVVNIHJlcGFja190ZXN0OworfQorIyBUaGlzIFVQREFURSBzaG91bGQgcHV0IHRoZSBu ZXcgdHVwbGUgaW50byBibG9jayAwICh0aGUgY3VycmVudCByYW5nZSkuIFNvCisjIHdoZW4gcmVw bGF5aW5nIGl0LCB3ZSBoYXZlIHRvIGNvbnZlcnQgaXQgdG8gSU5TRVJULiBUaGF0IGluY2x1ZGVz IGZldGNoaW5nCisjIHRoZSBvbGQgdHVwbGUncyBUT0FTVCBmcm9tIHRoZSBUT0FTVCB0YWJsZSBi ZWNhdXNlIHRoZSBvbGQgdHVwbGUgaXMgbm90CisjIGF2YWlsYWJsZSBkdXJpbmcgdGhlIHJlcGxh eS4KK3N0ZXAgY2hhbmdlX29sZF9iZXlvbmQyCit7CisJVVBEQVRFIHJlcGFja190ZXN0IFNFVCBq ID0gZ2VuX2V4dGVybmFsKCkKKwlXSEVSRSBjdGlkPShTRUxFQ1QgbWF4KGN0aWQpIEZST00gcmVw YWNrX3Rlc3QgV0hFUkUgdGlkX2Jsb2NrKGN0aWQpID0gMSkKKwlSRVRVUk5JTkcgdGlkX2Jsb2Nr KE9MRC5jdGlkKSwgdGlkX2Jsb2NrKE5FVy5jdGlkKTsKK30KKyMgQ2hlY2sgdGhlIHRhYmxlIGZy b20gdGhlIHBlcnNwZWN0aXZlIG9mIHM0Lgorc3RlcCBjaGVjazIKK3sKKwlJTlNFUlQgSU5UTyBk YXRhX3MyKGksIGopCisJU0VMRUNUIGksIGogRlJPTSByZXBhY2tfdGVzdDsKK30KK3N0ZXAgd2Fr ZXVwX25ld19yYW5nZQoreworCVNFTEVDVCBpbmplY3Rpb25fcG9pbnRzX3dha2V1cCgncmVwYWNr LWNvbmN1cnJlbnRseS1uZXctcmFuZ2UnKTsKK30KKyMgVGhpcyBzdGVwIGlzIHVzZWQgdG8gbWFr ZSBzdXJlIHRoYXQgUkVQQUNLIGlzIHdhaXRpbmcgb24gYW4gaW5qZWN0aW9uIHBvaW50CisjIGJl Zm9yZSBmaW5hbGl6aW5nIHRoZSAybmQgYmxvY2suIEhvd2V2ZXIsIHRoZSBjb2RpbmcgaXMgc3Vj aCB0aGF0IHRoZQorIyBjb3VudGVyIGlzIGluY3JlbWVudGVkIGF0IHRoZSB0b3Agb2YgdGhlIGxv b3AgKHNlZQorIyBoZWFwYW1fcmVsYXRpb25fY29weV9mb3JfY2x1c3RlcigpKSwgc28gd2Ugd2Fp dCB1bnRpbCBpdCdzIGF0IGxlYXN0IDMuCitzdGVwIHdhaXRfbmV3X3JhbmdlCit7CisJU0VMRUNU IHdhaXRfZm9yX2Jsb2Nrc19zY2FubmVkKCdyZXBhY2tfdGVzdCc6OnJlZ2NsYXNzLCAzKTsKK30K KworIyBUZXN0IGlmIHNuYXBzaG90cyBhcmUgdXNlZCBjb3JyZWN0bHkgdG8gc2NhbiBibG9jayBy YW5nZXMuCitwZXJtdXRhdGlvbgorCWxvYWQKKwlyZXBhY2sKKwljaGFuZ2VfbmV3X2JleW9uZAor CWNoYW5nZV9vbGRfYmV5b25kCisJY2hlY2syCisJd2FrZXVwX25ld19yYW5nZQorCWNoZWNrMQor CisjIFNwZWNpYWwgYXR0ZW50aW9uIGlzIG5lZWRlZCB0byB1cGRhdGUgdHVwbGUgaW4gYmxvY2sg MSBzbyB0aGF0IHRoZSBuZXcgdHVwbGUKKyMgYXBwZWFycyBpbiBibG9jayAwLiBUaGUgcHJlcGFy YXRpb24gaW5jbHVkZXMgVkFDVVVNLCB3aGljaCBpbiB0dXJuIGNhbm5vdAorIyBwcm9jZWVkIHdo aWxlIFJFUEFDSyBpcyBpbiBwcm9ncmVzcy4gVGhhdCdzIHdoeSB3ZSBuZWVkIGEgc2VwYXJhdGUK KyMgcGVybXV0YXRpb24uIE5vdGUgdGhhdCB0d28gd2FrZS11cHMgYXJlIG5lZWRlZCBhcyB3ZSBo YXZlIHR3byByYW5nZQorIyBib3VuZGFyaWVzIG5vdy4gSG93ZXZlciB3ZSBuZWVkIHRvIHdhaXQg aW4gYmV0d2VlbiB0byBtYWtlIHN1cmUgdGhhdCB0aGUKKyMgc2Vjb25kIHdhaXRpbmcgc3RhcnRl ZCBiZWZvcmUgd2UgdHJ5IHRvIHdha2UgaXQgdXAuCitwZXJtdXRhdGlvbgorCWxvYWQyCisJbG9h ZDJfdmFjdXVtCisJcmVwYWNrCisJY2hhbmdlX29sZF9iZXlvbmQyCisJY2hlY2syCisJd2FrZXVw X25ld19yYW5nZQorCXdhaXRfbmV3X3JhbmdlCisJd2FrZXVwX25ld19yYW5nZQorCWNoZWNrMQor CisjIFRoZSBmaXJzdCBwZXJtdXRhdGlvbiB3aXRoIGlkZW50aXR5IGluZGV4IGFzIHRoZSBjbHVz dGVyaW5nIGluZGV4LgorcGVybXV0YXRpb24KKwlsb2FkCisJcmVwYWNrX3BrZXkKKwljaGFuZ2Vf bmV3X2JleW9uZAorCWNoYW5nZV9vbGRfYmV5b25kCisJY2hlY2syCisJd2FrZXVwX25ld19yYW5n ZQorCWNoZWNrMQorCWNoZWNrMV9vcmRlcl9hc2MKKyMgVGhlIGZpcnN0IHBlcm11dGF0aW9uIHdp dGggYW5vdGhlciBjbHVzdGVyaW5nIGluZGV4LgorcGVybXV0YXRpb24KKwlsb2FkCisJcmVwYWNr X290aGVyX2luZGV4CisJY2hhbmdlX25ld19iZXlvbmQKKwljaGFuZ2Vfb2xkX2JleW9uZAorCWNo ZWNrMgorCXdha2V1cF9uZXdfcmFuZ2UKKwljaGVjazEKKwljaGVjazFfb3JkZXJfZGVzYwotLSAK Mi41MS4wCgo= --=-=-= Content-Type: application/mbox Content-Disposition: attachment; filename=v05-0006-Simplify-the-way-restrictions-are-imposed-on-index-f.patch Content-Transfer-Encoding: base64 RnJvbSAwYzE1MDg1N2IzZTMyNjQzYWMzMGU4ZTIwNzQxYjU3NjQ5Mjk2ZjU2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmluIEhvdXNrYSA8YWhAY3liZXJ0ZWMuYXQ+CkRhdGU6 IFR1ZSwgMTAgTm92IDIwMjYgMTE6NDQ6MzkgKzAxMDAKU3ViamVjdDogW1BBVENIIDYvOV0gU2lt cGxpZnkgdGhlIHdheSByZXN0cmljdGlvbnMgYXJlIGltcG9zZWQgb24gaW5kZXgKIGZ1bmN0aW9u cy4KCldoZW5ldmVyIHdlIGV4cGVjdCBwb3NzaWJsZSBleGVjdXRpb24gb2YgaW5kZXggZnVuY3Rp b25zLCB3ZSBuZWVkIHRvIG1ha2Ugc3VyZQp0aGF0IHRoZXkgZXhlY3V0ZSB3aXRoIHRoZSBhcHBy b3ByaWF0ZSBwcml2aWxlZ2VzLiBBbHNvLCB0aGUgY29yZSBzaG91bGQgbm90CnNlZSAoYW5kIHVz ZSkgdmFsdWVzIG9mIEdVQyBwYXJhbWV0ZXJzIGludHJvZHVjZWQgYnkgdGhlIGluZGV4IGZ1bmN0 aW9ucy4KClRoaXMgcGF0Y2ggaW50cm9kdWNlcyBmdW5jdGlvbnMgZW5hYmxlX2luZGV4X2J1aWxk X3NlY3VyaXR5KCkgYW5kCmRpc2FibGVfaW5kZXhfYnVpbGRfc2VjdXJpdHkoKSB3aGljaCBtYWtl IHRoZSBzZWN1cml0eSBtZWFzdXJlcyBsZXNzCnZlcmJvc2UuIEl0J3MgbmVlZGVkIGZvciB0aGUg dXBjb21pbmcgZW5oYW5jZW1lbnRzIG9mIFJFUEFDSyAoQ09OQ1VSUkVOVExZKSwKYnV0IGxvb2tz IGxpa2UgdXNlZnVsIHJlZmFjdG9yaW5nIGFueXdheS4KLS0tCiBzcmMvYmFja2VuZC9hY2Nlc3Mv YnJpbi9icmluLmMgICB8IDMyICsrKystLS0tLS0tLS0tCiBzcmMvYmFja2VuZC9jYXRhbG9nL2lu ZGV4LmMgICAgICB8IDcyICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiBzcmMvYmFj a2VuZC9jb21tYW5kcy9hbmFseXplLmMgICB8IDIxICsrKy0tLS0tLS0KIHNyYy9iYWNrZW5kL2Nv bW1hbmRzL2luZGV4Y21kcy5jIHwgNDkgKysrKysrKy0tLS0tLS0tLS0tLS0tLQogc3JjL2JhY2tl bmQvY29tbWFuZHMvcmVwYWNrLmMgICAgfCAzMiArKysrKy0tLS0tLS0tLQogc3JjL2JhY2tlbmQv Y29tbWFuZHMvdmFjdXVtLmMgICAgfCAyMyArKystLS0tLS0tCiBzcmMvaW5jbHVkZS9jYXRhbG9n L2luZGV4LmggICAgICB8IDEwICsrKysrCiBzcmMvdG9vbHMvcGdpbmRlbnQvdHlwZWRlZnMubGlz dCB8ICAxICsKIDggZmlsZXMgY2hhbmdlZCwgOTQgaW5zZXJ0aW9ucygrKSwgMTQ2IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2FjY2Vzcy9icmluL2JyaW4uYyBiL3NyYy9i YWNrZW5kL2FjY2Vzcy9icmluL2JyaW4uYwppbmRleCA1MDU5ZGE4ZGNlNy4uY2ZhYzNiODBmMjcg MTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2FjY2Vzcy9icmluL2JyaW4uYworKysgYi9zcmMvYmFj a2VuZC9hY2Nlc3MvYnJpbi9icmluLmMKQEAgLTEzOTEsMTAgKzEzOTEsOCBAQCBicmluX3N1bW1h cml6ZV9yYW5nZShQR19GVU5DVElPTl9BUkdTKQogCU9pZAkJCWhlYXBvaWQ7CiAJUmVsYXRpb24J aW5kZXhSZWw7CiAJUmVsYXRpb24JaGVhcFJlbDsKLQlPaWQJCQlzYXZlX3VzZXJpZDsKLQlpbnQJ CQlzYXZlX3NlY19jb250ZXh0OwotCWludAkJCXNhdmVfbmVzdGxldmVsOwogCWRvdWJsZQkJbnVt U3VtbWFyaXplZCA9IDA7CisJSW5kZXhCdWlsZFNlY3VyaXR5IGlic2VjOwogCiAJaWYgKFJlY292 ZXJ5SW5Qcm9ncmVzcygpKQogCQllcmVwb3J0KEVSUk9SLApAQCAtMTQyMCwyNyArMTQxOCwxMiBA QCBicmluX3N1bW1hcml6ZV9yYW5nZShQR19GVU5DVElPTl9BUkdTKQogCQloZWFwUmVsID0gdGFi bGVfb3BlbihoZWFwb2lkLCBTaGFyZVVwZGF0ZUV4Y2x1c2l2ZUxvY2spOwogCiAJCS8qCi0JCSAq IEF1dG92YWN1dW0gY2FsbHMgdXMuICBGb3IgaXRzIGJlbmVmaXQsIHN3aXRjaCB0byB0aGUgdGFi bGUgb3duZXIncwotCQkgKiB1c2VyaWQsIHNvIHRoYXQgYW55IGluZGV4IGZ1bmN0aW9ucyBhcmUg cnVuIGFzIHRoYXQgdXNlci4gIEFsc28KLQkJICogbG9jayBkb3duIHNlY3VyaXR5LXJlc3RyaWN0 ZWQgb3BlcmF0aW9ucyBhbmQgYXJyYW5nZSB0byBtYWtlIEdVQwotCQkgKiB2YXJpYWJsZSBjaGFu Z2VzIGxvY2FsIHRvIHRoaXMgY29tbWFuZC4gIFRoaXMgaXMgaGFybWxlc3MsIGFsYmVpdAotCQkg KiB1bm5lY2Vzc2FyeSwgd2hlbiBjYWxsZWQgZnJvbSBTUUwsIGJlY2F1c2Ugd2UgZmFpbCBzaG9y dGx5IGlmIHRoZQotCQkgKiB1c2VyIGRvZXMgbm90IG93biB0aGUgaW5kZXguCisJCSAqIFByZXZl bnQgaW5kZXggZnVuY3Rpb25zIGZyb20gZG9pbmcgd2hhdCB0aGV5IGFyZSBub3Qgc3VwcG9zZWQg dG8uCiAJCSAqLwotCQlHZXRVc2VySWRBbmRTZWNDb250ZXh0KCZzYXZlX3VzZXJpZCwgJnNhdmVf c2VjX2NvbnRleHQpOwotCQlTZXRVc2VySWRBbmRTZWNDb250ZXh0KGhlYXBSZWwtPnJkX3JlbC0+ cmVsb3duZXIsCi0JCQkJCQkJICAgc2F2ZV9zZWNfY29udGV4dCB8IFNFQ1VSSVRZX1JFU1RSSUNU RURfT1BFUkFUSU9OKTsKLQkJc2F2ZV9uZXN0bGV2ZWwgPSBOZXdHVUNOZXN0TGV2ZWwoKTsKLQkJ UmVzdHJpY3RTZWFyY2hQYXRoKCk7CisJCWVuYWJsZV9pbmRleF9idWlsZF9zZWN1cml0eShoZWFw UmVsLT5yZF9yZWwtPnJlbG93bmVyLCAmaWJzZWMpOwogCX0KIAllbHNlCi0JewogCQloZWFwUmVs ID0gTlVMTDsKLQkJLyogU2V0IHRoZXNlIGp1c3QgdG8gc3VwcHJlc3MgInVuaW5pdGlhbGl6ZWQg dmFyaWFibGUiIHdhcm5pbmdzICovCi0JCXNhdmVfdXNlcmlkID0gSW52YWxpZE9pZDsKLQkJc2F2 ZV9zZWNfY29udGV4dCA9IC0xOwotCQlzYXZlX25lc3RsZXZlbCA9IC0xOwotCX0KIAogCWluZGV4 UmVsID0gaW5kZXhfb3BlbihpbmRleG9pZCwgU2hhcmVVcGRhdGVFeGNsdXNpdmVMb2NrKTsKIApA QCAtMTQ1Myw3ICsxNDM2LDggQEAgYnJpbl9zdW1tYXJpemVfcmFuZ2UoUEdfRlVOQ1RJT05fQVJH UykKIAkJCQkJCVJlbGF0aW9uR2V0UmVsYXRpb25OYW1lKGluZGV4UmVsKSkpKTsKIAogCS8qIFVz ZXIgbXVzdCBvd24gdGhlIGluZGV4IChjb21wYXJhYmxlIHRvIHByaXZpbGVnZXMgbmVlZGVkIGZv ciBWQUNVVU0pICovCi0JaWYgKGhlYXBSZWwgIT0gTlVMTCAmJiAhb2JqZWN0X293bmVyY2hlY2so UmVsYXRpb25SZWxhdGlvbklkLCBpbmRleG9pZCwgc2F2ZV91c2VyaWQpKQorCWlmIChoZWFwUmVs ICE9IE5VTEwgJiYgIW9iamVjdF9vd25lcmNoZWNrKFJlbGF0aW9uUmVsYXRpb25JZCwgaW5kZXhv aWQsCisJCQkJCQkJCQkJCSAgaWJzZWMudXNlcmlkKSkKIAkJYWNsY2hlY2tfZXJyb3IoQUNMQ0hF Q0tfTk9UX09XTkVSLCBPQkpFQ1RfSU5ERVgsCiAJCQkJCSAgIFJlbGF0aW9uR2V0UmVsYXRpb25O YW1lKGluZGV4UmVsKSk7CiAKQEAgLTE0NzcsMTEgKzE0NjEsOSBAQCBicmluX3N1bW1hcml6ZV9y YW5nZShQR19GVU5DVElPTl9BUkdTKQogCQkJCSBlcnJtc2coImluZGV4IFwiJXNcIiBpcyBub3Qg dmFsaWQiLAogCQkJCQkJUmVsYXRpb25HZXRSZWxhdGlvbk5hbWUoaW5kZXhSZWwpKSkpOwogCi0J LyogUm9sbCBiYWNrIGFueSBHVUMgY2hhbmdlcyBleGVjdXRlZCBieSBpbmRleCBmdW5jdGlvbnMg Ki8KLQlBdEVPWGFjdF9HVUMoZmFsc2UsIHNhdmVfbmVzdGxldmVsKTsKKwkvKiBSZWxheCB0aGUg cmVzdHJpY3Rpb25zIGltcG9zZWQgYWJvdmUuICovCisJZGlzYWJsZV9pbmRleF9idWlsZF9zZWN1 cml0eSgmaWJzZWMpOwogCi0JLyogUmVzdG9yZSB1c2VyaWQgYW5kIHNlY3VyaXR5IGNvbnRleHQg Ki8KLQlTZXRVc2VySWRBbmRTZWNDb250ZXh0KHNhdmVfdXNlcmlkLCBzYXZlX3NlY19jb250ZXh0 KTsKIAogCWluZGV4X2Nsb3NlKGluZGV4UmVsLCBTaGFyZVVwZGF0ZUV4Y2x1c2l2ZUxvY2spOwog CXRhYmxlX2Nsb3NlKGhlYXBSZWwsIFNoYXJlVXBkYXRlRXhjbHVzaXZlTG9jayk7CmRpZmYgLS1n aXQgYS9zcmMvYmFja2VuZC9jYXRhbG9nL2luZGV4LmMgYi9zcmMvYmFja2VuZC9jYXRhbG9nL2lu ZGV4LmMKaW5kZXggOTk0MTM1NTY1NzIuLmFiOWY0NTYzY2M1IDEwMDY0NAotLS0gYS9zcmMvYmFj a2VuZC9jYXRhbG9nL2luZGV4LmMKKysrIGIvc3JjL2JhY2tlbmQvY2F0YWxvZy9pbmRleC5jCkBA IC0xNTE5LDExICsxNTE5LDkgQEAgaW5kZXhfY29uY3VycmVudGx5X2J1aWxkKE9pZCBoZWFwUmVs YXRpb25JZCwKIAkJCQkJCSBPaWQgaW5kZXhSZWxhdGlvbklkKQogewogCVJlbGF0aW9uCWhlYXBS ZWw7Ci0JT2lkCQkJc2F2ZV91c2VyaWQ7Ci0JaW50CQkJc2F2ZV9zZWNfY29udGV4dDsKLQlpbnQJ CQlzYXZlX25lc3RsZXZlbDsKIAlSZWxhdGlvbglpbmRleFJlbGF0aW9uOwogCUluZGV4SW5mbyAg KmluZGV4SW5mbzsKKwlJbmRleEJ1aWxkU2VjdXJpdHkgaWJzZWM7CiAKIAkvKiBUaGlzIGhhZCBi ZXR0ZXIgbWFrZSBzdXJlIHRoYXQgYSBzbmFwc2hvdCBpcyBhY3RpdmUgKi8KIAlBc3NlcnQoQWN0 aXZlU25hcHNob3RTZXQoKSk7CkBAIC0xNTMyLDE1ICsxNTMwLDkgQEAgaW5kZXhfY29uY3VycmVu dGx5X2J1aWxkKE9pZCBoZWFwUmVsYXRpb25JZCwKIAloZWFwUmVsID0gdGFibGVfb3BlbihoZWFw UmVsYXRpb25JZCwgU2hhcmVVcGRhdGVFeGNsdXNpdmVMb2NrKTsKIAogCS8qCi0JICogU3dpdGNo IHRvIHRoZSB0YWJsZSBvd25lcidzIHVzZXJpZCwgc28gdGhhdCBhbnkgaW5kZXggZnVuY3Rpb25z IGFyZSBydW4KLQkgKiBhcyB0aGF0IHVzZXIuICBBbHNvIGxvY2sgZG93biBzZWN1cml0eS1yZXN0 cmljdGVkIG9wZXJhdGlvbnMgYW5kCi0JICogYXJyYW5nZSB0byBtYWtlIEdVQyB2YXJpYWJsZSBj aGFuZ2VzIGxvY2FsIHRvIHRoaXMgY29tbWFuZC4KKwkgKiBQcmV2ZW50IGluZGV4IGZ1bmN0aW9u cyBmcm9tIGRvaW5nIHdoYXQgdGhleSBhcmUgbm90IHN1cHBvc2VkIHRvLgogCSAqLwotCUdldFVz ZXJJZEFuZFNlY0NvbnRleHQoJnNhdmVfdXNlcmlkLCAmc2F2ZV9zZWNfY29udGV4dCk7Ci0JU2V0 VXNlcklkQW5kU2VjQ29udGV4dChoZWFwUmVsLT5yZF9yZWwtPnJlbG93bmVyLAotCQkJCQkJICAg c2F2ZV9zZWNfY29udGV4dCB8IFNFQ1VSSVRZX1JFU1RSSUNURURfT1BFUkFUSU9OKTsKLQlzYXZl X25lc3RsZXZlbCA9IE5ld0dVQ05lc3RMZXZlbCgpOwotCVJlc3RyaWN0U2VhcmNoUGF0aCgpOwor CWVuYWJsZV9pbmRleF9idWlsZF9zZWN1cml0eShoZWFwUmVsLT5yZF9yZWwtPnJlbG93bmVyLCAm aWJzZWMpOwogCiAJaW5kZXhSZWxhdGlvbiA9IGluZGV4X29wZW4oaW5kZXhSZWxhdGlvbklkLCBS b3dFeGNsdXNpdmVMb2NrKTsKIApAQCAtMTU1NywxMSArMTU0OSw4IEBAIGluZGV4X2NvbmN1cnJl bnRseV9idWlsZChPaWQgaGVhcFJlbGF0aW9uSWQsCiAJLyogTm93IGJ1aWxkIHRoZSBpbmRleCAq LwogCWluZGV4X2J1aWxkKGhlYXBSZWwsIGluZGV4UmVsYXRpb24sIGluZGV4SW5mbywgZmFsc2Us IHRydWUsIHRydWUpOwogCi0JLyogUm9sbCBiYWNrIGFueSBHVUMgY2hhbmdlcyBleGVjdXRlZCBi eSBpbmRleCBmdW5jdGlvbnMgKi8KLQlBdEVPWGFjdF9HVUMoZmFsc2UsIHNhdmVfbmVzdGxldmVs KTsKLQotCS8qIFJlc3RvcmUgdXNlcmlkIGFuZCBzZWN1cml0eSBjb250ZXh0ICovCi0JU2V0VXNl cklkQW5kU2VjQ29udGV4dChzYXZlX3VzZXJpZCwgc2F2ZV9zZWNfY29udGV4dCk7CisJLyogUmVs YXggdGhlIHJlc3RyaWN0aW9ucyBpbXBvc2VkIGFib3ZlLiAqLworCWRpc2FibGVfaW5kZXhfYnVp bGRfc2VjdXJpdHkoJmlic2VjKTsKIAogCS8qIENsb3NlIGJvdGggdGhlIHJlbGF0aW9ucywgYnV0 IGtlZXAgdGhlIGxvY2tzICovCiAJdGFibGVfY2xvc2UoaGVhcFJlbCwgTm9Mb2NrKTsKQEAgLTM0 NzcsOSArMzQ2Niw3IEBAIHZhbGlkYXRlX2luZGV4KE9pZCBoZWFwSWQsIE9pZCBpbmRleElkLCBT bmFwc2hvdCBzbmFwc2hvdCkKIAlJbmRleEluZm8gICppbmRleEluZm87CiAJSW5kZXhWYWN1dW1J bmZvIGl2aW5mbzsKIAlWYWxpZGF0ZUluZGV4U3RhdGUgc3RhdGU7Ci0JT2lkCQkJc2F2ZV91c2Vy aWQ7Ci0JaW50CQkJc2F2ZV9zZWNfY29udGV4dDsKLQlpbnQJCQlzYXZlX25lc3RsZXZlbDsKKwlJ bmRleEJ1aWxkU2VjdXJpdHkgaWJzZWM7CiAKIAl7CiAJCWNvbnN0IGludAlwcm9ncmVzc19pbmRl eFtdID0gewpAQCAtMzUwMSwxNSArMzQ4OCw5IEBAIHZhbGlkYXRlX2luZGV4KE9pZCBoZWFwSWQs IE9pZCBpbmRleElkLCBTbmFwc2hvdCBzbmFwc2hvdCkKIAloZWFwUmVsYXRpb24gPSB0YWJsZV9v cGVuKGhlYXBJZCwgU2hhcmVVcGRhdGVFeGNsdXNpdmVMb2NrKTsKIAogCS8qCi0JICogU3dpdGNo IHRvIHRoZSB0YWJsZSBvd25lcidzIHVzZXJpZCwgc28gdGhhdCBhbnkgaW5kZXggZnVuY3Rpb25z IGFyZSBydW4KLQkgKiBhcyB0aGF0IHVzZXIuICBBbHNvIGxvY2sgZG93biBzZWN1cml0eS1yZXN0 cmljdGVkIG9wZXJhdGlvbnMgYW5kCi0JICogYXJyYW5nZSB0byBtYWtlIEdVQyB2YXJpYWJsZSBj aGFuZ2VzIGxvY2FsIHRvIHRoaXMgY29tbWFuZC4KKwkgKiBQcmV2ZW50IGluZGV4IGZ1bmN0aW9u cyBmcm9tIGRvaW5nIHdoYXQgdGhleSBhcmUgbm90IHN1cHBvc2VkIHRvLgogCSAqLwotCUdldFVz ZXJJZEFuZFNlY0NvbnRleHQoJnNhdmVfdXNlcmlkLCAmc2F2ZV9zZWNfY29udGV4dCk7Ci0JU2V0 VXNlcklkQW5kU2VjQ29udGV4dChoZWFwUmVsYXRpb24tPnJkX3JlbC0+cmVsb3duZXIsCi0JCQkJ CQkgICBzYXZlX3NlY19jb250ZXh0IHwgU0VDVVJJVFlfUkVTVFJJQ1RFRF9PUEVSQVRJT04pOwot CXNhdmVfbmVzdGxldmVsID0gTmV3R1VDTmVzdExldmVsKCk7Ci0JUmVzdHJpY3RTZWFyY2hQYXRo KCk7CisJZW5hYmxlX2luZGV4X2J1aWxkX3NlY3VyaXR5KGhlYXBSZWxhdGlvbi0+cmRfcmVsLT5y ZWxvd25lciwgJmlic2VjKTsKIAogCWluZGV4UmVsYXRpb24gPSBpbmRleF9vcGVuKGluZGV4SWQs IFJvd0V4Y2x1c2l2ZUxvY2spOwogCkBAIC0zNTg5LDExICszNTcwLDggQEAgdmFsaWRhdGVfaW5k ZXgoT2lkIGhlYXBJZCwgT2lkIGluZGV4SWQsIFNuYXBzaG90IHNuYXBzaG90KQogCQkgInZhbGlk YXRlX2luZGV4IGZvdW5kICUuMGYgaGVhcCB0dXBsZXMsICUuMGYgaW5kZXggdHVwbGVzOyBpbnNl cnRlZCAlLjBmIG1pc3NpbmcgdHVwbGVzIiwKIAkJIHN0YXRlLmh0dXBzLCBzdGF0ZS5pdHVwcywg c3RhdGUudHVwc19pbnNlcnRlZCk7CiAKLQkvKiBSb2xsIGJhY2sgYW55IEdVQyBjaGFuZ2VzIGV4 ZWN1dGVkIGJ5IGluZGV4IGZ1bmN0aW9ucyAqLwotCUF0RU9YYWN0X0dVQyhmYWxzZSwgc2F2ZV9u ZXN0bGV2ZWwpOwotCi0JLyogUmVzdG9yZSB1c2VyaWQgYW5kIHNlY3VyaXR5IGNvbnRleHQgKi8K LQlTZXRVc2VySWRBbmRTZWNDb250ZXh0KHNhdmVfdXNlcmlkLCBzYXZlX3NlY19jb250ZXh0KTsK KwkvKiBSZWxheCB0aGUgcmVzdHJpY3Rpb25zIGltcG9zZWQgYWJvdmUuICovCisJZGlzYWJsZV9p bmRleF9idWlsZF9zZWN1cml0eSgmaWJzZWMpOwogCiAJLyogQ2xvc2UgcmVscywgYnV0IGtlZXAg bG9ja3MgKi8KIAlpbmRleF9jbG9zZShpbmRleFJlbGF0aW9uLCBOb0xvY2spOwpAQCAtNDIxOCw2 ICs0MTk2LDM2IEBAIHJlaW5kZXhfcmVsYXRpb24oY29uc3QgUmVpbmRleFN0bXQgKnN0bXQsIE9p ZCByZWxpZCwgaW50IGZsYWdzLAogCXJldHVybiByZXN1bHQ7CiB9CiAKKy8qCisgKiBCZWZvcmUg YnVpbGRpbmcgYW4gaW5kZXgsIHdpdGNoIHRvIHRoZSB0YWJsZSBvd25lcidzIHVzZXJpZCwgc28g dGhhdCBhbnkKKyAqIGluZGV4IGZ1bmN0aW9ucyBhcmUgcnVuIGFzIHRoYXQgdXNlci4gQWxzbyBs b2NrIGRvd24gc2VjdXJpdHktcmVzdHJpY3RlZAorICogb3BlcmF0aW9ucyBhbmQgYXJyYW5nZSB0 byBtYWtlIEdVQyB2YXJpYWJsZSBjaGFuZ2VzIGxvY2FsIHRvIHRoaXMgY29tbWFuZC4KKyAqCisg KiBJbmZvcm1hdGlvbiBuZWVkZWQgbGF0ZXIgYnkgZGlzYWJsZV9pbmRleF9idWlsZF9zZWN1cml0 eSgpIGlzIHN0b3JlZCBpbgorICogKnNlYy4KKyAqLwordm9pZAorZW5hYmxlX2luZGV4X2J1aWxk X3NlY3VyaXR5KE9pZCB1c2VyaWQsIEluZGV4QnVpbGRTZWN1cml0eSAqc2VjKQoreworCUdldFVz ZXJJZEFuZFNlY0NvbnRleHQoJnNlYy0+dXNlcmlkLCAmc2VjLT5zZWNfY29udGV4dCk7CisJU2V0 VXNlcklkQW5kU2VjQ29udGV4dCh1c2VyaWQsCisJCQkJCQkgICBzZWMtPnNlY19jb250ZXh0IHwg U0VDVVJJVFlfUkVTVFJJQ1RFRF9PUEVSQVRJT04pOworCXNlYy0+bmVzdGxldmVsID0gTmV3R1VD TmVzdExldmVsKCk7CisJUmVzdHJpY3RTZWFyY2hQYXRoKCk7Cit9CisKKy8qCisgKiBVbmRvIHdo YXQgZW5hYmxlX2luZGV4X2J1aWxkX3NlY3VyaXR5KCkgZGlkLgorICovCit2b2lkCitkaXNhYmxl X2luZGV4X2J1aWxkX3NlY3VyaXR5KEluZGV4QnVpbGRTZWN1cml0eSAqc2VjKQoreworCS8qIFJv bGwgYmFjayBhbnkgR1VDIGNoYW5nZXMgZXhlY3V0ZWQgYnkgaW5kZXggZnVuY3Rpb25zICovCisJ QXRFT1hhY3RfR1VDKGZhbHNlLCBzZWMtPm5lc3RsZXZlbCk7CisKKwkvKiBSZXN0b3JlIHVzZXJp ZCBhbmQgc2VjdXJpdHkgY29udGV4dCAqLworCVNldFVzZXJJZEFuZFNlY0NvbnRleHQoc2VjLT51 c2VyaWQsIHNlYy0+c2VjX2NvbnRleHQpOworfQogCiAvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgKgkJU3lzdGVtIGlu ZGV4IHJlaW5kZXhpbmcgc3VwcG9ydApkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvY29tbWFuZHMv YW5hbHl6ZS5jIGIvc3JjL2JhY2tlbmQvY29tbWFuZHMvYW5hbHl6ZS5jCmluZGV4IDUxOGQ3NTI2 MjU1Li5hN2M1OTJlMzM3NCAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvYW5hbHl6 ZS5jCisrKyBiL3NyYy9iYWNrZW5kL2NvbW1hbmRzL2FuYWx5emUuYwpAQCAtMzUxLDE0ICszNTEs MTIgQEAgZG9fYW5hbHl6ZV9yZWwoUmVsYXRpb24gb25lcmVsLCBjb25zdCBWYWN1dW1QYXJhbXMg KnBhcmFtcywKIAlQR1JVc2FnZQlydTA7CiAJVGltZXN0YW1wVHogc3RhcnR0aW1lID0gMDsKIAlN ZW1vcnlDb250ZXh0IGNhbGxlcl9jb250ZXh0OwotCU9pZAkJCXNhdmVfdXNlcmlkOwotCWludAkJ CXNhdmVfc2VjX2NvbnRleHQ7Ci0JaW50CQkJc2F2ZV9uZXN0bGV2ZWw7CiAJV2FsVXNhZ2UJc3Rh cnR3YWx1c2FnZSA9IHBnV2FsVXNhZ2U7CiAJQnVmZmVyVXNhZ2Ugc3RhcnRidWZmZXJ1c2FnZSA9 IHBnQnVmZmVyVXNhZ2U7CiAJQnVmZmVyVXNhZ2UgYnVmZmVydXNhZ2U7CiAJUGdTdGF0X0NvdW50 ZXIgc3RhcnRyZWFkdGltZSA9IDA7CiAJUGdTdGF0X0NvdW50ZXIgc3RhcnR3cml0ZXRpbWUgPSAw OworCUluZGV4QnVpbGRTZWN1cml0eSBpYnNlYzsKIAogCXZlcmJvc2UgPSAocGFyYW1zLT5vcHRp b25zICYgVkFDT1BUX1ZFUkJPU0UpICE9IDA7CiAJaW5zdHJ1bWVudCA9ICh2ZXJib3NlIHx8IChB bUF1dG9WYWN1dW1Xb3JrZXJQcm9jZXNzKCkgJiYKQEAgLTM4NCwxNSArMzgyLDkgQEAgZG9fYW5h bHl6ZV9yZWwoUmVsYXRpb24gb25lcmVsLCBjb25zdCBWYWN1dW1QYXJhbXMgKnBhcmFtcywKIAlj YWxsZXJfY29udGV4dCA9IE1lbW9yeUNvbnRleHRTd2l0Y2hUbyhhbmxfY29udGV4dCk7CiAKIAkv KgotCSAqIFN3aXRjaCB0byB0aGUgdGFibGUgb3duZXIncyB1c2VyaWQsIHNvIHRoYXQgYW55IGlu ZGV4IGZ1bmN0aW9ucyBhcmUgcnVuCi0JICogYXMgdGhhdCB1c2VyLiAgQWxzbyBsb2NrIGRvd24g c2VjdXJpdHktcmVzdHJpY3RlZCBvcGVyYXRpb25zIGFuZAotCSAqIGFycmFuZ2UgdG8gbWFrZSBH VUMgdmFyaWFibGUgY2hhbmdlcyBsb2NhbCB0byB0aGlzIGNvbW1hbmQuCisJICogUHJldmVudCBp bmRleCBmdW5jdGlvbnMgZnJvbSBkb2luZyB3aGF0IHRoZXkgYXJlIG5vdCBzdXBwb3NlZCB0by4K IAkgKi8KLQlHZXRVc2VySWRBbmRTZWNDb250ZXh0KCZzYXZlX3VzZXJpZCwgJnNhdmVfc2VjX2Nv bnRleHQpOwotCVNldFVzZXJJZEFuZFNlY0NvbnRleHQob25lcmVsLT5yZF9yZWwtPnJlbG93bmVy LAotCQkJCQkJICAgc2F2ZV9zZWNfY29udGV4dCB8IFNFQ1VSSVRZX1JFU1RSSUNURURfT1BFUkFU SU9OKTsKLQlzYXZlX25lc3RsZXZlbCA9IE5ld0dVQ05lc3RMZXZlbCgpOwotCVJlc3RyaWN0U2Vh cmNoUGF0aCgpOworCWVuYWJsZV9pbmRleF9idWlsZF9zZWN1cml0eShvbmVyZWwtPnJkX3JlbC0+ cmVsb3duZXIsICZpYnNlYyk7CiAKIAkvKgogCSAqIFdoZW4gdmVyYm9zZSBvciBhdXRvdmFjdXVt IGxvZ2dpbmcgaXMgdXNlZCwgaW5pdGlhbGl6ZSBhIHJlc291cmNlIHVzYWdlCkBAIC04ODAsMTEg Kzg3Miw4IEBAIGRvX2FuYWx5emVfcmVsKFJlbGF0aW9uIG9uZXJlbCwgY29uc3QgVmFjdXVtUGFy YW1zICpwYXJhbXMsCiAJCX0KIAl9CiAKLQkvKiBSb2xsIGJhY2sgYW55IEdVQyBjaGFuZ2VzIGV4 ZWN1dGVkIGJ5IGluZGV4IGZ1bmN0aW9ucyAqLwotCUF0RU9YYWN0X0dVQyhmYWxzZSwgc2F2ZV9u ZXN0bGV2ZWwpOwotCi0JLyogUmVzdG9yZSB1c2VyaWQgYW5kIHNlY3VyaXR5IGNvbnRleHQgKi8K LQlTZXRVc2VySWRBbmRTZWNDb250ZXh0KHNhdmVfdXNlcmlkLCBzYXZlX3NlY19jb250ZXh0KTsK KwkvKiBSZWxheCB0aGUgcmVzdHJpY3Rpb25zIGltcG9zZWQgYWJvdmUuICovCisJZGlzYWJsZV9p bmRleF9idWlsZF9zZWN1cml0eSgmaWJzZWMpOwogCiAJLyogUmVzdG9yZSBjdXJyZW50IGNvbnRl eHQgYW5kIHJlbGVhc2UgbWVtb3J5ICovCiAJTWVtb3J5Q29udGV4dFN3aXRjaFRvKGNhbGxlcl9j b250ZXh0KTsKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL2luZGV4Y21kcy5jIGIv c3JjL2JhY2tlbmQvY29tbWFuZHMvaW5kZXhjbWRzLmMKaW5kZXggODkyYWJmZjRkYjUuLjUzMDll NjUxMjg5IDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9jb21tYW5kcy9pbmRleGNtZHMuYworKysg Yi9zcmMvYmFja2VuZC9jb21tYW5kcy9pbmRleGNtZHMuYwpAQCAtNzAyLDYgKzcwMiw4IEBAIERl ZmluZUluZGV4KFBhcnNlU3RhdGUgKnBzdGF0ZSwKIAkgKiBTd2l0Y2ggdG8gdGhlIHRhYmxlIG93 bmVyJ3MgdXNlcmlkLCBzbyB0aGF0IGFueSBpbmRleCBmdW5jdGlvbnMgYXJlIHJ1bgogCSAqIGFz IHRoYXQgdXNlci4gIEFsc28gbG9jayBkb3duIHNlY3VyaXR5LXJlc3RyaWN0ZWQgb3BlcmF0aW9u cy4gIFdlCiAJICogYWxyZWFkeSBhcnJhbmdlZCB0byBtYWtlIEdVQyB2YXJpYWJsZSBjaGFuZ2Vz IGxvY2FsIHRvIHRoaXMgY29tbWFuZC4KKwkgKgorCSAqIFhYWCBVc2UgZW5hYmxlX2luZGV4X2J1 aWxkX3NlY3VyaXR5KCk/CiAJICovCiAJR2V0VXNlcklkQW5kU2VjQ29udGV4dCgmcm9vdF9zYXZl X3VzZXJpZCwgJnJvb3Rfc2F2ZV9zZWNfY29udGV4dCk7CiAJU2V0VXNlcklkQW5kU2VjQ29udGV4 dChyZWwtPnJkX3JlbC0+cmVsb3duZXIsCkBAIC0xNDA1LDIyICsxNDA3LDE2IEBAIERlZmluZUlu ZGV4KFBhcnNlU3RhdGUgKnBzdGF0ZSwKIAkJCXsKIAkJCQlPaWQJCQljaGlsZFJlbGlkID0gcGFy dF9vaWRzW2ldOwogCQkJCVJlbGF0aW9uCWNoaWxkcmVsOwotCQkJCU9pZAkJCWNoaWxkX3NhdmVf dXNlcmlkOwotCQkJCWludAkJCWNoaWxkX3NhdmVfc2VjX2NvbnRleHQ7Ci0JCQkJaW50CQkJY2hp bGRfc2F2ZV9uZXN0bGV2ZWw7CiAJCQkJTGlzdAkgICAqY2hpbGRpZHhzOwogCQkJCUxpc3RDZWxs ICAgKmNlbGw7CiAJCQkJQXR0ck1hcCAgICAqYXR0bWFwOwogCQkJCWJvb2wJCWZvdW5kID0gZmFs c2U7CisJCQkJSW5kZXhCdWlsZFNlY3VyaXR5IGNoaWxkX2lic2VjOwogCiAJCQkJY2hpbGRyZWwg PSB0YWJsZV9vcGVuKGNoaWxkUmVsaWQsIGxvY2ttb2RlKTsKIAotCQkJCUdldFVzZXJJZEFuZFNl Y0NvbnRleHQoJmNoaWxkX3NhdmVfdXNlcmlkLAotCQkJCQkJCQkJICAgJmNoaWxkX3NhdmVfc2Vj X2NvbnRleHQpOwotCQkJCVNldFVzZXJJZEFuZFNlY0NvbnRleHQoY2hpbGRyZWwtPnJkX3JlbC0+ cmVsb3duZXIsCi0JCQkJCQkJCQkgICBjaGlsZF9zYXZlX3NlY19jb250ZXh0IHwgU0VDVVJJVFlf UkVTVFJJQ1RFRF9PUEVSQVRJT04pOwotCQkJCWNoaWxkX3NhdmVfbmVzdGxldmVsID0gTmV3R1VD TmVzdExldmVsKCk7Ci0JCQkJUmVzdHJpY3RTZWFyY2hQYXRoKCk7CisJCQkJZW5hYmxlX2luZGV4 X2J1aWxkX3NlY3VyaXR5KGNoaWxkcmVsLT5yZF9yZWwtPnJlbG93bmVyLAorCQkJCQkJCQkJCQkm Y2hpbGRfaWJzZWMpOwogCiAJCQkJLyoKIAkJCQkgKiBEb24ndCB0cnkgdG8gY3JlYXRlIGluZGV4 ZXMgb24gZm9yZWlnbiB0YWJsZXMsIHRob3VnaC4gU2tpcApAQCAtMTQzNyw5ICsxNDMzLDcgQEAg RGVmaW5lSW5kZXgoUGFyc2VTdGF0ZSAqcHN0YXRlLAogCQkJCQkJCQkgZXJyZGV0YWlsKCJUYWJs ZSBcIiVzXCIgY29udGFpbnMgcGFydGl0aW9ucyB0aGF0IGFyZSBmb3JlaWduIHRhYmxlcy4iLAog CQkJCQkJCQkJCSAgIFJlbGF0aW9uR2V0UmVsYXRpb25OYW1lKHJlbCkpKSk7CiAKLQkJCQkJQXRF T1hhY3RfR1VDKGZhbHNlLCBjaGlsZF9zYXZlX25lc3RsZXZlbCk7Ci0JCQkJCVNldFVzZXJJZEFu ZFNlY0NvbnRleHQoY2hpbGRfc2F2ZV91c2VyaWQsCi0JCQkJCQkJCQkJICAgY2hpbGRfc2F2ZV9z ZWNfY29udGV4dCk7CisJCQkJCWRpc2FibGVfaW5kZXhfYnVpbGRfc2VjdXJpdHkoJmNoaWxkX2li c2VjKTsKIAkJCQkJdGFibGVfY2xvc2UoY2hpbGRyZWwsIGxvY2ttb2RlKTsKIAkJCQkJY29udGlu dWU7CiAJCQkJfQpAQCAtMTUyNCw5ICsxNTE4LDcgQEAgRGVmaW5lSW5kZXgoUGFyc2VTdGF0ZSAq cHN0YXRlLAogCQkJCX0KIAogCQkJCWxpc3RfZnJlZShjaGlsZGlkeHMpOwotCQkJCUF0RU9YYWN0 X0dVQyhmYWxzZSwgY2hpbGRfc2F2ZV9uZXN0bGV2ZWwpOwotCQkJCVNldFVzZXJJZEFuZFNlY0Nv bnRleHQoY2hpbGRfc2F2ZV91c2VyaWQsCi0JCQkJCQkJCQkgICBjaGlsZF9zYXZlX3NlY19jb250 ZXh0KTsKKwkJCQlkaXNhYmxlX2luZGV4X2J1aWxkX3NlY3VyaXR5KCZjaGlsZF9pYnNlYyk7CiAJ CQkJdGFibGVfY2xvc2UoY2hpbGRyZWwsIE5vTG9jayk7CiAKIAkJCQkvKgpAQCAtMTU1Myw3ICsx NTQ1LDcgQEAgRGVmaW5lSW5kZXgoUGFyc2VTdGF0ZSAqcHN0YXRlLAogCQkJCQkgKiBSZWN1cnNl IGFzIHRoZSBzdGFydGluZyB1c2VyIElELiAgQ2FsbGVlIHdpbGwgdXNlIHRoYXQKIAkJCQkJICog Zm9yIHBlcm1pc3Npb24gY2hlY2tzLCB0aGVuIHN3aXRjaCBhZ2Fpbi4KIAkJCQkJICovCi0JCQkJ CUFzc2VydChHZXRVc2VySWQoKSA9PSBjaGlsZF9zYXZlX3VzZXJpZCk7CisJCQkJCUFzc2VydChH ZXRVc2VySWQoKSA9PSBjaGlsZF9pYnNlYy51c2VyaWQpOwogCQkJCQlTZXRVc2VySWRBbmRTZWND b250ZXh0KHJvb3Rfc2F2ZV91c2VyaWQsCiAJCQkJCQkJCQkJICAgcm9vdF9zYXZlX3NlY19jb250 ZXh0KTsKIAkJCQkJY2hpbGRBZGRyID0KQEAgLTE1NjYsOCArMTU1OCw4IEBAIERlZmluZUluZGV4 KFBhcnNlU3RhdGUgKnBzdGF0ZSwKIAkJCQkJCQkJCWlzX2FsdGVyX3RhYmxlLCBjaGVja19yaWdo dHMsCiAJCQkJCQkJCQljaGVja19ub3RfaW5fdXNlLAogCQkJCQkJCQkJc2tpcF9idWlsZCwgcXVp ZXQpOwotCQkJCQlTZXRVc2VySWRBbmRTZWNDb250ZXh0KGNoaWxkX3NhdmVfdXNlcmlkLAotCQkJ CQkJCQkJCSAgIGNoaWxkX3NhdmVfc2VjX2NvbnRleHQpOworCQkJCQlTZXRVc2VySWRBbmRTZWND b250ZXh0KGNoaWxkX2lic2VjLnVzZXJpZCwKKwkJCQkJCQkJCQkgICBjaGlsZF9pYnNlYy5zZWNf Y29udGV4dCk7CiAKIAkJCQkJLyoKIAkJCQkJICogQ2hlY2sgaWYgdGhlIGluZGV4IGp1c3QgY3Jl YXRlZCBpcyB2YWxpZCBvciBub3QsIGFzIGl0CkBAIC00MTI0LDI3ICs0MTE2LDE5IEBAIFJlaW5k ZXhSZWxhdGlvbkNvbmN1cnJlbnRseShjb25zdCBSZWluZGV4U3RtdCAqc3RtdCwgT2lkIHJlbGF0 aW9uT2lkLCBjb25zdCBSZWluCiAJCU9pZAkJCW5ld0luZGV4SWQ7CiAJCVJlbGF0aW9uCWluZGV4 UmVsOwogCQlSZWxhdGlvbgloZWFwUmVsOwotCQlPaWQJCQlzYXZlX3VzZXJpZDsKLQkJaW50CQkJ c2F2ZV9zZWNfY29udGV4dDsKLQkJaW50CQkJc2F2ZV9uZXN0bGV2ZWw7CiAJCVJlbGF0aW9uCW5l d0luZGV4UmVsOwogCQlMb2NrUmVsSWQgICpsb2NrcmVsaWQ7CiAJCU9pZAkJCXRhYmxlc3BhY2Vp ZDsKKwkJSW5kZXhCdWlsZFNlY3VyaXR5IGlic2VjOwogCiAJCWluZGV4UmVsID0gaW5kZXhfb3Bl bihpZHgtPmluZGV4SWQsIFNoYXJlVXBkYXRlRXhjbHVzaXZlTG9jayk7CiAJCWhlYXBSZWwgPSB0 YWJsZV9vcGVuKGluZGV4UmVsLT5yZF9pbmRleC0+aW5kcmVsaWQsCiAJCQkJCQkJIFNoYXJlVXBk YXRlRXhjbHVzaXZlTG9jayk7CiAKIAkJLyoKLQkJICogU3dpdGNoIHRvIHRoZSB0YWJsZSBvd25l cidzIHVzZXJpZCwgc28gdGhhdCBhbnkgaW5kZXggZnVuY3Rpb25zIGFyZQotCQkgKiBydW4gYXMg dGhhdCB1c2VyLiAgQWxzbyBsb2NrIGRvd24gc2VjdXJpdHktcmVzdHJpY3RlZCBvcGVyYXRpb25z Ci0JCSAqIGFuZCBhcnJhbmdlIHRvIG1ha2UgR1VDIHZhcmlhYmxlIGNoYW5nZXMgbG9jYWwgdG8g dGhpcyBjb21tYW5kLgorCQkgKiBQcmV2ZW50IGluZGV4IGZ1bmN0aW9ucyBmcm9tIGRvaW5nIHdo YXQgdGhleSBhcmUgbm90IHN1cHBvc2VkIHRvLgogCQkgKi8KLQkJR2V0VXNlcklkQW5kU2VjQ29u dGV4dCgmc2F2ZV91c2VyaWQsICZzYXZlX3NlY19jb250ZXh0KTsKLQkJU2V0VXNlcklkQW5kU2Vj Q29udGV4dChoZWFwUmVsLT5yZF9yZWwtPnJlbG93bmVyLAotCQkJCQkJCSAgIHNhdmVfc2VjX2Nv bnRleHQgfCBTRUNVUklUWV9SRVNUUklDVEVEX09QRVJBVElPTik7Ci0JCXNhdmVfbmVzdGxldmVs ID0gTmV3R1VDTmVzdExldmVsKCk7Ci0JCVJlc3RyaWN0U2VhcmNoUGF0aCgpOworCQllbmFibGVf aW5kZXhfYnVpbGRfc2VjdXJpdHkoaGVhcFJlbC0+cmRfcmVsLT5yZWxvd25lciwgJmlic2VjKTsK IAogCQkvKiBkZXRlcm1pbmUgc2FmZXR5IG9mIHRoaXMgaW5kZXggZm9yIHNldF9pbmRleHNhZmVf cHJvY2ZsYWdzICovCiAJCWlkeC0+c2FmZSA9IChSZWxhdGlvbkdldEluZGV4RXhwcmVzc2lvbnMo aW5kZXhSZWwpID09IE5JTCAmJgpAQCAtNDIzMiwxMSArNDIxNiw4IEBAIFJlaW5kZXhSZWxhdGlv bkNvbmN1cnJlbnRseShjb25zdCBSZWluZGV4U3RtdCAqc3RtdCwgT2lkIHJlbGF0aW9uT2lkLCBj b25zdCBSZWluCiAJCWluZGV4X2Nsb3NlKGluZGV4UmVsLCBOb0xvY2spOwogCQlpbmRleF9jbG9z ZShuZXdJbmRleFJlbCwgTm9Mb2NrKTsKIAotCQkvKiBSb2xsIGJhY2sgYW55IEdVQyBjaGFuZ2Vz IGV4ZWN1dGVkIGJ5IGluZGV4IGZ1bmN0aW9ucyAqLwotCQlBdEVPWGFjdF9HVUMoZmFsc2UsIHNh dmVfbmVzdGxldmVsKTsKLQotCQkvKiBSZXN0b3JlIHVzZXJpZCBhbmQgc2VjdXJpdHkgY29udGV4 dCAqLwotCQlTZXRVc2VySWRBbmRTZWNDb250ZXh0KHNhdmVfdXNlcmlkLCBzYXZlX3NlY19jb250 ZXh0KTsKKwkJLyogUmVsYXggdGhlIHJlc3RyaWN0aW9ucyBpbXBvc2VkIGFib3ZlLiAqLworCQlk aXNhYmxlX2luZGV4X2J1aWxkX3NlY3VyaXR5KCZpYnNlYyk7CiAKIAkJdGFibGVfY2xvc2UoaGVh cFJlbCwgTm9Mb2NrKTsKIApkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvcmVwYWNr LmMgYi9zcmMvYmFja2VuZC9jb21tYW5kcy9yZXBhY2suYwppbmRleCA5ZDY5YTRmMDcxNy4uNDM4 YWJmN2RjOTAgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFjay5jCisrKyBi L3NyYy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFjay5jCkBAIC00ODUsOSArNDg1LDYgQEAgY2x1c3Rl cl9yZWwoUmVwYWNrQ29tbWFuZCBjbWQsIFJlbGF0aW9uIE9sZEhlYXAsIE9pZCBpbmRleE9pZCwK IAlPaWQJCQl0YWJsZU9pZCA9IFJlbGF0aW9uR2V0UmVsaWQoT2xkSGVhcCk7CiAJUmVsYXRpb24J aW5kZXg7CiAJTE9DS01PREUJbG1vZGU7Ci0JT2lkCQkJc2F2ZV91c2VyaWQ7Ci0JaW50CQkJc2F2 ZV9zZWNfY29udGV4dDsKLQlpbnQJCQlzYXZlX25lc3RsZXZlbDsKIAlib29sCQl2ZXJib3NlID0g KChwYXJhbXMtPm9wdGlvbnMgJiBDTFVPUFRfVkVSQk9TRSkgIT0gMCk7CiAJYm9vbAkJcmVjaGVj ayA9ICgocGFyYW1zLT5vcHRpb25zICYgQ0xVT1BUX1JFQ0hFQ0spICE9IDApOwogCWJvb2wJCWNv bmN1cnJlbnQgPSAoKHBhcmFtcy0+b3B0aW9ucyAmIENMVU9QVF9DT05DVVJSRU5UKSAhPSAwKTsK QEAgLTUzMywxNyArNTMwLDYgQEAgY2x1c3Rlcl9yZWwoUmVwYWNrQ29tbWFuZCBjbWQsIFJlbGF0 aW9uIE9sZEhlYXAsIE9pZCBpbmRleE9pZCwKIAkvKiBSZXBvcnQgdGhlIG9yZGVyaW5nIGluZGV4 IGV2ZW4gd2hlbiB1c2luZyBhIHNlcXVlbnRpYWwgc2NhbiBhbmQgc29ydC4gKi8KIAlwZ3N0YXRf cHJvZ3Jlc3NfdXBkYXRlX211bHRpX3BhcmFtKDIsIHByb2dyZXNzX2luZGV4LCBwcm9ncmVzc192 YWx1ZXMpOwogCi0JLyoKLQkgKiBTd2l0Y2ggdG8gdGhlIHRhYmxlIG93bmVyJ3MgdXNlcmlkLCBz byB0aGF0IGFueSBpbmRleCBmdW5jdGlvbnMgYXJlIHJ1bgotCSAqIGFzIHRoYXQgdXNlci4gIEFs c28gbG9jayBkb3duIHNlY3VyaXR5LXJlc3RyaWN0ZWQgb3BlcmF0aW9ucyBhbmQKLQkgKiBhcnJh bmdlIHRvIG1ha2UgR1VDIHZhcmlhYmxlIGNoYW5nZXMgbG9jYWwgdG8gdGhpcyBjb21tYW5kLgot CSAqLwotCUdldFVzZXJJZEFuZFNlY0NvbnRleHQoJnNhdmVfdXNlcmlkLCAmc2F2ZV9zZWNfY29u dGV4dCk7Ci0JU2V0VXNlcklkQW5kU2VjQ29udGV4dChPbGRIZWFwLT5yZF9yZWwtPnJlbG93bmVy LAotCQkJCQkJICAgc2F2ZV9zZWNfY29udGV4dCB8IFNFQ1VSSVRZX1JFU1RSSUNURURfT1BFUkFU SU9OKTsKLQlzYXZlX25lc3RsZXZlbCA9IE5ld0dVQ05lc3RMZXZlbCgpOwotCVJlc3RyaWN0U2Vh cmNoUGF0aCgpOwotCiAJLyoKIAkgKiBSZWNoZWNrIHRoYXQgdGhlIHJlbGF0aW9uIGlzIHN0aWxs IHdoYXQgaXQgd2FzIHdoZW4gd2Ugc3RhcnRlZC4KIAkgKgpAQCAtNTUyLDcgKzUzOCw3IEBAIGNs dXN0ZXJfcmVsKFJlcGFja0NvbW1hbmQgY21kLCBSZWxhdGlvbiBPbGRIZWFwLCBPaWQgaW5kZXhP aWQsCiAJICogbm90LXByZXZpb3VzbHktY2x1c3RlcmVkIGluZGV4LgogCSAqLwogCWlmIChyZWNo ZWNrICYmCi0JCSFjbHVzdGVyX3JlbF9yZWNoZWNrKGNtZCwgT2xkSGVhcCwgaW5kZXhPaWQsIHNh dmVfdXNlcmlkLAorCQkhY2x1c3Rlcl9yZWxfcmVjaGVjayhjbWQsIE9sZEhlYXAsIGluZGV4T2lk LCBHZXRVc2VySWQoKSwKIAkJCQkJCQkgbG1vZGUsIHBhcmFtcy0+b3B0aW9ucykpCiAJCWdvdG8g b3V0OwogCkBAIC02NzYsMTIgKzY2Miw2IEBAIGNsdXN0ZXJfcmVsKFJlcGFja0NvbW1hbmQgY21k LCBSZWxhdGlvbiBPbGRIZWFwLCBPaWQgaW5kZXhPaWQsCiAJCXJlYnVpbGRfcmVsYXRpb24oT2xk SGVhcCwgaW5kZXgsIHZlcmJvc2UsIGlkZW50X2lkeCk7CiAKIG91dDoKLQkvKiBSb2xsIGJhY2sg YW55IEdVQyBjaGFuZ2VzIGV4ZWN1dGVkIGJ5IGluZGV4IGZ1bmN0aW9ucyAqLwotCUF0RU9YYWN0 X0dVQyhmYWxzZSwgc2F2ZV9uZXN0bGV2ZWwpOwotCi0JLyogUmVzdG9yZSB1c2VyaWQgYW5kIHNl Y3VyaXR5IGNvbnRleHQgKi8KLQlTZXRVc2VySWRBbmRTZWNDb250ZXh0KHNhdmVfdXNlcmlkLCBz YXZlX3NlY19jb250ZXh0KTsKLQogCXBnc3RhdF9wcm9ncmVzc19lbmRfY29tbWFuZCgpOwogfQog CkBAIC0xMTA0LDYgKzEwODQsNyBAQCByZWJ1aWxkX3JlbGF0aW9uKFJlbGF0aW9uIE9sZEhlYXAs IFJlbGF0aW9uIGluZGV4LCBib29sIHZlcmJvc2UsCiAJVHJhbnNhY3Rpb25JZCBmcm96ZW5YaWQ7 CiAJTXVsdGlYYWN0SWQgY3V0b2ZmTXVsdGk7CiAJYm9vbAkJY29uY3VycmVudCA9IE9pZElzVmFs aWQoaWRlbnRfaWR4KTsKKwlJbmRleEJ1aWxkU2VjdXJpdHkgaWJzZWM7CiAJQ2hhbmdlQ29udGV4 dCAqY2hnY3h0ID0gTlVMTDsKICNpZiBVU0VfQVNTRVJUX0NIRUNLSU5HCiAJTE9DS01PREUJbG1v ZGU7CkBAIC0xMTE0LDYgKzEwOTUsMTEgQEAgcmVidWlsZF9yZWxhdGlvbihSZWxhdGlvbiBPbGRI ZWFwLCBSZWxhdGlvbiBpbmRleCwgYm9vbCB2ZXJib3NlLAogCUFzc2VydChpbmRleCA9PSBOVUxM IHx8IENoZWNrUmVsYXRpb25Mb2NrZWRCeU1lKGluZGV4LCBsbW9kZSwgZmFsc2UpKTsKICNlbmRp ZgogCisJLyoKKwkgKiBQcmV2ZW50IGluZGV4IGZ1bmN0aW9ucyBmcm9tIGRvaW5nIHdoYXQgdGhl eSBhcmUgbm90IHN1cHBvc2VkIHRvLgorCSAqLworCWVuYWJsZV9pbmRleF9idWlsZF9zZWN1cml0 eShPbGRIZWFwLT5yZF9yZWwtPnJlbG93bmVyLCAmaWJzZWMpOworCiAJaWYgKGNvbmN1cnJlbnQp CiAJewogCQkvKgpAQCAtMTMyNCw4ICsxMzEwLDEwIEBAIHJlYnVpbGRfcmVsYXRpb24oUmVsYXRp b24gT2xkSGVhcCwgUmVsYXRpb24gaW5kZXgsIGJvb2wgdmVyYm9zZSwKIAkJCQkJCSBmcm96ZW5Y aWQsIGN1dG9mZk11bHRpLAogCQkJCQkJIHJlbHBlcnNpc3RlbmNlKTsKIAl9Ci19CiAKKwkvKiBS ZWxheCB0aGUgcmVzdHJpY3Rpb25zIGltcG9zZWQgYWJvdmUuICovCisJZGlzYWJsZV9pbmRleF9i dWlsZF9zZWN1cml0eSgmaWJzZWMpOworfQogCiAvKgogICogQ3JlYXRlIHRoZSB0cmFuc2llbnQg dGFibGUgdGhhdCB3aWxsIGJlIGZpbGxlZCB3aXRoIG5ldyBkYXRhIGR1cmluZwpkaWZmIC0tZ2l0 IGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvdmFjdXVtLmMgYi9zcmMvYmFja2VuZC9jb21tYW5kcy92 YWN1dW0uYwppbmRleCAzYTVjMWVmZDZhYy4uYzUyMTFkYjAwMDYgMTAwNjQ0Ci0tLSBhL3NyYy9i YWNrZW5kL2NvbW1hbmRzL3ZhY3V1bS5jCisrKyBiL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3ZhY3V1 bS5jCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAiYWNjZXNzL3RhYmxlYW0uaCIKICNpbmNs dWRlICJhY2Nlc3MvdHJhbnNhbS5oIgogI2luY2x1ZGUgImFjY2Vzcy94YWN0LmgiCisjaW5jbHVk ZSAiY2F0YWxvZy9pbmRleC5oIgogI2luY2x1ZGUgImNhdGFsb2cvbmFtZXNwYWNlLmgiCiAjaW5j bHVkZSAiY2F0YWxvZy9wZ19kYXRhYmFzZS5oIgogI2luY2x1ZGUgImNhdGFsb2cvcGdfaW5oZXJp dHMuaCIKQEAgLTIwNDAsMTAgKzIwNDEsOCBAQCB2YWN1dW1fcmVsKE9pZCByZWxpZCwgUmFuZ2VW YXIgKnJlbGF0aW9uLCBWYWN1dW1QYXJhbXMgcGFyYW1zLAogCUxvY2tSZWxJZAlsb2NrcmVsaWQ7 CiAJT2lkCQkJcHJpdl9yZWxpZDsKIAlPaWQJCQl0b2FzdF9yZWxpZDsKLQlPaWQJCQlzYXZlX3Vz ZXJpZDsKLQlpbnQJCQlzYXZlX3NlY19jb250ZXh0OwotCWludAkJCXNhdmVfbmVzdGxldmVsOwog CVZhY3V1bVBhcmFtcyB0b2FzdF92YWN1dW1fcGFyYW1zOworCUluZGV4QnVpbGRTZWN1cml0eSBp YnNlYzsKIAlTdGRSZE9wdGlvbnMgKnJlbG9wdHM7CiAJU3RkUmRPcHRpb25zIHJlbG9wdHNfY29w eTsKIApAQCAtMjMxNiwxNiArMjMxNSw5IEBAIHZhY3V1bV9yZWwoT2lkIHJlbGlkLCBSYW5nZVZh ciAqcmVsYXRpb24sIFZhY3V1bVBhcmFtcyBwYXJhbXMsCiAJfQogCiAJLyoKLQkgKiBTd2l0Y2gg dG8gdGhlIHRhYmxlIG93bmVyJ3MgdXNlcmlkLCBzbyB0aGF0IGFueSBpbmRleCBmdW5jdGlvbnMg YXJlIHJ1bgotCSAqIGFzIHRoYXQgdXNlci4gIEFsc28gbG9jayBkb3duIHNlY3VyaXR5LXJlc3Ry aWN0ZWQgb3BlcmF0aW9ucyBhbmQKLQkgKiBhcnJhbmdlIHRvIG1ha2UgR1VDIHZhcmlhYmxlIGNo YW5nZXMgbG9jYWwgdG8gdGhpcyBjb21tYW5kLiAoVGhpcyBpcwotCSAqIHVubmVjZXNzYXJ5LCBi dXQgaGFybWxlc3MsIGZvciBsYXp5IFZBQ1VVTS4pCisJICogUHJldmVudCBpbmRleCBmdW5jdGlv bnMgZnJvbSBkb2luZyB3aGF0IHRoZXkgYXJlIG5vdCBzdXBwb3NlZCB0by4KIAkgKi8KLQlHZXRV c2VySWRBbmRTZWNDb250ZXh0KCZzYXZlX3VzZXJpZCwgJnNhdmVfc2VjX2NvbnRleHQpOwotCVNl dFVzZXJJZEFuZFNlY0NvbnRleHQocmVsLT5yZF9yZWwtPnJlbG93bmVyLAotCQkJCQkJICAgc2F2 ZV9zZWNfY29udGV4dCB8IFNFQ1VSSVRZX1JFU1RSSUNURURfT1BFUkFUSU9OKTsKLQlzYXZlX25l c3RsZXZlbCA9IE5ld0dVQ05lc3RMZXZlbCgpOwotCVJlc3RyaWN0U2VhcmNoUGF0aCgpOworCWVu YWJsZV9pbmRleF9idWlsZF9zZWN1cml0eShyZWwtPnJkX3JlbC0+cmVsb3duZXIsICZpYnNlYyk7 CiAKIAkvKgogCSAqIElmIFBST0NFU1NfTUFJTiBpcyBzZXQgKHRoZSBkZWZhdWx0KSwgaXQncyB0 aW1lIHRvIHZhY3V1bSB0aGUgbWFpbgpAQCAtMjM1NiwxMSArMjM0OCw4IEBAIHZhY3V1bV9yZWwo T2lkIHJlbGlkLCBSYW5nZVZhciAqcmVsYXRpb24sIFZhY3V1bVBhcmFtcyBwYXJhbXMsCiAJCQl0 YWJsZV9yZWxhdGlvbl92YWN1dW0ocmVsLCAmcGFyYW1zLCBic3RyYXRlZ3kpOwogCX0KIAotCS8q IFJvbGwgYmFjayBhbnkgR1VDIGNoYW5nZXMgZXhlY3V0ZWQgYnkgaW5kZXggZnVuY3Rpb25zICov Ci0JQXRFT1hhY3RfR1VDKGZhbHNlLCBzYXZlX25lc3RsZXZlbCk7Ci0KLQkvKiBSZXN0b3JlIHVz ZXJpZCBhbmQgc2VjdXJpdHkgY29udGV4dCAqLwotCVNldFVzZXJJZEFuZFNlY0NvbnRleHQoc2F2 ZV91c2VyaWQsIHNhdmVfc2VjX2NvbnRleHQpOworCS8qIFJlbGF4IHRoZSByZXN0cmljdGlvbnMg aW1wb3NlZCBhYm92ZS4gKi8KKwlkaXNhYmxlX2luZGV4X2J1aWxkX3NlY3VyaXR5KCZpYnNlYyk7 CiAKIAkvKiBhbGwgZG9uZSB3aXRoIHRoaXMgY2xhc3MsIGJ1dCBob2xkIGxvY2sgdW50aWwgY29t bWl0ICovCiAJaWYgKHJlbCkKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2NhdGFsb2cvaW5kZXgu aCBiL3NyYy9pbmNsdWRlL2NhdGFsb2cvaW5kZXguaAppbmRleCA1YWRkNjY4MTdjZi4uYjk2ZTRj MDc4YWYgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2NhdGFsb2cvaW5kZXguaAorKysgYi9zcmMv aW5jbHVkZS9jYXRhbG9nL2luZGV4LmgKQEAgLTE3Niw2ICsxNzYsMTYgQEAgZXh0ZXJuIHZvaWQg cmVpbmRleF9pbmRleChjb25zdCBSZWluZGV4U3RtdCAqc3RtdCwgT2lkIGluZGV4SWQsCiBleHRl cm4gYm9vbCByZWluZGV4X3JlbGF0aW9uKGNvbnN0IFJlaW5kZXhTdG10ICpzdG10LCBPaWQgcmVs aWQsIGludCBmbGFncywKIAkJCQkJCQkgY29uc3QgUmVpbmRleFBhcmFtcyAqcGFyYW1zKTsKIAor dHlwZWRlZiBzdHJ1Y3QgSW5kZXhCdWlsZFNlY3VyaXR5Cit7CisJT2lkCQkJdXNlcmlkOworCWlu dAkJCXNlY19jb250ZXh0OworCWludAkJCW5lc3RsZXZlbDsKK30gSW5kZXhCdWlsZFNlY3VyaXR5 OworCitleHRlcm4gdm9pZCBlbmFibGVfaW5kZXhfYnVpbGRfc2VjdXJpdHkoT2lkIHVzZXJpZCwg SW5kZXhCdWlsZFNlY3VyaXR5ICpzZWMpOworZXh0ZXJuIHZvaWQgZGlzYWJsZV9pbmRleF9idWls ZF9zZWN1cml0eShJbmRleEJ1aWxkU2VjdXJpdHkgKnNlYyk7CisKIGV4dGVybiBib29sIFJlaW5k ZXhJc1Byb2Nlc3NpbmdIZWFwKE9pZCBoZWFwT2lkKTsKIGV4dGVybiBib29sIFJlaW5kZXhJc1By b2Nlc3NpbmdJbmRleChPaWQgaW5kZXhPaWQpOwogCmRpZmYgLS1naXQgYS9zcmMvdG9vbHMvcGdp bmRlbnQvdHlwZWRlZnMubGlzdCBiL3NyYy90b29scy9wZ2luZGVudC90eXBlZGVmcy5saXN0Cmlu ZGV4IGJkNzRiZjE1YTc2Li44OTllMTZjOGIxYSAxMDA2NDQKLS0tIGEvc3JjL3Rvb2xzL3BnaW5k ZW50L3R5cGVkZWZzLmxpc3QKKysrIGIvc3JjL3Rvb2xzL3BnaW5kZW50L3R5cGVkZWZzLmxpc3QK QEAgLTEzMDYsNiArMTMwNiw3IEBAIEluZGV4QXR0YWNoSW5mbwogSW5kZXhBdHRyQml0bWFwS2lu ZAogSW5kZXhCdWlsZENhbGxiYWNrCiBJbmRleEJ1aWxkUmVzdWx0CitJbmRleEJ1aWxkU2VjdXJp dHkKIEluZGV4QnVsa0RlbGV0ZUNhbGxiYWNrCiBJbmRleEJ1bGtEZWxldGVSZXN1bHQKIEluZGV4 Q2xhdXNlCi0tIAoyLjUxLjAKCg== --=-=-= Content-Type: application/mbox Content-Disposition: attachment; filename=v05-0007-Use-separate-transactions-for-catalog-changes.patch Content-Transfer-Encoding: base64 RnJvbSBiN2RkMThkZGJlOGY0NDI0OWNkMDFmZTRjNTljZmNjNWY0OGYyMjhiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmluIEhvdXNrYSA8YWhAY3liZXJ0ZWMuYXQ+CkRhdGU6 IFR1ZSwgMTAgTm92IDIwMjYgMTE6NDQ6MzkgKzAxMDAKU3ViamVjdDogW1BBVENIIDcvOV0gVXNl IHNlcGFyYXRlIHRyYW5zYWN0aW9ucyBmb3IgY2F0YWxvZyBjaGFuZ2VzLgoKVGhpcyBpcyBhbm90 aGVyIHBhcnQgb2YgdGhlIGVmZm9ydCB0byBlbGltaW5hdGUgdGhlIGltcGFjdCBvZiBSRVBBQ0sK KENPTkNVUlJFTlRMWSkgb24gVkFDVVVNIHhtaW4gaG9yaXpvbi4gV2hpbGUgb25lIG9mIHRoZSBw cmV2aW91cyBwYXRjaGVzCmF2b2lkcyB1c2luZyB0aGUgc2FtZSBzbmFwc2hvdCBmb3IgbG9uZyB0 aW1lLCBoZXJlIHdlIHRyeSB0byBhdm9pZCB1c2luZyB0aGUKc2FtZSBYSUQgdGhyb3VnaG91dCB0 aGUgUkVQQUNLIGV4ZWN1dGlvbi4gVGhlIGlkZWEgaXMgdGhhdCB3ZSBvbmx5IGdldCBYSUQKYXNz aWduZWQgZm9yIGEgY2F0YWxvZyBjaGFuZ2UsIGFuZCBhcyBzb29uIGFzIGl0J3MgZG9uZSwgd2Ug c3RhcnQgYSBuZXcKdHJhbnNhY3Rpb24uIFdlIHN0aWxsIG5lZWQgWElEIHRvIGxvYWQgdGhlIGRh dGEgaW50byB0aGUgbmV3IHRhYmxlLCBidXQgdGhpcwp3aWxsIGJlIGZpeGVkIGJ5IHRoZSBuZXh0 IHBhdGNoIGluIHRoZSBzZXJpZXMuCgpBIHNpZGUgZWZmZWN0IG9mIGNvbW1pdHRpbmcgdGhlIGNh dGFsb2cgY2hhbmdlcyBlYXJseSBpcyB0aGF0IHRoZSBuZXcgdGFibGUgaXMKdmlzaWJsZSB0byBv dGhlciB0cmFuc2FjdGlvbnMgd2hpbGUgUkVQQUNLIGlzIHN0aWxsIHJ1bm5pbmcuIFRoZSBvdGhl cgp0cmFuc2FjdGlvbnMgYXJlIG5vdCBhYmxlIHRvIGFjY2VzcyBpdCB0aG91Z2ggc2luY2Ugd2Ug a2VlcCBpdCBsb2NrZWQgaW4KQWNjZXNzRXhjbHVzaXZlTW9kZSBhbGwgdGhlIHRpbWUuIEhvd2V2 ZXIsIGJ5IGNvbW1pdHRpbmcgdGhlIHRyYW5zYWN0aW9uIHRoYXQKY3JlYXRlZCB0aGUgdGFibGUg d2UnZCBsb3NlIHRoZSBsb2NrLiBUaGVyZWZvcmUgd2UgdXNlIGEgc2Vzc2lvbiBsb2NrIHVudGls CnRoZSB0YWJsZSBnZXRzIGxvY2tlZCBpbiB0aGUgZm9sbG93aW5nIHRyYW5zYWN0aW9uLgoKQW5v dGhlciBwcm9ibGVtIGlzIHRoYXQsIG9uY2UgdGhlIGNyZWF0aW9uIG9mIHRoZSBuZXcgdGFibGUg Z290IGNvbW1pdHRlZCwgdGhlCnRhYmxlIHdpbGwgbm90IGJlIGRyb3BwZWQgYXV0b21hdGljYWxs eSBpZiBSRVBBQ0sgZW5kcyB1cCB3aXRoIEVSUk9SIChvcgpjcmFzaCkuIFdlIHJlc29sdmUgdGhp cyBieSBjcmVhdGluZyBhIGRlcGVuZGVuY3kgaW4gdGhlIHN5c3RlbSBjYXRhbG9nLiBXaGVuClJF UEFDSyBzdGFydHMsIGl0IGZpcnN0IHVzZXMgdGhlIGRlcGVuZGVuY3kgaW5mb3JtYXRpb24gdG8g ZmluZCBvdXQgaWYgc29tZQp0YWJsZSBkZXBlbmRzIG9uIHRoZSB0YWJsZSB0aGF0IHNob3VsZCBi ZSBwcm9jZXNzZWQsIGFuZCBpZiBpdCBkb2VzLCBpdCBjaGVja3MKaWYgaXRzIHBnX2NsYXNzKHJl bHJld3JpdGUpIGF0dHJpYnV0ZSBwb2ludHMgdG8gdGhlIHRhYmxlIHRvIGJlIHByb2Nlc3NlZC4g SW4Kc3VjaCBhIGNhc2UgaXQgZHJvcHMgdGhlIG5ldyB0YWJsZSBiZWNhdXNlIGl0IGV2aWRlbnRs eSBiZWxvbmdzIHRvIHRoZQpwcmV2aW91cyAoZmFpbGVkKSBydW4uCgpCZXNpZGVzIGNyZWF0aW9u IG9mIHRoZSBuZXcgdGFibGUsIHNlcGFyYXRlIHRyYW5zYWN0aW9uIGlzIGFsc28gdXNlZCB0byBl YWNoCmluZGV4LAotLS0KIHNyYy9iYWNrZW5kL2NvbW1hbmRzL21hdHZpZXcuYyAgIHwgICAyICst CiBzcmMvYmFja2VuZC9jb21tYW5kcy9yZXBhY2suYyAgICB8IDkyMiArKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tCiBzcmMvYmFja2VuZC9jb21tYW5kcy90YWJsZWNtZHMuYyB8ICAgMiAr LQogc3JjL2luY2x1ZGUvY29tbWFuZHMvcmVwYWNrLmggICAgfCAgMTAgKy0KIHNyYy90b29scy9w Z2luZGVudC90eXBlZGVmcy5saXN0IHwgICAyICsKIDUgZmlsZXMgY2hhbmdlZCwgNzg5IGluc2Vy dGlvbnMoKyksIDE0OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9jb21t YW5kcy9tYXR2aWV3LmMgYi9zcmMvYmFja2VuZC9jb21tYW5kcy9tYXR2aWV3LmMKaW5kZXggNDA3 NDg5NThlYWYuLmRmOTBkMDk5OTBkIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9jb21tYW5kcy9t YXR2aWV3LmMKKysrIGIvc3JjL2JhY2tlbmQvY29tbWFuZHMvbWF0dmlldy5jCkBAIC0zMTgsNyAr MzE4LDcgQEAgUmVmcmVzaE1hdFZpZXdCeU9pZChPaWQgbWF0dmlld09pZCwgYm9vbCBpc19jcmVh dGUsIGJvb2wgc2tpcERhdGEsCiAJICovCiAJT0lETmV3SGVhcCA9IG1ha2VfbmV3X2hlYXAobWF0 dmlld09pZCwgdGFibGVTcGFjZSwKIAkJCQkJCQkgICBtYXR2aWV3UmVsLT5yZF9yZWwtPnJlbGFt LAotCQkJCQkJCSAgIHJlbHBlcnNpc3RlbmNlLCBFeGNsdXNpdmVMb2NrKTsKKwkJCQkJCQkgICBy ZWxwZXJzaXN0ZW5jZSwgRXhjbHVzaXZlTG9jaywgTlVMTCk7CiAJQXNzZXJ0KENoZWNrUmVsYXRp b25PaWRMb2NrZWRCeU1lKE9JRE5ld0hlYXAsIEFjY2Vzc0V4Y2x1c2l2ZUxvY2ssIGZhbHNlKSk7 CiAKIAkvKiBHZW5lcmF0ZSB0aGUgZGF0YSwgaWYgd2FudGVkLiAqLwpkaWZmIC0tZ2l0IGEvc3Jj L2JhY2tlbmQvY29tbWFuZHMvcmVwYWNrLmMgYi9zcmMvYmFja2VuZC9jb21tYW5kcy9yZXBhY2su YwppbmRleCA0MzhhYmY3ZGM5MC4uYjdlMjRkOGU2ZDUgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5k L2NvbW1hbmRzL3JlcGFjay5jCisrKyBiL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFjay5jCkBA IC01MSw2ICs1MSw3IEBACiAjaW5jbHVkZSAiY2F0YWxvZy9wZ19hbS5oIgogI2luY2x1ZGUgImNh dGFsb2cvcGdfYXR0cmRlZi5oIgogI2luY2x1ZGUgImNhdGFsb2cvcGdfY29uc3RyYWludC5oIgor I2luY2x1ZGUgImNhdGFsb2cvcGdfZGVwZW5kLmgiCiAjaW5jbHVkZSAiY2F0YWxvZy9wZ19pbmhl cml0cy5oIgogI2luY2x1ZGUgImNhdGFsb2cvdG9hc3RpbmcuaCIKICNpbmNsdWRlICJjb21tYW5k cy9kZWZyZW0uaCIKQEAgLTczLDYgKzc0LDcgQEAKICNpbmNsdWRlICJzdG9yYWdlL3ByZWRpY2F0 ZS5oIgogI2luY2x1ZGUgInN0b3JhZ2UvcHJvYy5oIgogI2luY2x1ZGUgInV0aWxzL2FjbC5oIgor I2luY2x1ZGUgInV0aWxzL2J1aWx0aW5zLmgiCiAjaW5jbHVkZSAidXRpbHMvZm1ncm9pZHMuaCIK ICNpbmNsdWRlICJ1dGlscy9ndWMuaCIKICNpbmNsdWRlICJ1dGlscy9pbmplY3Rpb25fcG9pbnQu aCIKQEAgLTk2LDYgKzk4LDQyIEBAIHR5cGVkZWYgc3RydWN0CiAJT2lkCQkJaW5kZXhPaWQ7CiB9 IFJlbFRvQ2x1c3RlcjsKIAorLyoKKyAqIEluZm9ybWF0aW9uIG5lZWRlZCB0byBjbG9zZSBhbmQg cmUtb3BlbiByZWxhdGlvbiBvbiB0cmFuc2FjdGlvbiBib3VuZGFyeS4KKyAqLwordHlwZWRlZiBz dHJ1Y3QgUmVsUmVvcGVuSW5mbworeworCU9pZAkJCXJlbGlkOworCVJlbGF0aW9uICAgKnBfcmVs OworCWJvb2wJCWlzX25ldzsKK30gUmVsUmVvcGVuSW5mbzsKKworLyoKKyAqIEluZm9ybWF0aW9u IG5lZWRlZCB0byByZWxlYXNlIGFucyByZS1pbml0aWFsaXplIENoYW5nZUNvbnRleHQgb24KKyAq IHRyYW5zYWN0aW9uIGJvdW5kYXJ5LgorICovCit0eXBlZGVmIHN0cnVjdCBDaGFuZ2VDb250ZXhC YWNrdXAKK3sKKwkvKiBUaGUgbmV3IHJlbGF0aW9uLiAqLworCVJlbGF0aW9uCXJlbDsKKwlSZWxS ZW9wZW5JbmZvIHJlbF9yaTsKKwlPaWQJCQlpZGVudF9pbmRleDsKKworCS8qIFRoZSBvbGQgcmVs YXRpb24uICovCisJUmVsYXRpb24JcmVsX29sZDsKKwlSZWxSZW9wZW5JbmZvIHJlbF9yaV9vbGQ7 CisKKwkvKiBBdXhpbGlhcnkgcmVsYXRpb24uICovCisJUmVsYXRpb24JcmVsX2F1eDsKKwlSZWxS ZW9wZW5JbmZvIHJlbF9hdXhfcmk7CisJT2lkCQkJaWRlbnRfaW5kZXhfYXV4OworCisJLyogQ29t bW9uIGZpZWxkcyAqLworCWludAkJCWZpbGVfc2VxX3NuYXBzaG90OworCWludAkJCWZpbGVfc2Vx X2NoYW5nZXM7CisJT2lkCQkJY2x1c3RlcmluZ19pbmRleDsKK30gQ2hhbmdlQ29udGV4dEJhY2t1 cDsKKwogLyoKICAqIFdoZW4gUkVQQUNLIChDT05DVVJSRU5UTFkpIGNvcGllcyBkYXRhIHRvIHRo ZSBuZXcgaGVhcCwgYSBuZXcgc25hcHNob3QgaXMKICAqIGJ1aWx0IGFmdGVyIHByb2Nlc3Npbmcg dGhpcyBtYW55IHBhZ2VzLiBYWFggVHVuZSB0aGUgdmFsdWUuCkBAIC0xMjAsNiArMTU4LDEzIEBA IHR5cGVkZWYgc3RydWN0IERlY29kaW5nV29ya2VyCiAvKiBQb2ludGVyIHRvIGN1cnJlbnRseSBy dW5uaW5nIGRlY29kaW5nIHdvcmtlci4gKi8KIHN0YXRpYyBEZWNvZGluZ1dvcmtlciAqZGVjb2Rp bmdfd29ya2VyID0gTlVMTDsKIAorLyoKKyAqIEluIHRoZSBDT05DVVJSRU5UTFkgbW9kZSwgd2Ug bmVlZCBtdWx0aXBsZSB0cmFuc2FjdGlvbnMgdG8gcHJvY2VzcyBhIHNpbmdsZQorICogdGFibGUu IEluZm9ybWF0aW9uIHRoYXQgbmVlZHMgdG8gc3Vydml2ZSBjb21taXQgc2hvdWxkIGJlIHN0b3Jl ZCBpbiB0aGlzCisgKiBjb250ZXh0LgorICovCitzdGF0aWMgTWVtb3J5Q29udGV4dCByZXBhY2tf Y3h0ID0gTlVMTDsKKwogLyoKICAqIElzIHRoZXJlIGEgbWVzc2FnZSBzZW50IGJ5IGEgcmVwYWNr IHdvcmtlciB0aGF0IHRoZSBiYWNrZW5kIG5lZWRzIHRvCiAgKiByZWNlaXZlPwpAQCAtMTM1LDYg KzE4MCwxNCBAQCBzdGF0aWMgdm9pZCBjaGVja19jb25jdXJyZW50X3JlcGFja19yZXF1aXJlbWVu dHMoUmVsYXRpb24gcmVsLAogc3RhdGljIHZvaWQgY2hlY2tfaW5kZXhfcmVxdWlyZW1lbnRzKFJl bGF0aW9uIHJlbCwgUmVwYWNrQ29tbWFuZCBjbWQpOwogc3RhdGljIHZvaWQgcmVidWlsZF9yZWxh dGlvbihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBpbmRleCwgYm9vbCB2ZXJib3NlLAogCQkJ CQkJCSBPaWQgaWRlbnRfaWR4KTsKK3N0YXRpYyBDaGFuZ2VDb250ZXh0ICptYWtlX25ld19oZWFw X2Zvcl9yZXBhY2soT2lkIHRhYmxlc3BhY2UsCisJCQkJCQkJCQkJCSAgIE9pZCBhY2Nlc3NfbWV0 aG9kLAorCQkJCQkJCQkJCQkgICBjaGFyIHJlbHBlcnNpc3RlbmNlLAorCQkJCQkJCQkJCQkgICBP aWQgaWRlbnRfaWR4LAorCQkJCQkJCQkJCQkgICBSZWxhdGlvbiAqcF9vbGRfaGVhcCwKKwkJCQkJ CQkJCQkJICAgUmVsYXRpb24gKnBfY2x1c3RlcmluZ19pbmRleCwKKwkJCQkJCQkJCQkJICAgSW5k ZXhCdWlsZFNlY3VyaXR5ICppYnNlYyk7CitzdGF0aWMgTGlzdCAqZmluZF9uZXdfaGVhcHMoT2lk IHJlbGlkX29sZCk7CiBzdGF0aWMgdm9pZCBjb3B5X3RhYmxlX2RhdGEoUmVsYXRpb24gTmV3SGVh cCwgUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gT2xkSW5kZXgsCiAJCQkJCQkJYm9vbCB2ZXJi b3NlLAogCQkJCQkJCWJvb2wgKnBTd2FwVG9hc3RCeUNvbnRlbnQsCkBAIC0xNzcsMTcgKzIzMCwz MiBAQCBzdGF0aWMgdm9pZCByZWxlYXNlX2NoYW5nZV9jb250ZXh0KENoYW5nZUNvbnRleHQgKmNo Z2N4dCk7CiBzdGF0aWMgdm9pZCBpbml0aWFsaXplX2NoYW5nZV9kZXN0KFJlcGFja0Rlc3QgKmRl c3QsIFJlbGF0aW9uIHJlbGF0aW9uLAogCQkJCQkJCQkgICBPaWQgaWRlbnRfaW5kZXhfaWQpOwog c3RhdGljIHZvaWQgcmVsZWFzZV9jaGFuZ2VfZGVzdChSZXBhY2tEZXN0ICpkZXN0KTsKK3N0YXRp YyB2b2lkIGJhY2t1cF9jaGFuZ2VfY29udGV4dChDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIFJlbGF0 aW9uICpwX29sZCwKKwkJCQkJCQkJICBDaGFuZ2VDb250ZXh0QmFja3VwICpiYWNrdXApOworc3Rh dGljIENoYW5nZUNvbnRleHQgKnJlaW5pdGlhbGl6ZV9jaGFuZ2VfY29udGV4dChDaGFuZ2VDb250 ZXh0QmFja3VwICpiYWNrdXApOworc3RhdGljIHZvaWQgZW5hYmxlX3Nlc3Npb25fbG9ja3MoUmVs YXRpb24gcmVsLCBMT0NLTU9ERSBsbW9kZSwgYm9vbCBpc19uZXcpOworc3RhdGljIHZvaWQgZGlz YWJsZV9zZXNzaW9uX2xvY2tzKFJlbGF0aW9uIHJlbCwgTE9DS01PREUgbG1vZGUsIGJvb2wgaXNf bmV3KTsKK3N0YXRpYyB2b2lkIHByZXBhcmVfcmVsYXRpb25fZm9yX3Jlb3BlbmluZyhSZWxhdGlv biAqcF9yZWwsCisJCQkJCQkJCQkJICAgUmVsUmVvcGVuSW5mbyAqYmFja3VwLAorCQkJCQkJCQkJ CSAgIGJvb2wgaXNfbmV3KTsKK3N0YXRpYyB2b2lkIHJlb3Blbl9yZWxhdGlvbihSZWxSZW9wZW5J bmZvICpiYWNrdXApOwogc3RhdGljIHZvaWQgcmVidWlsZF9yZWxhdGlvbl9maW5pc2hfY29uY3Vy cmVudChSZWxhdGlvbiBOZXdIZWFwLCBSZWxhdGlvbiBPbGRIZWFwLAogCQkJCQkJCQkJCQkgICBP aWQgaWRlbnRJZHgsCiAJCQkJCQkJCQkJCSAgIFRyYW5zYWN0aW9uSWQgZnJvemVuWGlkLAogCQkJ CQkJCQkJCQkgICBNdWx0aVhhY3RJZCBjdXRvZmZNdWx0aSwKIAkJCQkJCQkJCQkJICAgQ2hhbmdl Q29udGV4dCAqY2hnY3h0KTsKLXN0YXRpYyB2b2lkIHByb2Nlc3NfYXV4aWxpYXJ5X3RhYmxlKENo YW5nZUNvbnRleHQgKmNoZ2N4dCwgUmVsYXRpb24gT2xkSGVhcCwKLQkJCQkJCQkJCU9pZCBpZGVu dElkeCk7Ci1zdGF0aWMgTGlzdCAqYnVpbGRfbmV3X2luZGV4ZXMoUmVsYXRpb24gTmV3SGVhcCwg TGlzdCAqT2xkSW5kZXhlcyk7CitzdGF0aWMgQ2hhbmdlQ29udGV4dCAqcHJvY2Vzc19hdXhpbGlh cnlfdGFibGUoQ2hhbmdlQ29udGV4dCAqY2hnY3h0LAorCQkJCQkJCQkJCQkgIFJlbGF0aW9uICpw T2xkSGVhcCwKKwkJCQkJCQkJCQkJICBSZWxhdGlvbiAqcE5ld0hlYXAsCisJCQkJCQkJCQkJCSAg T2lkIGlkZW50SWR4KTsKK3N0YXRpYyBMaXN0ICpidWlsZF9uZXdfaW5kZXhlcyhMaXN0ICpPbGRJ bmRleGVzLCBSZWxhdGlvbiAqcF9vbGQsCisJCQkJCQkJICAgUmVsYXRpb24gKnBfbmV3LAorCQkJ CQkJCSAgIENoYW5nZUNvbnRleHQgKipwX2NoZ2N4dCk7CiBzdGF0aWMgT2lkCWJ1aWxkX25ld19p bmRleChSZWxhdGlvbiBOZXdIZWFwLCBPaWQgb2xkaW5kZXgsIGJvb2wgaXNfYXV4KTsKK3N0YXRp YyBDaGFuZ2VDb250ZXh0ICpzdGFydF9uZXdfdHJhbnNhY3Rpb24oQ2hhbmdlQ29udGV4dCAqY2hn Y3h0LAorCQkJCQkJCQkJCQlSZWxhdGlvbiAqcF9vbGQsIFJlbGF0aW9uICpwX25ldyk7CiBzdGF0 aWMgdm9pZCBjb3B5X2luZGV4X2NvbnN0cmFpbnRzKFJlbGF0aW9uIG9sZF9pbmRleCwgT2lkIG5l d19pbmRleF9pZCwKLQkJCQkJCQkJICAgT2lkIG5ld19oZWFwX2lkKTsKKwkJCQkJCQkJICAgUmVs YXRpb24gbmV3X2hlYXApOwogc3RhdGljIHZvaWQgY29weV9hdHRyaWJ1dGVfZGVmYXVsdHMoT2lk IG9sZF9oZWFwX29pZCwgT2lkIG5ld19oZWFwX29pZCk7CiBzdGF0aWMgUmVsYXRpb24gcHJvY2Vz c19zaW5nbGVfcmVsYXRpb24oUmVwYWNrU3RtdCAqc3RtdCwKIAkJCQkJCQkJCQlMT0NLTU9ERSBs b2NrbW9kZSwKQEAgLTY1MSw2ICs3MTksMTcgQEAgY2x1c3Rlcl9yZWwoUmVwYWNrQ29tbWFuZCBj bWQsIFJlbGF0aW9uIE9sZEhlYXAsIE9pZCBpbmRleE9pZCwKIAkgKi8KIAlpZiAoY29uY3VycmVu dCkKIAl7CisJCS8qCisJCSAqIEluIHRoZSBDT05DVVJSRU5UTFkgbW9kZSwgbmV3IHRyYW5zYWN0 aW9ucyBtYXkgYmUgc3RhcnRlZC4gTWFrZQorCQkgKiBzdXJlIHdlIGNhbiBwcmVzZXJ2ZSBpbmZv cm1hdGlvbiBhY3Jvc3MgdHJhbnNhY3Rpb24gYm91bmRhcmllcy4KKwkJICovCisJCWlmIChyZXBh Y2tfY3h0ID09IE5VTEwpCisJCQlyZXBhY2tfY3h0ID0gQWxsb2NTZXRDb250ZXh0Q3JlYXRlKFRv cE1lbW9yeUNvbnRleHQsCisJCQkJCQkJCQkJCSAgICJSZXBhY2sgLSBUb3AiLAorCQkJCQkJCQkJ CQkgICBBTExPQ1NFVF9ERUZBVUxUX1NJWkVTKTsKKwkJZWxzZQorCQkJTWVtb3J5Q29udGV4dFJl c2V0KHJlcGFja19jeHQpOworCiAJCVBHX0VOU1VSRV9FUlJPUl9DTEVBTlVQKHN0b3BfcmVwYWNr X2RlY29kaW5nX3dvcmtlcl9jYiwgMCk7CiAJCXsKIAkJCXJlYnVpbGRfcmVsYXRpb24oT2xkSGVh cCwgaW5kZXgsIHZlcmJvc2UsIGlkZW50X2lkeCk7CkBAIC0xMDc3LDggKzExNTYsOCBAQCByZWJ1 aWxkX3JlbGF0aW9uKFJlbGF0aW9uIE9sZEhlYXAsIFJlbGF0aW9uIGluZGV4LCBib29sIHZlcmJv c2UsCiAJT2lkCQkJdGFibGVPaWQgPSBSZWxhdGlvbkdldFJlbGlkKE9sZEhlYXApOwogCU9pZAkJ CWFjY2Vzc01ldGhvZCA9IE9sZEhlYXAtPnJkX3JlbC0+cmVsYW07CiAJT2lkCQkJdGFibGVTcGFj ZSA9IE9sZEhlYXAtPnJkX3JlbC0+cmVsdGFibGVzcGFjZTsKLQlPaWQJCQlPSUROZXdIZWFwOwot CVJlbGF0aW9uCU5ld0hlYXA7CisJT2lkCQkJT0lETmV3SGVhcCA9IEludmFsaWRPaWQ7CisJUmVs YXRpb24JTmV3SGVhcCA9IE5VTEw7CiAJY2hhcgkJcmVscGVyc2lzdGVuY2U7CiAJYm9vbAkJc3dh cF90b2FzdF9ieV9jb250ZW50OwogCVRyYW5zYWN0aW9uSWQgZnJvemVuWGlkOwpAQCAtMTEwMiw2 ICsxMTgxLDggQEAgcmVidWlsZF9yZWxhdGlvbihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBp bmRleCwgYm9vbCB2ZXJib3NlLAogCiAJaWYgKGNvbmN1cnJlbnQpCiAJeworCQlNZW1vcnlDb250 ZXh0IG9sZGN4dDsKKwogCQkvKgogCQkgKiBUaGUgd29ya2VyIG5lZWRzIHRvIGJlIG1lbWJlciBv ZiB0aGUgbG9ja2luZyBncm91cCB3ZSdyZSB0aGUgbGVhZGVyCiAJCSAqIG9mLiBXZSBvdWdodCB0 byBiZWNvbWUgdGhlIGxlYWRlciBiZWZvcmUgdGhlIHdvcmtlciBzdGFydHMuIFRoZQpAQCAtMTEz MSw4ICsxMjEyLDEyIEBAIHJlYnVpbGRfcmVsYXRpb24oUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRp b24gaW5kZXgsIGJvb2wgdmVyYm9zZSwKIAkJICogd2FpdGluZyBmb3IgYSBsb2NrIGNvbmZsaWN0 aW5nIHdpdGggU2hhcmVVcGRhdGVFeGNsdXNpdmVMb2NrIG9uIG91cgogCQkgKiB0YWJsZSBvciBp dHMgVE9BU1QgcmVsYXRpb24gKGUuZy4gaXQgcnVucyBDUkVBVEUgSU5ERVgpLCB3ZSBjYW4gZW5k CiAJCSAqIHVwIGluIGEgZGVhZGxvY2suCisJCSAqCisJCSAqIFVzZSBtZW1vcnkgY29udGV4dCB0 aGF0IHN1cnZpdmVzIHRyYW5zYWN0aW9uIGNvbW1pdChzKS4KIAkJICovCisJCW9sZGN4dCA9IE1l bW9yeUNvbnRleHRTd2l0Y2hUbyhyZXBhY2tfY3h0KTsKIAkJc3RhcnRfcmVwYWNrX2RlY29kaW5n X3dvcmtlcih0YWJsZU9pZCk7CisJCU1lbW9yeUNvbnRleHRTd2l0Y2hUbyhvbGRjeHQpOwogCX0K IAogCS8qIGZvciBDTFVTVEVSIG9yIFJFUEFDSyBVU0lORyBJTkRFWCwgbWFyayB0aGUgaW5kZXgg YXMgdGhlIG9uZSB0byB1c2UgKi8KQEAgLTExNDIsMTEyICsxMjI3LDMyIEBAIHJlYnVpbGRfcmVs YXRpb24oUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gaW5kZXgsIGJvb2wgdmVyYm9zZSwKIAkv KiBSZW1lbWJlciBpbmZvIGFib3V0IHJlbCBiZWZvcmUgY2xvc2luZyBPbGRIZWFwICovCiAJcmVs cGVyc2lzdGVuY2UgPSBPbGRIZWFwLT5yZF9yZWwtPnJlbHBlcnNpc3RlbmNlOwogCi0JLyoKLQkg KiBDcmVhdGUgdGhlIHRyYW5zaWVudCB0YWJsZSB0aGF0IHdpbGwgcmVjZWl2ZSB0aGUgcmUtb3Jk ZXJlZCBkYXRhLgotCSAqCi0JICogT2xkSGVhcCBpcyBhbHJlYWR5IGxvY2tlZCwgc28gbm8gbmVl ZCB0byBsb2NrIGl0IGFnYWluLiAgbWFrZV9uZXdfaGVhcAotCSAqIG9idGFpbnMgQWNjZXNzRXhj bHVzaXZlTG9jayBvbiB0aGUgbmV3IGhlYXAgYW5kIGl0cyB0b2FzdCB0YWJsZS4KLQkgKi8KLQlP SUROZXdIZWFwID0gbWFrZV9uZXdfaGVhcCh0YWJsZU9pZCwgdGFibGVTcGFjZSwKLQkJCQkJCQkg ICBhY2Nlc3NNZXRob2QsCi0JCQkJCQkJICAgcmVscGVyc2lzdGVuY2UsCi0JCQkJCQkJICAgTm9M b2NrKTsKLQlBc3NlcnQoQ2hlY2tSZWxhdGlvbk9pZExvY2tlZEJ5TWUoT0lETmV3SGVhcCwgQWNj ZXNzRXhjbHVzaXZlTG9jaywgZmFsc2UpKTsKLQlOZXdIZWFwID0gdGFibGVfb3BlbihPSUROZXdI ZWFwLCBOb0xvY2spOwotCiAJaWYgKGNvbmN1cnJlbnQpCiAJewotCQlib29sCQluZWVkX2F1eF9y ZWw7Ci0KLQogCQkvKgotCQkgKiBBdXhpbGlhcnkgdGFibGUgaXMgbmVlZGVkIGZvciBjbHVzdGVy aW5nIGluIHRoZSBDT05DVVJSRU5UTFkgbW9kZSwKLQkJICogc2VlIGNvbW1lbnRzIGluIENoYW5n ZUNvbnRleHQuIFhYWCBOb24tYnRyZWUgaW5kZXggaXMgcHJvYmFibHkgbm90Ci0JCSAqIHZlcnkg dXNlZnVsIGZvciBjbHVzdGVyaW5nLCBidXQgQ0xVU1RFUiBhY2NlcHRlZCBpdCwgc28gdGhlcmUn cyBubwotCQkgKiByZWFzb24gZm9yIFJFUEFDSyB0byBpbnRyb2R1Y2UgbmV3IHJlc3RyaWN0aW9u cy4KKwkJICogQ3JlYXRlIHRoZSB0cmFuc2llbnQgdGFibGUgdGhhdCB3aWxsIHJlY2VpdmUgdGhl IHJlLW9yZGVyZWQgZGF0YSwKKwkJICogYW5kIHBvc3NpYmx5IHRoZSBhdXhpbGlhcnkgdGFibGUg Zm9yIHRoZSBvcmRlcmVkIGRhdGEuCiAJCSAqLwotCQluZWVkX2F1eF9yZWwgPSBpbmRleCAhPSBO VUxMOwotCi0JCS8qIEdhdGhlciBpbmZvcm1hdGlvbiB0byBhcHBseSBjb25jdXJyZW50IGNoYW5n ZXMuICovCi0JCWNoZ2N4dCA9IHBhbGxvYzBfb2JqZWN0KENoYW5nZUNvbnRleHQpOworCQljaGdj eHQgPSBtYWtlX25ld19oZWFwX2Zvcl9yZXBhY2sodGFibGVTcGFjZSwgYWNjZXNzTWV0aG9kLAor CQkJCQkJCQkJCSAgcmVscGVyc2lzdGVuY2UsIGlkZW50X2lkeCwKKwkJCQkJCQkJCQkgICZPbGRI ZWFwLCAmaW5kZXgsICZpYnNlYyk7CisJCU5ld0hlYXAgPSBjaGdjeHQtPmNjX2Rlc3QucmVsOwor CX0KKwllbHNlCisJeworCQlBc3NlcnQoQ2hlY2tSZWxhdGlvbkxvY2tlZEJ5TWUoT2xkSGVhcCwg QWNjZXNzRXhjbHVzaXZlTG9jaywgZmFsc2UpKTsKIAogCQkvKgotCQkgKiBDcmVhdGUgYSBjb3B5 IG9mIHRoZSBhdHRyaWJ1dGUgZGVmYXVsdHMgb24gdGhlIHRlbXAgdGFibGUsIHdoaWNoCi0JCSAq IHRoZSBleGVjdXRvciBuZWVkcyB3aGVuIHJlcGxheWluZyBjb25jdXJyZW50IGRhdGEgY2hhbmdl cy4KKwkJICogTm90aGluZyBzcGVjaWFsIGhlcmUuIE5vIGxvY2tpbmcgYXMgdGhlIGNhbGxlciBz aG91bGQgYWxyZWFkeSBoYXZlCisJCSAqIGEgbG9jayBvbiB0aGUgb2xkIHJlbGF0aW9uLCBhbmQg dGhlIG5ldyBvbmUgd2lsbCBiZSBsb2NrZWQgYnkKKwkJICogbWFrZV9uZXdfaGVhcCgpIGFueXdh eS4KIAkJICovCi0JCWNvcHlfYXR0cmlidXRlX2RlZmF1bHRzKHRhYmxlT2lkLCBPSUROZXdIZWFw KTsKLQotCQlpZiAoIW5lZWRfYXV4X3JlbCkKLQkJewotCQkJT2lkCQkJaWRlbnRfaWR4X25ldzsK LQotCQkJLyoKLQkJCSAqIENyZWF0ZSB0aGUgaWRlbnRpdHkgaW5kZXguIFdlIHdpbGwgbmVlZCBp dCBkdXJpbmcgZGF0YSBjb3B5aW5nCi0JCQkgKiBzbyB0aGF0IHdlIGNhbiBhcHBseSB0aGUgZGF0 YSBjaGFuZ2VzIGF0IHRoZSBhcHByb3ByaWF0ZSB0aW1lIC0KLQkJCSAqIHNlZSBjb21tZW50cyBh cm91bmQgdGhlIGNhbGwgb2YKLQkJCSAqIHJlcGFja19wcm9jZXNzX2NvbmN1cnJlbnRfY2hhbmdl cygpIHdpdGggYmxvY2sgcmFuZ2Ugc3BlY2lmaWVkLgotCQkJICovCi0JCQlpZGVudF9pZHhfbmV3 ID0gYnVpbGRfbmV3X2luZGV4KE5ld0hlYXAsIGlkZW50X2lkeCwgZmFsc2UpOwotCi0JCQlpbml0 aWFsaXplX2NoYW5nZV9jb250ZXh0KGNoZ2N4dCwgT2xkSGVhcCwgTmV3SGVhcCwKLQkJCQkJCQkJ CSAgaWRlbnRfaWR4X25ldyk7Ci0JCX0KLQkJZWxzZQotCQl7Ci0JCQlPaWQJCQlhdXhfb2lkOwot CQkJUmVsYXRpb24JYXV4X3JlbDsKLQkJCU9pZAkJCWF1eF9pZGVudF9pZHg7Ci0KLQkJCS8qCi0J CQkgKiBBcyB0aGUgY29uY3VycmVudCBkYXRhIGNoYW5nZXMgd2lsbCBiZSBhcHBsaWVkIHRvIHRo ZSBhdXhpbGlhcnkKLQkJCSAqIGhlYXAsIHRoZSBuZXcgaGVhcCBkb2VzIG5vdCBuZWVkIHRoZSBp ZGVudGl0eSBpbmRleCB5ZXQuIFdlJ2xsCi0JCQkgKiBidWlsZCBpdCBhZnRlciBoYXZpbmcgY29w aWVkIHRoZSBkYXRhIGZyb20gdGhlIGF1eGlsaWFyeSBoZWFwLgotCQkJICogKEJ1bGsgaW5zZXJ0 IHNob3VsZCBiZSBtb3JlIGVmZmljaWVudC4pCi0JCQkgKi8KLQkJCWluaXRpYWxpemVfY2hhbmdl X2NvbnRleHQoY2hnY3h0LCBPbGRIZWFwLCBOZXdIZWFwLCBJbnZhbGlkT2lkKTsKLQotCQkJLyoK LQkJCSAqIExpa2UgYWJvdmUsIGJ1dCBvbmx5IHRlbXBvcmFyeSAtIG5vIG90aGVyIGJhY2tlbmQg c2hvdWxkIG5lZWQKLQkJCSAqIGl0LgotCQkJICovCi0JCQlhdXhfb2lkID0gbWFrZV9uZXdfaGVh cCh0YWJsZU9pZCwgdGFibGVTcGFjZSwgYWNjZXNzTWV0aG9kLAotCQkJCQkJCQkJUkVMUEVSU0lT VEVOQ0VfVEVNUCwgTm9Mb2NrKTsKLQkJCUFzc2VydChDaGVja1JlbGF0aW9uT2lkTG9ja2VkQnlN ZShhdXhfb2lkLCBBY2Nlc3NFeGNsdXNpdmVMb2NrLAotCQkJCQkJCQkJCQkgIGZhbHNlKSk7Ci0J CQlhdXhfcmVsID0gdGFibGVfb3BlbihhdXhfb2lkLCBOb0xvY2spOwotCi0KLQkJCS8qCi0JCQkg KiBDb3B5IHRoZSBhdHRyaWJ1dGUgZGVmYXVsdHMgYXMgd2UgZGlkIGZvciB0aGUgbmV3IGhlYXAg YWJvdmUgLQotCQkJICogdGhlIGNvbmN1cnJlbnQgY2hhbmdlcyBhbHNvIG5lZWQgdG8gYmUgYXBw bGllZCB0byB0aGUgYXV4aWxpYXJ5Ci0JCQkgKiB0YWJsZS4KLQkJCSAqLwotCQkJY29weV9hdHRy aWJ1dGVfZGVmYXVsdHModGFibGVPaWQsIGF1eF9vaWQpOwotCi0JCQkvKgotCQkJICogVGhlIHNh bWUgZm9yIGlkZW50aXR5IGluZGV4LiAoVGhlIGFkZGl0aW9uYWwKLQkJCSAqIFNoYXJlVXBkYXRl RXhjbHVzaXZlTG9jayBvbiBpZGVudF9pZHggaXMgbm90IGEgcHJvYmxlbSwgaXQnbGwKLQkJCSAq IGJlIHJlbGVhc2VkIGF0IHRoZSBlbmQgb2YgdHJhbnNhY3Rpb24uKQotCQkJICovCi0JCQlhdXhf aWRlbnRfaWR4ID0gYnVpbGRfbmV3X2luZGV4KGF1eF9yZWwsIGlkZW50X2lkeCwgdHJ1ZSk7Ci0K LQkJCS8qCi0JCQkgKiBNYWtlIHRoZSByZWxhdGlvbiByZWFkeSBmb3IgdXNlLgotCQkJICovCi0J CQljaGdjeHQtPmNjX2Rlc3RfYXV4ID0gcGFsbG9jMF9vYmplY3QoUmVwYWNrRGVzdCk7Ci0JCQlp bml0aWFsaXplX2NoYW5nZV9kZXN0KGNoZ2N4dC0+Y2NfZGVzdF9hdXgsIGF1eF9yZWwsCi0JCQkJ CQkJCSAgIGF1eF9pZGVudF9pZHgpOwotCi0JCQkvKgotCQkJICogU2V0IE9JRCBvZiB0aGUgb2xk IHJlbGF0aW9uJ3MgY2x1c3RlcmluZyBpbmRleCBpZiBpdCdzCi0JCQkgKiBkaWZmZXJlbnQgZnJv bSB0aGUgaWRlbnRpdHkgaW5kZXguIE90aGVyd2lzZSBzZXQgSW52YWxpZE9pZCB0bwotCQkJICog aW5kaWNhdGUgdGhhdCB0aGUgaWRlbnRpdHkgaW5kZXggc2hvdWxkIGJlIHVzZWQgZm9yIGNsdXN0 ZXJpbmcuCi0JCQkgKi8KLQkJCWlmIChSZWxhdGlvbkdldFJlbGlkKGluZGV4KSAhPSBpZGVudF9p ZHgpCi0JCQkJY2hnY3h0LT5jY19jbHVzdGVyaW5nX2luZGV4ID0gUmVsYXRpb25HZXRSZWxpZChp bmRleCk7Ci0JCQllbHNlCi0JCQkJY2hnY3h0LT5jY19jbHVzdGVyaW5nX2luZGV4ID0gSW52YWxp ZE9pZDsKLQkJfQorCQlPSUROZXdIZWFwID0gbWFrZV9uZXdfaGVhcCh0YWJsZU9pZCwgdGFibGVT cGFjZSwgYWNjZXNzTWV0aG9kLAorCQkJCQkJCQkgICByZWxwZXJzaXN0ZW5jZSwgTm9Mb2NrLCBO VUxMKTsKKwkJLyogTm8gYWRkaXRpb25hbCBsb2NrIG5lZWRlZC4gKi8KKwkJQXNzZXJ0KENoZWNr UmVsYXRpb25PaWRMb2NrZWRCeU1lKE9JRE5ld0hlYXAsIEFjY2Vzc0V4Y2x1c2l2ZUxvY2ssCisJ CQkJCQkJCQkJICBmYWxzZSkpOworCQlOZXdIZWFwID0gdGFibGVfb3BlbihPSUROZXdIZWFwLCBO b0xvY2spOwogCX0KIAogCS8qIENvcHkgdGhlIGhlYXAgZGF0YSBpbnRvIHRoZSBuZXcgdGFibGUg aW4gdGhlIGRlc2lyZWQgb3JkZXIgKi8KQEAgLTEzMTUsNiArMTMyMCwzMzcgQEAgcmVidWlsZF9y ZWxhdGlvbihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBpbmRleCwgYm9vbCB2ZXJib3NlLAog CWRpc2FibGVfaW5kZXhfYnVpbGRfc2VjdXJpdHkoJmlic2VjKTsKIH0KIAorLyoKKyAqIFdyYXBw ZXIgYXJvdW5kIG1ha2VfbmV3X2hlYXAoKSB0byBoYW5kbGUgc3BlY2lmaWNzIG9mIFJFUEFDSwor ICogKENPTkNVUlJFTlRMWSkuCisgKgorICogJ2lkZW50X2lkeCcgaXMgdGhlIGlkZW50aXR5IGlu ZGV4LCB0byBoYW5kbGUgcmVwbGF5aW5nIG9mIGNvbmN1cnJlbnQgZGF0YQorICogY2hhbmdlcyB0 byB0aGUgbmV3IGhlYXAuCisgKgorICogVGhlIGZ1bmN0aW9uIHN0YXJ0cyBhIG5ldyB0cmFuc2Fj dGlvbi4gVGhlcmVmb3JlLCBib3RoIG9sZCBoZWFwIGFuZAorICogY2x1c3RlcmluZyBpbmRleCBh cmUgcGFzc2VkIGluIHRoZSBmb3JtIG9mIHBvaW50ZXIgc28gdGhlIGNhbGxlciBoYXMgdGhlCisg KiBjb3JyZWN0IGVudHJpZXMgaW4gdGhlIG5ldyB0cmFuc2FjdGlvbi4gTmV3IGhlYXAgaXMgcmV0 dXJuZWQgaW4gdGhlCisgKiBDaGFuZ2VDb250ZXh0IG9iamVjdC4gT24gcmV0dXJuLCB0aGUgbmV3 IGhlYXAgd2lsbCBiZSBsb2NrZWQgaW4KKyAqIEFjY2Vzc0V4Y2x1c2l2ZUxvY2sgbW9kZS4KKyAq Lworc3RhdGljIENoYW5nZUNvbnRleHQgKgorbWFrZV9uZXdfaGVhcF9mb3JfcmVwYWNrKE9pZCB0 YWJsZXNwYWNlLCBPaWQgYWNjZXNzX21ldGhvZCwKKwkJCQkJCSBjaGFyIHJlbHBlcnNpc3RlbmNl LCBPaWQgaWRlbnRfaWR4LAorCQkJCQkJIFJlbGF0aW9uICpwX29sZF9oZWFwLCBSZWxhdGlvbiAq cF9jbHVzdGVyaW5nX2luZGV4LAorCQkJCQkJIEluZGV4QnVpbGRTZWN1cml0eSAqaWJzZWMpCit7 CisJUmVsYXRpb24Jb2xkX2hlYXAgPSAqcF9vbGRfaGVhcDsKKwlSZWxhdGlvbgljbHVzdGVyaW5n X2luZGV4ID0gKnBfY2x1c3RlcmluZ19pbmRleDsKKwlMaXN0CSAgICpleGlzdGluZyA9IE5JTDsK KwlSZWxhdGlvbgluZXdfaGVhcDsKKwlPaWQJCQlvbGRfaGVhcF9vaWQgPSBSZWxhdGlvbkdldFJl bGlkKG9sZF9oZWFwKTsKKwlib29sCQluZWVkX2F1eF9yZWw7CisJT2lkCQkJbmV3X2hlYXBfb2lk OworCU9iamVjdEFkZHJlc3Mgb2xkX29iaiwKKwkJCQluZXdfb2JqOworCU9pZAkJCWlkZW50X2lk eF9uZXc7CisJT2lkCQkJYXV4X29pZCA9IEludmFsaWRPaWQ7CisJT2lkCQkJYXV4X2lkZW50X2lk eCA9IEludmFsaWRPaWQ7CisJT2lkCQkJY2x1c3RlcmluZ19pbmRleF9vaWQgPSBJbnZhbGlkT2lk OworCVJlbGF0aW9uCWF1eF9yZWwgPSBOVUxMOworCUNoYW5nZUNvbnRleHQgKmNoZ2N4dDsKKwor CS8qCisJICogSW4gdGhlIENPTkNVUlJFTlRMWSBjYXNlLCB3ZSBkbyB0aGUgY2F0YWxvZyBjaGFu Z2VzIGluIGEgc2VwYXJhdGUKKwkgKiB0cmFuc2FjdGlvbiBzbyB0aGF0IHdlIGRvIG5vdCBoYXZl IFhJRCBhc3NpZ25lZCB3aGlsZSBjb3B5aW5nIHRoZSBkYXRhLgorCSAqIChUaGF0IFhJRCB3b3Vs ZCBibG9jayB0aGUgcHJvZ3Jlc3Mgb2YgdGhlIHhtaW4gaG9yaXpvbiBmb3IgVkFDVVVNLikKKwkg KiBUaGVyZWZvcmUsIHRoZSBuZXcgcmVsYXRpb24gd2lsbCBiZSBjcmVhdGVkIGluIGEgc2VwYXJh dGUgdHJhbnNhY3Rpb24KKwkgKiBhbmQgdGh1cyBiZSB2aXNpYmxlIHRvIG90aGVyIHRyYW5zYWN0 aW9ucywgYWx0aG91Z2ggb3VyIGxvY2sgc2hvdWxkIG5vdAorCSAqIGxldCB0aGVtIGFjY2VzcyBp dC4gSG93ZXZlciwgaWYgcHJldmlvdXMgcnVuIG9mIFJFUEFDSyBlbmRlZCB3aXRoCisJICogRVJS T1IsIHN1Y2ggcmVsYXRpb24gbWF5IHN0aWxsIGJlIHRoZXJlLgorCSAqCisJICogQmVzaWRlcyB0 aGF0LCBhbiBhdXhpbGlhcnkgcmVsYXRpb24gKGZvciB0dXBsZSBzb3J0aW5nKSBtaWdodCBleGlz dC4KKwkgKiBUaHVzIHdlIGV4cGVjdCBhIGxpc3Qgb2YgemVybywgb25lIG9yIHR3byBpdGVtcy4K KwkgKgorCSAqIFNpbmNlIHRoZSByZWxhdGlvbnMgc2hvdWxkIGRlcGVuZCBvbiB0aGUgb2xkIG9u ZSAoc2VlIGJlbG93KSwgd2UgdXNlCisJICogdGhlIHBnX2RlcGVuZCBjYXRhbG9nIHRvIGZpbmQg aXQuCisJICovCisJZXhpc3RpbmcgPSBmaW5kX25ld19oZWFwcyhvbGRfaGVhcF9vaWQpOworCUFz c2VydChsaXN0X2xlbmd0aChleGlzdGluZykgPD0gMik7CisJZm9yZWFjaF9vaWQoZXhpc3Rpbmdf b2lkLCBleGlzdGluZykKKwl7CisJCS8qIFRoZXJlIGFwcGVhcnMgdG8gYmUgb25lLCBzbyBzaW1w bHkgZHJvcCBpdC4gKi8KKwkJbmV3X29iai5jbGFzc0lkID0gUmVsYXRpb25SZWxhdGlvbklkOwor CQluZXdfb2JqLm9iamVjdElkID0gZXhpc3Rpbmdfb2lkOworCQluZXdfb2JqLm9iamVjdFN1Yklk ID0gSW52YWxpZE9pZDsKKworCQkvKgorCQkgKiBVc2VyIGlzIG5vdCBzdXBwb3NlZCB0byBjcmVh dGUgYW55IGRlcGVuZGVuY2llcyBvbiB0aGUgcmVsYXRpb24sIHNvCisJCSAqIENBU0NBREUuCisJ CSAqLworCQlwZXJmb3JtRGVsZXRpb24oJm5ld19vYmosIERST1BfQ0FTQ0FERSwgUEVSRk9STV9E RUxFVElPTl9JTlRFUk5BTCk7CisJfQorCisJLyoKKwkgKiBUaGUgb2xkIGhlYXAgc2hvdWxkIGFs cmVhZHkgYmUgbG9ja2VkIGJ5IHRoZSBjYWxsZXIuIEFzIGZvciB0aGUgbmV3CisJICogb25lLCBs b2NrIGlzIG5lZWRlZCBiZWNhdXNlIHRoZSBjb21taXQgYmVsb3cgd2lsbCBtYWtlIGl0IHZpc2li bGUgdG8KKwkgKiBvdGhlciB0cmFuc2FjdGlvbnMuIG1ha2VfbmV3X2hlYXAoKSBzaG91bGQgbG9j ayBpdC4KKwkgKi8KKwlBc3NlcnQoQ2hlY2tSZWxhdGlvbkxvY2tlZEJ5TWUob2xkX2hlYXAsIFNo YXJlVXBkYXRlRXhjbHVzaXZlTG9jaywKKwkJCQkJCQkJICAgZmFsc2UpKTsKKwkvKgorCSAqIFVz ZSBhIHN1ZmZpeCB0byBpbmRpY2F0ZSB0aGF0IHRoZSBDT05DVVJSRU5UTFkgb3B0aW9uIHdhcyB1 c2VkLiBSRVBBQ0sKKwkgKiB3L28gQ09OQ1VSUkVOVExZIHJ1bnMgaW4gYSBzaW5nbGUgdHJhbnNh Y3Rpb24sIHNvIGl0IGRvZXMgbm90IGhhdmUgdG8KKwkgKiBjbGVhbnVwIGFueSByZW1uYW50cyBm cm9tIHRoZSBwcmV2aW91cyBydW4uIFRodXMgaXQnZCBmYWlsIGlmIFJFUEFDSworCSAqIHdpdGgg Q09OQ1VSUkVOVExZIGxlZnQgaXRzIG5ldyBoZWFwIGJlaGluZCAoZHVlIHRvIEVSUk9SKS4KKwkg Ki8KKwluZXdfaGVhcF9vaWQgPSBtYWtlX25ld19oZWFwKG9sZF9oZWFwX29pZCwgdGFibGVzcGFj ZSwgYWNjZXNzX21ldGhvZCwKKwkJCQkJCQkJIHJlbHBlcnNpc3RlbmNlLCBOb0xvY2ssICJfYyIp OworCUFzc2VydChDaGVja1JlbGF0aW9uT2lkTG9ja2VkQnlNZShuZXdfaGVhcF9vaWQsIEFjY2Vz c0V4Y2x1c2l2ZUxvY2ssCisJCQkJCQkJCQkgIGZhbHNlKSk7CisKKwluZXdfaGVhcCA9IHRhYmxl X29wZW4obmV3X2hlYXBfb2lkLCBOb0xvY2spOworCisJLyoKKwkgKiBDcmVhdGUgYSBjb3B5IG9m IHRoZSBhdHRyaWJ1dGUgZGVmYXVsdHMgb24gdGhlIHRlbXAgdGFibGUsIHdoaWNoIHRoZQorCSAq IGV4ZWN1dG9yIG5lZWRzIHdoZW4gcmVwbGF5aW5nIGNvbmN1cnJlbnQgZGF0YSBjaGFuZ2VzLgor CSAqLworCWNvcHlfYXR0cmlidXRlX2RlZmF1bHRzKG9sZF9oZWFwX29pZCwgbmV3X2hlYXBfb2lk KTsKKworCS8qCisJICogQXV4aWxpYXJ5IHRhYmxlIGlzIG5lZWRlZCBmb3IgY2x1c3RlcmluZyBp biB0aGUgQ09OQ1VSUkVOVExZIG1vZGUsIHNlZQorCSAqIGNvbW1lbnRzIGluIENoYW5nZUNvbnRl eHQuIFhYWCBOb24tYnRyZWUgaW5kZXggaXMgcHJvYmFibHkgbm90IHZlcnkKKwkgKiB1c2VmdWwg Zm9yIGNsdXN0ZXJpbmcsIGJ1dCBDTFVTVEVSIGFjY2VwdGVkIGl0LCBzbyB0aGVyZSdzIG5vIHJl YXNvbgorCSAqIGZvciBSRVBBQ0sgdG8gaW50cm9kdWNlIG5ldyByZXN0cmljdGlvbnMuCisJICov CisJbmVlZF9hdXhfcmVsID0gY2x1c3RlcmluZ19pbmRleCAhPSBOVUxMOworCWlmICghbmVlZF9h dXhfcmVsKQorCXsKKwkJLyoKKwkJICogQ3JlYXRlIHRoZSBpZGVudGl0eSBpbmRleC4gV2Ugd2ls bCBuZWVkIGl0IGR1cmluZyBkYXRhIGNvcHlpbmcgc28KKwkJICogdGhhdCB3ZSBjYW4gYXBwbHkg dGhlIGRhdGEgY2hhbmdlcyBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZSAtIHNlZQorCQkgKiBjb21t ZW50cyBhcm91bmQgdGhlIGNhbGwgb2YgcmVwYWNrX3Byb2Nlc3NfY29uY3VycmVudF9jaGFuZ2Vz KCkKKwkJICogd2l0aCBibG9jayByYW5nZSBzcGVjaWZpZWQuCisJCSAqLworCQlpZGVudF9pZHhf bmV3ID0gYnVpbGRfbmV3X2luZGV4KG5ld19oZWFwLCBpZGVudF9pZHgsIGZhbHNlKTsKKwl9CisJ ZWxzZQorCXsKKwkJLyoKKwkJICogQXMgdGhlIGNvbmN1cnJlbnQgZGF0YSBjaGFuZ2VzIHdpbGwg YmUgYXBwbGllZCB0byB0aGUgYXV4aWxpYXJ5CisJCSAqIGhlYXAsIHRoZSBuZXcgaGVhcCBkb2Vz IG5vdCBuZWVkIHRoZSBpZGVudGl0eSBpbmRleCB5ZXQuIFdlJ2xsCisJCSAqIGJ1aWxkIGl0IGFm dGVyIGhhdmluZyBjb3BpZWQgdGhlIGRhdGEgZnJvbSB0aGUgYXV4aWxpYXJ5IGhlYXAuCisJCSAq IChCdWxrIGluc2VydCBzaG91bGQgYmUgbW9yZSBlZmZpY2llbnQuKQorCQkgKi8KKwkJaWRlbnRf aWR4X25ldyA9IEludmFsaWRPaWQ7CisKKwkJLyoKKwkJICogQ3JlYXRlIHRoZSBhdXhpbGlhcnkg dGFibGUgLSBsaWtlIHRoZSBuZXcgaGVhcCBhYm92ZSwgYnV0IG9ubHkKKwkJICogdW5sb2dnZWQg LSBuZWl0aGVyIGNyYXNoIHJlY292ZXJ5IG5vciByZXBsaWNhdGlvbiBpcyBuZWVkZWQuCisJCSAq LworCQlhdXhfb2lkID0gbWFrZV9uZXdfaGVhcChvbGRfaGVhcF9vaWQsIHRhYmxlc3BhY2UsIGFj Y2Vzc19tZXRob2QsCisJCQkJCQkJCVJFTFBFUlNJU1RFTkNFX1VOTE9HR0VELCBOb0xvY2ssICJf YXV4Iik7CisJCUFzc2VydChDaGVja1JlbGF0aW9uT2lkTG9ja2VkQnlNZShhdXhfb2lkLCBBY2Nl c3NFeGNsdXNpdmVMb2NrLAorCQkJCQkJCQkJCSAgZmFsc2UpKTsKKworCQkvKgorCQkgKiBUaGUg c2FtZSBmb3IgaWRlbnRpdHkgaW5kZXguIChUaGUgYWRkaXRpb25hbAorCQkgKiBTaGFyZVVwZGF0 ZUV4Y2x1c2l2ZUxvY2sgb24gaWRlbnRfaWR4IGlzIG5vdCBhIHByb2JsZW0sIGl0J2xsIGJlCisJ CSAqIHJlbGVhc2VkIGF0IHRoZSBlbmQgb2YgdHJhbnNhY3Rpb24uKQorCQkgKi8KKwkJYXV4X3Jl bCA9IHRhYmxlX29wZW4oYXV4X29pZCwgTm9Mb2NrKTsKKwkJYXV4X2lkZW50X2lkeCA9IGJ1aWxk X25ld19pbmRleChhdXhfcmVsLCBpZGVudF9pZHgsIHRydWUpOworCisJCWNsdXN0ZXJpbmdfaW5k ZXhfb2lkID0gUmVsYXRpb25HZXRSZWxpZChjbHVzdGVyaW5nX2luZGV4KTsKKworCQkvKgorCQkg KiBDb3B5IHRoZSBhdHRyaWJ1dGUgZGVmYXVsdHMgYXMgd2UgZGlkIGZvciB0aGUgbmV3IGhlYXAg YWJvdmUgLSB0aGUKKwkJICogY29uY3VycmVudCBjaGFuZ2VzIGFsc28gbmVlZCB0byBiZSBhcHBs aWVkIHRvIHRoZSBhdXhpbGlhcnkgdGFibGUuCisJCSAqLworCQljb3B5X2F0dHJpYnV0ZV9kZWZh dWx0cyhvbGRfaGVhcF9vaWQsIGF1eF9vaWQpOworCX0KKworCS8qCisJICogQ3JlYXRlIGRlcGVu ZGVuY2llcyBvbiB0aGUgb2xkIGhlYXAgLSBpdCBlbnN1cmVzIHRoYXQgZHJvcHBpbmcgdGhlIG9s ZAorCSAqIGhlYXAgYXV0b21hdGljYWxseSBjYXNjYWRlcyB0byB0aGUgbmV3IG9uZXMuCisJICov CisJb2xkX29iai5jbGFzc0lkID0gUmVsYXRpb25SZWxhdGlvbklkOworCW9sZF9vYmoub2JqZWN0 SWQgPSBvbGRfaGVhcF9vaWQ7CisJb2xkX29iai5vYmplY3RTdWJJZCA9IEludmFsaWRPaWQ7CisJ bmV3X29iai5jbGFzc0lkID0gUmVsYXRpb25SZWxhdGlvbklkOworCW5ld19vYmoub2JqZWN0SWQg PSBuZXdfaGVhcF9vaWQ7CisJbmV3X29iai5vYmplY3RTdWJJZCA9IEludmFsaWRPaWQ7CisJcmVj b3JkRGVwZW5kZW5jeU9uKCZuZXdfb2JqLCAmb2xkX29iaiwgREVQRU5ERU5DWV9BVVRPKTsKKwor CWlmIChPaWRJc1ZhbGlkKGF1eF9vaWQpKQorCXsKKwkJbmV3X29iai5vYmplY3RJZCA9IGF1eF9v aWQ7CisJCXJlY29yZERlcGVuZGVuY3lPbigmbmV3X29iaiwgJm9sZF9vYmosIERFUEVOREVOQ1lf QVVUTyk7CisJfQorCisJLyoKKwkgKiBDb21taXQgd2lsbCByZWxlYXNlIHRoZSBsb2Nrcywgc28g bWFrZSBzdXJlIG5vIG9uZSBjYW4gYWx0ZXIgb3IgZHJvcAorCSAqIHRoZSByZWxhdGlvbnMgdW50 aWwgd2UncmUgZG9uZS4KKwkgKi8KKwllbmFibGVfc2Vzc2lvbl9sb2NrcyhvbGRfaGVhcCwgU2hh cmVVcGRhdGVFeGNsdXNpdmVMb2NrLCBmYWxzZSk7CisJLyogTm9Mb2NrIGZvciBzaW1wbGljaXR5 LCBjb21taXQgd2lsbCByZWxlYXNlIHRoZSBleGlzdGluZyBsb2NrIGFueXdheS4gKi8KKwl0YWJs ZV9jbG9zZShvbGRfaGVhcCwgTm9Mb2NrKTsKKworCS8qIExpa2V3aXNlLCBhY3F1aXJlIHNlc3Np b24gbG9jayBmb3IgdGhlIG5ldyBoZWFwLiAqLworCWVuYWJsZV9zZXNzaW9uX2xvY2tzKG5ld19o ZWFwLCBBY2Nlc3NFeGNsdXNpdmVMb2NrLCB0cnVlKTsKKwl0YWJsZV9jbG9zZShuZXdfaGVhcCwg Tm9Mb2NrKTsKKworCS8qCisJICogVGhlIHNhbWUgZm9yIHRoZSBhdXhpbGlhcnkgcmVsYXRpb24g YW5kIGNsdXN0ZXJpbmcgaW5kZXggaWYgb3JkZXJpbmcgaXMKKwkgKiByZXF1aXJlZC4KKwkgKi8K KwlpZiAobmVlZF9hdXhfcmVsKQorCXsKKwkJZW5hYmxlX3Nlc3Npb25fbG9ja3MoYXV4X3JlbCwg QWNjZXNzRXhjbHVzaXZlTG9jaywgdHJ1ZSk7CisJCXRhYmxlX2Nsb3NlKGF1eF9yZWwsIE5vTG9j ayk7CisKKwkJLyogaXNfbmV3IGRvZXMgbm90IG1hdHRlciBmb3IgaW5kZXguICovCisJCWVuYWJs ZV9zZXNzaW9uX2xvY2tzKGNsdXN0ZXJpbmdfaW5kZXgsIFNoYXJlVXBkYXRlRXhjbHVzaXZlTG9j aywKKwkJCQkJCQkgZmFsc2UpOworCQlpbmRleF9jbG9zZShjbHVzdGVyaW5nX2luZGV4LCBOb0xv Y2spOworCX0KKworCS8qCisJICogRXZlbiBpZiB0aGUgY2x1c3RlcmluZyBpbmRleCBpcyBub3Qg YXBwcm9wcmlhdGUgZm9yIHNvcnRpbmcsIHdlIG91Z2h0CisJICogdG8gY2xvc2UgaXQgYmVmb3Jl IGNvbW1pdHRpbmcgdGhlIHRyYW5zYWN0aW9uLgorCSAqLworCWVsc2UgaWYgKGNsdXN0ZXJpbmdf aW5kZXgpCisJCWluZGV4X2Nsb3NlKGNsdXN0ZXJpbmdfaW5kZXgsIE5vTG9jayk7CisKKwkvKgor CSAqIENvbW1pdCB0aGUgY3VycmVudCB0cmFuc2FjdGlvbiBhbmQgc3RhcnQgYSBuZXcgb25lLgor CSAqLworCWRpc2FibGVfaW5kZXhfYnVpbGRfc2VjdXJpdHkoaWJzZWMpOworCVBvcEFjdGl2ZVNu YXBzaG90KCk7CisJQ29tbWl0VHJhbnNhY3Rpb25Db21tYW5kKCk7CisJU3RhcnRUcmFuc2FjdGlv bkNvbW1hbmQoKTsKKwlQdXNoQWN0aXZlU25hcHNob3QoR2V0VHJhbnNhY3Rpb25TbmFwc2hvdCgp KTsKKwllbmFibGVfaW5kZXhfYnVpbGRfc2VjdXJpdHkoaWJzZWMtPnVzZXJpZCwgaWJzZWMpOwor CisJLyoKKwkgKiBPcGVuIHRoZSBoZWFwcyBpbiB0aGUgbmV3IHRyYW5zYWN0aW9uIGFuZCBkaXNh YmxlIHRoZSBzZXNzaW9uIGxvY2tzLgorCSAqLworCW9sZF9oZWFwID0gdGFibGVfb3BlbihvbGRf aGVhcF9vaWQsIE5vTG9jayk7CisJZGlzYWJsZV9zZXNzaW9uX2xvY2tzKG9sZF9oZWFwLCBTaGFy ZVVwZGF0ZUV4Y2x1c2l2ZUxvY2ssIGZhbHNlKTsKKwluZXdfaGVhcCA9IHRhYmxlX29wZW4obmV3 X2hlYXBfb2lkLCBOb0xvY2spOworCWRpc2FibGVfc2Vzc2lvbl9sb2NrcyhuZXdfaGVhcCwgQWNj ZXNzRXhjbHVzaXZlTG9jaywgdHJ1ZSk7CisKKwkvKgorCSAqIGNvcHlfdGFibGVfZGF0YSgpIGV4 cGVjdHMgdGhlIG9sZCBoZWFwJ3MgVE9BU1QgcmVsYXRpb24gdG8gYmUgbG9ja2VkLgorCSAqLwor CWlmIChPaWRJc1ZhbGlkKG9sZF9oZWFwLT5yZF9yZWwtPnJlbHRvYXN0cmVsaWQpKQorCQlMb2Nr UmVsYXRpb25PaWQob2xkX2hlYXAtPnJkX3JlbC0+cmVsdG9hc3RyZWxpZCwKKwkJCQkJCVNoYXJl VXBkYXRlRXhjbHVzaXZlTG9jayk7CisKKwkvKgorCSAqIEFsbG9jYXRlIGFuZCBpbml0aWFsaXpl IG1lbW9yeSBmb3IgdGhlIG91dHB1dCBpbmZvcm1hdGlvbi4gV2Ugc2hvdWxkbid0CisJICogaGF2 ZSBkb25lIGl0IGluIHRoZSBtZW1vcnkgY29udGV4dCBvZiB0aGUgcHJldmlvdXMgdHJhbnNhY3Rp b24uCisJICovCisJY2hnY3h0ID0gcGFsbG9jMF9vYmplY3QoQ2hhbmdlQ29udGV4dCk7CisJaW5p dGlhbGl6ZV9jaGFuZ2VfY29udGV4dChjaGdjeHQsIG9sZF9oZWFwLCBuZXdfaGVhcCwgaWRlbnRf aWR4X25ldyk7CisJY2hnY3h0LT5jY19pbmRfYnVpbGRfc2VjID0gKmlic2VjOworCWlmIChuZWVk X2F1eF9yZWwpCisJeworCQkvKgorCQkgKiBNYWtlIHRoZSBhdXhpbGlhcnkgcmVsYXRpb24gcmVh ZHkgZm9yIHVzZS4KKwkJICovCisJCWNoZ2N4dC0+Y2NfZGVzdF9hdXggPSBwYWxsb2MwX29iamVj dChSZXBhY2tEZXN0KTsKKwkJYXV4X3JlbCA9IHRhYmxlX29wZW4oYXV4X29pZCwgTm9Mb2NrKTsK KwkJZGlzYWJsZV9zZXNzaW9uX2xvY2tzKGF1eF9yZWwsIEFjY2Vzc0V4Y2x1c2l2ZUxvY2ssIHRy dWUpOworCQlpbml0aWFsaXplX2NoYW5nZV9kZXN0KGNoZ2N4dC0+Y2NfZGVzdF9hdXgsIGF1eF9y ZWwsCisJCQkJCQkJICAgYXV4X2lkZW50X2lkeCk7CisKKwkJLyoKKwkJICogU2V0IE9JRCBvZiB0 aGUgb2xkIHJlbGF0aW9uJ3MgY2x1c3RlcmluZyBpbmRleCBpZiBpdCdzIGRpZmZlcmVudAorCQkg KiBmcm9tIHRoZSBpZGVudGl0eSBpbmRleC4gT3RoZXJ3aXNlIHNldCBJbnZhbGlkT2lkIHRvIGlu ZGljYXRlIHRoYXQKKwkJICogdGhlIGlkZW50aXR5IGluZGV4IHNob3VsZCBiZSB1c2VkIGZvciBj bHVzdGVyaW5nLgorCQkgKi8KKwkJaWYgKGNsdXN0ZXJpbmdfaW5kZXhfb2lkICE9IGlkZW50X2lk eCkKKwkJCWNoZ2N4dC0+Y2NfY2x1c3RlcmluZ19pbmRleCA9IGNsdXN0ZXJpbmdfaW5kZXhfb2lk OworCQllbHNlCisJCQljaGdjeHQtPmNjX2NsdXN0ZXJpbmdfaW5kZXggPSBJbnZhbGlkT2lkOwor CisJCS8qIFJlLW9wZW4gdGhlIGNsdXN0ZXJpbmcgaW5kZXguICovCisJCWNsdXN0ZXJpbmdfaW5k ZXggPSBpbmRleF9vcGVuKGNsdXN0ZXJpbmdfaW5kZXhfb2lkLCBOb0xvY2spOworCQkvKiBpc19u ZXcgZG9lcyBub3QgbWF0dGVyIGZvciBpbmRleC4gKi8KKwkJZGlzYWJsZV9zZXNzaW9uX2xvY2tz KGNsdXN0ZXJpbmdfaW5kZXgsIFNoYXJlVXBkYXRlRXhjbHVzaXZlTG9jaywKKwkJCQkJCQkgIGZh bHNlKTsKKwl9CisJZWxzZQorCQljbHVzdGVyaW5nX2luZGV4ID0gTlVMTDsKKworCSpwX29sZF9o ZWFwID0gb2xkX2hlYXA7CisJKnBfY2x1c3RlcmluZ19pbmRleCA9IGNsdXN0ZXJpbmdfaW5kZXg7 CisKKwlyZXR1cm4gY2hnY3h0OworfQorCisvKgorICogQ2hlY2sgaWYgbmV3IGhlYXAsIGFuZCBw b3NzaWJseSBhbHNvIGFuIGF1eGlsaWFyeSBoZWFwLCBhbHJlYWR5IGV4aXN0cyBmb3IKKyAqIGdp dmVuIG9sZCBoZWFwIC0gdHlwaWNhbGx5IGR1ZSB0byBmYWlsZWQgUkVQQUNLIChDT05DVVJSRU5U TFkpLiBSZXR1cm4gT0lEcworICogb2YgaW4gYSBsaXN0IG9yIE5JTCBpZiB0aGVyZSBpcyBub25l LgorICovCitzdGF0aWMgTGlzdCAqCitmaW5kX25ld19oZWFwcyhPaWQgcmVsaWRfb2xkKQorewor CVJlbGF0aW9uCWRlcFJlbDsKKwlTY2FuS2V5RGF0YSBrZXlbM107CisJU3lzU2NhbkRlc2Mgc2Nh bjsKKwlIZWFwVHVwbGUJdHVwOworCUxpc3QJICAgKnJlc3VsdCA9IE5JTDsKKworCVNjYW5LZXlJ bml0KCZrZXlbMF0sCisJCQkJQW51bV9wZ19kZXBlbmRfcmVmY2xhc3NpZCwKKwkJCQlCVEVxdWFs U3RyYXRlZ3lOdW1iZXIsIEZfT0lERVEsCisJCQkJUmVsYXRpb25SZWxhdGlvbklkKTsKKwlTY2Fu S2V5SW5pdCgma2V5WzFdLAorCQkJCUFudW1fcGdfZGVwZW5kX3JlZm9iamlkLAorCQkJCUJURXF1 YWxTdHJhdGVneU51bWJlciwgRl9PSURFUSwKKwkJCQlPYmplY3RJZEdldERhdHVtKHJlbGlkX29s ZCkpOworCVNjYW5LZXlJbml0KCZrZXlbMl0sCisJCQkJQW51bV9wZ19kZXBlbmRfcmVmb2Jqc3Vi aWQsCisJCQkJQlRFcXVhbFN0cmF0ZWd5TnVtYmVyLCBGX09JREVRLAorCQkJCU9iamVjdElkR2V0 RGF0dW0oSW52YWxpZE9pZCkpOworCisJZGVwUmVsID0gdGFibGVfb3BlbihEZXBlbmRSZWxhdGlv bklkLCBBY2Nlc3NTaGFyZUxvY2spOworCXNjYW4gPSBzeXN0YWJsZV9iZWdpbnNjYW4oZGVwUmVs LCBEZXBlbmRSZWZlcmVuY2VJbmRleElkLCB0cnVlLAorCQkJCQkJCSAgTlVMTCwgMywga2V5KTsK Kwl3aGlsZSAoSGVhcFR1cGxlSXNWYWxpZCh0dXAgPSBzeXN0YWJsZV9nZXRuZXh0KHNjYW4pKSkK Kwl7CisJCUZvcm1fcGdfZGVwZW5kIGRlcGZvcm07CisKKwkJLyoKKwkJICogVGhlcmUgc2hvdWxk IGJlIEFVVE8gZGVwZW5kZW5jeSBmcm9tIGFub3RoZXIgdGFibGUsIHdoaWNoIGlzIHRoZQorCQkg KiBuZXcgb3IgdGhlIGF1eGlsaWFyeSBvbmUuIElmIHdlIGZvdW5kIGFueSBvdGhlciwganVzdCBp Z25vcmUgdGhlbS4KKwkJICovCisJCWRlcGZvcm0gPSAoRm9ybV9wZ19kZXBlbmQpIEdFVFNUUlVD VCh0dXApOworCQlpZiAoZGVwZm9ybS0+Y2xhc3NpZCA9PSBSZWxhdGlvblJlbGF0aW9uSWQgJiYK KwkJCWRlcGZvcm0tPmRlcHR5cGUgPT0gREVQRU5ERU5DWV9BVVRPKQorCQl7CisJCQlSZWxhdGlv bglyZWw7CisJCQlGb3JtX3BnX2NsYXNzIGNsYXNzRm9ybTsKKwkJCU9pZAkJCW1hdGNoZWQgPSBJ bnZhbGlkT2lkOworCisJCQlyZWwgPSByZWxhdGlvbl9vcGVuKGRlcGZvcm0tPm9iamlkLCBBY2Nl c3NTaGFyZUxvY2spOworCisJCQkvKgorCQkJICogVGhlIG5ldyByZWxhdGlvbidzIHJlbHJld3Jp dGUgc2hvdWxkIHBvaW50IHRvIHRoZSBvbGQgcmVsYXRpb24uCisJCQkgKi8KKwkJCWNsYXNzRm9y bSA9IHJlbC0+cmRfcmVsOworCQkJaWYgKGNsYXNzRm9ybS0+cmVscmV3cml0ZSA9PSByZWxpZF9v bGQpCisJCQkJbWF0Y2hlZCA9IGRlcGZvcm0tPm9iamlkOworCQkJdGFibGVfY2xvc2UocmVsLCBB Y2Nlc3NTaGFyZUxvY2spOworCisJCQlpZiAoT2lkSXNWYWxpZChtYXRjaGVkKSkKKwkJCQlyZXN1 bHQgPSBsYXBwZW5kX29pZChyZXN1bHQsIG1hdGNoZWQpOworCQl9CisJfQorCXN5c3RhYmxlX2Vu ZHNjYW4oc2Nhbik7CisJdGFibGVfY2xvc2UoZGVwUmVsLCBBY2Nlc3NTaGFyZUxvY2spOworCisJ cmV0dXJuIHJlc3VsdDsKK30KKwogLyoKICAqIENyZWF0ZSB0aGUgdHJhbnNpZW50IHRhYmxlIHRo YXQgd2lsbCBiZSBmaWxsZWQgd2l0aCBuZXcgZGF0YSBkdXJpbmcKICAqIENMVVNURVIsIEFMVEVS IFRBQkxFLCBhbmQgc2ltaWxhciBvcGVyYXRpb25zLiAgVGhlIHRyYW5zaWVudCB0YWJsZQpAQCAt MTMyNyw3ICsxNjYzLDcgQEAgcmVidWlsZF9yZWxhdGlvbihSZWxhdGlvbiBPbGRIZWFwLCBSZWxh dGlvbiBpbmRleCwgYm9vbCB2ZXJib3NlLAogICovCiBPaWQKIG1ha2VfbmV3X2hlYXAoT2lkIE9J RE9sZEhlYXAsIE9pZCBOZXdUYWJsZVNwYWNlLCBPaWQgTmV3QWNjZXNzTWV0aG9kLAotCQkJICBj aGFyIHJlbHBlcnNpc3RlbmNlLCBMT0NLTU9ERSBsb2NrbW9kZSkKKwkJCSAgY2hhciByZWxwZXJz aXN0ZW5jZSwgTE9DS01PREUgbG9ja21vZGUsIGNvbnN0IGNoYXIgKnN1ZmZpeCkKIHsKIAlUdXBs ZURlc2MJT2xkSGVhcERlc2M7CiAJY2hhcgkJTmV3SGVhcE5hbWVbTkFNRURBVEFMRU5dOwpAQCAt MTM3Nyw3ICsxNzEzLDggQEAgbWFrZV9uZXdfaGVhcChPaWQgT0lET2xkSGVhcCwgT2lkIE5ld1Rh YmxlU3BhY2UsIE9pZCBOZXdBY2Nlc3NNZXRob2QsCiAJICogbWFwcGVkLiAgVGhpcyBzaW1wbGlm aWVzIHN3YXBfcmVsYXRpb25fZmlsZXMsIGFuZCBpcyBhYnNvbHV0ZWx5CiAJICogbmVjZXNzYXJ5 IGZvciByZWJ1aWxkaW5nIHBnX2NsYXNzLCBmb3IgcmVhc29ucyBleHBsYWluZWQgdGhlcmUuCiAJ ICovCi0Jc25wcmludGYoTmV3SGVhcE5hbWUsIHNpemVvZihOZXdIZWFwTmFtZSksICJwZ190ZW1w XyV1IiwgT0lET2xkSGVhcCk7CisJc25wcmludGYoTmV3SGVhcE5hbWUsIHNpemVvZihOZXdIZWFw TmFtZSksICJwZ190ZW1wXyV1JXMiLCBPSURPbGRIZWFwLAorCQkJIHN1ZmZpeCA/IHN1ZmZpeCA6 ICIiKTsKIAogCU9JRE5ld0hlYXAgPSBoZWFwX2NyZWF0ZV93aXRoX2NhdGFsb2coTmV3SGVhcE5h bWUsCiAJCQkJCQkJCQkJICBuYW1lc3BhY2VpZCwKQEAgLTI3ODEsMzEgKzMxMTgsNiBAQCBwcm9j ZXNzX3NpbmdsZV9yZWxhdGlvbihSZXBhY2tTdG10ICpzdG10LCBMT0NLTU9ERSBsb2NrbW9kZSwg Ym9vbCBpc1RvcExldmVsLAogCUFzc2VydChzdG10LT5jb21tYW5kID09IFJFUEFDS19DT01NQU5E X0NMVVNURVIgfHwKIAkJICAgc3RtdC0+Y29tbWFuZCA9PSBSRVBBQ0tfQ09NTUFORF9SRVBBQ0sp OwogCi0JaWYgKHBhcmFtcy0+b3B0aW9ucyAmIENMVU9QVF9DT05DVVJSRU5UKQotCXsKLQkJLyoK LQkJICogU2luY2UgUkVQQUNLIChDT05DVVJSRU5UTFkpIHBvcHMgdGhlIGFjdGl2ZSBzbmFwc2hv dCBkdXJpbmcgdGhlCi0JCSAqIHByb2Nlc3NpbmcgKGl0IGNyZWF0ZXMgYW5kIHB1c2hlcyBzbmFw c2hvdHMgb24gaXRzIG93biksIGFuZCBzaW5jZQotCQkgKiB0aGF0IHNuYXBzaG90IGNhbiBiZSBy ZWZlcmVuY2VkIGJ5IHRoZSBjdXJyZW50IHBvcnRhbCwgd2UgbmVlZCB0bwotCQkgKiBtYWtlIHN1 cmUgdGhhdCB0aGUgcG9ydGFsIGhhcyBubyBkYW5nbGluZyBwb2ludGVyIHRvIHRoZSBzbmFwc2hv dC4KLQkJICogU3RhcnRpbmcgYSBuZXcgdHJhbnNhY3Rpb24gc2VlbXMgdG8gYmUgdGhlIHNpbXBs ZXN0IHdheS4KLQkJICoKLQkJICogWFhYIFRoZSBmb2xsb3dpbmcgcGF0Y2hlcyBpbiB0aGUgc2Vy aWVzIG1ha2UgdGhpcyB1bm5lY2Vzc2FyeSwgYXMKLQkJICogdGhleSBzdGFydCBuZXcgdHJhbnNh Y3Rpb25zIGZvciBvdGhlciByZWFzb25zIGVsc2V3aGVyZS4KLQkJICovCi0JCVBvcEFjdGl2ZVNu YXBzaG90KCk7Ci0JCUNvbW1pdFRyYW5zYWN0aW9uQ29tbWFuZCgpOwotCi0JCS8qIFN0YXJ0IGEg bmV3IHRyYW5zYWN0aW9uLiAqLwotCQlTdGFydFRyYW5zYWN0aW9uQ29tbWFuZCgpOwotCi0JCS8q Ci0JCSAqIEZ1bmN0aW9ucyBpbiBpbmRleGVzIG1heSB3YW50IGEgc25hcHNob3Qgc2V0LiBOb3Rl IHRoYXQgdGhlIHBvcnRhbAotCQkgKiBpcyBub3QgYXdhcmUgb2YgdGhpcyBvbmUsIHNvIHRoZSBj YWxsZXIgbmVlZHMgdG8gcG9wIGl0IGV4cGxpY2l0bHkuCi0JCSAqLwotCQlQdXNoQWN0aXZlU25h cHNob3QoR2V0VHJhbnNhY3Rpb25TbmFwc2hvdCgpKTsKLQl9Ci0KIAkvKgogCSAqIE1ha2Ugc3Vy ZSBBTkFMWVpFIGlzIHNwZWNpZmllZCBpZiBhIGNvbHVtbiBsaXN0IGlzIHByZXNlbnQuCiAJICov CkBAIC0zNzQyLDYgKzQwNTQsMTkzIEBAIHJlbGVhc2VfY2hhbmdlX2Rlc3QoUmVwYWNrRGVzdCAq ZGVzdCkKIAlwZnJlZShkZXN0LT5pZGVudF9rZXkpOwogfQogCisvKgorICogQ29weSBpbmZvcm1h dGlvbiBuZWVkZWQgdG8gcmUtaW5pdGlhbGl6ZSAnY2hnY3h0JyB0byAnYmFja3VwJy4KKyAqLwor c3RhdGljIHZvaWQKK2JhY2t1cF9jaGFuZ2VfY29udGV4dChDaGFuZ2VDb250ZXh0ICpjaGdjeHQs IFJlbGF0aW9uICpwX29sZCwKKwkJCQkJICBDaGFuZ2VDb250ZXh0QmFja3VwICpiYWNrdXApCit7 CisJUmVwYWNrRGVzdCAqZGVzdDsKKworCW1lbXNldChiYWNrdXAsIDAsIHNpemVvZihDaGFuZ2VD b250ZXh0QmFja3VwKSk7CisKKwkvKiBTdG9yZSBpbmZvcm1hdGlvbiBhYm91dCB0aGUgbmV3IHJl bGF0aW9uLiAqLworCWRlc3QgPSAmY2hnY3h0LT5jY19kZXN0OworCWJhY2t1cC0+cmVsID0gZGVz dC0+cmVsOworCXByZXBhcmVfcmVsYXRpb25fZm9yX3Jlb3BlbmluZygmYmFja3VwLT5yZWwsICZi YWNrdXAtPnJlbF9yaSwgdHJ1ZSk7CisJYmFja3VwLT5pZGVudF9pbmRleCA9IGRlc3QtPmlkZW50 X2luZGV4ID8KKwkJUmVsYXRpb25HZXRSZWxpZChkZXN0LT5pZGVudF9pbmRleCkgOiBJbnZhbGlk T2lkOworCisJLyogTGlrZXdpc2UsIHRoZSBvbGQgcmVsYXRpb24uICovCisJYmFja3VwLT5yZWxf b2xkID0gKnBfb2xkOworCXByZXBhcmVfcmVsYXRpb25fZm9yX3Jlb3BlbmluZygmYmFja3VwLT5y ZWxfb2xkLCAmYmFja3VwLT5yZWxfcmlfb2xkLAorCQkJCQkJCQkgICBmYWxzZSk7CisKKwkvKiBT dG9yZSBpbmZvcm1hdGlvbiBvbiB0aGUgYXV4aWxpYXJ5IHJlbGF0aW9uIGlmIG9uZSBleGlzdHMu ICovCisJaWYgKGNoZ2N4dC0+Y2NfZGVzdF9hdXgpCisJeworCQlkZXN0ID0gY2hnY3h0LT5jY19k ZXN0X2F1eDsKKwkJYmFja3VwLT5yZWxfYXV4ID0gZGVzdC0+cmVsOworCQlwcmVwYXJlX3JlbGF0 aW9uX2Zvcl9yZW9wZW5pbmcoJmJhY2t1cC0+cmVsX2F1eCwgJmJhY2t1cC0+cmVsX2F1eF9yaSwK KwkJCQkJCQkJCSAgIHRydWUpOworCQliYWNrdXAtPmlkZW50X2luZGV4X2F1eCA9IGRlc3QtPmlk ZW50X2luZGV4ID8KKwkJCVJlbGF0aW9uR2V0UmVsaWQoZGVzdC0+aWRlbnRfaW5kZXgpIDogSW52 YWxpZE9pZDsKKwl9CisJZWxzZQorCXsKKwkJLyogVGhlcmUgc2hvdWxkIGJlIG5vIHJlb3Blbmlu Zy4gKi8KKwkJQXNzZXJ0KGJhY2t1cC0+cmVsX2F1eF9yaS5yZWxpZCA9PSBJbnZhbGlkT2lkKTsK Kwl9CisKKwkvKiBCYWNrdXAgdGhlIGNvbW1vbiBmaWVsZHMuICovCisJYmFja3VwLT5maWxlX3Nl cV9zbmFwc2hvdCA9IGNoZ2N4dC0+Y2NfZmlsZV9zZXFfc25hcHNob3Q7CisJYmFja3VwLT5maWxl X3NlcV9jaGFuZ2VzID0gY2hnY3h0LT5jY19maWxlX3NlcV9jaGFuZ2VzOworCWJhY2t1cC0+Y2x1 c3RlcmluZ19pbmRleCA9IGNoZ2N4dC0+Y2NfY2x1c3RlcmluZ19pbmRleDsKK30KKworLyoKKyAq IENyZWF0ZSBhbmQgaW5pdGlhbGl6ZSBhbiBpbnN0YW5jZSBvZiBDaGFuZ2VDb250ZXh0LCBiYXNl ZCBvbiBwcmV2aW91c2x5CisgKiBleGlzdGluZyBpbnN0YW5jZS4gSXQgaW5jbHVkZXMgcmUtb3Bl bmluZyBvZiByZWxhdGlvbnMgYW5kIGluZGV4ZXMuCisgKi8KK3N0YXRpYyBDaGFuZ2VDb250ZXh0 ICoKK3JlaW5pdGlhbGl6ZV9jaGFuZ2VfY29udGV4dChDaGFuZ2VDb250ZXh0QmFja3VwICpiYWNr dXApCit7CisJQ2hhbmdlQ29udGV4dCAqY2hnY3h0OworCVJlbFJlb3BlbkluZm8gKnJyaTsKKwlP aWQJCW9sZF90b2FzdGlkOworCisJY2hnY3h0ID0gcGFsbG9jMF9vYmplY3QoQ2hhbmdlQ29udGV4 dCk7CisKKwkvKiBSZS1vcGVuIHRoZSBvbGQgYW5kIG5ldyByZWxhdGlvbi4gKi8KKwlyZW9wZW5f cmVsYXRpb24oJmJhY2t1cC0+cmVsX3JpX29sZCk7CisJcmVvcGVuX3JlbGF0aW9uKCZiYWNrdXAt PnJlbF9yaSk7CisKKwkvKgorCSAqIGNvcHlfdGFibGVfZGF0YSgpIGV4cGVjdHMgdGhlIG9sZCBo ZWFwJ3MgVE9BU1QgcmVsYXRpb24gdG8gYmUgbG9ja2VkLgorCSAqLworCW9sZF90b2FzdGlkID0g YmFja3VwLT5yZWxfb2xkLT5yZF9yZWwtPnJlbHRvYXN0cmVsaWQ7CisJaWYgKE9pZElzVmFsaWQo b2xkX3RvYXN0aWQpKQorCQlMb2NrUmVsYXRpb25PaWQob2xkX3RvYXN0aWQsIFNoYXJlVXBkYXRl RXhjbHVzaXZlTG9jayk7CisKKwkvKiBJbml0aWFsaXplIHRoZSBjb250ZXh0LiAqLworCWluaXRp YWxpemVfY2hhbmdlX2NvbnRleHQoY2hnY3h0LCBiYWNrdXAtPnJlbF9vbGQsIGJhY2t1cC0+cmVs LAorCQkJCQkJCSAgYmFja3VwLT5pZGVudF9pbmRleCk7CisKKwkvKiBUaGUgc2FtZSBmb3IgdGhl IGF1eGlsaWFyeSByZWxhdGlvbiwgaWYgaXQgZXhpc3RzLiAqLworCXJyaSA9ICZiYWNrdXAtPnJl bF9hdXhfcmk7CisJaWYgKE9pZElzVmFsaWQocnJpLT5yZWxpZCkpCisJeworCQlyZW9wZW5fcmVs YXRpb24ocnJpKTsKKwkJY2hnY3h0LT5jY19kZXN0X2F1eCA9IHBhbGxvYzBfb2JqZWN0KFJlcGFj a0Rlc3QpOworCQlpbml0aWFsaXplX2NoYW5nZV9kZXN0KGNoZ2N4dC0+Y2NfZGVzdF9hdXgsIGJh Y2t1cC0+cmVsX2F1eCwKKwkJCQkJCQkgICBiYWNrdXAtPmlkZW50X2luZGV4X2F1eCk7CisJfQor CisJLyogUmVzdG9yZSB0aGUgY29tbW9uIGZpZWxkcy4gKi8KKwljaGdjeHQtPmNjX2ZpbGVfc2Vx X3NuYXBzaG90ID0gYmFja3VwLT5maWxlX3NlcV9zbmFwc2hvdDsKKwljaGdjeHQtPmNjX2ZpbGVf c2VxX2NoYW5nZXMgPSBiYWNrdXAtPmZpbGVfc2VxX2NoYW5nZXM7CisJY2hnY3h0LT5jY19jbHVz dGVyaW5nX2luZGV4ID0gYmFja3VwLT5jbHVzdGVyaW5nX2luZGV4OworCisJcmV0dXJuIGNoZ2N4 dDsKK30KKworLyoKKyAqIExvY2sgdGhlIHJlbGF0aW9uIGFuZCBpdHMgVE9BU1QgcmVsYXRpb24g dXNpbmcgYSBzZXNzaW9uIGxvY2suCisgKi8KK3N0YXRpYyB2b2lkCitlbmFibGVfc2Vzc2lvbl9s b2NrcyhSZWxhdGlvbiByZWwsIExPQ0tNT0RFIGxtb2RlLCBib29sIGlzX25ldykKK3sKKwlMb2Nr UmVsSWQJbG9jazsKKwlPaWQJCQl0b2FzdGlkOworCisJQXNzZXJ0KENoZWNrUmVsYXRpb25Mb2Nr ZWRCeU1lKHJlbCwgbG1vZGUsIGZhbHNlKSk7CisJbG9jayA9IHJlbC0+cmRfbG9ja0luZm8ubG9j a1JlbElkOworCUxvY2tSZWxhdGlvbklkRm9yU2Vzc2lvbigmbG9jaywgbG1vZGUpOworCisJLyoK KwkgKiBUaGUgc2FtZSBmb3IgVE9BU1QgcmVsYXRpb24uIFhYWCBJcyBpdCBvayB0aGF0IHdlIGRv IG5vdCBsb2NrIFRPQVNUCisJICogcmVsYXRpb24gb2YgdGhlIG9sZCByZWxhdGlvbiB1bnRpbCB3 ZSBzdGFydCBzd2FwcGluZyB0aGUgZmlsZXM/IChUaGUKKwkgKiBuZXcgcmVsYXRpb24ncyBUT0FT VCBpcyBsb2NrZWQgb24gY3JlYXRpb24sIHNvIHdlIGtlZXAgaXQgdGhhdCB3YXkuKQorCSAqLwor CXRvYXN0aWQgPSByZWwtPnJkX3JlbC0+cmVsdG9hc3RyZWxpZDsKKwlpZiAoaXNfbmV3ICYmIE9p ZElzVmFsaWQodG9hc3RpZCkpCisJeworCQlBc3NlcnQoQ2hlY2tSZWxhdGlvbk9pZExvY2tlZEJ5 TWUodG9hc3RpZCwgbG1vZGUsIGZhbHNlKSk7CisJCWxvY2sucmVsSWQgPSB0b2FzdGlkOworCQlM b2NrUmVsYXRpb25JZEZvclNlc3Npb24oJmxvY2ssIGxtb2RlKTsKKwl9Cit9CisKKy8qCisgKiBE aXNhYmxlIHNlc3Npb24gbG9ja3MgYWNxdWlyZWQgZWFybGllciBieSBlbmFibGVfc2Vzc2lvbl9s b2NrcygpLCBidXQgZmlyc3QKKyAqIGFjcXVpcmUgbm9ybWFsICh0cmFuc2FjdGlvbmFsKSBsb2Nr KHMpLgorICovCitzdGF0aWMgdm9pZAorZGlzYWJsZV9zZXNzaW9uX2xvY2tzKFJlbGF0aW9uIHJl bCwgTE9DS01PREUgbG1vZGUsIGJvb2wgaXNfbmV3KQoreworCUxvY2tSZWxJZAlsb2NrOworCU9p ZAkJCXRvYXN0aWQ7CisKKwlMb2NrUmVsYXRpb24ocmVsLCBsbW9kZSk7CisJbG9jayA9IHJlbC0+ cmRfbG9ja0luZm8ubG9ja1JlbElkOworCVVubG9ja1JlbGF0aW9uSWRGb3JTZXNzaW9uKCZsb2Nr LCBsbW9kZSk7CisJQXNzZXJ0KENoZWNrUmVsYXRpb25Mb2NrZWRCeU1lKHJlbCwgbG1vZGUsIGZh bHNlKSk7CisKKwkvKiBUaGUgc2FtZSBmb3IgVE9BU1QgcmVsYXRpb24uIFNlZSBlbmFibGVfc2Vz c2lvbl9sb2NrcygpLiAqLworCXRvYXN0aWQgPSByZWwtPnJkX3JlbC0+cmVsdG9hc3RyZWxpZDsK KwlpZiAoaXNfbmV3ICYmIE9pZElzVmFsaWQodG9hc3RpZCkpCisJeworCQlsb2NrLnJlbElkID0g dG9hc3RpZDsKKwkJTG9ja1JlbGF0aW9uSWQoJmxvY2ssIGxtb2RlKTsKKwkJVW5sb2NrUmVsYXRp b25JZEZvclNlc3Npb24oJmxvY2ssIGxtb2RlKTsKKwkJQXNzZXJ0KENoZWNrUmVsYXRpb25PaWRM b2NrZWRCeU1lKHRvYXN0aWQsIGxtb2RlLCBmYWxzZSkpOworCX0KK30KKworLyoKKyAqIFJlbWVt YmVyIE9JRCBvZiBhIHJlbGF0aW9uLCBsb2NrIGl0IHVzaW5nIGEgc2Vzc2lvbiBsb2NrIGFuZCBj bG9zZSBpdC4gYW5kIGEKKyAqCisgKiBUaGUgbG9jayBtb2RlIGlzIGFsd2F5cyBTaGFyZVVwZGF0 ZUV4Y2x1c2l2ZUxvY2ssIGFzIHRoaXMgaXMgcmVsYXRlZCB0bworICogUkVQQUNLIChDT05DVVJS RU5UTFkpLgorICovCitzdGF0aWMgdm9pZAorcHJlcGFyZV9yZWxhdGlvbl9mb3JfcmVvcGVuaW5n KFJlbGF0aW9uICpwX3JlbCwgUmVsUmVvcGVuSW5mbyAqYmFja3VwLAorCQkJCQkJCSAgIGJvb2wg aXNfbmV3KQoreworCVJlbGF0aW9uCXJlbCA9ICpwX3JlbDsKKwlMT0NLTU9ERQlsbW9kZTsKKwor CWxtb2RlID0gaXNfbmV3ID8gQWNjZXNzRXhjbHVzaXZlTG9jayA6IFNoYXJlVXBkYXRlRXhjbHVz aXZlTG9jazsKKworCS8qIFJlbWVtYmVyIHdoYXQgd2UgbmVlZCB0byBiZSBhYmxlIHRvIHJlLW9w ZW4gdGhlIHJlbGF0aW9uIGxhdGVyLiAqLworCWJhY2t1cC0+cmVsaWQgPSBSZWxhdGlvbkdldFJl bGlkKHJlbCk7CisJYmFja3VwLT5wX3JlbCA9IHBfcmVsOworCWJhY2t1cC0+aXNfbmV3ID0gaXNf bmV3OworCisJLyoKKwkgKiBDbG9zZSBpdCwgYnV0IG1ha2Ugc3VyZSB0aGUgbG9jayBpcyBub3Qg bG9zdCBhdCB0cmFuc2FjdGlvbiBib3VuZGFyeS4KKwkgKi8KKwllbmFibGVfc2Vzc2lvbl9sb2Nr cyhyZWwsIGxtb2RlLCBpc19uZXcpOworCXJlbGF0aW9uX2Nsb3NlKHJlbCwgTm9Mb2NrKTsKK30K KworLyoKKyAqIE9wZW4gdGhlIHJlbGF0aW9uLCBhY3F1aXJlIHRyYW5zYWN0aW9uYWwgbG9jayBv biBpdCBhbmQgcmVsZWFzZSB0aGUgc2Vzc2lvbgorICogbG9jayBhY3F1aXJlZCBieSBwcmVwYXJl X3JlbGF0aW9uX2Zvcl9yZW9wZW5pbmcoKS4KKyAqLworc3RhdGljIHZvaWQKK3Jlb3Blbl9yZWxh dGlvbihSZWxSZW9wZW5JbmZvICpiYWNrdXApCit7CisJUmVsYXRpb24JcmVsOworCUxPQ0tNT0RF CWxtb2RlOworCisJbG1vZGUgPSBiYWNrdXAtPmlzX25ldyA/IEFjY2Vzc0V4Y2x1c2l2ZUxvY2sg OiBTaGFyZVVwZGF0ZUV4Y2x1c2l2ZUxvY2s7CisJcmVsID0gcmVsYXRpb25fb3BlbihiYWNrdXAt PnJlbGlkLCBsbW9kZSk7CisJZGlzYWJsZV9zZXNzaW9uX2xvY2tzKHJlbCwgbG1vZGUsIGJhY2t1 cC0+aXNfbmV3KTsKKwkqYmFja3VwLT5wX3JlbCA9IHJlbDsKK30KKwogLyoKICAqIFRoZSBmaW5h bCBzdGVwcyBvZiByZWJ1aWxkX3JlbGF0aW9uKCkgZm9yIGNvbmN1cnJlbnQgcHJvY2Vzc2luZy4K ICAqCkBAIC0zNzU5LDIxICs0MjU4LDI3IEBAIHJlYnVpbGRfcmVsYXRpb25fZmluaXNoX2NvbmN1 cnJlbnQoUmVsYXRpb24gTmV3SGVhcCwgUmVsYXRpb24gT2xkSGVhcCwKIAlMaXN0CSAgICppbmRf b2lkc19uZXc7CiAJT2lkCQkJb2xkX3RhYmxlX29pZCA9IFJlbGF0aW9uR2V0UmVsaWQoT2xkSGVh cCk7CiAJT2lkCQkJbmV3X3RhYmxlX29pZCA9IFJlbGF0aW9uR2V0UmVsaWQoTmV3SGVhcCk7Ci0J TGlzdAkgICAqaW5kX29pZHNfb2xkID0gUmVsYXRpb25HZXRJbmRleExpc3QoT2xkSGVhcCk7CisJ TGlzdAkgICAqaW5kX29pZHNfb2xkOwogCUxpc3RDZWxsICAgKmxjLAogCQkJICAgKmxjMjsKIAlj aGFyCQlyZWxwZXJzaXN0ZW5jZTsKIAlib29sCQlpc19zeXN0ZW1fY2F0YWxvZzsKIAlYTG9nUmVj UHRyCWVuZF9vZl93YWw7CisJTWVtb3J5Q29udGV4dCBvbGRjeHQ7CiAJTGlzdAkgICAqaW5kZXhy ZWxzOwogCUxpc3QJICAgKmluZHNfdG1wID0gTklMOwogCiAJQXNzZXJ0KENoZWNrUmVsYXRpb25M b2NrZWRCeU1lKE9sZEhlYXAsIFNoYXJlVXBkYXRlRXhjbHVzaXZlTG9jaywgZmFsc2UpKTsKIAlB c3NlcnQoQ2hlY2tSZWxhdGlvbkxvY2tlZEJ5TWUoTmV3SGVhcCwgQWNjZXNzRXhjbHVzaXZlTG9j aywgZmFsc2UpKTsKIAotCS8qIElmIHdlIGhhdmUgdGhlIGF1eGlsaWFyeSB0YWJsZSwgdGhpcyBp cyB0aGUgbW9tZW50IHdlIHNob3VsZCB1c2UgaXQuICovCisJLyoKKwkgKiBJZiB3ZSBoYXZlIHRo ZSBhdXhpbGlhcnkgdGFibGUsIHRoaXMgaXMgdGhlIG1vbWVudCB3ZSBzaG91bGQgdXNlIGl0Lgor CSAqIE5vdGUgdGhhdCB0aGUgZnVuY3Rpb24gY2FuIHN0YXJ0IG5ldyB0cmFuc2FjdGlvbihzKS4g SW4gdGhhdCBjYXNlIGl0CisJICogcmUtb3BlbnMgdGhlIG5ldyBhbmQgb2xkIGhlYXAsIHNvIHBh c3MgcG9pbnRlcnMgdG8gZ2V0IHRoZSByZWxhdGlvbgorCSAqIGNhY2hlIGVudHJpZXMgdXBkYXRl ZC4KKwkgKi8KIAlpZiAoY2hnY3h0LT5jY19kZXN0X2F1eCkKLQkJcHJvY2Vzc19hdXhpbGlhcnlf dGFibGUoY2hnY3h0LCBPbGRIZWFwLCBpZGVudElkeCk7CisJCWNoZ2N4dCA9IHByb2Nlc3NfYXV4 aWxpYXJ5X3RhYmxlKGNoZ2N4dCwgJk9sZEhlYXAsICZOZXdIZWFwLCBpZGVudElkeCk7CiAKIAkv KgogCSAqIFVubGlrZSB0aGUgZXhjbHVzaXZlIGNhc2UsIHdlIGJ1aWxkIG5ldyBpbmRleGVzIGZv ciB0aGUgbmV3IHJlbGF0aW9uCkBAIC0zNzk2LDEzICs0MzAxLDE3IEBAIHJlYnVpbGRfcmVsYXRp b25fZmluaXNoX2NvbmN1cnJlbnQoUmVsYXRpb24gTmV3SGVhcCwgUmVsYXRpb24gT2xkSGVhcCwK IAkgKiBhdXhpbGlhcnkgdGFibGUpIGNhbiBiZSBhIHByb2JsZW0gaW4gdGVybXMgb2YgaW5kZXgg bGF5b3V0LiBTaG91bGRuJ3QKIAkgKiB3ZSBkcm9wIHRoZSBpZGVudGl0eSBpbmRleCBhbmQgYnVp bGQgaXQgdXNpbmcgYnVsayBpbnNlcnQgdG9vPwogCSAqLworCW9sZGN4dCA9IE1lbW9yeUNvbnRl eHRTd2l0Y2hUbyhyZXBhY2tfY3h0KTsKKwlpbmRfb2lkc19vbGQgPSBSZWxhdGlvbkdldEluZGV4 TGlzdChPbGRIZWFwKTsKIAlmb3JlYWNoX29pZChpbmRfb2lkLCBpbmRfb2lkc19vbGQpCiAJewog CQlpZiAoaW5kX29pZCAhPSBpZGVudElkeCkKIAkJCWluZHNfdG1wID0gbGFwcGVuZF9vaWQoaW5k c190bXAsIGluZF9vaWQpOwogCX0KKwlNZW1vcnlDb250ZXh0U3dpdGNoVG8ob2xkY3h0KTsKIAlp bmRfb2lkc19vbGQgPSBpbmRzX3RtcDsKLQlpbmRfb2lkc19uZXcgPSBidWlsZF9uZXdfaW5kZXhl cyhOZXdIZWFwLCBpbmRfb2lkc19vbGQpOworCWluZF9vaWRzX25ldyA9IGJ1aWxkX25ld19pbmRl eGVzKGluZF9vaWRzX29sZCwgJk9sZEhlYXAsICZOZXdIZWFwLAorCQkJCQkJCQkJICZjaGdjeHQp OwogCiAJLyoKIAkgKiBUaGUgaWRlbnRpdHkgaW5kZXggd2lsbCBiZSBpbnZvbHZlZCBpbiB0aGUg Zm9sbG93aW5nIHByb2Nlc3NpbmcuCkBAIC0zOTYzLDkgKzQ0NzIsMTUgQEAgcmVidWlsZF9yZWxh dGlvbl9maW5pc2hfY29uY3VycmVudChSZWxhdGlvbiBOZXdIZWFwLCBSZWxhdGlvbiBPbGRIZWFw LAogLyoKICAqIENvcHkgdGhlIGNvbnRlbnRzIG9mIHRoZSBhdXhpbGlhcnkgdGFibGUgdG8gdGhl IG5ldyB0YWJsZSBpbiB0aGUgZGVzaXJlZAogICogb3JkZXIsIHRoZW4gZHJvcCB0aGUgYXV4aWxp YXJ5IHRhYmxlLgorICoKKyAqIEFsbCB0aGUgb3BlbmVkIHJlbGF0aW9ucyBtYXkgbmVlZCB0byBi ZSBjbG9zZWQgYW5kIHJlLW9wZW5lZCBiZWNhdXNlIHRoZQorICogZnVuY3Rpb24gbWF5IHN0YXJ0 IGEgbmV3IHRyYW5zYWN0aW9uLiBUaGF0J3Mgd2h5IGEgcG9pbnRlciB0byBvbGQgYW5kIG5ldwor ICogaGVhcCBpcyBwYXNzZWQuICdjaGdjeHQnIGlzIHJlLWNyZWF0ZWQgaW4gdGhhdCBjYXNlLCBz byB1c2VyIHNob3VsZCB1c2UgdGhlCisgKiByZXR1cm5lZCB2YWx1ZS4KICAqLwotc3RhdGljIHZv aWQKLXByb2Nlc3NfYXV4aWxpYXJ5X3RhYmxlKENoYW5nZUNvbnRleHQgKmNoZ2N4dCwgUmVsYXRp b24gT2xkSGVhcCwgT2lkIGlkZW50SWR4KQorc3RhdGljIENoYW5nZUNvbnRleHQgKgorcHJvY2Vz c19hdXhpbGlhcnlfdGFibGUoQ2hhbmdlQ29udGV4dCAqY2hnY3h0LCBSZWxhdGlvbiAqcE9sZEhl YXAsCisJCQkJCQlSZWxhdGlvbiAqcE5ld0hlYXAsIE9pZCBpZGVudElkeCkKIHsKIAlSZXBhY2tE ZXN0ICpkZXN0ID0gY2hnY3h0LT5jY19kZXN0X2F1eDsKIAlPaWQJCQlpZGVudF9pZHhfbmV3OwpA QCAtMzk4Niw5ICs0NTAxLDE2IEBAIHByb2Nlc3NfYXV4aWxpYXJ5X3RhYmxlKENoYW5nZUNvbnRl eHQgKmNoZ2N4dCwgUmVsYXRpb24gT2xkSGVhcCwgT2lkIGlkZW50SWR4KQogCQkvKgogCQkgKiBD cmVhdGUgaXQgYWNjb3JkaW5nIHRvIHRoZSBjbHVzdGVyaW5nIGluZGV4IG9uIHRoZSBvbGQgcmVs YXRpb24uCiAJCSAqLwotCQljbF9pbmRfb2lkID0gYnVpbGRfbmV3X2luZGV4KGRlc3QtPnJlbCwK LQkJCQkJCQkJCSBjaGdjeHQtPmNjX2NsdXN0ZXJpbmdfaW5kZXgsCisJCWNsX2luZF9vaWQgPSBi dWlsZF9uZXdfaW5kZXgoZGVzdC0+cmVsLCBjaGdjeHQtPmNjX2NsdXN0ZXJpbmdfaW5kZXgsCiAJ CQkJCQkJCQkgdHJ1ZSk7CisKKwkJLyoKKwkJICogVGhlIGluZGV4IGJ1aWxkIGdlbmVyYXRlZCBh IG5ldyBYSUQsIHNvIGNvbW1pdCB0aGUgdHJhbnNhY3Rpb24gYW5kCisJCSAqIHN0YXJ0IGEgbmV3 IG9uZS4KKwkJICovCisJCWNoZ2N4dCA9IHN0YXJ0X25ld190cmFuc2FjdGlvbihjaGdjeHQsIHBP bGRIZWFwLCBwTmV3SGVhcCk7CisJCWRlc3QgPSBjaGdjeHQtPmNjX2Rlc3RfYXV4OworCiAJCWNs dXN0ZXJpbmdfaW5kZXggPSBpbmRleF9vcGVuKGNsX2luZF9vaWQsIE5vTG9jayk7CiAJfQogCWVs c2UKQEAgLTQwNDksNiArNDU3MSwxMiBAQCBwcm9jZXNzX2F1eGlsaWFyeV90YWJsZShDaGFuZ2VD b250ZXh0ICpjaGdjeHQsIFJlbGF0aW9uIE9sZEhlYXAsIE9pZCBpZGVudElkeCkKIAkvKiBCdWls ZCB0aGUgaWRlbnRpdHkgaW5kZXggb24gdGhlIG5ldyByZWxhdGlvbi4gKi8KIAlpZGVudF9pZHhf bmV3ID0gYnVpbGRfbmV3X2luZGV4KGNoZ2N4dC0+Y2NfZGVzdC5yZWwsIGlkZW50SWR4LCBmYWxz ZSk7CiAKKwkvKgorCSAqIFRoZSBpbmRleCBidWlsZCBnZW5lcmF0ZWQgYSBuZXcgWElELCBzbyBj b21taXQgdGhlIHRyYW5zYWN0aW9uIGFuZAorCSAqIHN0YXJ0IGEgbmV3IG9uZS4KKwkgKi8KKwlj aGdjeHQgPSBzdGFydF9uZXdfdHJhbnNhY3Rpb24oY2hnY3h0LCBwT2xkSGVhcCwgcE5ld0hlYXAp OworCiAJLyoKIAkgKiBNYWtlIHRoZSBuZXcgaGVhcCByZWFkeSB0byB1c2UgdGhlIGluZGV4IGZv ciBmdXR1cmUgcmVwbGF5aW5nIG9mCiAJICogY29uY3VycmVudCBjaGFuZ2VzLgpAQCAtNDA1Niw2 ICs0NTg0LDggQEAgcHJvY2Vzc19hdXhpbGlhcnlfdGFibGUoQ2hhbmdlQ29udGV4dCAqY2hnY3h0 LCBSZWxhdGlvbiBPbGRIZWFwLCBPaWQgaWRlbnRJZHgpCiAJcmVsID0gY2hnY3h0LT5jY19kZXN0 LnJlbDsKIAlyZWxlYXNlX2NoYW5nZV9kZXN0KCZjaGdjeHQtPmNjX2Rlc3QpOwogCWluaXRpYWxp emVfY2hhbmdlX2Rlc3QoJmNoZ2N4dC0+Y2NfZGVzdCwgcmVsLCBpZGVudF9pZHhfbmV3KTsKKwor CXJldHVybiBjaGdjeHQ7CiB9CiAKIC8qCkBAIC00MDY3LDIwICs0NTk3LDQ2IEBAIHByb2Nlc3Nf YXV4aWxpYXJ5X3RhYmxlKENoYW5nZUNvbnRleHQgKmNoZ2N4dCwgUmVsYXRpb24gT2xkSGVhcCwg T2lkIGlkZW50SWR4KQogICogQSBsaXN0IG9mIE9JRHMgb2YgdGhlIGNvcnJlc3BvbmRpbmcgaW5k ZXhlcyBjcmVhdGVkIG9uIE5ld0hlYXAgaXMKICAqIHJldHVybmVkLiBUaGUgb3JkZXIgb2YgaXRl bXMgZG9lcyBtYXRjaCwgc28gd2UgY2FuIHVzZSB0aGVzZSBhcnJheXMgdG8gc3dhcAogICogaW5k ZXggc3RvcmFnZS4KKyAqCisgKiBBIHNlcGFyYXRlIHRyYW5zYWN0aW9uIGlzIHVzZWQgZm9yIGVh Y2ggaW5kZXguIFRoZXJlZm9yZSBjYWxsZXIgbmVlZHMgdG8KKyAqIHBhc3MgcG9pbnRlcnMgdG8g dGhlIHJlbGNhY2hlIGVudHJpZXMgc28gdGhhdCB3ZSBjYW4gcHJvdmlkZSBoaW0gd2l0aCBuZXcK KyAqIGVudHJpZXMgYWZ0ZXIgcmVvcGVuaW5nIHRoZSByZWxhdGlvbnMuIExpa2V3aXNlLCBwb2lu dGVyIHRvIENoYW5nZUNvbnRleHQKKyAqIGlzIHVzZWQgdG8gcmV0dXJuIHRoZSByZS1jcmVhdGVk IGluc3RhbmNlLgogICovCiBzdGF0aWMgTGlzdCAqCi1idWlsZF9uZXdfaW5kZXhlcyhSZWxhdGlv biBOZXdIZWFwLCBMaXN0ICpPbGRJbmRleGVzKQorYnVpbGRfbmV3X2luZGV4ZXMoTGlzdCAqT2xk SW5kZXhlcywgUmVsYXRpb24gKnBfb2xkLCBSZWxhdGlvbiAqcF9uZXcsCisJCQkJICBDaGFuZ2VD b250ZXh0ICoqcF9jaGdjeHQpCiB7CisJQ2hhbmdlQ29udGV4dCAqY2hnY3h0ID0gKnBfY2hnY3h0 OwogCUxpc3QJICAgKnJlc3VsdCA9IE5JTDsKIAogCWZvcmVhY2hfb2lkKG9sZGluZGV4LCBPbGRJ bmRleGVzKQogCXsKKwkJUmVsYXRpb24JcmVsX25ldyA9ICpwX25ldzsKIAkJT2lkCQkJbmV3aW5k ZXg7CisJCU1lbW9yeUNvbnRleHQgb2xkY3h0OwogCi0JCW5ld2luZGV4ID0gYnVpbGRfbmV3X2lu ZGV4KE5ld0hlYXAsIG9sZGluZGV4LCBmYWxzZSk7CisJCW5ld2luZGV4ID0gYnVpbGRfbmV3X2lu ZGV4KHJlbF9uZXcsIG9sZGluZGV4LCBmYWxzZSk7CisKKwkJLyoKKwkJICogQWxsb2NhdGUgdGhl IGxpc3QgaW4gcmVwYWNrX2N4dCBzbyBpdCBzdXJ2aXZlcyB0aGUgY3VycmVudAorCQkgKiB0cmFu c2FjdGlvbi4KKwkJICovCisJCW9sZGN4dCA9IE1lbW9yeUNvbnRleHRTd2l0Y2hUbyhyZXBhY2tf Y3h0KTsKIAkJcmVzdWx0ID0gbGFwcGVuZF9vaWQocmVzdWx0LCBuZXdpbmRleCk7CisJCU1lbW9y eUNvbnRleHRTd2l0Y2hUbyhvbGRjeHQpOworCisJCS8qCisJCSAqIFVzZSBvbmUgdHJhbnNhY3Rp b24gcGVyIGluZGV4LCB0byBsaW1pdCB0aGUgaW1wYWN0IG9uIHhtaW4KKwkJICogaG9yaXpvbnMu IFhYWCBEb2VzIGl0IG1ha2Ugc2Vuc2UgdG8gZXZlbiBmaXJzdCBjb21taXQgdGhlIGNhdGFsb2cK KwkJICogY2hhbmdlcyBhbmQgdGhlbiBkbyB0aGUgYnVpbGQgaW4gYSBuZXcgdHJhbnNhY3Rpb24g KHdoaWNoIHNob3VsZAorCQkgKiBub3Qgc2V0IE15UHJvYy0+eG1pbiB1bnRpbCB0aGUgYnVpbGQg aXMgY29tcGxldGUpPyBOb3Qgc3VyZS4KKwkJICovCisJCWNoZ2N4dCA9IHN0YXJ0X25ld190cmFu c2FjdGlvbihjaGdjeHQsIHBfb2xkLCBwX25ldyk7CiAJfQogCisJKnBfY2hnY3h0ID0gY2hnY3h0 OworCiAJcmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtNDEwMiwxNyArNDY1OCwxOSBAQCBidWlsZF9u ZXdfaW5kZXgoUmVsYXRpb24gTmV3SGVhcCwgT2lkIG9sZGluZGV4LCBib29sIGlzX2F1eCkKIAog CWluZCA9IGluZGV4X29wZW4ob2xkaW5kZXgsIFNoYXJlVXBkYXRlRXhjbHVzaXZlTG9jayk7CiAK LQluZXdOYW1lID0gQ2hvb3NlUmVsYXRpb25OYW1lKGdldF9yZWxfbmFtZShvbGRpbmRleCksCisJ bmV3TmFtZSA9IENob29zZVJlbGF0aW9uTmFtZShSZWxhdGlvbkdldFJlbGF0aW9uTmFtZShOZXdI ZWFwKSwKIAkJCQkJCQkJIE5VTEwsCiAJCQkJCQkJCSAicmVwYWNrbmV3IiwKLQkJCQkJCQkJIGdl dF9yZWxfbmFtZXNwYWNlKGluZC0+cmRfaW5kZXgtPmluZHJlbGlkKSwKKwkJCQkJCQkJIGdldF9y ZWxfbmFtZXNwYWNlKFJlbGF0aW9uR2V0UmVsaWQoTmV3SGVhcCkpLAogCQkJCQkJCQkgZmFsc2Up OworCiAJLyogRnVuY3Rpb25zIGluIGluZGV4ZXMgbWF5IHdhbnQgYSBzbmFwc2hvdCBzZXQuICov CiAJQXNzZXJ0KEFjdGl2ZVNuYXBzaG90U2V0KCkpOwogCW5ld2luZGV4ID0gaW5kZXhfY3JlYXRl X2NvcHkoTmV3SGVhcCwgSU5ERVhfQ1JFQVRFX1NVUFBSRVNTX1BST0dSRVNTLAogCQkJCQkJCQkg b2xkaW5kZXgsIGluZC0+cmRfcmVsLT5yZWx0YWJsZXNwYWNlLAogCQkJCQkJCQkgbmV3TmFtZSk7 Ci0JY29weV9pbmRleF9jb25zdHJhaW50cyhpbmQsIG5ld2luZGV4LCBSZWxhdGlvbkdldFJlbGlk KE5ld0hlYXApKTsKKworCWNvcHlfaW5kZXhfY29uc3RyYWludHMoaW5kLCBuZXdpbmRleCwgTmV3 SGVhcCk7CiAJaW5kZXhfY2xvc2UoaW5kLCBOb0xvY2spOwogCiAJLyoKQEAgLTQxMjksNiArNDY4 Nyw1MCBAQCBidWlsZF9uZXdfaW5kZXgoUmVsYXRpb24gTmV3SGVhcCwgT2lkIG9sZGluZGV4LCBi b29sIGlzX2F1eCkKIAlyZXR1cm4gbmV3aW5kZXg7CiB9CiAKKy8qCisgKiBTdGFydCBhIG5ldyB0 cmFuc2FjdGlvbiwgYnV0IG1ha2Ugc3VyZSB0aGF0IHRoZSBjYWxsZXIgc3RpbGwgaGFzIHZhbGlk CisgKiByZWxjYWNoZSBlbnRyaWVzIGFzIHdlbGwgYXMgdmFsaWQgQ2hhbmdlQ29udGV4dC4gVGhl IHByb2JsZW0gaXMgdGhhdAorICogcmVsY2FjaGUgcmVmZXJlbmNlcyBzaG91bGQgYmUgY2xvc2Vk IGJlZm9yZSB0cmFuc2FjdGlvbiBjb21taXQsIHNvIHdlIG5lZWQKKyAqIHRoZW0gcmUtb3BlbmVk IGluIHRoZSBuZXcgdHJhbnNhY3Rpb24uIEFsc28sIGNvbW1pdCByZWxlYXNlcyBhbGwgbG9ja3MK KyAqIGFjcXVpcmVkIGluIHRoZSB0cmFuc2FjdGlvbiwgaG93ZXZlciB3ZSBkb24ndCB3YW50IHRv IGxvc2Ugb3VyIGxvY2tzLiBXZQorICogd29yayBpdCBhcm91bmQgYnkgdXNpbmcgc2Vzc2lvbiBs b2NrcyB0ZW1wb3JhcmlseS4KKyAqLworc3RhdGljIENoYW5nZUNvbnRleHQgKgorc3RhcnRfbmV3 X3RyYW5zYWN0aW9uKENoYW5nZUNvbnRleHQgKmNoZ2N4dCwgUmVsYXRpb24gKnBfb2xkLCBSZWxh dGlvbiAqcF9uZXcpCit7CisJQ2hhbmdlQ29udGV4dEJhY2t1cCBjaGdjeHRfYmFja3VwOworCU1l bW9yeUNvbnRleHQgb2xkY3h0OworCUluZGV4QnVpbGRTZWN1cml0eSBpYnNlYyA9IGNoZ2N4dC0+ Y2NfaW5kX2J1aWxkX3NlYzsKKworCS8qIFRoaXMgYWxzbyBjbG9zZXMgdGhlIHJlbGF0aW9ucy4g Ki8KKwliYWNrdXBfY2hhbmdlX2NvbnRleHQoY2hnY3h0LCBwX29sZCwgJmNoZ2N4dF9iYWNrdXAp OworCXJlbGVhc2VfY2hhbmdlX2NvbnRleHQoY2hnY3h0KTsKKworCWRpc2FibGVfaW5kZXhfYnVp bGRfc2VjdXJpdHkoJmlic2VjKTsKKwlQb3BBY3RpdmVTbmFwc2hvdCgpOworCUNvbW1pdFRyYW5z YWN0aW9uQ29tbWFuZCgpOworCVN0YXJ0VHJhbnNhY3Rpb25Db21tYW5kKCk7CisJUHVzaEFjdGl2 ZVNuYXBzaG90KEdldFRyYW5zYWN0aW9uU25hcHNob3QoKSk7CisJZW5hYmxlX2luZGV4X2J1aWxk X3NlY3VyaXR5KGlic2VjLnVzZXJpZCwgJmlic2VjKTsKKworCS8qIENyZWF0ZSAnY2hnY3h0JyB1 c2luZyByZS1vcGVuZWQgcmVsYXRpb25zLiAqLworCW9sZGN4dCA9IE1lbW9yeUNvbnRleHRTd2l0 Y2hUbyhyZXBhY2tfY3h0KTsKKwkvKiBUaGlzIGFsc28gcmUtb3BlbnMgdGhlIG5ldyByZWxhdGlv bi4gKi8KKwljaGdjeHQgPSByZWluaXRpYWxpemVfY2hhbmdlX2NvbnRleHQoJmNoZ2N4dF9iYWNr dXApOworCWNoZ2N4dC0+Y2NfaW5kX2J1aWxkX3NlYyA9IGlic2VjOworCU1lbW9yeUNvbnRleHRT d2l0Y2hUbyhvbGRjeHQpOworCisJLyogVXBkYXRlIHRoZSBjYWxsZXJzIHJlbGNhY2hlIGVudHJp ZXMgZm9yIHRoZSByZWxhdGlvbnMuICovCisJKnBfbmV3ID0gY2hnY3h0LT5jY19kZXN0LnJlbDsK KwkvKgorCSAqIEEgYml0IGhhY2tpc2ggZm9yIHRoZSBvbGQgcmVsYXRpb24sIGJ1dCB3ZSBkb24n dCByZWFsbHkgbmVlZCB0byBzdG9yZQorCSAqIGl0IGluIGNoZ2N4dC4KKwkgKi8KKwkqcF9vbGQg PSAqY2hnY3h0X2JhY2t1cC5yZWxfcmlfb2xkLnBfcmVsOworCisJcmV0dXJuIGNoZ2N4dDsKK30K KwogLyoKICAqIENyZWF0ZSBhIHRyYW5zaWVudCBjb3B5IG9mIGEgY29uc3RyYWludCAtLSBzdXBw b3J0ZWQgYnkgYSB0cmFuc2llbnQKICAqIGNvcHkgb2YgdGhlIGluZGV4IHRoYXQgc3VwcG9ydHMg dGhlIG9yaWdpbmFsIGNvbnN0cmFpbnQuCkBAIC00MTQyLDE0ICs0NzQ0LDE3IEBAIGJ1aWxkX25l d19pbmRleChSZWxhdGlvbiBOZXdIZWFwLCBPaWQgb2xkaW5kZXgsIGJvb2wgaXNfYXV4KQogICog dGhleSBhcmUgZHJvcHBlZCB3aGVuIHRoZSB0cmFuc2llbnQgdGFibGUgaXMgZHJvcHBlZC4KICAq Lwogc3RhdGljIHZvaWQKLWNvcHlfaW5kZXhfY29uc3RyYWludHMoUmVsYXRpb24gb2xkX2luZGV4 LCBPaWQgbmV3X2luZGV4X2lkLCBPaWQgbmV3X2hlYXBfaWQpCitjb3B5X2luZGV4X2NvbnN0cmFp bnRzKFJlbGF0aW9uIG9sZF9pbmRleCwgT2lkIG5ld19pbmRleF9pZCwKKwkJCQkJICAgUmVsYXRp b24gbmV3X2hlYXApCiB7CisJT2lkIG5ld19oZWFwX2lkID0gUmVsYXRpb25HZXRSZWxpZChuZXdf aGVhcCk7CiAJU2NhbktleURhdGEgc2tleTsKIAlSZWxhdGlvbglyZWw7CiAJVHVwbGVEZXNjCWRl c2M7CiAJU3lzU2NhbkRlc2Mgc2NhbjsKIAlIZWFwVHVwbGUJdHVwOwogCU9iamVjdEFkZHJlc3Mg b2JqcmVsOworCUxpc3QJKmNoZWNrbmFtZXMgPSBOSUw7CiAKIAlyZWwgPSB0YWJsZV9vcGVuKENv bnN0cmFpbnRSZWxhdGlvbklkLCBSb3dFeGNsdXNpdmVMb2NrKTsKIAlPYmplY3RBZGRyZXNzU2V0 KG9ianJlbCwgUmVsYXRpb25SZWxhdGlvbklkLCBuZXdfaGVhcF9pZCk7CkBAIC00MTc0LDYgKzQ3 NzksOCBAQCBjb3B5X2luZGV4X2NvbnN0cmFpbnRzKFJlbGF0aW9uIG9sZF9pbmRleCwgT2lkIG5l d19pbmRleF9pZCwgT2lkIG5ld19oZWFwX2lkKQogCQlib29sCQlyZXBsYWNlc1tOYXR0c19wZ19j b25zdHJhaW50XSA9IHswfTsKIAkJSGVhcFR1cGxlCW5ld190dXA7CiAJCU9iamVjdEFkZHJlc3Mg b2JqY29uOworCQljaGFyCSpjb25uYW1lOworCQlOYW1lRGF0YQljbmFtZTsKIAogCQlpZiAoY29u Zm9ybS0+Y29uaW5kaWQgIT0gUmVsYXRpb25HZXRSZWxpZChvbGRfaW5kZXgpKQogCQkJY29udGlu dWU7CkBAIC00MTg3LDYgKzQ3OTQsMjcgQEAgY29weV9pbmRleF9jb25zdHJhaW50cyhSZWxhdGlv biBvbGRfaW5kZXgsIE9pZCBuZXdfaW5kZXhfaWQsIE9pZCBuZXdfaGVhcF9pZCkKIAkJdmFsdWVz W0FudW1fcGdfY29uc3RyYWludF9jb25pbmRpZCAtIDFdID0gT2JqZWN0SWRHZXREYXR1bShuZXdf aW5kZXhfaWQpOwogCQlyZXBsYWNlc1tBbnVtX3BnX2NvbnN0cmFpbnRfY29uaW5kaWQgLSAxXSA9 IHRydWU7CiAKKwkJLyoKKwkJICogR2VuZXJhdGUgYSB1bmlxdWUgbmFtZSBmb3IgdGhlIGNvbnN0 cmFpbnQuCisJCSAqCisJCSAqIEFsdGhvdWdoIHRoZSBwZ19jb25zdHJhaW50IGNhdGFsb2cgYWxs b3dzIGR1cGxpY2F0ZSBuYW1lcyB3aXRoaW4gYQorCQkgKiBuYW1lc3BhY2UgKGFzIGxvbmcgYXMg dGhleSBiZWxvbmcgdG8gZGlmZmVyZW50IHJlbGF0aW9ucyksIEFMVEVSCisJCSAqIFRBQkxFIC4u LiBBREQgQ09OU1RSQUlOVCB1c2VzIHRoZSBjb25zdHJhaW50IG5hbWUgYXMgdGhlIG5hbWUgb2Yg YW4KKwkJICogaW5kZXggdGhhdCBzdXBwb3J0cyB0aGUgY29uc3RyYWludCwgYW5kIGluZGV4IG5h bWVzIG11c3QgYmUgdW5pcXVlCisJCSAqIHdpdGhpbiBhIG5hbWVzcGFjZS4gSGVyZSB3ZSBtYWtl IHN1cmUgdGhhdCBwZ19kdW1wIHByb2R1Y2VzIHZhbGlkCisJCSAqIG91dHB1dCBldmVuIGlmIHRo ZSBpbmRleCBoYXBwZW5zIHRvIHN1cnZpdmUgRVJST1IgLyBjcmFzaC4KKwkJICovCisJCWNvbm5h bWUgPSBDaG9vc2VDb25zdHJhaW50TmFtZShSZWxhdGlvbkdldFJlbGF0aW9uTmFtZShuZXdfaGVh cCksCisJCQkJCQkJCQkgICBOVUxMLAorCQkJCQkJCQkJICAgIiIsCisJCQkJCQkJCQkgICBSZWxh dGlvbkdldE5hbWVzcGFjZShyZWwpLAorCQkJCQkJCQkJICAgY2hlY2tuYW1lcyk7CisJCWNoZWNr bmFtZXMgPSBsYXBwZW5kKGNoZWNrbmFtZXMsIGNvbm5hbWUpOworCisJCW5hbWVzdHJjcHkoJmNu YW1lLCBjb25uYW1lKTsKKwkJdmFsdWVzW0FudW1fcGdfY29uc3RyYWludF9jb25uYW1lIC0gMV0g PSBOYW1lR2V0RGF0dW0oJmNuYW1lKTsKKwkJcmVwbGFjZXNbQW51bV9wZ19jb25zdHJhaW50X2Nv bm5hbWUgLSAxXSA9IHRydWU7CisKIAkJbmV3X3R1cCA9IGhlYXBfbW9kaWZ5X3R1cGxlKHR1cCwg ZGVzYywgdmFsdWVzLCBudWxscywgcmVwbGFjZXMpOwogCiAJCS8qIEluc2VydCBpdCBpbnRvIHRo ZSBjYXRhbG9nLiAqLwpAQCAtNDMxNSw2ICs0OTQzLDggQEAgc3RhcnRfcmVwYWNrX2RlY29kaW5n X3dvcmtlcihPaWQgcmVsaWQpCiAJc2l6ZSA9IEJVRkZFUkFMSUdOKG9mZnNldG9mKERlY29kaW5n V29ya2VyU2hhcmVkLCBlcnJvcl9xdWV1ZSkpICsKIAkJQlVGRkVSQUxJR04oUkVQQUNLX0VSUk9S X1FVRVVFX1NJWkUpOwogCWRlY29kaW5nX3dvcmtlci0+c2VnID0gZHNtX2NyZWF0ZShzaXplLCAw KTsKKwkvKiBUaGUgc2VnbWVudCBzaG91bGQgbm90IGJlIGRldGFjaGVkIGF0IHRyYW5zYWN0aW9u IGJvdW5kYXJ5LiAqLworCWRzbV9waW5fbWFwcGluZyhkZWNvZGluZ193b3JrZXItPnNlZyk7CiAK IAlzaGFyZWQgPSAoRGVjb2RpbmdXb3JrZXJTaGFyZWQgKikgZHNtX3NlZ21lbnRfYWRkcmVzcyhk ZWNvZGluZ193b3JrZXItPnNlZyk7CiAJc2hhcmVkLT5pbml0aWFsaXplZCA9IGZhbHNlOwpkaWZm IC0tZ2l0IGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvdGFibGVjbWRzLmMgYi9zcmMvYmFja2VuZC9j b21tYW5kcy90YWJsZWNtZHMuYwppbmRleCBhYTg5YzlhNDYzNy4uNWU3NWEyYmM4NDQgMTAwNjQ0 Ci0tLSBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3RhYmxlY21kcy5jCisrKyBiL3NyYy9iYWNrZW5k L2NvbW1hbmRzL3RhYmxlY21kcy5jCkBAIC02MDY2LDcgKzYwNjYsNyBAQCBBVFJld3JpdGVUYWJs ZXMoQWx0ZXJUYWJsZVN0bXQgKnBhcnNldHJlZSwgTGlzdCAqKndxdWV1ZSwgTE9DS01PREUgbG9j a21vZGUsCiAJCQkgKiB1bmxvZ2dlZCBhbnl3YXkuCiAJCQkgKi8KIAkJCU9JRE5ld0hlYXAgPSBt YWtlX25ld19oZWFwKHRhYi0+cmVsaWQsIE5ld1RhYmxlU3BhY2UsIE5ld0FjY2Vzc01ldGhvZCwK LQkJCQkJCQkJCSAgIHBlcnNpc3RlbmNlLCBsb2NrbW9kZSk7CisJCQkJCQkJCQkgICBwZXJzaXN0 ZW5jZSwgbG9ja21vZGUsIE5VTEwpOwogCiAJCQkvKgogCQkJICogQ29weSB0aGUgaGVhcCBkYXRh IGludG8gdGhlIG5ldyB0YWJsZSB3aXRoIHRoZSBkZXNpcmVkCmRpZmYgLS1naXQgYS9zcmMvaW5j bHVkZS9jb21tYW5kcy9yZXBhY2suaCBiL3NyYy9pbmNsdWRlL2NvbW1hbmRzL3JlcGFjay5oCmlu ZGV4IDIxMTliYTAxZDhjLi41Nzk5ZDQzYzczYSAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvY29t bWFuZHMvcmVwYWNrLmgKKysrIGIvc3JjL2luY2x1ZGUvY29tbWFuZHMvcmVwYWNrLmgKQEAgLTE4 LDYgKzE4LDcgQEAKICNpbmNsdWRlICJhY2Nlc3MvaGlvLmgiCiAjaW5jbHVkZSAiYWNjZXNzL3Nr ZXkuaCIKICNpbmNsdWRlICJhY2Nlc3MveGxvZ2RlZnMuaCIKKyNpbmNsdWRlICJjYXRhbG9nL2lu ZGV4LmgiCiAjaW5jbHVkZSAibm9kZXMvZXhlY25vZGVzLmgiCiAjaW5jbHVkZSAibm9kZXMvcGFy c2Vub2Rlcy5oIgogI2luY2x1ZGUgInBhcnNlci9wYXJzZV9ub2RlLmgiCkBAIC0xMjYsNiArMTI3 LDEyIEBAIHR5cGVkZWYgc3RydWN0IENoYW5nZUNvbnRleHQKIAkgKiBUaGUgaW5kZXggdGhhdCBk ZWZpbmVzIG9yZGVyaW5nIG9mIHRoZSBvbGQgdGFibGUuCiAJICovCiAJT2lkCQkJY2NfY2x1c3Rl cmluZ19pbmRleDsKKworCS8qCisJICogSW5mb3JtYXRpb24gbmVlZGVkIHRvIGRpc2FibGUgLyBl bmFibGUgc2VjdXJpdHkgcmVzdHJpY3Rpb25zIG9uIGluZGV4CisJICogZnVuY3Rpb25zLiBUaGlz IGlzIG5lZWRlZCB3aGVuIHN0YXJ0aW5nIGEgbmV3IHRyYW5zYWN0aW9uLgorCSAqLworCUluZGV4 QnVpbGRTZWN1cml0eSBjY19pbmRfYnVpbGRfc2VjOwogfSBDaGFuZ2VDb250ZXh0OwogCiBleHRl cm4gUEdETExJTVBPUlQgaW50IHJlcGFja19wYWdlc19wZXJfc25hcHNob3Q7CkBAIC0xMzksNyAr MTQ2LDggQEAgZXh0ZXJuIHZvaWQgY2hlY2tfaW5kZXhfaXNfY2x1c3RlcmFibGUoUmVsYXRpb24g T2xkSGVhcCwgT2lkIGluZGV4T2lkLAogZXh0ZXJuIHZvaWQgbWFya19pbmRleF9jbHVzdGVyZWQo UmVsYXRpb24gcmVsLCBPaWQgaW5kZXhPaWQsIGJvb2wgaXNfaW50ZXJuYWwpOwogCiBleHRlcm4g T2lkCW1ha2VfbmV3X2hlYXAoT2lkIE9JRE9sZEhlYXAsIE9pZCBOZXdUYWJsZVNwYWNlLCBPaWQg TmV3QWNjZXNzTWV0aG9kLAotCQkJCQkJICBjaGFyIHJlbHBlcnNpc3RlbmNlLCBMT0NLTU9ERSBs b2NrbW9kZSk7CisJCQkJCQkgIGNoYXIgcmVscGVyc2lzdGVuY2UsIExPQ0tNT0RFIGxvY2ttb2Rl LAorCQkJCQkJICBjb25zdCBjaGFyICpzdWZmaXgpOwogZXh0ZXJuIHZvaWQgaGVhcF9pbnNlcnRf Zm9yX3JlcGFjayhDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIFR1cGxlVGFibGVTbG90ICpzcmMsCiAJ CQkJCQkJCSAgIFR1cGxlVGFibGVTbG90ICpyZWZvcm0pOwogZXh0ZXJuIGJvb2wgdHVwbGVfbmVl ZHNfcmVmb3JtKEhlYXBUdXBsZSB0dXBsZSwgVHVwbGVEZXNjIHR1cERlc2MpOwpkaWZmIC0tZ2l0 IGEvc3JjL3Rvb2xzL3BnaW5kZW50L3R5cGVkZWZzLmxpc3QgYi9zcmMvdG9vbHMvcGdpbmRlbnQv dHlwZWRlZnMubGlzdAppbmRleCA4OTllMTZjOGIxYS4uZDI4OTc5MTc0MWEgMTAwNjQ0Ci0tLSBh L3NyYy90b29scy9wZ2luZGVudC90eXBlZGVmcy5saXN0CisrKyBiL3NyYy90b29scy9wZ2luZGVu dC90eXBlZGVmcy5saXN0CkBAIC00MjgsNiArNDI4LDcgQEAgQ2F0YWxvZ0lkCiBDYXRhbG9nSWRN YXBFbnRyeQogQ2F0YWxvZ0luZGV4U3RhdGUKIENoYW5nZUNvbnRleHQKK0NoYW5nZUNvbnRleHRC YWNrdXAKIENoYW5nZVZhck5vZGVzX2NvbnRleHQKIENoYW5uZWxOYW1lCiBDaGVja1BvaW50CkBA IC0yNTkwLDYgKzI1OTEsNyBAQCBSZWxNYXBwaW5nCiBSZWxPcHRJbmZvCiBSZWxPcHRLaW5kCiBS ZWxQYXRoU3RyCitSZWxSZW9wZW5JbmZvCiBSZWxTdGF0c0luZm8KIFJlbFN5bmNDYWxsYmFja0Z1 bmN0aW9uCiBSZWxUb0NoZWNrCi0tIAoyLjUxLjAKCg== --=-=-= Content-Type: application/mbox Content-Disposition: attachment; filename=v05-0008-Decouple-updating-of-freezing-information-from-swap_.patch Content-Transfer-Encoding: base64 RnJvbSA4YjdiNzJjODE4NWJhNzRjNjIwZDE4N2UzZjA5NTE5MTAyNGNkZTBkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmluIEhvdXNrYSA8YWhAY3liZXJ0ZWMuYXQ+CkRhdGU6 IFR1ZSwgMTAgTm92IDIwMjYgMTE6NDQ6MzkgKzAxMDAKU3ViamVjdDogW1BBVENIIDgvOV0gRGVj b3VwbGUgdXBkYXRpbmcgb2YgZnJlZXppbmcgaW5mb3JtYXRpb24gZnJvbQogc3dhcF9yZWxhdGlv bl9maWxlcygpLgoKU28gZmFyLCB0aGUgcmVsZnJvemVueGlkIGFuZCByZWxtaW5teGlkIGF0dHJp YnV0ZXMgb2YgcGdfY2xhc3MgdXNlZCB0byBiZQp1cGRhdGVkIGJ5IHN3YXBfcmVsYXRpb25fZmls ZXMoKSwgaG93ZXZlciwgbm90IGV2ZXJ5IGNhbGwgb2YgdGhlIGZ1bmN0aW9uCnNob3VsZCBkbyB0 aGF0LiBPbiB0aGUgY29udHJhcnksIG5ldyBmZWF0dXJlIG9mIFJFUEFDSyAoQ09OQ1VSUkVOVExZ KSB3aWxsCm5lZWQgdG8gdXBkYXRlIHRoaXMgaW5mb3JtYXRpb24gaW4gb25lIGNhc2UgdGhhdCB3 b3VsZCBiZSB0cmlja3kgdG8gaGFuZGxlCnVzaW5nIHN3YXBfcmVsYXRpb25fZmlsZXMoKS4KLS0t CiBzcmMvYmFja2VuZC9jb21tYW5kcy9yZXBhY2suYyB8IDEyMCArKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNTkgaW5zZXJ0aW9ucygrKSwgNjEgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvcmVwYWNrLmMgYi9z cmMvYmFja2VuZC9jb21tYW5kcy9yZXBhY2suYwppbmRleCBiN2UyNGQ4ZTZkNS4uM2RjOTgzMmVm NjYgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFjay5jCisrKyBiL3NyYy9i YWNrZW5kL2NvbW1hbmRzL3JlcGFjay5jCkBAIC0xOTQsNiArMTk0LDggQEAgc3RhdGljIHZvaWQg Y29weV90YWJsZV9kYXRhKFJlbGF0aW9uIE5ld0hlYXAsIFJlbGF0aW9uIE9sZEhlYXAsIFJlbGF0 aW9uIE9sZEluZGUKIAkJCQkJCQlUcmFuc2FjdGlvbklkICpwRnJlZXplWGlkLAogCQkJCQkJCU11 bHRpWGFjdElkICpwQ3V0b2ZmTXVsdGksCiAJCQkJCQkJQ2hhbmdlQ29udGV4dCAqY2hnY3h0KTsK K3N0YXRpYyB2b2lkIHVwZGF0ZV9yZWxhdGlvbl9jdXRvZmZzKE9pZCByZWxpZCwgVHJhbnNhY3Rp b25JZCBmcm96ZW5YaWQsCisJCQkJCQkJCQlNdWx0aVhhY3RJZCBjdXRvZmZNdWx0aSk7CiBzdGF0 aWMgTGlzdCAqZ2V0X3RhYmxlc190b19yZXBhY2soUmVwYWNrQ29tbWFuZCBjbWQsIGJvb2wgdXNp bmdpbmRleCwKIAkJCQkJCQkJICBNZW1vcnlDb250ZXh0IHBlcm1jeHQpOwogc3RhdGljIExpc3Qg KmdldF90YWJsZXNfdG9fcmVwYWNrX3BhcnRpdGlvbmVkKFJlcGFja1N0bXQgKnN0bXQsCkBAIC0y MTUyLDEzICsyMTU0LDYgQEAgY29weV90YWJsZV9kYXRhKFJlbGF0aW9uIE5ld0hlYXAsIFJlbGF0 aW9uIE9sZEhlYXAsIFJlbGF0aW9uIE9sZEluZGV4LAogICogbGlua3MpIHdoaWxlIHRoZSBsYXR0 ZXIgaXMgdGhlIG9ubHkgd2F5IHRvIGhhbmRsZSBjYXNlcyBpbiB3aGljaCBhIHRvYXN0CiAgKiB0 YWJsZSBpcyBhZGRlZCBvciByZW1vdmVkIGFsdG9nZXRoZXIuCiAgKgotICogQWRkaXRpb25hbGx5 LCB0aGUgZmlyc3QgcmVsYXRpb24gaXMgbWFya2VkIHdpdGggcmVsZnJvemVueGlkIHNldCB0bwot ICogZnJvemVuWGlkLiAgSXQgc2VlbXMgYSBiaXQgdWdseSB0byBoYXZlIHRoaXMgaGVyZSwgYnV0 IHRoZSBjYWxsZXIgd291bGQKLSAqIGhhdmUgdG8gZG8gaXQgYW55d2F5LCBzbyBoYXZpbmcgaXQg aGVyZSBzYXZlcyBhIGhlYXBfdXBkYXRlLiAgTm90ZTogaW4KLSAqIHRoZSBzd2FwLXRvYXN0LWxp bmtzIGNhc2UsIHdlIGFzc3VtZSB3ZSBkb24ndCBuZWVkIHRvIGNoYW5nZSB0aGUgdG9hc3QKLSAq IHRhYmxlJ3MgcmVsZnJvemVueGlkOiB0aGUgbmV3IHZlcnNpb24gb2YgdGhlIHRvYXN0IHRhYmxl IHNob3VsZCBhbHJlYWR5Ci0gKiBoYXZlIHJlbGZyb3plbnhpZCBzZXQgdG8gUmVjZW50WG1pbiwg d2hpY2ggaXMgZ29vZCBlbm91Z2guCi0gKgogICogTGFzdGx5LCBpZiByMiBhbmQgaXRzIHRvYXN0 IHRhYmxlIGFuZCB0b2FzdCBpbmRleCAoaWYgYW55KSBhcmUgbWFwcGVkLAogICogdGhlaXIgT0lE cyBhcmUgZW1pdHRlZCBpbnRvIG1hcHBlZF90YWJsZXNbXS4gIFRoaXMgaXMgaGFja3kgYnV0IGJl YXRzCiAgKiBoYXZpbmcgdG8gbG9vayB0aGUgaW5mb3JtYXRpb24gdXAgYWdhaW4gbGF0ZXIgaW4g ZmluaXNoX2hlYXBfc3dhcC4KQEAgLTIxNjcsOSArMjE2Miw3IEBAIHN0YXRpYyB2b2lkCiBzd2Fw X3JlbGF0aW9uX2ZpbGVzKE9pZCByMSwgT2lkIHIyLCBib29sIHRhcmdldF9pc19wZ19jbGFzcywK IAkJCQkJYm9vbCBzd2FwX3RvYXN0X2J5X2NvbnRlbnQsCiAJCQkJCWJvb2wgaXNfaW50ZXJuYWws Ci0JCQkJCVRyYW5zYWN0aW9uSWQgZnJvemVuWGlkLAotCQkJCQlNdWx0aVhhY3RJZCBjdXRvZmZN dWx0aSwKLQkJCQkJT2lkICptYXBwZWRfdGFibGVzKQorCQkJCQlPaWQgKm1hcHBlZF90YWJsZXMs IE9pZCAqcjFfdG9hc3RpZCkKIHsKIAlSZWxhdGlvbglyZWxSZWxhdGlvbjsKIAlIZWFwVHVwbGUJ cmVsdHVwMSwKQEAgLTIyMDEsNiArMjE5NCw5IEBAIHN3YXBfcmVsYXRpb25fZmlsZXMoT2lkIHIx LCBPaWQgcjIsIGJvb2wgdGFyZ2V0X2lzX3BnX2NsYXNzLAogCXJlbGFtMSA9IHJlbGZvcm0xLT5y ZWxhbTsKIAlyZWxhbTIgPSByZWxmb3JtMi0+cmVsYW07CiAKKwlpZiAocjFfdG9hc3RpZCkKKwkJ KnIxX3RvYXN0aWQgPSByZWxmb3JtMS0+cmVsdG9hc3RyZWxpZDsKKwogCWlmIChSZWxGaWxlTnVt YmVySXNWYWxpZChyZWxmaWxlbnVtYmVyMSkgJiYKIAkJUmVsRmlsZU51bWJlcklzVmFsaWQocmVs ZmlsZW51bWJlcjIpKQogCXsKQEAgLTIzMTYsMTUgKzIzMTIsNiBAQCBzd2FwX3JlbGF0aW9uX2Zp bGVzKE9pZCByMSwgT2lkIHIyLCBib29sIHRhcmdldF9pc19wZ19jbGFzcywKIAkgKiBhbmQgdGhl biBmYWlsIHRvIGNvbW1pdCB0aGUgcGdfY2xhc3MgdXBkYXRlLgogCSAqLwogCi0JLyogc2V0IHJl bDEncyBmcm96ZW4gWGlkIGFuZCBtaW5pbXVtIE11bHRpWGlkICovCi0JaWYgKHJlbGZvcm0xLT5y ZWxraW5kICE9IFJFTEtJTkRfSU5ERVgpCi0JewotCQlBc3NlcnQoIVRyYW5zYWN0aW9uSWRJc1Zh bGlkKGZyb3plblhpZCkgfHwKLQkJCSAgIFRyYW5zYWN0aW9uSWRJc05vcm1hbChmcm96ZW5YaWQp KTsKLQkJcmVsZm9ybTEtPnJlbGZyb3plbnhpZCA9IGZyb3plblhpZDsKLQkJcmVsZm9ybTEtPnJl bG1pbm14aWQgPSBjdXRvZmZNdWx0aTsKLQl9Ci0KIAkvKiBzd2FwIHNpemUgc3RhdGlzdGljcyB0 b28sIHNpbmNlIG5ldyByZWwgaGFzIGZyZXNobHktdXBkYXRlZCBzdGF0cyAqLwogCXsKIAkJaW50 MzIJCXN3YXBfcGFnZXM7CkBAIC0yNDI2LDkgKzI0MTMsOCBAQCBzd2FwX3JlbGF0aW9uX2ZpbGVz KE9pZCByMSwgT2lkIHIyLCBib29sIHRhcmdldF9pc19wZ19jbGFzcywKIAkJCQkJCQkJCXRhcmdl dF9pc19wZ19jbGFzcywKIAkJCQkJCQkJCXN3YXBfdG9hc3RfYnlfY29udGVudCwKIAkJCQkJCQkJ CWlzX2ludGVybmFsLAotCQkJCQkJCQkJZnJvemVuWGlkLAotCQkJCQkJCQkJY3V0b2ZmTXVsdGks Ci0JCQkJCQkJCQltYXBwZWRfdGFibGVzKTsKKwkJCQkJCQkJCW1hcHBlZF90YWJsZXMsCisJCQkJ CQkJCQlOVUxMKTsKIAkJCX0KIAkJCWVsc2UKIAkJCXsKQEAgLTI1MjksOSArMjUxNSw4IEBAIHN3 YXBfcmVsYXRpb25fZmlsZXMoT2lkIHIxLCBPaWQgcjIsIGJvb2wgdGFyZ2V0X2lzX3BnX2NsYXNz LAogCQkJCQkJCXRhcmdldF9pc19wZ19jbGFzcywKIAkJCQkJCQlzd2FwX3RvYXN0X2J5X2NvbnRl bnQsCiAJCQkJCQkJaXNfaW50ZXJuYWwsCi0JCQkJCQkJSW52YWxpZFRyYW5zYWN0aW9uSWQsCi0J CQkJCQkJSW52YWxpZE11bHRpWGFjdElkLAotCQkJCQkJCW1hcHBlZF90YWJsZXMpOworCQkJCQkJ CW1hcHBlZF90YWJsZXMsCisJCQkJCQkJTlVMTCk7CiAJfQogCiAJLyogQ2xlYW4gdXAuICovCkBA IC0yNTQxLDYgKzI1MjYsMzYgQEAgc3dhcF9yZWxhdGlvbl9maWxlcyhPaWQgcjEsIE9pZCByMiwg Ym9vbCB0YXJnZXRfaXNfcGdfY2xhc3MsCiAJdGFibGVfY2xvc2UocmVsUmVsYXRpb24sIFJvd0V4 Y2x1c2l2ZUxvY2spOwogfQogCisvKgorICogVXBkYXRlIHJlbGZyb3plbnhpZCBhbmQgcmVsbWlu bXhpZCBhdHRyaWJ1dGVzIG9mIHBnX2NsYXNzIGVudHJ5LCBzcGVjaWZpZWQKKyAqIGJ5IE9JRC4K KyAqLworc3RhdGljIHZvaWQKK3VwZGF0ZV9yZWxhdGlvbl9jdXRvZmZzKE9pZCByZWxpZCwgVHJh bnNhY3Rpb25JZCBmcm96ZW5YaWQsCisJCQkJCQlNdWx0aVhhY3RJZCBjdXRvZmZNdWx0aSkKK3sK KwlSZWxhdGlvbglyZWxSZWxhdGlvbjsKKwlIZWFwVHVwbGUJcmVsdHVwOworCUZvcm1fcGdfY2xh c3MgcmVsZm9ybTsKKwlDYXRhbG9nSW5kZXhTdGF0ZSBpbmRzdGF0ZTsKKworCXJlbFJlbGF0aW9u ID0gdGFibGVfb3BlbihSZWxhdGlvblJlbGF0aW9uSWQsIFJvd0V4Y2x1c2l2ZUxvY2spOworCXJl bHR1cCA9IFNlYXJjaFN5c0NhY2hlQ29weTEoUkVMT0lELCBPYmplY3RJZEdldERhdHVtKHJlbGlk KSk7CisJaWYgKCFIZWFwVHVwbGVJc1ZhbGlkKHJlbHR1cCkpCisJCWVsb2coRVJST1IsICJjYWNo ZSBsb29rdXAgZmFpbGVkIGZvciByZWxhdGlvbiAldSIsIHJlbGlkKTsKKwlyZWxmb3JtID0gKEZv cm1fcGdfY2xhc3MpIEdFVFNUUlVDVChyZWx0dXApOworCXJlbGZvcm0tPnJlbGZyb3plbnhpZCA9 IGZyb3plblhpZDsKKwlyZWxmb3JtLT5yZWxtaW5teGlkID0gY3V0b2ZmTXVsdGk7CisKKwlpbmRz dGF0ZSA9IENhdGFsb2dPcGVuSW5kZXhlcyhyZWxSZWxhdGlvbik7CisJQ2F0YWxvZ1R1cGxlVXBk YXRlV2l0aEluZm8ocmVsUmVsYXRpb24sICZyZWx0dXAtPnRfc2VsZiwgcmVsdHVwLAorCQkJCQkJ CSAgIGluZHN0YXRlKTsKKwlDYXRhbG9nQ2xvc2VJbmRleGVzKGluZHN0YXRlKTsKKworCWhlYXBf ZnJlZXR1cGxlKHJlbHR1cCk7CisJdGFibGVfY2xvc2UocmVsUmVsYXRpb24sIFJvd0V4Y2x1c2l2 ZUxvY2spOworfQorCiAvKgogICogUmVtb3ZlIHRoZSB0cmFuc2llbnQgdGFibGUgdGhhdCB3YXMg YnVpbHQgYnkgbWFrZV9uZXdfaGVhcCwgYW5kIGZpbmlzaAogICogY2xlYW5pbmcgdXAgKGluY2x1 ZGluZyByZWJ1aWxkaW5nIGFsbCBpbmRleGVzIG9uIHRoZSBvbGQgaGVhcCkuCkBAIC0yNTU4LDYg KzI1NzMsNyBAQCBmaW5pc2hfaGVhcF9zd2FwKE9pZCBPSURPbGRIZWFwLCBPaWQgT0lETmV3SGVh cCwKIHsKIAlPYmplY3RBZGRyZXNzIG9iamVjdDsKIAlPaWQJCQltYXBwZWRfdGFibGVzWzRdOwor CU9pZAkJCW9pZF9vbGRfdG9hc3RpZDsKIAlpbnQJCQlpOwogCiAJLyogUmVwb3J0IHRoYXQgd2Ug YXJlIG5vdyBzd2FwcGluZyByZWxhdGlvbiBmaWxlcyAqLwpAQCAtMjU3NCw3ICsyNTkwLDcgQEAg ZmluaXNoX2hlYXBfc3dhcChPaWQgT0lET2xkSGVhcCwgT2lkIE9JRE5ld0hlYXAsCiAJc3dhcF9y ZWxhdGlvbl9maWxlcyhPSURPbGRIZWFwLCBPSUROZXdIZWFwLAogCQkJCQkJKE9JRE9sZEhlYXAg PT0gUmVsYXRpb25SZWxhdGlvbklkKSwKIAkJCQkJCXN3YXBfdG9hc3RfYnlfY29udGVudCwgaXNf aW50ZXJuYWwsCi0JCQkJCQlmcm96ZW5YaWQsIGN1dG9mZk11bHRpLCBtYXBwZWRfdGFibGVzKTsK KwkJCQkJCW1hcHBlZF90YWJsZXMsICZvaWRfb2xkX3RvYXN0aWQpOwogCiAJLyoKIAkgKiBJZiBp dCdzIGEgc3lzdGVtIGNhdGFsb2csIHF1ZXVlIGEgc2ludmFsIG1lc3NhZ2UgdG8gZmx1c2ggYWxs IGNhdGNhY2hlcwpAQCAtMjYzMCwzNyArMjY0NiwyMCBAQCBmaW5pc2hfaGVhcF9zd2FwKE9pZCBP SURPbGRIZWFwLCBPaWQgT0lETmV3SGVhcCwKIAkJCQkJCQkJIFBST0dSRVNTX1JFUEFDS19QSEFT RV9GSU5BTF9DTEVBTlVQKTsKIAogCS8qCi0JICogSWYgdGhlIHJlbGF0aW9uIGJlaW5nIHJlYnVp bHQgaXMgcGdfY2xhc3MsIHN3YXBfcmVsYXRpb25fZmlsZXMoKQotCSAqIGNvdWxkbid0IHVwZGF0 ZSBwZ19jbGFzcydzIG93biBwZ19jbGFzcyBlbnRyeSAoY2hlY2sgY29tbWVudHMgaW4KLQkgKiBz d2FwX3JlbGF0aW9uX2ZpbGVzKCkpLCB0aHVzIHJlbGZyb3plbnhpZCB3YXMgbm90IHVwZGF0ZWQu IFRoYXQncwotCSAqIGFubm95aW5nIGJlY2F1c2UgYSBwb3RlbnRpYWwgcmVhc29uIGZvciBkb2lu ZyBhIFZBQ1VVTSBGVUxMIGlzIGEKLQkgKiBpbW1pbmVudCBvciBhY3R1YWwgYW50aS13cmFwYXJv dW5kIHNodXRkb3duLiAgU28sIG5vdyB0aGF0IHdlIGNhbgotCSAqIGFjY2VzcyB0aGUgbmV3IHJl bGF0aW9uIHVzaW5nIGl0cyBpbmRpY2VzLCB1cGRhdGUgcmVsZnJvemVueGlkLgotCSAqIHBnX2Ns YXNzIGRvZXNuJ3QgaGF2ZSBhIHRvYXN0IHJlbGF0aW9uLCBzbyB3ZSBkb24ndCBuZWVkIHRvIHVw ZGF0ZSB0aGUKLQkgKiBjb3JyZXNwb25kaW5nIHRvYXN0IHJlbGF0aW9uLiBOb3QgdGhhdCB0aGVy ZSdzIGxpdHRsZSBwb2ludCBtb3ZpbmcgYWxsCi0JICogcmVsZnJvemVueGlkIHVwZGF0ZXMgaGVy ZSBzaW5jZSBzd2FwX3JlbGF0aW9uX2ZpbGVzKCkgbmVlZHMgdG8gd3JpdGUgdG8KLQkgKiBwZ19j bGFzcyBmb3Igbm9uLW1hcHBlZCByZWxhdGlvbnMgYW55d2F5LgorCSAqIFVwZGF0ZSByZWxmcm96 ZW54aWQgYW5kIHJlbG1pbm14aWQuIENDSSBpcyBuZWVkZWQgdG8gc2VlIHRoZSBtb3N0CisJICog cmVjZW50IHBnX2NsYXNzIHR1cGxlLCBjcmVhdGVkIGJ5IHN3YXBfcmVsYXRpb25fZmlsZXMoKS4g SG93ZXZlciB0aGF0CisJICogQ0NJIG1ha2VzIHVzIHVzZSB0aGUgbmV3IHJlbGF0aW9uIGZpbGUu IFRoZXJlZm9yZSB3ZSBjYW5ub3QgZG8gdGhpcworCSAqIGJlZm9yZSBpbmRleGVzIGhhdmUgYmVl biByZWJ1aWx0IHRvby4KIAkgKi8KLQlpZiAoT0lET2xkSGVhcCA9PSBSZWxhdGlvblJlbGF0aW9u SWQpCi0JewotCQlSZWxhdGlvbglyZWxSZWxhdGlvbjsKLQkJSGVhcFR1cGxlCXJlbHR1cDsKLQkJ Rm9ybV9wZ19jbGFzcyByZWxmb3JtOwotCi0JCXJlbFJlbGF0aW9uID0gdGFibGVfb3BlbihSZWxh dGlvblJlbGF0aW9uSWQsIFJvd0V4Y2x1c2l2ZUxvY2spOwotCi0JCXJlbHR1cCA9IFNlYXJjaFN5 c0NhY2hlQ29weTEoUkVMT0lELCBPYmplY3RJZEdldERhdHVtKE9JRE9sZEhlYXApKTsKLQkJaWYg KCFIZWFwVHVwbGVJc1ZhbGlkKHJlbHR1cCkpCi0JCQllbG9nKEVSUk9SLCAiY2FjaGUgbG9va3Vw IGZhaWxlZCBmb3IgcmVsYXRpb24gJXUiLCBPSURPbGRIZWFwKTsKLQkJcmVsZm9ybSA9IChGb3Jt X3BnX2NsYXNzKSBHRVRTVFJVQ1QocmVsdHVwKTsKLQotCQlyZWxmb3JtLT5yZWxmcm96ZW54aWQg PSBmcm96ZW5YaWQ7Ci0JCXJlbGZvcm0tPnJlbG1pbm14aWQgPSBjdXRvZmZNdWx0aTsKLQotCQlD YXRhbG9nVHVwbGVVcGRhdGUocmVsUmVsYXRpb24sICZyZWx0dXAtPnRfc2VsZiwgcmVsdHVwKTsK KwlDb21tYW5kQ291bnRlckluY3JlbWVudCgpOworCXVwZGF0ZV9yZWxhdGlvbl9jdXRvZmZzKE9J RE9sZEhlYXAsIGZyb3plblhpZCwgY3V0b2ZmTXVsdGkpOwogCi0JCXRhYmxlX2Nsb3NlKHJlbFJl bGF0aW9uLCBSb3dFeGNsdXNpdmVMb2NrKTsKLQl9CisJLyoKKwkgKiBUaGUgc2FtZSBmb3IgVE9B U1QsIGlmIG5lZWRlZC4gSW4gdGhlIHN3YXAtdG9hc3QtbGlua3MgY2FzZSwgdGhlIG5ldworCSAq IHRvYXN0IHRhYmxlIHNob3VsZCBhbHJlYWR5IGhhdmUgcmVsZnJvemVueGlkIHNldCB0byBSZWNl bnRYbWluLgorCSAqLworCWlmIChPaWRJc1ZhbGlkKG9pZF9vbGRfdG9hc3RpZCkgJiYgc3dhcF90 b2FzdF9ieV9jb250ZW50KQorCQl1cGRhdGVfcmVsYXRpb25fY3V0b2ZmcyhvaWRfb2xkX3RvYXN0 aWQsIGZyb3plblhpZCwgY3V0b2ZmTXVsdGkpOwogCiAJLyogRGVzdHJveSBuZXcgaGVhcCB3aXRo IG9sZCBmaWxlbnVtYmVyICovCiAJb2JqZWN0LmNsYXNzSWQgPSBSZWxhdGlvblJlbGF0aW9uSWQ7 CkBAIC00NDI2LDkgKzQ0MjUsOCBAQCByZWJ1aWxkX3JlbGF0aW9uX2ZpbmlzaF9jb25jdXJyZW50 KFJlbGF0aW9uIE5ld0hlYXAsIFJlbGF0aW9uIE9sZEhlYXAsCiAJCQkJCQkJKG9sZF90YWJsZV9v aWQgPT0gUmVsYXRpb25SZWxhdGlvbklkKSwKIAkJCQkJCQlmYWxzZSwJLyogc3dhcF90b2FzdF9i eV9jb250ZW50ICovCiAJCQkJCQkJdHJ1ZSwKLQkJCQkJCQlJbnZhbGlkVHJhbnNhY3Rpb25JZCwK LQkJCQkJCQlJbnZhbGlkTXVsdGlYYWN0SWQsCi0JCQkJCQkJbWFwcGVkX3RhYmxlcyk7CisJCQkJ CQkJbWFwcGVkX3RhYmxlcywKKwkJCQkJCQlOVUxMKTsKIAogI2lmZGVmIFVTRV9BU1NFUlRfQ0hF Q0tJTkcKIApAQCAtNDU4OSwxMCArNDU4NywxMCBAQCBwcm9jZXNzX2F1eGlsaWFyeV90YWJsZShD aGFuZ2VDb250ZXh0ICpjaGdjeHQsIFJlbGF0aW9uICpwT2xkSGVhcCwKIH0KIAogLyoKLSAqIEJ1 aWxkIGluZGV4ZXMgb24gTmV3SGVhcCBhY2NvcmRpbmcgdG8gdGhvc2Ugb24gdGhlIG9sZCBoZWFw LgorICogQnVpbGQgaW5kZXhlcyBvbiBOZXdIZWFwIGFjY29yZGluZyB0byB0aG9zZSBvbiBPbGRI ZWFwLgogICoKLSAqIE9sZEluZGV4ZXMgaXMgdGhlIGxpc3Qgb2YgaW5kZXggT0lEcyBvbiB0aGUg b2xkIGhlYXAuIFRoZSBjb250YWluZWQgaW5kZXhlcwotICogZW5kIHVwIGxvY2tlZCB1c2luZyBT aGFyZVVwZGF0ZUV4Y2x1c2l2ZUxvY2suCisgKiBPbGRJbmRleGVzIGlzIHRoZSBsaXN0IG9mIGlu ZGV4IE9JRHMgb24gT2xkSGVhcC4gVGhlIGNvbnRhaW5lZCBpbmRleGVzIGVuZAorICogdXAgbG9j a2VkIHVzaW5nIFNoYXJlVXBkYXRlRXhjbHVzaXZlTG9jay4KICAqCiAgKiBBIGxpc3Qgb2YgT0lE cyBvZiB0aGUgY29ycmVzcG9uZGluZyBpbmRleGVzIGNyZWF0ZWQgb24gTmV3SGVhcCBpcwogICog cmV0dXJuZWQuIFRoZSBvcmRlciBvZiBpdGVtcyBkb2VzIG1hdGNoLCBzbyB3ZSBjYW4gdXNlIHRo ZXNlIGFycmF5cyB0byBzd2FwCi0tIAoyLjUxLjAKCg== --=-=-= Content-Type: application/mbox Content-Disposition: attachment; filename=v05-0009-Make-REPACK-CONCURRENTLY-MVCC-safe.patch Content-Transfer-Encoding: base64 RnJvbSBhNmU3NjlmNDliMTlmZjM4NmI3MDY3OTA1NzQ3NWEyNzNhZjRhMDlkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmluIEhvdXNrYSA8YWhAY3liZXJ0ZWMuYXQ+CkRhdGU6 IFR1ZSwgMTAgTm92IDIwMjYgMTE6NDQ6MzkgKzAxMDAKU3ViamVjdDogW1BBVENIIDkvOV0gTWFr ZSBSRVBBQ0sgKENPTkNVUlJFTlRMWSkgTVZDQy1zYWZlLgoKSW4gdGhlIGluaXRpYWwgaW1wbGVt ZW50YXRpb24gb2YgUkVQQUNLIChDT05DVVJSRU5UTFkpLCB0dXBsZXMgaW4gdGhlIG5ldwp0YWJs ZSBhcmUgbWFya2VkIHdpdGggWElEIG9mIHRoZSB0cmFuc2FjdGlvbiB0aGUgY29tbWFuZCBleGVj dXRlcyBpbi4gVGhpcyBpcwpzaW1wbGVyIHRvIGltcGxlbWVudCwgYnV0IGNhbiBjYXVzZSBzdXJw cmlzaW5nIGJlaGF2aW9yOiBvbiBzcGVjaWZpYwpjb25kaXRpb25zLCB0aGUgdGFibGUgY29udGVu dHMgbWF5IGJlY29tZSBpbnZpc2libGUgZm9yIHRyYW5zYWN0aW9ucyB0aGF0CnNob3VsZCBzZWUg aXQuIChCb3RoIEFMVEVSIFRBQkxFIGFuZCBUUlVOQ0FURSBjb21tYW5kcyBoYXZlIHRoaXMgcHJv YmxlbS4pCkJlc2lkZXMgdGhhdCwgYXMgUkVQQUNLIChDT05DVVJSRU5UTFkpIG5lZWRzIHRvIGhh dmUgWElEIGFzc2lnbmVkICh0byBtYXJrIHRoZQpuZXcgdHVwbGVzKSB3aGlsZSBpdCBjb3BpZXMg dGhlIGRhdGEgKHdoaWNoIGNhbiB0YWtlIGxvbmcgdGltZSksIGl0IGNhbgpyZXN0cmljdCB0aGUg cHJvZ3Jlc3Mgb2YgdGhlIHhtaW4gaG9yaXpvbnMgZm9yIFZBQ1VVTSBxdWl0ZSBhIGJpdC4KClRo aXMgcGF0Y2ggdGVhY2hlcyBSRVBBQ0sgKENPTkNVUlJFTlRMWSkgdG8gdHJhbnNmZXIgdGhlIHZp c2liaWxpdHkKaW5mb3JtYXRpb24gZnJvbSB0aGUgb2xkIHRhYmxlIHRvIHRoZSBuZXcgb25lLiBU aHVzIHRoZXJlJ3Mgbm8gbmVlZCB0byBoYXZlClhJRCBhc3NpZ25lZCBkdXJpbmcgdGhlIGNvcHlp bmcsIGFuZCB0aGVyZWZvcmUgVkFDVVVNIChvZiBvdGhlciB0YWJsZXMpIGlzIG5vdApyZXN0cmlj dGVkIGFueW1vcmUuCgpBIG5ldyB0eXBlIG9mIHNuYXBzaG90IGlzIHVzZWQgdG8gbG9vayBmb3Ig dGhlIGV4aXN0aW5nIHR1cGxlcyBpbiB0aGUgbmV3CnRhYmxlLCBpbiBvcmRlciB0byBhcHBseSB0 aGUgY29uY3VycmVudCBkYXRhIGNoYW5nZXMgKGkuZS4gY2hhbmdlcyBwZXJmb3JtZWQKYnkgb3Ro ZXIgdHJhbnNhY3Rpb25zIGR1cmluZyB0aGUgaW5pdGlhbCBjb3B5aW5nKS4gVGhpcyBzbmFwc2hv dCBhc3N1bWVzIHRoYXQKdGhlIG5ldyB0YWJsZSBkb2VzIG5vdCBjb250YWluIGFueSB0dXBsZXMg Y3JlYXRlZCBieSBhYm9ydGVkCnRyYW5zYWN0aW9ucy4gVGhpcyBpcyBzaW1wbGVyIGFuZCBtb3Jl IGVmZmljaWVudCB0aGFuIGJ1aWxkaW5nIGhpc3RvcmljIE1WQ0MKc25hcHNob3RzIGZvciB0aGUg bG9vay11cHMuCgpPbmUgcHJvYmxlbSB0aGF0IG5lZWRzIHNwZWNpYWwgYXR0ZW50aW9uIGlzIHR1 cGxlIGZyZWV6aW5nLiBCZXNpZGVzIHBhZ2UKcHJ1bmluZyBjb2RlLCBmcmVlemluZyBpcyBjdXJy ZW50bHkgaW1wbGVtZW50ZWQgb25seSBpbiByZXdyaXRlaGVhcC5jLiBUaHVzIGl0CnNlZW1zIHNp bXBsZXIgdG8gdGVhY2ggUkVQQUNLIChDT05DVVJSRU5UTFkpIHRvIGNvcHkgdGhlIGRhdGEgdXNp bmcKcmV3cml0ZWhlYXAuYyByYXRoZXIgdGhhbiBpbXBsZW1lbnRpbmcgZnJlZXppbmcgb2YgaW5k aXZpZHVhbCB0dXBsZXMKaW5kZXBlbmRlbnQgZnJvbSBwYWdlIHBydW5pbmcuIChUaGUgbGF0dGVy IHdvdWxkIGluY2x1ZGUgV0FMIGxvZ2dpbmcgb2YgdGhlCmluZGl2aWR1YWwgZnJvemVuIHR1cGxl cywgd2hlcmVhcyByZXdyaXRlaGVhcC5jIGxvZ3MgdGhlIHdob2xlIHBhZ2UgYXQgb25jZS4pCkRp c2FkdmFudGFnZSBvZiB0aGlzIGFwcHJvYWNoIGlzIHRoYXQgd2Ugb25seSBmcmVlemUgdHVwbGVz IGR1cmluZyB0aGUgaW5pdGlhbApjb3B5aW5nLCB3aGlsZSB0aGUgZGF0YSBjaGFuZ2VzIGRlY29k ZWQgZnJvbSBXQUwgYXJlIHJlcGxheWVkIHdpdGhvdXQKZnJlZXppbmcuCgpUaGlzIHBhdGNoIGFs c28gdXNlcyByZXdyaXRlaGVhcC5jIChpbiBwYXJ0aWN1bGFyIHJhd19oZWFwX2luc2VydCgpKSB0 byBpbnNlcnQKVE9BU1QgdHVwbGVzLiBUaGF0IHNlZW1zIHRvIGJlIHRoZSBlYXNpZXN0IHdheSB0 byBhdm9pZCBnZXR0aW5nIFhJRCBhc3NpZ25lZApqdXN0IHRvIGluc2VydCBUT0FTVC4gSG93ZXZl ciwgZHVlIHRvIG5vdCB1c2luZyBhIG5ldyBYSUQsIGV2ZW4gVE9BU1QgbmVlZHMgdG8KYmUgZnJv emVuIG5vdyAtIGFnYWluLCB3ZSB1c2UgdGhlIGV4aXN0aW5nIGNvZGUgaW4gcmV3cml0ZWhlYXAu Yy4KLS0tCiBzcmMvYmFja2VuZC9hY2Nlc3MvY29tbW9uL3RvYXN0X2ludGVybmFscy5jICAgfCAg NDYgKy0KIHNyYy9iYWNrZW5kL2FjY2Vzcy9oZWFwL2hlYXBhbS5jICAgICAgICAgICAgICB8ICA4 NiArKystCiBzcmMvYmFja2VuZC9hY2Nlc3MvaGVhcC9oZWFwYW1faGFuZGxlci5jICAgICAgfCAy NTAgKysrKysrKysrLQogc3JjL2JhY2tlbmQvYWNjZXNzL2hlYXAvaGVhcGFtX3Zpc2liaWxpdHku YyAgIHwgIDYyICsrKwogc3JjL2JhY2tlbmQvYWNjZXNzL2hlYXAvaGVhcHRvYXN0LmMgICAgICAg ICAgIHwgIDIzICstCiBzcmMvYmFja2VuZC9hY2Nlc3MvaGVhcC9yZXdyaXRlaGVhcC5jICAgICAg ICAgfCAyNzIgKysrKysrKystLS0KIHNyYy9iYWNrZW5kL2FjY2Vzcy90YWJsZS90YWJsZWFtLmMg ICAgICAgICAgICB8ICAgMSArCiBzcmMvYmFja2VuZC9hY2Nlc3MvdGFibGUvdG9hc3RfaGVscGVy LmMgICAgICAgfCAgMTEgKy0KIHNyYy9iYWNrZW5kL2FjY2Vzcy90cmFuc2FtL3hsb2dpbnNlcnQu YyAgICAgICB8ICAzMSArLQogc3JjL2JhY2tlbmQvYWNjZXNzL3RyYW5zYW0veGxvZ3JlY292ZXJ5 LmMgICAgIHwgICA3ICstCiBzcmMvYmFja2VuZC9jYXRhbG9nL2luZGV4aW5nLmMgICAgICAgICAg ICAgICAgfCAgIDIgKy0KIHNyYy9iYWNrZW5kL2NvbW1hbmRzL21hdHZpZXcuYyAgICAgICAgICAg ICAgICB8ICAgMyArLQogc3JjL2JhY2tlbmQvY29tbWFuZHMvcmVwYWNrLmMgICAgICAgICAgICAg ICAgIHwgNDYxICsrKysrKysrKysrKy0tLS0tLQogc3JjL2JhY2tlbmQvY29tbWFuZHMvdGFibGVj bWRzLmMgICAgICAgICAgICAgIHwgICAxICsKIHNyYy9iYWNrZW5kL2V4ZWN1dG9yL25vZGVNb2Rp ZnlUYWJsZS5jICAgICAgICB8ICAgMSArCiBzcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2Fs L2RlY29kZS5jICAgICAgfCAxMTAgKysrKy0KIC4uLi9yZXBsaWNhdGlvbi9sb2dpY2FsL3Jlb3Jk ZXJidWZmZXIuYyAgICAgICB8ICAgMyArCiAuLi4vdXRpbHMvYWN0aXZpdHkvd2FpdF9ldmVudF9u YW1lcy50eHQgICAgICAgfCAgIDEgKwogc3JjL2luY2x1ZGUvYWNjZXNzL2hlYXBhbS5oICAgICAg ICAgICAgICAgICAgIHwgICA0ICstCiBzcmMvaW5jbHVkZS9hY2Nlc3MvaGVhcHRvYXN0LmggICAg ICAgICAgICAgICAgfCAgIDcgKy0KIHNyYy9pbmNsdWRlL2FjY2Vzcy9yZXdyaXRlaGVhcC5oICAg ICAgICAgICAgICB8ICAxNCArLQogc3JjL2luY2x1ZGUvYWNjZXNzL3RhYmxlYW0uaCAgICAgICAg ICAgICAgICAgIHwgIDI4ICstCiBzcmMvaW5jbHVkZS9hY2Nlc3MvdG9hc3RfaGVscGVyLmggICAg ICAgICAgICAgfCAgMTQgKy0KIHNyYy9pbmNsdWRlL2FjY2Vzcy90b2FzdF9pbnRlcm5hbHMuaCAg ICAgICAgICB8ICAgOSArLQogc3JjL2luY2x1ZGUvYWNjZXNzL3hsb2dfaW50ZXJuYWwuaCAgICAg ICAgICAgIHwgICAyICstCiBzcmMvaW5jbHVkZS9hY2Nlc3MveGxvZ2luc2VydC5oICAgICAgICAg ICAgICAgfCAgIDEgKwogc3JjL2luY2x1ZGUvYWNjZXNzL3hsb2dyZWNvcmQuaCAgICAgICAgICAg ICAgIHwgICA4ICsKIHNyYy9pbmNsdWRlL2NvbW1hbmRzL3JlcGFjay5oICAgICAgICAgICAgICAg ICB8ICAxNyArLQogc3JjL2luY2x1ZGUvdXRpbHMvc25hcG1nci5oICAgICAgICAgICAgICAgICAg IHwgIDEyICsKIHNyYy9pbmNsdWRlL3V0aWxzL3NuYXBzaG90LmggICAgICAgICAgICAgICAgICB8 ICAyNyArLQogLi4uL2luamVjdGlvbl9wb2ludHMvZXhwZWN0ZWQvcmVwYWNrLm91dCAgICAgIHwg IDEwICstCiAuLi4vaW5qZWN0aW9uX3BvaW50cy9zcGVjcy9yZXBhY2suc3BlYyAgICAgICAgfCAg MjMgKy0KIHNyYy90ZXN0L3JlZ3Jlc3MvZXhwZWN0ZWQvcnVsZXMub3V0ICAgICAgICAgICB8ICAx MiArLQogMzMgZmlsZXMgY2hhbmdlZCwgMTIyMyBpbnNlcnRpb25zKCspLCAzMzYgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvYWNjZXNzL2NvbW1vbi90b2FzdF9pbnRlcm5h bHMuYyBiL3NyYy9iYWNrZW5kL2FjY2Vzcy9jb21tb24vdG9hc3RfaW50ZXJuYWxzLmMKaW5kZXgg YTQyY2E3ZWQ3NmMuLmI2NjIzNGQ5ZTBlIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9hY2Nlc3Mv Y29tbW9uL3RvYXN0X2ludGVybmFscy5jCisrKyBiL3NyYy9iYWNrZW5kL2FjY2Vzcy9jb21tb24v dG9hc3RfaW50ZXJuYWxzLmMKQEAgLTE4NCwxMiArMTg0LDE1IEBAIHRvYXN0X3ByZXNlcnZlX3Zh bHVlaWQoUmVsYXRpb24gdG9hc3RyZWwsIE9pZCB0b2FzdG9pZCwKICAqIHJlbDogdGhlIG1haW4g cmVsYXRpb24gd2UncmUgd29ya2luZyB3aXRoIChub3QgdGhlIHRvYXN0IHJlbCEpCiAgKiB2YWx1 ZTogZGF0dW0gdG8gYmUgcHVzaGVkIHRvIHRvYXN0IHN0b3JhZ2UKICAqIG9sZGV4dGVybmFsOiBp ZiBub3QgTlVMTCwgdG9hc3QgcG9pbnRlciBwcmV2aW91c2x5IHJlcHJlc2VudGluZyB0aGUgZGF0 dW0KKyAqIHJ3c3RhdGU6IHN0YXRlIG5lZWRlZCBmb3IgInJhdyBpbnNlcnQiLgorICogdHVwX21h aW46IHRoZSB0dXBsZSB3aG9zZSBhdHRyaWJ1dGUgd2UncmUgc2F2aW5nCiAgKiBvcHRpb25zOiBv cHRpb25zIHRvIGJlIHBhc3NlZCB0byBoZWFwX2luc2VydCgpIGZvciB0b2FzdCByb3dzCiAgKiAt LS0tLS0tLS0tCiAgKi8KIERhdHVtCiB0b2FzdF9zYXZlX2RhdHVtKFJlbGF0aW9uIHJlbCwgRGF0 dW0gdmFsdWUsCi0JCQkJIHZhcmxlbmEgKm9sZGV4dGVybmFsLCB1aW50MzIgb3B0aW9ucykKKwkJ CQkgdmFybGVuYSAqb2xkZXh0ZXJuYWwsIFJld3JpdGVTdGF0ZSByd3N0YXRlLAorCQkJCSBIZWFw VHVwbGUgdHVwX21haW4sIHVpbnQzMiBvcHRpb25zKQogewogCVJlbGF0aW9uCXRvYXN0cmVsOwog CVJlbGF0aW9uICAgKnRvYXN0aWR4czsKQEAgLTM1Nyw3ICszNjAsNDEgQEAgdG9hc3Rfc2F2ZV9k YXR1bShSZWxhdGlvbiByZWwsIERhdHVtIHZhbHVlLAogCiAJCXRvYXN0dHVwID0gaGVhcF9mb3Jt X3R1cGxlKHRvYXN0dHVwRGVzYywgdF92YWx1ZXMsIHRfaXNudWxsKTsKIAotCQloZWFwX2luc2Vy dCh0b2FzdHJlbCwgdG9hc3R0dXAsIG15Y2lkLCBvcHRpb25zLCBOVUxMKTsKKwkJaWYgKHJ3c3Rh dGUgPT0gTlVMTCkKKwkJeworCQkJLyoKKwkJCSAqIFdpdGggUkVVU0VfWElEIHdlJ2QgbmVlZCBy ZWd1bGFyIGZyZWV6aW5nLCBob3dldmVyIHRoYXQgaXMKKwkJCSAqIGN1cnJlbnRseSBpbXBsZW1l bnRlZCBvbmx5IGFzIGEgcGFydCBvZiBWQUNVVU0gb3IgaW4KKwkJCSAqIHJld3JpdGVoZWFwLmMu IE9uIHRoZSBvdGhlciBoYW5kLCB0dXBsZXMgY29udGFpbmluZyBhIG5ldyBYSUQKKwkJCSAqIGNh biBiZSBtYXJrZWQgYXMgZnJvemVuIGluIHNwZWNpYWwgY2FzZXMgLSBzZWUgdGhlIGN1cnJlbnQg dXNlcworCQkJICogb2YgVEFCTEVfSU5TRVJUX0ZST1pFTi4KKwkJCSAqLworCQkJQXNzZXJ0KChv cHRpb25zICYgSEVBUF9JTlNFUlRfRlJPWkVOKSA9PSAwIHx8CisJCQkJICAgKG9wdGlvbnMgJiBU QUJMRV9SRVVTRV9YSUQpID09IDApOworCisJCQkvKgorCQkJICogSWYgYW4gZXhpc3RpbmcgWElE IHNob3VsZCBiZSB1c2VkLCB0aGUgZW50aXJlIHZpc2liaWxpdHkgaW5mbworCQkJICogb2YgdGhl IFRPQVNUIHR1cGxlIHNob3VsZCBiZSBlcXVhbCB0byB0aGF0IG9mIGNvcnJlc3BvbmRpbmcKKwkJ CSAqIHR1cGxlIGluIHRoZSBtYWluIHRhYmxlLgorCQkJICovCisJCQlpZiAob3B0aW9ucyAmIFRB QkxFX1JFVVNFX1hJRCkKKwkJCQlyZXdyaXRlX2NvcHlfdmlzaWJpbGl0eV9pbmZvKHRvYXN0dHVw LCB0dXBfbWFpbik7CisKKwkJCWhlYXBfaW5zZXJ0KHRvYXN0cmVsLCB0b2FzdHR1cCwgbXljaWQs IG9wdGlvbnMsIE5VTEwpOworCQl9CisJCWVsc2UKKwkJeworCQkJLyoKKwkJCSAqIER1cmluZyBo ZWFwIHJld3JpdGUsIFhJRCBpcyBhbHdheXMgcmV1c2VkIGFuZCB0aGUgdHVwbGUgaXMKKwkJCSAq IGFsd2F5cyBmcm96ZW4gLSB3ZSBkbyBub3QgZXhwZWN0IHRoZSB1c2VyIHRvIHRlbGwgdXMgd2hh dCB0bworCQkJICogZG8uCisJCQkgKi8KKwkJCUFzc2VydCgob3B0aW9ucyAmIEhFQVBfSU5TRVJU X0ZST1pFTikgPT0gMCAmJgorCQkJCSAgIChvcHRpb25zICYgVEFCTEVfUkVVU0VfWElEKSA9PSAw KTsKKworCQkJcmV3cml0ZV9oZWFwX3R1cGxlX25vX2NoYWlucyhyd3N0YXRlLCB0dXBfbWFpbiwg dG9hc3R0dXAsIGZhbHNlLAorCQkJCQkJCQkJCSB0cnVlKTsKKwkJfQogCiAJCS8qCiAJCSAqIENy ZWF0ZSB0aGUgaW5kZXggZW50cnkuICBXZSBjaGVhdCBhIGxpdHRsZSBoZXJlIGJ5IG5vdCB1c2lu ZwpAQCAtNDU4LDcgKzQ5NSw4IEBAIHRvYXN0X3ZhbHVlaWRfc2NhbmtleV9pbml0KFNjYW5LZXkg ZW50cnksIE9pZCB0b2FzdF90eXBpZCwgT2lkOCB2YWx1ZWlkKQogICogLS0tLS0tLS0tLQogICov CiB2b2lkCi10b2FzdF9kZWxldGVfZGF0dW0oUmVsYXRpb24gcmVsLCBEYXR1bSB2YWx1ZSwgYm9v bCBpc19zcGVjdWxhdGl2ZSkKK3RvYXN0X2RlbGV0ZV9kYXR1bShSZWxhdGlvbiByZWwsIERhdHVt IHZhbHVlLCBib29sIGlzX3NwZWN1bGF0aXZlLAorCQkJCSAgIFRyYW5zYWN0aW9uSWQgeGlkKQog ewogCXZhcmxlbmEgICAgKmF0dHIgPSAodmFybGVuYSAqKSBEYXR1bUdldFBvaW50ZXIodmFsdWUp OwogCXRvYXN0X2V4dGVybmFsX2RhdGEgdG9hc3RfZXh0X2RhdGE7CkBAIC01MTMsNyArNTUxLDcg QEAgdG9hc3RfZGVsZXRlX2RhdHVtKFJlbGF0aW9uIHJlbCwgRGF0dW0gdmFsdWUsIGJvb2wgaXNf c3BlY3VsYXRpdmUpCiAJCWlmIChpc19zcGVjdWxhdGl2ZSkKIAkJCWhlYXBfYWJvcnRfc3BlY3Vs YXRpdmUodG9hc3RyZWwsICZ0b2FzdHR1cC0+dF9zZWxmKTsKIAkJZWxzZQotCQkJc2ltcGxlX2hl YXBfZGVsZXRlKHRvYXN0cmVsLCAmdG9hc3R0dXAtPnRfc2VsZik7CisJCQlzaW1wbGVfaGVhcF9k ZWxldGUodG9hc3RyZWwsICZ0b2FzdHR1cC0+dF9zZWxmLCB4aWQpOwogCX0KIAogCS8qCmRpZmYg LS1naXQgYS9zcmMvYmFja2VuZC9hY2Nlc3MvaGVhcC9oZWFwYW0uYyBiL3NyYy9iYWNrZW5kL2Fj Y2Vzcy9oZWFwL2hlYXBhbS5jCmluZGV4IDNiYjMzNjk5MzQ5Li4xOWJlMWEzOTk1YiAxMDA2NDQK LS0tIGEvc3JjL2JhY2tlbmQvYWNjZXNzL2hlYXAvaGVhcGFtLmMKKysrIGIvc3JjL2JhY2tlbmQv YWNjZXNzL2hlYXAvaGVhcGFtLmMKQEAgLTY0LDcgKzY0LDcgQEAgc3RhdGljIFhMb2dSZWNQdHIg bG9nX2hlYXBfdXBkYXRlKFJlbGF0aW9uIHJlbG4sIEJ1ZmZlciBvbGRidWYsCiAJCQkJCQkJCSAg QnVmZmVyIHZtYnVmZmVyX25ldywgSGVhcFR1cGxlIG9sZHR1cCwKIAkJCQkJCQkJICBIZWFwVHVw bGUgbmV3dHVwLCBIZWFwVHVwbGUgb2xkX2tleV90dXBsZSwKIAkJCQkJCQkJICBib29sIGFsbF92 aXNpYmxlX2NsZWFyZWQsIGJvb2wgbmV3X2FsbF92aXNpYmxlX2NsZWFyZWQsCi0JCQkJCQkJCSAg Ym9vbCB3YWxMb2dpY2FsKTsKKwkJCQkJCQkJICBib29sIHdhbExvZ2ljYWwsIFRyYW5zYWN0aW9u SWQgeGlkKTsKICNpZmRlZiBVU0VfQVNTRVJUX0NIRUNLSU5HCiBzdGF0aWMgdm9pZCBjaGVja19s b2NrX2lmX2lucGxhY2VfdXBkYXRlYWJsZV9yZWwoUmVsYXRpb24gcmVsYXRpb24sCiAJCQkJCQkJ CQkJCQkgY29uc3QgSXRlbVBvaW50ZXJEYXRhICpvdGlkLApAQCAtMjAwNyw3ICsyMDA3LDcgQEAg dm9pZAogaGVhcF9pbnNlcnQoUmVsYXRpb24gcmVsYXRpb24sIEhlYXBUdXBsZSB0dXAsIENvbW1h bmRJZCBjaWQsCiAJCQl1aW50MzIgb3B0aW9ucywgQnVsa0luc2VydFN0YXRlIGJpc3RhdGUpCiB7 Ci0JVHJhbnNhY3Rpb25JZCB4aWQgPSBHZXRDdXJyZW50VHJhbnNhY3Rpb25JZCgpOworCVRyYW5z YWN0aW9uSWQgeGlkOwogCUhlYXBUdXBsZQloZWFwdHVwOwogCUJ1ZmZlcgkJYnVmZmVyOwogCVBh Z2UJCXBhZ2U7CkBAIC0yMDIxLDYgKzIwMjEsMTMgQEAgaGVhcF9pbnNlcnQoUmVsYXRpb24gcmVs YXRpb24sIEhlYXBUdXBsZSB0dXAsIENvbW1hbmRJZCBjaWQsCiAKIAlBc3NlcnRIYXNTbmFwc2hv dEZvclRvYXN0KHJlbGF0aW9uKTsKIAorCS8qIFRoZSBjYWxsZXIgbWlnaHQgbmVlZCB0byBwcmVz ZXJ2ZSB0aGUgZXhpc3RpbmcgeG1pbi4gKi8KKwlpZiAoKG9wdGlvbnMgJiBUQUJMRV9SRVVTRV9Y SUQpID09IDApCisJCXhpZCA9IEdldEN1cnJlbnRUcmFuc2FjdGlvbklkKCk7CisJZWxzZQorCQl4 aWQgPSBIZWFwVHVwbGVIZWFkZXJHZXRYbWluKHR1cC0+dF9kYXRhKTsKKwlBc3NlcnQoVHJhbnNh Y3Rpb25JZElzVmFsaWQoeGlkKSk7CisKIAkvKgogCSAqIEZpbGwgaW4gdHVwbGUgaGVhZGVyIGZp ZWxkcyBhbmQgdG9hc3QgdGhlIHR1cGxlIGlmIG5lY2Vzc2FyeS4KIAkgKgpAQCAtMjE3Nyw2ICsy MTg0LDEzIEBAIGhlYXBfaW5zZXJ0KFJlbGF0aW9uIHJlbGF0aW9uLCBIZWFwVHVwbGUgdHVwLCBD b21tYW5kSWQgY2lkLAogCQlpZiAodm1idWZmZXJfbW9kaWZpZWQpCiAJCQlYTG9nUmVnaXN0ZXJC dWZmZXIoSEVBUF9JTlNFUlRfQkxLUkVGX1ZNLCB2bWJ1ZmZlciwgMCk7CiAKKwkJLyoKKwkJICog RXZlbiBpZiB3ZSBkb24ndCBoYXZlIFhJRCBhc3NpZ25lZCwgdmFsaWQgWElEIGlzIG5lY2Vzc2Fy eSBmb3IKKwkJICogcmVjb3ZlcnkgYW5kIHN0cmVhbWluZyByZXBsaWNhdGlvbiB0byB3b3JrLgor CQkgKi8KKwkJaWYgKG9wdGlvbnMgJiBUQUJMRV9SRVVTRV9YSUQpCisJCQlYTG9nU2V0UmVjb3Jk WGlkKHhpZCk7CisKIAkJcmVjcHRyID0gWExvZ0luc2VydChSTV9IRUFQX0lELCBpbmZvKTsKIAog CQlQYWdlU2V0TFNOKHBhZ2UsIHJlY3B0cik7CkBAIC0yMjY2LDcgKzIyODAsNyBAQCBoZWFwX3By ZXBhcmVfaW5zZXJ0KFJlbGF0aW9uIHJlbGF0aW9uLCBIZWFwVHVwbGUgdHVwLCBUcmFuc2FjdGlv bklkIHhpZCwKIAkJcmV0dXJuIHR1cDsKIAl9CiAJZWxzZSBpZiAoSGVhcFR1cGxlSGFzRXh0ZXJu YWwodHVwKSB8fCB0dXAtPnRfbGVuID4gVE9BU1RfVFVQTEVfVEhSRVNIT0xEKQotCQlyZXR1cm4g aGVhcF90b2FzdF9pbnNlcnRfb3JfdXBkYXRlKHJlbGF0aW9uLCB0dXAsIE5VTEwsIG9wdGlvbnMp OworCQlyZXR1cm4gaGVhcF90b2FzdF9pbnNlcnRfb3JfdXBkYXRlKHJlbGF0aW9uLCB0dXAsIE5V TEwsIE5VTEwsIG9wdGlvbnMpOwogCWVsc2UKIAkJcmV0dXJuIHR1cDsKIH0KQEAgLTIzMjksNiAr MjM0Myw4IEBAIGhlYXBfbXVsdGlfaW5zZXJ0KFJlbGF0aW9uIHJlbGF0aW9uLCBUdXBsZVRhYmxl U2xvdCAqKnNsb3RzLCBpbnQgbnR1cGxlcywKIAogCS8qIGN1cnJlbnRseSBub3QgbmVlZGVkICh0 aHVzIHVuc3VwcG9ydGVkKSBmb3IgaGVhcF9tdWx0aV9pbnNlcnQoKSAqLwogCUFzc2VydCghKG9w dGlvbnMgJiBIRUFQX0lOU0VSVF9OT19MT0dJQ0FMKSk7CisJLyogTGlrZXdpc2UuICovCisJQXNz ZXJ0KCEob3B0aW9ucyAmIFRBQkxFX1JFVVNFX1hJRCkpOwogCiAJQXNzZXJ0SGFzU25hcHNob3RG b3JUb2FzdChyZWxhdGlvbik7CiAKQEAgLTI3NjEsMTEgKzI3NzcsMTEgQEAgeG1heF9pbmZvbWFz a19jaGFuZ2VkKHVpbnQxNiBuZXdfaW5mb21hc2ssIHVpbnQxNiBvbGRfaW5mb21hc2spCiAgKi8K IFRNX1Jlc3VsdAogaGVhcF9kZWxldGUoUmVsYXRpb24gcmVsYXRpb24sIGNvbnN0IEl0ZW1Qb2lu dGVyRGF0YSAqdGlkLAotCQkJQ29tbWFuZElkIGNpZCwgdWludDMyIG9wdGlvbnMsIFNuYXBzaG90 IGNyb3NzY2hlY2ssCisJCQlUcmFuc2FjdGlvbklkIHhpZCwgQ29tbWFuZElkIGNpZCwgdWludDMy IG9wdGlvbnMsCisJCQlTbmFwc2hvdCBjcm9zc2NoZWNrLAogCQkJYm9vbCB3YWl0LCBUTV9GYWls dXJlRGF0YSAqdG1mZCkKIHsKIAlUTV9SZXN1bHQJcmVzdWx0OwotCVRyYW5zYWN0aW9uSWQgeGlk ID0gR2V0Q3VycmVudFRyYW5zYWN0aW9uSWQoKTsKIAlJdGVtSWQJCWxwOwogCUhlYXBUdXBsZURh dGEgdHA7CiAJUGFnZQkJcGFnZTsKQEAgLTI3ODMsMTEgKzI3OTksMTQgQEAgaGVhcF9kZWxldGUo UmVsYXRpb24gcmVsYXRpb24sIGNvbnN0IEl0ZW1Qb2ludGVyRGF0YSAqdGlkLAogCWJvb2wJCWNs ZWFyX2FsbF92aXNpYmxlID0gZmFsc2U7CiAJSGVhcFR1cGxlCW9sZF9rZXlfdHVwbGUgPSBOVUxM OwkvKiByZXBsaWNhIGlkZW50aXR5IG9mIHRoZSB0dXBsZSAqLwogCWJvb2wJCW9sZF9rZXlfY29w aWVkID0gZmFsc2U7CisJYm9vbAkJb3ZlcnJpZGVfeGlkID0gZmFsc2U7CiAKIAlBc3NlcnQoSXRl bVBvaW50ZXJJc1ZhbGlkKHRpZCkpOwogCiAJQXNzZXJ0SGFzU25hcHNob3RGb3JUb2FzdChyZWxh dGlvbik7CiAKKwlBc3NlcnQoKG9wdGlvbnMgJiBUQUJMRV9SRVVTRV9YSUQpID09IDApOworCiAJ LyoKIAkgKiBGb3JiaWQgdGhpcyBkdXJpbmcgYSBwYXJhbGxlbCBvcGVyYXRpb24sIGxlc3QgaXQg YWxsb2NhdGUgYSBjb21ibyBDSUQuCiAJICogT3RoZXIgd29ya2VycyBtaWdodCBuZWVkIHRoYXQg Y29tYm8gQ0lEIGZvciB2aXNpYmlsaXR5IGNoZWNrcywgYW5kIHdlCkBAIC0yNzk4LDYgKzI4MTcs MTIgQEAgaGVhcF9kZWxldGUoUmVsYXRpb24gcmVsYXRpb24sIGNvbnN0IEl0ZW1Qb2ludGVyRGF0 YSAqdGlkLAogCQkJCShlcnJjb2RlKEVSUkNPREVfSU5WQUxJRF9UUkFOU0FDVElPTl9TVEFURSks CiAJCQkJIGVycm1zZygiY2Fubm90IGRlbGV0ZSB0dXBsZXMgZHVyaW5nIGEgcGFyYWxsZWwgb3Bl cmF0aW9uIikpKTsKIAorCS8qIENhbGxlciBjYW4gb3ZlcnJpZGUgdGhlIHhpZC4gKi8KKwlpZiAo IVRyYW5zYWN0aW9uSWRJc1ZhbGlkKHhpZCkpCisJCXhpZCA9IEdldEN1cnJlbnRUcmFuc2FjdGlv bklkKCk7CisJZWxzZQorCQlvdmVycmlkZV94aWQgPSB0cnVlOworCiAJYmxvY2sgPSBJdGVtUG9p bnRlckdldEJsb2NrTnVtYmVyKHRpZCk7CiAJYnVmZmVyID0gUmVhZEJ1ZmZlcihyZWxhdGlvbiwg YmxvY2spOwogCXBhZ2UgPSBCdWZmZXJHZXRQYWdlKGJ1ZmZlcik7CkBAIC0zMTQ5LDYgKzMxNzQs MTAgQEAgbDE6CiAJCWlmICh2bWJ1ZmZlcl9tb2RpZmllZCkKIAkJCVhMb2dSZWdpc3RlckJ1ZmZl cihIRUFQX0RFTEVURV9CTEtSRUZfVk0sIHZtYnVmZmVyLCAwKTsKIAorCQkvKiBTZWUgaGVhcF9p bnNlcnQoKSBmb3IgZGV0YWlscy4gKi8KKwkJaWYgKG92ZXJyaWRlX3hpZCkKKwkJCVhMb2dTZXRS ZWNvcmRYaWQoeGlkKTsKKwogCQlyZWNwdHIgPSBYTG9nSW5zZXJ0KFJNX0hFQVBfSUQsIFhMT0df SEVBUF9ERUxFVEUpOwogCiAJCVBhZ2VTZXRMU04ocGFnZSwgcmVjcHRyKTsKQEAgLTMxODUsNyAr MzIxNCw3IEBAIGwxOgogCQlBc3NlcnQoIUhlYXBUdXBsZUhhc0V4dGVybmFsKCZ0cCkpOwogCX0K IAllbHNlIGlmIChIZWFwVHVwbGVIYXNFeHRlcm5hbCgmdHApKQotCQloZWFwX3RvYXN0X2RlbGV0 ZShyZWxhdGlvbiwgJnRwLCBmYWxzZSk7CisJCWhlYXBfdG9hc3RfZGVsZXRlKHJlbGF0aW9uLCAm dHAsIGZhbHNlLCB4aWQpOwogCiAJLyoKIAkgKiBNYXJrIHR1cGxlIGZvciBpbnZhbGlkYXRpb24g ZnJvbSBzeXN0ZW0gY2FjaGVzIGF0IG5leHQgY29tbWFuZApAQCAtMzIxOCwxNCArMzI0NywxOCBA QCBsMToKICAqIHRoZSB0YXJnZXQgdHVwbGUgYXJlIG5vdCBleHBlY3RlZCAoZm9yIGV4YW1wbGUs IGJlY2F1c2Ugd2UgaGF2ZSBhIGxvY2sKICAqIG9uIHRoZSByZWxhdGlvbiBhc3NvY2lhdGVkIHdp dGggdGhlIHR1cGxlKS4gIEFueSBmYWlsdXJlIGlzIHJlcG9ydGVkCiAgKiB2aWEgZXJlcG9ydCgp LgorICoKKyAqIFhYWCBBZGQgc2ltcGxlX2hlYXBfZGVsZXRlX3hpZCgpIHNvIHRoYXQgdGhlIHNp Z25hdHVyZSBvZiB0aGlzIGZ1bmN0aW9uIGNhbgorICogc3RheSBpbnRhY3Q/CiAgKi8KIHZvaWQK LXNpbXBsZV9oZWFwX2RlbGV0ZShSZWxhdGlvbiByZWxhdGlvbiwgY29uc3QgSXRlbVBvaW50ZXJE YXRhICp0aWQpCitzaW1wbGVfaGVhcF9kZWxldGUoUmVsYXRpb24gcmVsYXRpb24sIGNvbnN0IEl0 ZW1Qb2ludGVyRGF0YSAqdGlkLAorCQkJCSAgIFRyYW5zYWN0aW9uSWQgeGlkKQogewogCVRNX1Jl c3VsdAlyZXN1bHQ7CiAJVE1fRmFpbHVyZURhdGEgdG1mZDsKIAotCXJlc3VsdCA9IGhlYXBfZGVs ZXRlKHJlbGF0aW9uLCB0aWQsCisJcmVzdWx0ID0gaGVhcF9kZWxldGUocmVsYXRpb24sIHRpZCwg eGlkLAogCQkJCQkJIEdldEN1cnJlbnRDb21tYW5kSWQodHJ1ZSksCiAJCQkJCQkgMCwKIAkJCQkJ CSBJbnZhbGlkU25hcHNob3QsCkBAIC0zMjc0LDcgKzMzMDcsNyBAQCBoZWFwX3VwZGF0ZShSZWxh dGlvbiByZWxhdGlvbiwgY29uc3QgSXRlbVBvaW50ZXJEYXRhICpvdGlkLCBIZWFwVHVwbGUgbmV3 dHVwLAogCQkJVFVfVXBkYXRlSW5kZXhlcyAqdXBkYXRlX2luZGV4ZXMpCiB7CiAJVE1fUmVzdWx0 CXJlc3VsdDsKLQlUcmFuc2FjdGlvbklkIHhpZCA9IEdldEN1cnJlbnRUcmFuc2FjdGlvbklkKCk7 CisJVHJhbnNhY3Rpb25JZCB4aWQ7CiAJQml0bWFwc2V0ICAqaG90X2F0dHJzOwogCUJpdG1hcHNl dCAgKnN1bV9hdHRyczsKIAlCaXRtYXBzZXQgICprZXlfYXR0cnM7CkBAIC0zMzQxLDYgKzMzNzQs MTMgQEAgaGVhcF91cGRhdGUoUmVsYXRpb24gcmVsYXRpb24sIGNvbnN0IEl0ZW1Qb2ludGVyRGF0 YSAqb3RpZCwgSGVhcFR1cGxlIG5ld3R1cCwKIAljaGVja19sb2NrX2lmX2lucGxhY2VfdXBkYXRl YWJsZV9yZWwocmVsYXRpb24sIG90aWQsIG5ld3R1cCk7CiAjZW5kaWYKIAorCS8qIFRoZSBjYWxs ZXIgbWlnaHQgbmVlZCB0byBwcmVzZXJ2ZSB0aGUgZXhpc3RpbmcgeG1pbi4gKi8KKwlpZiAoKG9w dGlvbnMgJiBUQUJMRV9SRVVTRV9YSUQpID09IDApCisJCXhpZCA9IEdldEN1cnJlbnRUcmFuc2Fj dGlvbklkKCk7CisJZWxzZQorCQl4aWQgPSBIZWFwVHVwbGVIZWFkZXJHZXRYbWluKG5ld3R1cC0+ dF9kYXRhKTsKKwlBc3NlcnQoVHJhbnNhY3Rpb25JZElzVmFsaWQoeGlkKSk7CisKIAkvKgogCSAq IEZldGNoIHRoZSBsaXN0IG9mIGF0dHJpYnV0ZXMgdG8gYmUgY2hlY2tlZCBmb3IgdmFyaW91cyBv cGVyYXRpb25zLgogCSAqCkBAIC0zOTc4LDEyICs0MDE4LDE2IEBAIGwyOgogCQkgKi8KIAkJaWYg KG5lZWRfdG9hc3QpCiAJCXsKKwkJCXVpbnQzMgl0b2FzdF9vcHRpb25zID0gb3B0aW9uczsKKwog CQkJLyoKIAkJCSAqIElmIGxvZ2ljYWwgZGVjb2RpbmcgaXMgbm90IG5lZWRlZCwgc3VwcHJlc3Mg aXQgZm9yIHRoZSBUT0FTVAogCQkJICogdHVwbGVzIHRvby4gV2UgbmV2ZXIgc2tpcCB0aGUgRlNN IGhlcmUuCiAJCQkgKi8KKwkJCWlmICghd2FsTG9naWNhbCkKKwkJCQl0b2FzdF9vcHRpb25zIHw9 IEhFQVBfSU5TRVJUX05PX0xPR0lDQUw7CiAJCQloZWFwdHVwID0gaGVhcF90b2FzdF9pbnNlcnRf b3JfdXBkYXRlKHJlbGF0aW9uLCBuZXd0dXAsICZvbGR0dXAsCi0JCQkJCQkJCQkJCQkgIHdhbExv Z2ljYWwgPyAwIDogSEVBUF9JTlNFUlRfTk9fTE9HSUNBTCk7CisJCQkJCQkJCQkJCQkgIE5VTEws IHRvYXN0X29wdGlvbnMpOwogCQkJbmV3dHVwc2l6ZSA9IE1BWEFMSUdOKGhlYXB0dXAtPnRfbGVu KTsKIAkJfQogCQllbHNlCkBAIC00Mjk5LDcgKzQzNDMsOSBAQCBsMjoKIAkJCQkJCQkJIG9sZF9r ZXlfdHVwbGUsCiAJCQkJCQkJCSBjbGVhcl9hbGxfdmlzaWJsZSwKIAkJCQkJCQkJIGNsZWFyX2Fs bF92aXNpYmxlX25ldywKLQkJCQkJCQkJIHdhbExvZ2ljYWwpOworCQkJCQkJCQkgd2FsTG9naWNh bCwKKwkJCQkJCQkJIG9wdGlvbnMgJiBUQUJMRV9SRVVTRV9YSUQgPyB4aWQgOiBJbnZhbGlkVHJh bnNhY3Rpb25JZCk7CisKIAkJaWYgKG5ld2J1ZiAhPSBidWZmZXIpCiAJCXsKIAkJCVBhZ2VTZXRM U04obmV3cGFnZSwgcmVjcHRyKTsKQEAgLTU1MzEsNyArNTU3NywxMyBAQCBjb21wdXRlX25ld194 bWF4X2luZm9tYXNrKFRyYW5zYWN0aW9uSWQgeG1heCwgdWludDE2IG9sZF9pbmZvbWFzaywKIAl1 aW50MTYJCW5ld19pbmZvbWFzaywKIAkJCQluZXdfaW5mb21hc2syOwogCi0JQXNzZXJ0KFRyYW5z YWN0aW9uSWRJc0N1cnJlbnRUcmFuc2FjdGlvbklkKGFkZF90b194bWF4KSk7CisJLyoKKwkgKiBU T0RPIE1vdmUgdGhpcyBzdGF0ZW1lbnQgdG8gY2FsbGVycz8gUkVQQUNLIChDT05DVVJSRU5UTFkp IHVzZXMKKwkgKiBhZGRfdG9feG1heCBkaWZmZXJlbnQgZnJvbSB0aGUgY3VycmVudCB0cmFuc2Fj dGlvbiB3aGVuIHJlcGxheWluZyBkYXRhCisJICogY2hhbmdlcy4gQWx0ZXJuYXRpdmVseSwgd2Ug Y2FuIGFkZCBhIGJvb2xlYW4gYXJndW1lbnQgdG8gdGhlIGZ1bmN0aW9uCisJICogaW5kaWNhdGlu ZyB0aGUgc3BlY2lhbCBjYXNlLCBidXQgdGhhdCBkb2VzIG5vdCBsb29rIG5pY2UuCisJICovCisJ Ly9Bc3NlcnQoVHJhbnNhY3Rpb25JZElzQ3VycmVudFRyYW5zYWN0aW9uSWQoYWRkX3RvX3htYXgp KTsKIAogbDU6CiAJbmV3X2luZm9tYXNrID0gMDsKQEAgLTY1MzAsNyArNjU4Miw5IEBAIGhlYXBf YWJvcnRfc3BlY3VsYXRpdmUoUmVsYXRpb24gcmVsYXRpb24sIGNvbnN0IEl0ZW1Qb2ludGVyRGF0 YSAqdGlkKQogCWlmIChIZWFwVHVwbGVIYXNFeHRlcm5hbCgmdHApKQogCXsKIAkJQXNzZXJ0KCFJ c1RvYXN0UmVsYXRpb24ocmVsYXRpb24pKTsKLQkJaGVhcF90b2FzdF9kZWxldGUocmVsYXRpb24s ICZ0cCwgdHJ1ZSk7CisJCS8qIFhJRCBvdmVycmlkaW5nIGlzIG5vdCBuZWVkZWQgZm9yIHNwZWN1 bGF0aXZlIGFib3J0LiAqLworCQlBc3NlcnQoVHJhbnNhY3Rpb25JZElzVmFsaWQoR2V0Q3VycmVu dFRyYW5zYWN0aW9uSWRJZkFueSgpKSk7CisJCWhlYXBfdG9hc3RfZGVsZXRlKHJlbGF0aW9uLCAm dHAsIHRydWUsIEdldEN1cnJlbnRUcmFuc2FjdGlvbklkKCkpOwogCX0KIAogCS8qCkBAIC05MDQw LDcgKzkwOTQsNyBAQCBsb2dfaGVhcF91cGRhdGUoUmVsYXRpb24gcmVsbiwgQnVmZmVyIG9sZGJ1 ZiwgQnVmZmVyIHZtYnVmZmVyX29sZCwKIAkJCQlIZWFwVHVwbGUgb2xkdHVwLCBIZWFwVHVwbGUg bmV3dHVwLAogCQkJCUhlYXBUdXBsZSBvbGRfa2V5X3R1cGxlLAogCQkJCWJvb2wgYWxsX3Zpc2li bGVfY2xlYXJlZCwgYm9vbCBuZXdfYWxsX3Zpc2libGVfY2xlYXJlZCwKLQkJCQlib29sIHdhbExv Z2ljYWwpCisJCQkJYm9vbCB3YWxMb2dpY2FsLCBUcmFuc2FjdGlvbklkIHhpZCkKIHsKIAl4bF9o ZWFwX3VwZGF0ZSB4bHJlYzsKIAl4bF9oZWFwX2hlYWRlciB4bGhkcjsKQEAgLTkyNjUsNiArOTMx OSwxMCBAQCBsb2dfaGVhcF91cGRhdGUoUmVsYXRpb24gcmVsbiwgQnVmZmVyIG9sZGJ1ZiwgQnVm ZmVyIHZtYnVmZmVyX29sZCwKIAkvKiBmaWx0ZXJpbmcgYnkgb3JpZ2luIG9uIGEgcm93IGxldmVs IGlzIG11Y2ggbW9yZSBlZmZpY2llbnQgKi8KIAlYTG9nU2V0UmVjb3JkRmxhZ3MoWExPR19JTkNM VURFX09SSUdJTik7CiAKKwkvKiBTZWUgaGVhcF9pbnNlcnQoKSBmb3IgZGV0YWlscy4gKi8KKwlp ZiAoVHJhbnNhY3Rpb25JZElzVmFsaWQoeGlkKSkKKwkJWExvZ1NldFJlY29yZFhpZCh4aWQpOwor CiAJcmVjcHRyID0gWExvZ0luc2VydChSTV9IRUFQX0lELCBpbmZvKTsKIAogCXJldHVybiByZWNw dHI7CmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9hY2Nlc3MvaGVhcC9oZWFwYW1faGFuZGxlci5j IGIvc3JjL2JhY2tlbmQvYWNjZXNzL2hlYXAvaGVhcGFtX2hhbmRsZXIuYwppbmRleCA1ZWQ2YmYz ZTIxNi4uMjdiNTQ3ZjI0MzQgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2FjY2Vzcy9oZWFwL2hl YXBhbV9oYW5kbGVyLmMKKysrIGIvc3JjL2JhY2tlbmQvYWNjZXNzL2hlYXAvaGVhcGFtX2hhbmRs ZXIuYwpAQCAtNTAsMTQgKzUwLDI1IEBACiAjaW5jbHVkZSAidXRpbHMvaW5qZWN0aW9uX3BvaW50 LmgiCiAjaW5jbHVkZSAidXRpbHMvcmVsLmgiCiAjaW5jbHVkZSAidXRpbHMvdHVwbGVzb3J0Lmgi Ci0KLXN0YXRpYyBTbmFwc2hvdCBmaW5hbGl6ZV9ibG9ja19yYW5nZShSZWxhdGlvbiByZWxfZHN0 LCBDaGFuZ2VDb250ZXh0ICpjaGdjeHQsCi0JCQkJCQkJCQkgQmxvY2tOdW1iZXIgY3VyLAorI2lu Y2x1ZGUgInV0aWxzL3dhaXRfZXZlbnRfdHlwZXMuaCIKKworc3RhdGljIHZvaWQgdXBkYXRlX2lk ZW50aXR5X2luZGV4KENoYW5nZUNvbnRleHQgKmNoZ2N4dCwKKwkJCQkJCQkJICBCbG9ja051bWJl ciByYW5nZV9zdGFydCwKKwkJCQkJCQkJICBCbG9ja051bWJlciByYW5nZV9lbmQpOworc3RhdGlj IFNuYXBzaG90IGZpbmFsaXplX2Jsb2NrX3JhbmdlKFJlbGF0aW9uIHJlbF9vbGQsIFJlbGF0aW9u IHJlbF9kc3QsCisJCQkJCQkJCQkgVHJhbnNhY3Rpb25JZCBvbGRlc3RfeG1pbiwKKwkJCQkJCQkJ CSBUcmFuc2FjdGlvbklkIHhpZF9jdXRvZmYsCisJCQkJCQkJCQkgTXVsdGlYYWN0SWQgbXVsdGlf Y3V0b2ZmLAorCQkJCQkJCQkJIENoYW5nZUNvbnRleHQgKmNoZ2N4dCwgQmxvY2tOdW1iZXIgY3Vy LAogCQkJCQkJCQkJIEJsb2NrTnVtYmVyIHN0YXJ0LCBCbG9ja051bWJlciAqZW5kX3AsCiAJCQkJ CQkJCQkgQmxvY2tOdW1iZXIgbmJsb2NrcywKKwkJCQkJCQkJCSBSZXdyaXRlU3RhdGUgKnJ3c3Rh dGVfcCwKIAkJCQkJCQkJCSBCbG9ja051bWJlciAqcmFuZ2Vfc3RhcnRfZHN0X3ApOwogc3RhdGlj IHZvaWQgcmVmb3JtX2FuZF9yZXdyaXRlX3R1cGxlKFR1cGxlVGFibGVTbG90ICpzcmMsIFR1cGxl VGFibGVTbG90ICpyZWZvcm0sCiAJCQkJCQkJCQkgUmV3cml0ZVN0YXRlIHJ3c3RhdGUpOworc3Rh dGljIHZvaWQgaGVhcF9pbnNlcnRfZm9yX3JlcGFjayhDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIFR1 cGxlVGFibGVTbG90ICpzcmMsCisJCQkJCQkJCSAgIFR1cGxlVGFibGVTbG90ICpyZWZvcm0sCisJ CQkJCQkJCSAgIFJld3JpdGVTdGF0ZSByd3N0YXRlKTsKIAogc3RhdGljIGJvb2wgU2FtcGxlSGVh cFR1cGxlVmlzaWJsZShUYWJsZVNjYW5EZXNjIHNjYW4sIEJ1ZmZlciBidWZmZXIsCiAJCQkJCQkJ CSAgIEhlYXBUdXBsZSB0dXBsZSwKQEAgLTIwMiw3ICsyMTMsOCBAQCBoZWFwYW1fdHVwbGVfY29t cGxldGVfc3BlY3VsYXRpdmUoUmVsYXRpb24gcmVsYXRpb24sIFR1cGxlVGFibGVTbG90ICpzbG90 LAogfQogCiBzdGF0aWMgVE1fUmVzdWx0Ci1oZWFwYW1fdHVwbGVfZGVsZXRlKFJlbGF0aW9uIHJl bGF0aW9uLCBJdGVtUG9pbnRlciB0aWQsIENvbW1hbmRJZCBjaWQsCitoZWFwYW1fdHVwbGVfZGVs ZXRlKFJlbGF0aW9uIHJlbGF0aW9uLCBJdGVtUG9pbnRlciB0aWQsIFRyYW5zYWN0aW9uSWQgeGlk LAorCQkJCQlDb21tYW5kSWQgY2lkLAogCQkJCQl1aW50MzIgb3B0aW9ucywgU25hcHNob3Qgc25h cHNob3QsIFNuYXBzaG90IGNyb3NzY2hlY2ssCiAJCQkJCWJvb2wgd2FpdCwgVE1fRmFpbHVyZURh dGEgKnRtZmQpCiB7CkBAIC0yMTEsNyArMjIzLDcgQEAgaGVhcGFtX3R1cGxlX2RlbGV0ZShSZWxh dGlvbiByZWxhdGlvbiwgSXRlbVBvaW50ZXIgdGlkLCBDb21tYW5kSWQgY2lkLAogCSAqIHRoZSBz dG9yYWdlIGl0c2VsZiBpcyBjbGVhbmluZyB0aGUgZGVhZCB0dXBsZXMgYnkgaXRzZWxmLCBpdCBp cyB0aGUKIAkgKiB0aW1lIHRvIGNhbGwgdGhlIGluZGV4IHR1cGxlIGRlbGV0aW9uIGFsc28uCiAJ ICovCi0JcmV0dXJuIGhlYXBfZGVsZXRlKHJlbGF0aW9uLCB0aWQsIGNpZCwgb3B0aW9ucywgY3Jv c3NjaGVjaywgd2FpdCwKKwlyZXR1cm4gaGVhcF9kZWxldGUocmVsYXRpb24sIHRpZCwgeGlkLCBj aWQsIG9wdGlvbnMsIGNyb3NzY2hlY2ssIHdhaXQsCiAJCQkJCSAgIHRtZmQpOwogfQogCkBAIC02 MTQsNiArNjI2LDcgQEAgaGVhcGFtX3JlbGF0aW9uX2NvcHlfZm9yX2NsdXN0ZXIoUmVsYXRpb24g T2xkSGVhcCwgUmVsYXRpb24gTmV3SGVhcCwKIAlCbG9ja051bWJlciByYW5nZV9zdGFydCA9IElu dmFsaWRCbG9ja051bWJlcjsKIAlCbG9ja051bWJlciByYW5nZV9lbmQgPSBJbnZhbGlkQmxvY2tO dW1iZXI7CiAJQmxvY2tOdW1iZXIgcmFuZ2Vfc3RhcnRfbmV3ID0gSW52YWxpZEJsb2NrTnVtYmVy OworCUJsb2NrTnVtYmVyIHJhbmdlX2VuZF9uZXcgPSBJbnZhbGlkQmxvY2tOdW1iZXI7CiAJQmxv Y2tOdW1iZXIJbmJsb2NrcyA9IEludmFsaWRCbG9ja051bWJlcjsKIAlSZWxhdGlvbglyZWxfZHN0 OwogCkBAIC02MzMsMTQgKzY0NiwxMCBAQCBoZWFwYW1fcmVsYXRpb25fY29weV9mb3JfY2x1c3Rl cihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBOZXdIZWFwLAogCUFzc2VydChSZWxhdGlvbkdl dFRhcmdldEJsb2NrKHJlbF9kc3QpID09IEludmFsaWRCbG9ja051bWJlcik7CiAKIAkvKgotCSAq IEluIG5vbi1jb25jdXJyZW50IG1vZGUsIGluaXRpYWxpemUgdGhlIHJld3JpdGUgb3BlcmF0aW9u LiAgVGhpcyBpcyBub3QKLQkgKiBuZWVkZWQgaW4gY29uY3VycmVudCBtb2RlLgorCSAqIEluaXRp YWxpemUgdGhlIHJld3JpdGUgb3BlcmF0aW9uLgogCSAqLwotCWlmICghY29uY3VycmVudCkKLQkJ cndzdGF0ZSA9IGJlZ2luX2hlYXBfcmV3cml0ZShPbGRIZWFwLCBOZXdIZWFwLCBPbGRlc3RYbWlu LAotCQkJCQkJCQkJICp4aWRfY3V0b2ZmLCAqbXVsdGlfY3V0b2ZmKTsKLQllbHNlCi0JCXJ3c3Rh dGUgPSBOVUxMOworCXJ3c3RhdGUgPSBiZWdpbl9oZWFwX3Jld3JpdGUoT2xkSGVhcCwgcmVsX2Rz dCwgT2xkZXN0WG1pbiwgKnhpZF9jdXRvZmYsCisJCQkJCQkJCSAqbXVsdGlfY3V0b2ZmLCBjb25j dXJyZW50KTsKIAogCS8qCiAJICogU2V0IHVwIHNvcnRpbmcgaWYgd2FudGVkLiBDT05DVVJSRU5U TFkgZWZmZWN0aXZlbHkgaWdub3JlcyB1c2Vfc29ydCAtCkBAIC03MjAsMTcgKzcyOSwxOCBAQCBo ZWFwYW1fcmVsYXRpb25fY29weV9mb3JfY2x1c3RlcihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlv biBOZXdIZWFwLAogCQlJbnZhbGlkYXRlQ2F0YWxvZ1NuYXBzaG90KCk7CiAKIAkJLyoKLQkJICog QXMgdGhlcmUgaXMgbm8gc25hcHNob3QsIG91ciB4bWluIHNob3VsZCBiZSBpbnZhbGlkIG5vdy4K LQkJICoKLQkJICogWFhYIHhpZCBjYW4gc3RpbGwgYmUgdmFsaWQuIFRoZSBuZXh0IHBhdGNoZXMg aW4gdGhlIHNlcmllcyBmaXgKLQkJICogdGhhdC4KKwkJICogQXMgdGhlcmUgaXMgbm8gc25hcHNo b3QsIG91ciB4bWluIHNob3VsZCBiZSBpbnZhbGlkIG5vdy4geGlkIHNob3VsZAorCQkgKiBiZSBp bnZhbGlkIHRvbyBiZWNhdXNlIG91ciB0cmFuc2FjdGlvbnMgZGlkbid0IGhhdmUgdG8gZG8gYW55 CisJCSAqIHdyaXRlcyB5ZXQuCiAJCSAqLwogCQlBc3NlcnQoIVRyYW5zYWN0aW9uSWRJc1ZhbGlk KE15UHJvYy0+eG1pbikpOworCQlBc3NlcnQoIVRyYW5zYWN0aW9uSWRJc1ZhbGlkKE15UHJvYy0+ eGlkKSk7CiAKIAkJLyoKIAkJICogV2FpdCB1bnRpbCB0aGUgd29ya2VyIGhhcyB0aGUgaW5pdGlh bCBzbmFwc2hvdCBhbmQgcmV0cmlldmUgaXQuCiAJCSAqLwogCQlzbmFwc2hvdCA9IHJlcGFja19n ZXRfc25hcHNob3QoY2hnY3h0KTsKKwkJY2hnY3h0LT5jY19sYXN0X3NuYXBzaG90X3htaW4gPSBz bmFwc2hvdC0+eG1pbjsKIAogCQkvKgogCQkgKiBVbmxpa2UgYSBzY2FuIGR1cmluZyBxdWVyeSBw cm9jZXNzaW5nLCB3ZSBhbHNvIG5lZWQgdG8gY2FwdHVyZQpAQCAtNzQ0LDYgKzc1NCwyMSBAQCBo ZWFwYW1fcmVsYXRpb25fY29weV9mb3JfY2x1c3RlcihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlv biBOZXdIZWFwLAogCQkgKi8KIAkJbmJsb2NrcyA9IGhlYXBTY2FuLT5yc19uYmxvY2tzOwogCisJ CS8qCisJCSAqIFNpbmNlIHdlIGN1cnJlbnRseSBkbyBub3QgZnJlZXplIHR1cGxlcyB3aGVuIHJl cGxheWluZyBkYXRhCisJCSAqIGNoYW5nZXMsIFhJRHMgb2YgdGhlIHJlcGxheWVkIHRyYW5zYWN0 aW9ucyBzaG91bGQgbm90IHByZWNlZGUgdGhlCisJCSAqIG5ldyB2YWx1ZSBvZiByZWxmcm96ZW54 aWQuIChPbmx5IHRyYW5zYWN0aW9ucyBoYXZpbmcgWElEID49CisJCSAqIHNuYXBzaG90LT54bWlu IHdpbGwgYmUgcmVwbGF5ZWQuKSBUaGlzIGlzIHJhdGhlciBwYXJhbm9pYSwKKwkJICogdmFjdXVt X2dldF9jdXRvZmZzKCkgc2hvdWxkbid0IGFsbG93IHRoaXMgYXNzZXJ0aW9uIHRvIGZpcmUuCisJ CSAqCisJCSAqIFJlZ2FyZGluZyBtdWx0aXhhY3RzLCB0aGUgY29ycmVzcG9uZGluZyBjdXRvZmYg aXMgcHJvYmFibHkgbm90CisJCSAqIHRyaXZpYWwgdG8gZGV0ZXJtaW5lLCBob3dldmVyIHRoZXJl IHNob3VsZCBub3QgYmUgYW55IG11bHRpeGFjdHMgaW4KKwkJICogdGhlIG5ldyByZWxhdGlvbiBh dCBhbGw6IHdlIGRvIG5vdCByZXBsYXkgdHVwbGUgbG9ja2luZyByZWNvcmRzIGFuCisJCSAqIHRo YXQncyBvayBiZWNhdXNlIHRoZSB0dXBsZSBsb2NrcyBzaG91bGQgbm8gbG9uZ2VyIGV4aXN0IGF0 IHRoZQorCQkgKiBtb21lbnQgd2UgYWNxdWlyZSBBY2Nlc3NFeGNsdXNpdmVMb2NrIG9uIHRoZSBv bGQgcmVsYXRpb24uCisJCSAqLworCQlBc3NlcnQoVHJhbnNhY3Rpb25JZFByZWNlZGVzT3JFcXVh bHMoKnhpZF9jdXRvZmYsIHNuYXBzaG90LT54bWluKSk7CisKIAkJUHVzaEFjdGl2ZVNuYXBzaG90 KHNuYXBzaG90KTsKIAl9CiAKQEAgLTkyMCw5ICs5NDUsMTIgQEAgaGVhcGFtX3JlbGF0aW9uX2Nv cHlfZm9yX2NsdXN0ZXIoUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gTmV3SGVhcCwKIAkJCS8q IEVuZCBvZiB0aGUgY3VycmVudCByYW5nZSBvciBhIHdyYXBhcm91bmQ/ICovCiAJCQlpZiAoIXJl cGFja19ibG9ja19pbl9yYW5nZShibGtubywgcmFuZ2Vfc3RhcnQsIHJhbmdlX2VuZCwKIAkJCQkJ CQkJCSAgIEludmFsaWRCbG9ja051bWJlcikpCi0JCQkJc25hcHNob3QgPSBmaW5hbGl6ZV9ibG9j a19yYW5nZShyZWxfZHN0LCBjaGdjeHQsIGJsa25vLAotCQkJCQkJCQkJCQkJcmFuZ2Vfc3RhcnQs CisJCQkJc25hcHNob3QgPSBmaW5hbGl6ZV9ibG9ja19yYW5nZShPbGRIZWFwLCByZWxfZHN0LAor CQkJCQkJCQkJCQkJT2xkZXN0WG1pbiwgKnhpZF9jdXRvZmYsCisJCQkJCQkJCQkJCQkqbXVsdGlf Y3V0b2ZmLAorCQkJCQkJCQkJCQkJY2hnY3h0LCBibGtubywgcmFuZ2Vfc3RhcnQsCiAJCQkJCQkJ CQkJCQkmcmFuZ2VfZW5kLCBuYmxvY2tzLAorCQkJCQkJCQkJCQkJJnJ3c3RhdGUsCiAJCQkJCQkJ CQkJCQkmcmFuZ2Vfc3RhcnRfbmV3KTsKIAogCQkJLyogRmluYWxseSBjaGVjayB0aGUgdHVwbGUg dmlzaWJpbGl0eS4gKi8KQEAgLTk2Miw3ICs5OTAsNyBAQCBoZWFwYW1fcmVsYXRpb25fY29weV9m b3JfY2x1c3RlcihSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBOZXdIZWFwLAogCQkJaWYgKCFj b25jdXJyZW50KQogCQkJCXJlZm9ybV9hbmRfcmV3cml0ZV90dXBsZShzbG90LCByZWZvcm1fc2xv dCwgcndzdGF0ZSk7CiAJCQllbHNlCi0JCQkJaGVhcF9pbnNlcnRfZm9yX3JlcGFjayhjaGdjeHQs IHNsb3QsIHJlZm9ybV9zbG90KTsKKwkJCQloZWFwX2luc2VydF9mb3JfcmVwYWNrKGNoZ2N4dCwg c2xvdCwgcmVmb3JtX3Nsb3QsIHJ3c3RhdGUpOwogCiAJCQkvKgogCQkJICogSW4gaW5kZXhzY2Fu IG1vZGUgYW5kIGFsc28gVkFDVVVNIEZVTEwsIHJlcG9ydCBpbmNyZWFzZSBpbgpAQCAtOTc4LDYg KzEwMDYsMTMgQEAgaGVhcGFtX3JlbGF0aW9uX2NvcHlfZm9yX2NsdXN0ZXIoUmVsYXRpb24gT2xk SGVhcCwgUmVsYXRpb24gTmV3SGVhcCwKIAl7CiAJCVhMb2dSZWNQdHIJZW5kX29mX3dhbDsKIAor CQkvKiBXcml0ZSBvdXQgYW55IHJlbWFpbmluZyB0dXBsZXMsIGFuZCBmc3luYyBpZiBuZWVkZWQg Ki8KKwkJZW5kX2hlYXBfcmV3cml0ZShyd3N0YXRlKTsKKworCQkvKiBGaW5hbGl6ZSB0aGUgbGFz dCByYW5nZSBpbiB0aGUgbmV3IHJlbGF0aW9uLiAqLworCQlyYW5nZV9lbmRfbmV3ID0gUmVsYXRp b25HZXROdW1iZXJPZkJsb2NrcyhyZWxfZHN0KTsKKwkJdXBkYXRlX2lkZW50aXR5X2luZGV4KGNo Z2N4dCwgcmFuZ2Vfc3RhcnRfbmV3LCByYW5nZV9lbmRfbmV3KTsKKwogCQkvKgogCQkgKiBQcm9j ZXNzIHRoZSBjaGFuZ2VzIGJlbG9uZ2luZyB0byB0aGUgbGFzdCByYW5nZS4KIAkJICovCkBAIC05 OTAsMTEgKzEwMjUsMTYgQEAgaGVhcGFtX3JlbGF0aW9uX2NvcHlfZm9yX2NsdXN0ZXIoUmVsYXRp b24gT2xkSGVhcCwgUmVsYXRpb24gTmV3SGVhcCwKIAogCQkvKgogCQkgKiBUaGVyZSB3YXMgYW4g YWN0aXZlIHRyYW5zYWN0aW9uIHNuYXBzaG90IG9uIGVudHJ5LCBzbyBwdXNoIG9uZQotCQkgKiBi ZWZvcmUgcmV0dXJuLgorCQkgKiBiZWZvcmUgcmV0dXJuLiBXaGlsZSB0aGVyZSBpcyBubyBhY3Rp dmUgc25hcHNob3QsIGFsc28gaW52YWxpZGF0ZQorCQkgKiB0aGUgY2F0YWxvZyBzbmFwc2hvdCBz byB0aGF0IHRoZSB4bWluIGhvcml6b25zIGZvciBWQUNVVU0gY2FuCisJCSAqIGFkdmFuY2UuCiAJ CSAqLwogCQlQb3BBY3RpdmVTbmFwc2hvdCgpOworCQlJbnZhbGlkYXRlQ2F0YWxvZ1NuYXBzaG90 KCk7CisJCUFzc2VydCghVHJhbnNhY3Rpb25JZElzVmFsaWQoTXlQcm9jLT54bWluKSk7CisJCUFz c2VydCghVHJhbnNhY3Rpb25JZElzVmFsaWQoTXlQcm9jLT54aWQpKTsKKwkJQXNzZXJ0KCFIYXZl UmVnaXN0ZXJlZE9yQWN0aXZlU25hcHNob3QoKSk7CiAJCVB1c2hBY3RpdmVTbmFwc2hvdChHZXRU cmFuc2FjdGlvblNuYXBzaG90KCkpOwotCiAJfQogCiAJaWYgKGluZGV4U2NhbiAhPSBOVUxMKQpA QCAtMTA2MSw5ICsxMTAxLDcwIEBAIGhlYXBhbV9yZWxhdGlvbl9jb3B5X2Zvcl9jbHVzdGVyKFJl bGF0aW9uIE9sZEhlYXAsIFJlbGF0aW9uIE5ld0hlYXAsCiAKIAlFeGVjRHJvcFNpbmdsZVR1cGxl VGFibGVTbG90KHJlZm9ybV9zbG90KTsKIAotCS8qIFdyaXRlIG91dCBhbnkgcmVtYWluaW5nIHR1 cGxlcywgYW5kIGZzeW5jIGlmIG5lZWRlZCAqLwotCWlmIChyd3N0YXRlKQorCWlmICghY29uY3Vy cmVudCkKKwl7CisJCS8qCisJCSAqIEluIHRoZSBDT05DVVJSRU5UTFkgY2FzZSwgd2UgaGFkIHRv IGRvIGF3YXkgd2l0aCB0aGUgcmV3cml0ZSBzdGF0ZQorCQkgKiBlYXJsaWVyLgorCQkgKi8KIAkJ ZW5kX2hlYXBfcmV3cml0ZShyd3N0YXRlKTsKKwl9Cit9CisKKy8qCisgKiBTY2FuIHJhbmdlIG9m IHRoZSBuZXcgLyBhdXhpbGlhcnkgcmVsYXRpb24gYW5kIGluc2VydCBhbGwgdGhlIHR1cGxlcyBp bnRvCisgKiB0aGUgaWRlbnRpdHkgaW5kZXguIHJhbmdlX2VuZCBpcyB0aGUgZmlyc3QgYmxvY2sg b2YgdGhlIG5leHQgcmFuZ2UuCisgKi8KK3N0YXRpYyB2b2lkCit1cGRhdGVfaWRlbnRpdHlfaW5k ZXgoQ2hhbmdlQ29udGV4dCAqY2hnY3h0LCBCbG9ja051bWJlciByYW5nZV9zdGFydCwKKwkJCQkJ ICBCbG9ja051bWJlciByYW5nZV9lbmQpCit7CisJUmVwYWNrRGVzdCAqZGVzdDsKKwlCbG9ja051 bWJlciBmaXJzdF9ibG9jaywKKwkJCQlsYXN0X2Jsb2NrOworCUl0ZW1Qb2ludGVyRGF0YSBtaW50 aWQsCisJCQkJbWF4dGlkOworCVRhYmxlU2NhbkRlc2Mgc2NhbjsKKwlUdXBsZVRhYmxlU2xvdCAq c2xvdDsKKworCS8qCisJICogSWYgYW4gYXV4aWxpYXJ5IHRhYmxlIGV4aXN0cywgaXQncyB0aGUg b25lIHdlJ3JlIGNvcHlpbmcgdGhlIGRhdGEgaW50by4KKwkgKi8KKwlpZiAoY2hnY3h0LT5jY19k ZXN0X2F1eCkKKwkJZGVzdCA9IGNoZ2N4dC0+Y2NfZGVzdF9hdXg7CisJZWxzZQorCQlkZXN0ID0g JmNoZ2N4dC0+Y2NfZGVzdDsKKworCWZpcnN0X2Jsb2NrID0gcmFuZ2Vfc3RhcnQ7CisKKwlpZiAo cmFuZ2VfZW5kID4gcmFuZ2Vfc3RhcnQpCisJCWxhc3RfYmxvY2sgPSByYW5nZV9lbmQgLSAxOwor CWVsc2UKKwl7CisJCUFzc2VydChyYW5nZV9zdGFydCA9PSByYW5nZV9lbmQpOworCisJCWxhc3Rf YmxvY2sgPSByYW5nZV9lbmQ7CisJfQorCisJSXRlbVBvaW50ZXJTZXQoJm1pbnRpZCwgZmlyc3Rf YmxvY2ssIEZpcnN0T2Zmc2V0TnVtYmVyKTsKKwlJdGVtUG9pbnRlclNldCgmbWF4dGlkLCBsYXN0 X2Jsb2NrLCBNYXhPZmZzZXROdW1iZXIpOworCisJLyogWFhYIGZsYWdzPyAqLworCXNjYW4gPSB0 YWJsZV9iZWdpbnNjYW5fdGlkcmFuZ2UoZGVzdC0+cmVsLCBTbmFwc2hvdEFueSwgJm1pbnRpZCwg Jm1heHRpZCwKKwkJCQkJCQkJCTApOworCXNsb3QgPSB0YWJsZV9zbG90X2NyZWF0ZShkZXN0LT5y ZWwsIE5VTEwpOworCXdoaWxlICh0YWJsZV9zY2FuX2dldG5leHRzbG90KHNjYW4sIEZvcndhcmRT Y2FuRGlyZWN0aW9uLCBzbG90KSkKKwkJRXhlY0luc2VydEluZGV4VHVwbGVzKGRlc3QtPnJyaSwg ZGVzdC0+ZXN0YXRlLCAwLCBzbG90LCBOSUwsIE5VTEwpOworCUV4ZWNEcm9wU2luZ2xlVHVwbGVU YWJsZVNsb3Qoc2xvdCk7CisJdGFibGVfZW5kc2NhbihzY2FuKTsKKworCS8qCisJICogSW5kZXgg aW5zZXJ0aW9uIGNvdWxkIGhhdmUgYWNjZXNzZWQgY2F0YWxvZyB3aGVuIGNoZWNraW5nIGNvbnN0 cmFpbnRzLAorCSAqIHNvIG1ha2Ugc3VyZSB0aGF0IHdlIG5vIGxvbmdlciBibG9jayB0aGUgcHJv Z3Jlc3Mgb2YgeG1pbiBob3Jpem9ucyBmb3IKKwkgKiBWQUNVVU0uIChJdCdzIG9rIHRvIGhhdmUg YSBzbmFwc2hvdCB0aHJvdWdob3V0IHJhbmdlIHNjYW4sIHNvIHRoZXJlJ3MKKwkgKiBubyBwb2lu dCBpbiBkb2luZyB0aGlzIGludmFsaWRhdGlvbiBtb3JlIG9mdGVuLikKKwkgKi8KKwlJbnZhbGlk YXRlQ2F0YWxvZ1NuYXBzaG90KCk7CiB9CiAKIC8qCkBAIC0xMDc2LDIyICsxMTc3LDQ3IEBAIGhl YXBhbV9yZWxhdGlvbl9jb3B5X2Zvcl9jbHVzdGVyKFJlbGF0aW9uIE9sZEhlYXAsIFJlbGF0aW9u IE5ld0hlYXAsCiAgKiBmaXJzdCBibG9jayBiZXlvbmQgdGhlIG5ldyByYW5nZS4KICAqCiAgKiBS ZXR1cm4gdGhlIHNuYXBzaG90IGZvciB0aGUgc2NhbiBvZiB0aGUgbmV3IHJhbmdlLgorICoKKyAq IFRPRE8gQ29uc2lkZXIgYSBzdHJ1Y3R1cmUgdG8gYWNjb21tb2RhdGUgKG1vc3Qgb2YpIHRoZSBh cmd1bWVudHMuCiAgKi8KIHN0YXRpYyBTbmFwc2hvdAotZmluYWxpemVfYmxvY2tfcmFuZ2UoUmVs YXRpb24gcmVsX2RzdCwgQ2hhbmdlQ29udGV4dCAqY2hnY3h0LCBCbG9ja051bWJlciBjdXIsCitm aW5hbGl6ZV9ibG9ja19yYW5nZShSZWxhdGlvbiByZWxfb2xkLCBSZWxhdGlvbiByZWxfZHN0LAor CQkJCQkgVHJhbnNhY3Rpb25JZCBvbGRlc3RfeG1pbiwKKwkJCQkJIFRyYW5zYWN0aW9uSWQgeGlk X2N1dG9mZiwKKwkJCQkJIE11bHRpWGFjdElkIG11bHRpX2N1dG9mZiwKKwkJCQkJIENoYW5nZUNv bnRleHQgKmNoZ2N4dCwgQmxvY2tOdW1iZXIgY3VyLAogCQkJCQkgQmxvY2tOdW1iZXIgc3RhcnQs IEJsb2NrTnVtYmVyICplbmRfcCwKIAkJCQkJIEJsb2NrTnVtYmVyIG5ibG9ja3MsCisJCQkJCSBS ZXdyaXRlU3RhdGUgKnJ3c3RhdGVfcCwKIAkJCQkJIEJsb2NrTnVtYmVyICpyYW5nZV9zdGFydF9k c3RfcCkKIHsKIAlCbG9ja051bWJlciBlbmQgPSAqZW5kX3A7CisJUmV3cml0ZVN0YXRlIHJ3c3Rh dGUgPSAqcndzdGF0ZV9wOwogCVhMb2dSZWNQdHIJZW5kX29mX3dhbDsKIAlTbmFwc2hvdAlzbmFw c2hvdDsKKwlCbG9ja051bWJlciByYW5nZV9lbmRfZHN0OwogCiAJLyoKIAkgKiBXYWl0IGhlcmUg d2hlbiB0ZXN0aW5nIGhvdyBzbmFwc2hvdCBpcyBjaGFuZ2VkIGF0IHBhZ2UgYm91bmRhcnkuCiAJ ICovCiAJSU5KRUNUSU9OX1BPSU5UKCJyZXBhY2stY29uY3VycmVudGx5LW5ldy1yYW5nZSIsIE5V TEwpOwogCisJLyoKKwkgKiBNYWtlIHN1cmUgdGhlIGRhdGEgaXMgZmx1c2hlZCB0byBmaWxlIGJl Zm9yZSBjaGFuZ2VzIGNhbiBiZSBhcHBsaWVkIHRvCisJICogaXQuIChOb3RoaW5nIG9mIGl0IHNo b3VsZCBiZSBpbiBzaGFyZWQgYnVmZmVycyBzbyBmYXIuKQorCSAqLworCWVuZF9oZWFwX3Jld3Jp dGUocndzdGF0ZSk7CisKKwkvKgorCSAqIE5vdyB0aGF0IHRoZSBkYXRhIGNhbiBiZSBhY2Nlc3Nl ZCB2aWEgc2hhcmVkIGJ1ZmZlcnMsIHNjYW4gaXQgYW5kIGFkZAorCSAqIGVhY2ggdHVwbGUgdG8g dGhlIGlkZW50aXR5IGluZGV4IC0gdGhpcyBpcyBuZWNlc3NhcnkgdG8gdXBkYXRlIHRoZQorCSAq IGNvbmN1cnJlbnQgZGF0YSBjaGFuZ2VzIGJlbG93LiBXZSBjb3VsZCBub3QgZG8gdGhhdCBlYXJs aWVyIGJlY2F1c2UKKwkgKiBldmVuIGluc2VydGlvbiBpbnRvIGluZGV4IG1pZ2h0IG5lZWQgdG8g ZmV0Y2ggaGVhcCB0dXBsZXMsIGluIG9yZGVyIHRvCisJICogY2hlY2sgdW5pcXVlIG9yIGV4Y2x1 c2lvbiBjb25zdHJhaW50cy4KKwkgKi8KKwlyYW5nZV9lbmRfZHN0ID0gUmVsYXRpb25HZXROdW1i ZXJPZkJsb2NrcyhyZWxfZHN0KTsKKwl1cGRhdGVfaWRlbnRpdHlfaW5kZXgoY2hnY3h0LCAqcmFu Z2Vfc3RhcnRfZHN0X3AsIHJhbmdlX2VuZF9kc3QpOworCiAJLyoKIAkgKiBEZWNvZGUgYWxsIHRo ZSBjb25jdXJyZW50IGRhdGEgY2hhbmdlcyBjb21taXR0ZWQgc28gZmFyIGJlZm9yZQogCSAqIHJl cXVlc3RpbmcgdGhlIG5leHQgc25hcHNob3QgLSB0aGVzZSBjaGFuZ2VzIGFyZSBhcHBsaWNhYmxl IG9uIHRvcCBvZgpAQCAtMTE0MCw2ICsxMjY2LDcgQEAgZmluYWxpemVfYmxvY2tfcmFuZ2UoUmVs YXRpb24gcmVsX2RzdCwgQ2hhbmdlQ29udGV4dCAqY2hnY3h0LCBCbG9ja051bWJlciBjdXIsCiAK IAkvKiBTZWUgYWJvdmUuICovCiAJQXNzZXJ0KCFUcmFuc2FjdGlvbklkSXNWYWxpZChNeVByb2Mt PnhtaW4pKTsKKwlBc3NlcnQoIVRyYW5zYWN0aW9uSWRJc1ZhbGlkKE15UHJvYy0+eGlkKSk7CiAK IAkvKgogCSAqIFhYWCBJdCBtaWdodCBiZSB3b3J0aCBBc3NlcnQoQ2F0YWxvZ1NuYXBzaG90ID09 IE5VTEwpIGhlcmUsIGhvd2V2ZXIKQEAgLTExNzAsOCArMTI5NywxOSBAQCBmaW5hbGl6ZV9ibG9j a19yYW5nZShSZWxhdGlvbiByZWxfZHN0LCBDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIEJsb2NrTnVt YmVyIGN1ciwKIAkgKiBuZXh0IGJhdGNoIG9mIGRlY29kZWQgY2hhbmdlcy4KIAkgKi8KIAlzbmFw c2hvdCA9IHJlcGFja19nZXRfc25hcHNob3QoY2hnY3h0KTsKKworCUFzc2VydChUcmFuc2FjdGlv bklkRm9sbG93c09yRXF1YWxzKHNuYXBzaG90LT54bWluLAorCQkJCQkJCQkJCWNoZ2N4dC0+Y2Nf bGFzdF9zbmFwc2hvdF94bWluKSk7CisJY2hnY3h0LT5jY19sYXN0X3NuYXBzaG90X3htaW4gPSBz bmFwc2hvdC0+eG1pbjsKKwogCVB1c2hBY3RpdmVTbmFwc2hvdChzbmFwc2hvdCk7CiAKKwkvKgor CSAqIFByZXBhcmUgZm9yIGJ1bGsgaW5zZXJ0IG9mIHRoZSBuZXh0IHNldCBvZiB0dXBsZXMuIFdl IHJlbHkgb24gaXQgdG8KKwkgKiBzdGFydCBvbiBhIG5ldyBwYWdlLCBldmVuIGlmIHRoZSBsYXN0 IGV4aXN0aW5nIHBhZ2UgaXMgbm90IGZ1bGwuCisJICovCisJKnJ3c3RhdGVfcCA9IGJlZ2luX2hl YXBfcmV3cml0ZShyZWxfb2xkLCByZWxfZHN0LCBvbGRlc3RfeG1pbiwgeGlkX2N1dG9mZiwKKwkJ CQkJCQkJCW11bHRpX2N1dG9mZiwgdHJ1ZSk7CiAJKnJhbmdlX3N0YXJ0X2RzdF9wID0gUmVsYXRp b25HZXROdW1iZXJPZkJsb2NrcyhyZWxfZHN0KTsKIAogCXJldHVybiBzbmFwc2hvdDsKQEAgLTI2 MDcsNiArMjc0NSw3MCBAQCByZWZvcm1fYW5kX3Jld3JpdGVfdHVwbGUoVHVwbGVUYWJsZVNsb3Qg KnNyYywgVHVwbGVUYWJsZVNsb3QgKnJlZm9ybSwKIAkJaGVhcF9mcmVldHVwbGUobmV3dHVwbGUp OwogfQogCisvKgorICogSW5zZXJ0IHR1cGxlIHdoZW4gcHJvY2Vzc2luZyBSRVBBQ0sgQ09OQ1VS UkVOVExZLgorICoKKyAqICdyZWZvcm0nIGlzIGEgc2xvdCB0byB1c2UgZm9yIHR1cGxlICJyZWZv cm1pbmciLCB0eXBpY2FsbHkgdG8gZ2V0IHNldAorICogdmFsdWVzIG9mIGRyb3BwZWQgY29sdW1u cyB0byBOVUxMLgorICoKKyAqIFdlIHBhc3MgdGhlIE5PX0xPR0lDQUwgZmxhZyB0byBoZWFwX2lu c2VydCgpIGluIG9yZGVyIHRvIHNraXAgbG9naWNhbAorICogZGVjb2Rpbmc6IGFzIHNvb24gYXMg UkVQQUNLIENPTkNVUlJFTlRMWSBzd2FwcyB0aGUgcmVsYXRpb24gZmlsZXMsIGl0IGRyb3BzCisg KiB0aGlzIHJlbGF0aW9uLCBzbyBubyBsb2dpY2FsIHJlcGxpY2F0aW9uIHN1YnNjcmlwdGlvbiBz aG91bGQgbmVlZCB0aGUgZGF0YS4KKyAqLworc3RhdGljIHZvaWQKK2hlYXBfaW5zZXJ0X2Zvcl9y ZXBhY2soQ2hhbmdlQ29udGV4dCAqY2hnY3h0LCBUdXBsZVRhYmxlU2xvdCAqc3JjLAorCQkJCQkg ICBUdXBsZVRhYmxlU2xvdCAqcmVmb3JtLCBSZXdyaXRlU3RhdGUgcndzdGF0ZSkKK3sKKwlIZWFw VHVwbGUJdHVwbGUsCisJCQkJbmV3X3R1cGxlOworCWJvb2wJCXNob3VsZEZyZWUsCisJCQkJc2hv dWxkRnJlZU5ldzsKKwlUdXBsZVRhYmxlU2xvdCAqc2xvdDsKKwlib29sCQlmcmVlemU7CisKKwlp ZiAoY2hnY3h0LT5jY19kZXN0X2F1eCkKKwl7CisJCS8qIFdpbGwgZnJlZXplIHdoZW4gY29weWlu ZyBkYXRhIHRvIHRoZSBuZXcgdGFibGUuICovCisJCWZyZWV6ZSA9IGZhbHNlOworCX0KKwllbHNl CisJCWZyZWV6ZSA9IHRydWU7CisKKwl0dXBsZSA9IEV4ZWNGZXRjaFNsb3RIZWFwVHVwbGUoc3Jj LCBmYWxzZSwgJnNob3VsZEZyZWUpOworCisJLyoKKwkgKiBUaGUgc291cmNlIHNsb3QgaXMgbm90 IGV4cGVjdGVkIHRvIGNyZWF0ZSBhIGNvcHkgb2YgdGhlIHR1cGxlLgorCSAqLworCUFzc2VydChU VFNfSVNfQlVGRkVSVFVQTEUoc3JjKSk7CisJQXNzZXJ0KCFzaG91bGRGcmVlKTsKKworCWlmIChy ZWZvcm0gIT0gTlVMTCAmJiB0dXBsZV9uZWVkc19yZWZvcm0odHVwbGUsIHNyYy0+dHRzX3R1cGxl RGVzY3JpcHRvcikpCisJeworCQljbGVhcl9kcm9wcGVkX2F0dHJpYnV0ZXModHVwbGUsIHJlZm9y bSk7CisJCXNsb3QgPSByZWZvcm07CisJfQorCWVsc2UKKwkJc2xvdCA9IHNyYzsKKworCS8qIE1h a2Ugc3VyZSB3ZSBoYXZlIGEgY29weSBvZiB0aGUgdHVwbGUuICovCisJbmV3X3R1cGxlID0gRXhl Y0ZldGNoU2xvdEhlYXBUdXBsZShzbG90LCB0cnVlLCAmc2hvdWxkRnJlZU5ldyk7CisKKwkvKgor CSAqIFBlcmZvcm0gdGhlIGluc2VydGlvbi4gU2luY2UgdGhlIHR1cGxlIHdhcyB2aXNpYmxlIGZv ciB0aGUgaW5pdGlhbAorCSAqIGNvcHksIHhtYXggbmVlZHMgdG8gYmUgY2xlYXJlZC4gSWYgdGhl IGRlbGV0aW5nIHRyYW5zYWN0aW9uIGNvbW1pdHRlZCwKKwkgKiB0aGUgeG1heCB3aWxsIGJlIHNl dCBkdXJpbmcgaXRzIHJlcGxheS4KKwkgKi8KKwlyZXdyaXRlX2hlYXBfdHVwbGVfbm9fY2hhaW5z KHJ3c3RhdGUsIHR1cGxlLCBuZXdfdHVwbGUsIHRydWUsCisJCQkJCQkJCSBmcmVlemUpOworCisJ LyogVGhlIGluc2VydGlvbiBzaG91bGRuJ3QgaGF2ZSBjYXVzZWQgWElEIGFzc2lnbm1lbnQuICov CisJQXNzZXJ0KCFUcmFuc2FjdGlvbklkSXNWYWxpZChHZXRDdXJyZW50VHJhbnNhY3Rpb25JZElm QW55KCkpKTsKKworCS8qIENsZWFudXAuICovCisJaWYgKHNob3VsZEZyZWVOZXcpCisJCWhlYXBf ZnJlZXR1cGxlKG5ld190dXBsZSk7Cit9CisKIC8qCiAgKiBDaGVjayB2aXNpYmlsaXR5IG9mIHRo ZSB0dXBsZS4KICAqLwpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvYWNjZXNzL2hlYXAvaGVhcGFt X3Zpc2liaWxpdHkuYyBiL3NyYy9iYWNrZW5kL2FjY2Vzcy9oZWFwL2hlYXBhbV92aXNpYmlsaXR5 LmMKaW5kZXggOTA1NDQ0YWUwMzYuLjIzZWYzOWJkODA2IDEwMDY0NAotLS0gYS9zcmMvYmFja2Vu ZC9hY2Nlc3MvaGVhcC9oZWFwYW1fdmlzaWJpbGl0eS5jCisrKyBiL3NyYy9iYWNrZW5kL2FjY2Vz cy9oZWFwL2hlYXBhbV92aXNpYmlsaXR5LmMKQEAgLTEzNjUsNiArMTM2NSw2NSBAQCBIZWFwVHVw bGVTYXRpc2ZpZXNOb25WYWN1dW1hYmxlKEhlYXBUdXBsZSBodHVwLCBTbmFwc2hvdCBzbmFwc2hv dCwKIAlyZXR1cm4gcmVzICE9IEhFQVBUVVBMRV9ERUFEOwogfQogCisvKgorICogSGVhcFR1cGxl U2F0aXNmaWVzTmV3SGVhcAorICoJCUNvbnNpZGVyIGFsbCB0cmFuc2FjdGlvbnMgY29tbWl0dGVk IG9yIGN1cnJlbnQuCisgKgorICogU2VlIFNOQVBTSE9UX05FV19IRUFQJ3MgZGVmaW5pdGlvbiBm b3IgdGhlIGludGVuZGVkIGJlaGF2aW91ci4KKyAqCisgKi8KK3N0YXRpYyBib29sCitIZWFwVHVw bGVTYXRpc2ZpZXNOZXdIZWFwKEhlYXBUdXBsZSBodHVwLCBTbmFwc2hvdCBzbmFwc2hvdCwgQnVm ZmVyIGJ1ZmZlcikKK3sKKwlIZWFwVHVwbGVIZWFkZXIgdHVwbGUgPSBodHVwLT50X2RhdGE7CisK KwlBc3NlcnQoSXRlbVBvaW50ZXJJc1ZhbGlkKCZodHVwLT50X3NlbGYpKTsKKwlBc3NlcnQoaHR1 cC0+dF90YWJsZU9pZCAhPSBJbnZhbGlkT2lkKTsKKworCS8qIHhtaW4gc2hvdWxkIGFsd2F5cyBi ZSB0aGVyZS4gKi8KKwlBc3NlcnQoVHJhbnNhY3Rpb25JZElzVmFsaWQoSGVhcFR1cGxlSGVhZGVy R2V0WG1pbih0dXBsZSkpKTsKKworCS8qCisJICogTm8gb25lIHNob3VsZCBoYXZlIHRoZSBjaGFu Y2UgdG8gc2V0IFhNSU5fSU5WQUxJRCB1bnRpbCBSRVBBQ0sgaGFzCisJICogZmluaXNoZWQsIGFu ZCB3ZSBkbyBub3QgbmVlZCBpdC4KKwkgKi8KKwlBc3NlcnQoIUhlYXBUdXBsZUhlYWRlclhtaW5J bnZhbGlkKHR1cGxlKSk7CisKKwkvKgorCSAqIFVubGlrZSB0aGF0LCBYTUlOX0NPTU1JVFRFRCBt aWdodCBoYXZlIGJlZW4gc2V0IGVhcmxpZXIgYnkgUkVQQUNLCisJICogaXRzZWxmLCBidXQgd2Ug ZG9uJ3QgbmVlZCBpdCBoZXJlLgorCSAqLworCisJLyoKKwkgKiBTZXQgWE1JTl9DT01NSVRURUQg dG8gbWFrZSB0aGUgbmV4dCBjaGVja3MgKGJ5IGFueSBzbmFwc2hvdCkgZmFzdGVyLgorCSAqCisJ ICogVE9ETyBTZXQgdGhlIGZsYWcgaW4gdGhlIGluaXRpYWwgbG9hZCBhbmQgaW4KKwkgKiBhcHBs eV9jb25jdXJyZW50X2NoYW5nZXMoKS4KKwkgKi8KKwlTZXRIaW50Qml0cyh0dXBsZSwgYnVmZmVy LCBIRUFQX1hNSU5fQ09NTUlUVEVELAorCQkJCUhlYXBUdXBsZUhlYWRlckdldFJhd1htYXgodHVw bGUpKTsKKworCS8qIEluc2VydGVkIHR1cGxlcyBoYXZlIFhNQVhfSU5WQUxJRCBzZXQuICovCisJ aWYgKHR1cGxlLT50X2luZm9tYXNrICYgSEVBUF9YTUFYX0lOVkFMSUQpCisJCXJldHVybiB0cnVl OworCisJLyoKKwkgKiBSRVBBQ0sgY291bGQgaGF2ZSBzZXQgWE1BWF9DT01NSVRURUQgZHVyaW5n IFVQREFURSBvciBERUxFVEUsIG9yIGJlbG93LgorCSAqLworCWlmICh0dXBsZS0+dF9pbmZvbWFz ayAmIEhFQVBfWE1BWF9DT01NSVRURUQpCisJCXJldHVybiBmYWxzZTsKKworCWlmICghVHJhbnNh Y3Rpb25JZElzVmFsaWQoSGVhcFR1cGxlSGVhZGVyR2V0UmF3WG1heCh0dXBsZSkpKQorCQlyZXR1 cm4gdHJ1ZTsKKworCS8qCisJICogU2V0IFhNQVhfQ09NTUlUVEVEIHRvIG1ha2UgdGhlIG5leHQg Y2hlY2tzIGZhc3Rlci4KKwkgKi8KKwlTZXRIaW50Qml0cyh0dXBsZSwgYnVmZmVyLCBIRUFQX1hN QVhfQ09NTUlUVEVELAorCQkJCUhlYXBUdXBsZUhlYWRlckdldFJhd1htYXgodHVwbGUpKTsKKwor CXJldHVybiBmYWxzZTsKK30KIAogLyoKICAqIEhlYXBUdXBsZUlzU3VyZWx5RGVhZApAQCAtMTc0 OSw2ICsxODA4LDkgQEAgSGVhcFR1cGxlU2F0aXNmaWVzVmlzaWJpbGl0eShIZWFwVHVwbGUgaHR1 cCwgU25hcHNob3Qgc25hcHNob3QsIEJ1ZmZlciBidWZmZXIpCiAJCQlyZXR1cm4gSGVhcFR1cGxl U2F0aXNmaWVzSGlzdG9yaWNNVkNDKGh0dXAsIHNuYXBzaG90LCBidWZmZXIpOwogCQljYXNlIFNO QVBTSE9UX05PTl9WQUNVVU1BQkxFOgogCQkJcmV0dXJuIEhlYXBUdXBsZVNhdGlzZmllc05vblZh Y3V1bWFibGUoaHR1cCwgc25hcHNob3QsIGJ1ZmZlcik7CisJCWNhc2UgU05BUFNIT1RfTkVXX0hF QVA6CisJCQlyZXR1cm4gSGVhcFR1cGxlU2F0aXNmaWVzTmV3SGVhcChodHVwLCBzbmFwc2hvdCwg YnVmZmVyKTsKKwogCX0KIAogCXJldHVybiBmYWxzZTsJCQkJLyoga2VlcCBjb21waWxlciBxdWll dCAqLwpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvYWNjZXNzL2hlYXAvaGVhcHRvYXN0LmMgYi9z cmMvYmFja2VuZC9hY2Nlc3MvaGVhcC9oZWFwdG9hc3QuYwppbmRleCBlMzI5NjYyYjY4My4uYjYw MmRjMDFmNTAgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2FjY2Vzcy9oZWFwL2hlYXB0b2FzdC5j CisrKyBiL3NyYy9iYWNrZW5kL2FjY2Vzcy9oZWFwL2hlYXB0b2FzdC5jCkBAIC00MCw3ICs0MCw4 IEBACiAgKiAtLS0tLS0tLS0tCiAgKi8KIHZvaWQKLWhlYXBfdG9hc3RfZGVsZXRlKFJlbGF0aW9u IHJlbCwgSGVhcFR1cGxlIG9sZHR1cCwgYm9vbCBpc19zcGVjdWxhdGl2ZSkKK2hlYXBfdG9hc3Rf ZGVsZXRlKFJlbGF0aW9uIHJlbCwgSGVhcFR1cGxlIG9sZHR1cCwgYm9vbCBpc19zcGVjdWxhdGl2 ZSwKKwkJCQkgIFRyYW5zYWN0aW9uSWQgeGlkKQogewogCVR1cGxlRGVzYwl0dXBsZURlc2M7CiAJ RGF0dW0JCXRvYXN0X3ZhbHVlc1tNYXhIZWFwQXR0cmlidXRlTnVtYmVyXTsKQEAgLTcwLDcgKzcx LDggQEAgaGVhcF90b2FzdF9kZWxldGUoUmVsYXRpb24gcmVsLCBIZWFwVHVwbGUgb2xkdHVwLCBi b29sIGlzX3NwZWN1bGF0aXZlKQogCWhlYXBfZGVmb3JtX3R1cGxlKG9sZHR1cCwgdHVwbGVEZXNj LCB0b2FzdF92YWx1ZXMsIHRvYXN0X2lzbnVsbCk7CiAKIAkvKiBEbyB0aGUgcmVhbCB3b3JrLiAq LwotCXRvYXN0X2RlbGV0ZV9leHRlcm5hbChyZWwsIHRvYXN0X3ZhbHVlcywgdG9hc3RfaXNudWxs LCBpc19zcGVjdWxhdGl2ZSk7CisJdG9hc3RfZGVsZXRlX2V4dGVybmFsKHJlbCwgdG9hc3RfdmFs dWVzLCB0b2FzdF9pc251bGwsIGlzX3NwZWN1bGF0aXZlLAorCQkJCQkJICB4aWQpOwogfQogCiAK QEAgLTg0LDYgKzg2LDcgQEAgaGVhcF90b2FzdF9kZWxldGUoUmVsYXRpb24gcmVsLCBIZWFwVHVw bGUgb2xkdHVwLCBib29sIGlzX3NwZWN1bGF0aXZlKQogICoJbmV3dHVwOiB0aGUgY2FuZGlkYXRl IG5ldyB0dXBsZSB0byBiZSBpbnNlcnRlZAogICoJb2xkdHVwOiB0aGUgb2xkIHJvdyB2ZXJzaW9u IGZvciBVUERBVEUsIG9yIE5VTEwgZm9yIElOU0VSVAogICoJb3B0aW9uczogb3B0aW9ucyB0byBi ZSBwYXNzZWQgdG8gaGVhcF9pbnNlcnQoKSBmb3IgdG9hc3Qgcm93cworICoJcndzdGF0ZTogaWYg dmFsaWQsIHVzZSByYXdfaGVhcF9pbnNlcnQoKQogICogUmVzdWx0OgogICoJZWl0aGVyIG5ld3R1 cCBpZiBubyB0b2FzdGluZyBpcyBuZWVkZWQsIG9yIGEgcGFsbG9jJ2QgbW9kaWZpZWQgdHVwbGUK ICAqCXRoYXQgaXMgd2hhdCBzaG91bGQgYWN0dWFsbHkgZ2V0IHN0b3JlZApAQCAtOTQsNyArOTcs NyBAQCBoZWFwX3RvYXN0X2RlbGV0ZShSZWxhdGlvbiByZWwsIEhlYXBUdXBsZSBvbGR0dXAsIGJv b2wgaXNfc3BlY3VsYXRpdmUpCiAgKi8KIEhlYXBUdXBsZQogaGVhcF90b2FzdF9pbnNlcnRfb3Jf dXBkYXRlKFJlbGF0aW9uIHJlbCwgSGVhcFR1cGxlIG5ld3R1cCwgSGVhcFR1cGxlIG9sZHR1cCwK LQkJCQkJCQl1aW50MzIgb3B0aW9ucykKKwkJCQkJCQlSZXdyaXRlU3RhdGUgcndzdGF0ZSwgdWlu dDMyIG9wdGlvbnMpCiB7CiAJSGVhcFR1cGxlCXJlc3VsdF90dXBsZTsKIAlUdXBsZURlc2MJdHVw bGVEZXNjOwpAQCAtMTA5LDYgKzExMiw3IEBAIGhlYXBfdG9hc3RfaW5zZXJ0X29yX3VwZGF0ZShS ZWxhdGlvbiByZWwsIEhlYXBUdXBsZSBuZXd0dXAsIEhlYXBUdXBsZSBvbGR0dXAsCiAJRGF0dW0J CXRvYXN0X29sZHZhbHVlc1tNYXhIZWFwQXR0cmlidXRlTnVtYmVyXTsKIAlUb2FzdEF0dHJJbmZv IHRvYXN0X2F0dHJbTWF4SGVhcEF0dHJpYnV0ZU51bWJlcl07CiAJVG9hc3RUdXBsZUNvbnRleHQg dHRjOworCVRyYW5zYWN0aW9uSWQgeGlkOwogCiAJLyoKIAkgKiBJZ25vcmUgdGhlIElOU0VSVF9T UEVDVUxBVElWRSBvcHRpb24uIFNwZWN1bGF0aXZlIGluc2VydGlvbnMvc3VwZXIKQEAgLTE1Niw2 ICsxNjAsMTMgQEAgaGVhcF90b2FzdF9pbnNlcnRfb3JfdXBkYXRlKFJlbGF0aW9uIHJlbCwgSGVh cFR1cGxlIG5ld3R1cCwgSGVhcFR1cGxlIG9sZHR1cCwKIAl0dGMudHRjX2F0dHIgPSB0b2FzdF9h dHRyOwogCXRvYXN0X3R1cGxlX2luaXQoJnR0Yyk7CiAKKwkvKgorCSAqIHJhd19oZWFwX2luc2Vy dCgpIG1heSBiZSBuZWVkZWQgZm9yIGluc2VydGlvbiBpbnRvIHRoZSBUT0FTVCB0YWJsZS4gSW4K KwkgKiB0aGF0IGNhc2UsIHZpc2liaWxpdHkgaW5mb3JtYXRpb24gd2lsbCBiZSByZXRyaWV2ZWQg ZnJvbSAnbmV3dHVwJy4KKwkgKi8KKwl0dGMudHRjX3J3c3RhdGUgPSByd3N0YXRlOworCXR0Yy50 dGNfdHVwX21haW4gPSBuZXd0dXA7CisKIAkvKiAtLS0tLS0tLS0tCiAJICogQ29tcHJlc3MgYW5k L29yIHNhdmUgZXh0ZXJuYWwgdW50aWwgZGF0YSBmaXRzIGludG8gdGFyZ2V0IGxlbmd0aAogCSAq CkBAIC0zMzUsNyArMzQ2LDExIEBAIGhlYXBfdG9hc3RfaW5zZXJ0X29yX3VwZGF0ZShSZWxhdGlv biByZWwsIEhlYXBUdXBsZSBuZXd0dXAsIEhlYXBUdXBsZSBvbGR0dXAsCiAJZWxzZQogCQlyZXN1 bHRfdHVwbGUgPSBuZXd0dXA7CiAKLQl0b2FzdF90dXBsZV9jbGVhbnVwKCZ0dGMpOworCWlmIChv cHRpb25zICYgVEFCTEVfUkVVU0VfWElEKQorCQl4aWQgPSBIZWFwVHVwbGVIZWFkZXJHZXRYbWlu KG5ld3R1cC0+dF9kYXRhKTsKKwllbHNlCisJCXhpZCA9IEludmFsaWRUcmFuc2FjdGlvbklkOyAv KiBUaGUgY3VycmVudCB0cmFuc2FjdGlvbi4gKi8KKwl0b2FzdF90dXBsZV9jbGVhbnVwKCZ0dGMs IHhpZCk7CiAKIAlyZXR1cm4gcmVzdWx0X3R1cGxlOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tl bmQvYWNjZXNzL2hlYXAvcmV3cml0ZWhlYXAuYyBiL3NyYy9iYWNrZW5kL2FjY2Vzcy9oZWFwL3Jl d3JpdGVoZWFwLmMKaW5kZXggYmUwZjY2NDZiODMuLmRjNTM4YjAxODVjIDEwMDY0NAotLS0gYS9z cmMvYmFja2VuZC9hY2Nlc3MvaGVhcC9yZXdyaXRlaGVhcC5jCisrKyBiL3NyYy9iYWNrZW5kL2Fj Y2Vzcy9oZWFwL3Jld3JpdGVoZWFwLmMKQEAgLTEwNyw2ICsxMDcsNyBAQAogI2luY2x1ZGUgImFj Y2Vzcy9oZWFwYW0uaCIKICNpbmNsdWRlICJhY2Nlc3MvaGVhcGFtX3hsb2cuaCIKICNpbmNsdWRl ICJhY2Nlc3MvaGVhcHRvYXN0LmgiCisjaW5jbHVkZSAiYWNjZXNzL211bHRpeGFjdC5oIgogI2lu Y2x1ZGUgImFjY2Vzcy9yZXdyaXRlaGVhcC5oIgogI2luY2x1ZGUgImFjY2Vzcy90cmFuc2FtLmgi CiAjaW5jbHVkZSAiYWNjZXNzL3hhY3QuaCIKQEAgLTExOSw2ICsxMjAsNyBAQAogI2luY2x1ZGUg InN0b3JhZ2UvYnVmbWdyLmgiCiAjaW5jbHVkZSAic3RvcmFnZS9idWxrX3dyaXRlLmgiCiAjaW5j bHVkZSAic3RvcmFnZS9mZC5oIgorI2luY2x1ZGUgInN0b3JhZ2UvbG1nci5oIgogI2luY2x1ZGUg InN0b3JhZ2UvcHJvY2FycmF5LmgiCiAjaW5jbHVkZSAidXRpbHMvbWVtdXRpbHMuaCIKICNpbmNs dWRlICJ1dGlscy9yZWwuaCIKQEAgLTE1MSw2ICsxNTMsMTIgQEAgdHlwZWRlZiBzdHJ1Y3QgUmV3 cml0ZVN0YXRlRGF0YQogCUhUQUIJICAgKnJzX29sZF9uZXdfdGlkX21hcDsgLyogdW5tYXRjaGVk IEIgdHVwbGVzICovCiAJSFRBQgkgICAqcnNfbG9naWNhbF9tYXBwaW5nczsJLyogbG9naWNhbCBy ZW1hcHBpbmcgZmlsZXMgKi8KIAl1aW50MzIJCXJzX251bV9yZXdyaXRlX21hcHBpbmdzOwkvKiAj IGluIG1lbW9yeSBtYXBwaW5ncyAqLworCisJLyoKKwkgKiBJZiB0aGlzIGlzIGluaXRpYWxpemVk LCByYXdfaGVhcF9pbnNlcnQoKSBpcyBhbHNvIHVzZWQgZm9yIFRPQVNUCisJICogcmVsYXRpb24u CisJICovCisJc3RydWN0IFJld3JpdGVTdGF0ZURhdGEgKnRvYXN0OwogfSBSZXdyaXRlU3RhdGVE YXRhOwogCiAvKgpAQCAtMjExLDYgKzIxOSwxMSBAQCB0eXBlZGVmIHN0cnVjdCBSZXdyaXRlTWFw cGluZ0RhdGFFbnRyeQogCiAKIC8qIHByb3RvdHlwZXMgZm9yIGludGVybmFsIGZ1bmN0aW9ucyAq Lworc3RhdGljIFJld3JpdGVTdGF0ZSBiZWdpbl9oZWFwX3Jld3JpdGVfY29tbW9uKFJlbGF0aW9u IG9sZF9oZWFwLAorCQkJCQkJCQkJCQkgIFJlbGF0aW9uIG5ld19oZWFwLAorCQkJCQkJCQkJCQkg IFRyYW5zYWN0aW9uSWQgb2xkZXN0X3htaW4sCisJCQkJCQkJCQkJCSAgVHJhbnNhY3Rpb25JZCBm cmVlemVfeGlkLAorCQkJCQkJCQkJCQkgIE11bHRpWGFjdElkIGN1dG9mZl9tdWx0aSk7CiBzdGF0 aWMgdm9pZCByYXdfaGVhcF9pbnNlcnQoUmV3cml0ZVN0YXRlIHN0YXRlLCBIZWFwVHVwbGUgdHVw KTsKIAogLyogaW50ZXJuYWwgbG9naWNhbCByZW1hcHBpbmcgcHJvdG90eXBlcyAqLwpAQCAtMjI3 LDE4ICsyNDAsMTkgQEAgc3RhdGljIHZvaWQgbG9naWNhbF9lbmRfaGVhcF9yZXdyaXRlKFJld3Jp dGVTdGF0ZSBzdGF0ZSk7CiAgKiBvbGRlc3RfeG1pbgl4aWQgdXNlZCBieSB0aGUgY2FsbGVyIHRv IGRldGVybWluZSB3aGljaCB0dXBsZXMgYXJlIGRlYWQKICAqIGZyZWV6ZV94aWQJeGlkIGJlZm9y ZSB3aGljaCB0dXBsZXMgd2lsbCBiZSBmcm96ZW4KICAqIGN1dG9mZl9tdWx0aQltdWx0aXhhY3Qg YmVmb3JlIHdoaWNoIG11bHRpcyB3aWxsIGJlIHJlbW92ZWQKKyAqIG5vX2NoYWlucwlvbmx5IHJh dyBpbnNlcnQgKGFuZCBmcmVlemluZyksIGRvIG5vdCBjYXJlIG9mIEhPVCBjaGFpbnMKICAqCiAg KiBSZXR1cm5zIGFuIG9wYXF1ZSBSZXdyaXRlU3RhdGUsIGFsbG9jYXRlZCBpbiBjdXJyZW50IG1l bW9yeSBjb250ZXh0LAogICogdG8gYmUgdXNlZCBpbiBzdWJzZXF1ZW50IGNhbGxzIHRvIHRoZSBv dGhlciBmdW5jdGlvbnMuCiAgKi8KIFJld3JpdGVTdGF0ZQogYmVnaW5faGVhcF9yZXdyaXRlKFJl bGF0aW9uIG9sZF9oZWFwLCBSZWxhdGlvbiBuZXdfaGVhcCwgVHJhbnNhY3Rpb25JZCBvbGRlc3Rf eG1pbiwKLQkJCQkgICBUcmFuc2FjdGlvbklkIGZyZWV6ZV94aWQsIE11bHRpWGFjdElkIGN1dG9m Zl9tdWx0aSkKKwkJCQkgICBUcmFuc2FjdGlvbklkIGZyZWV6ZV94aWQsIE11bHRpWGFjdElkIGN1 dG9mZl9tdWx0aSwKKwkJCQkgICBib29sIG5vX2NoYWlucykKIHsKLQlSZXdyaXRlU3RhdGUgc3Rh dGU7CiAJTWVtb3J5Q29udGV4dCByd19jeHQ7CiAJTWVtb3J5Q29udGV4dCBvbGRfY3h0OwotCUhB U0hDVEwJCWhhc2hfY3RsOworCVJld3JpdGVTdGF0ZSBzdGF0ZTsKIAogCS8qCiAJICogVG8gZWFz ZSBjbGVhbnVwLCBtYWtlIGEgc2VwYXJhdGUgY29udGV4dCB0aGF0IHdpbGwgY29udGFpbiB0aGUK QEAgLTI0OSw5ICsyNjMsOTkgQEAgYmVnaW5faGVhcF9yZXdyaXRlKFJlbGF0aW9uIG9sZF9oZWFw LCBSZWxhdGlvbiBuZXdfaGVhcCwgVHJhbnNhY3Rpb25JZCBvbGRlc3RfeG0KIAkJCQkJCQkJICAg QUxMT0NTRVRfREVGQVVMVF9TSVpFUyk7CiAJb2xkX2N4dCA9IE1lbW9yeUNvbnRleHRTd2l0Y2hU byhyd19jeHQpOwogCisJc3RhdGUgPSBiZWdpbl9oZWFwX3Jld3JpdGVfY29tbW9uKG9sZF9oZWFw LCBuZXdfaGVhcCwgb2xkZXN0X3htaW4sCisJCQkJCQkJCQkgIGZyZWV6ZV94aWQsIGN1dG9mZl9t dWx0aSk7CisJc3RhdGUtPnJzX2N4dCA9IHJ3X2N4dDsKKworCWlmICghbm9fY2hhaW5zKQorCXsK KwkJSEFTSENUTAkJaGFzaF9jdGw7CisKKwkJLyogSW5pdGlhbGl6ZSBoYXNoIHRhYmxlcyB1c2Vk IHRvIHRyYWNrIHVwZGF0ZSBjaGFpbnMgKi8KKwkJaGFzaF9jdGwua2V5c2l6ZSA9IHNpemVvZihU aWRIYXNoS2V5KTsKKwkJaGFzaF9jdGwuZW50cnlzaXplID0gc2l6ZW9mKFVucmVzb2x2ZWRUdXBE YXRhKTsKKwkJaGFzaF9jdGwuaGN4dCA9IHN0YXRlLT5yc19jeHQ7CisKKwkJc3RhdGUtPnJzX3Vu cmVzb2x2ZWRfdHVwcyA9CisJCQloYXNoX2NyZWF0ZSgiUmV3cml0ZSAvIFVucmVzb2x2ZWQgY3Rp ZHMiLAorCQkJCQkJMTI4LAkvKiBhcmJpdHJhcnkgaW5pdGlhbCBzaXplICovCisJCQkJCQkmaGFz aF9jdGwsCisJCQkJCQlIQVNIX0VMRU0gfCBIQVNIX0JMT0JTIHwgSEFTSF9DT05URVhUKTsKKwor CQloYXNoX2N0bC5lbnRyeXNpemUgPSBzaXplb2YoT2xkVG9OZXdNYXBwaW5nRGF0YSk7CisKKwkJ c3RhdGUtPnJzX29sZF9uZXdfdGlkX21hcCA9CisJCQloYXNoX2NyZWF0ZSgiUmV3cml0ZSAvIE9s ZCB0byBuZXcgdGlkIG1hcCIsCisJCQkJCQkxMjgsCS8qIGFyYml0cmFyeSBpbml0aWFsIHNpemUg Ki8KKwkJCQkJCSZoYXNoX2N0bCwKKwkJCQkJCUhBU0hfRUxFTSB8IEhBU0hfQkxPQlMgfCBIQVNI X0NPTlRFWFQpOworCisJCWxvZ2ljYWxfYmVnaW5faGVhcF9yZXdyaXRlKHN0YXRlKTsKKwl9CisJ ZWxzZQorCXsKKwkJT2lkCQkJdG9hc3RpZDsKKworCQkvKgorCQkgKiBUaGUgY3VycmVudCB1c2Vy IG9mIHRoaXMgbW9kZSwgUkVQQUNLIChDT05DVVJSRU5UTFkpLCBkb2VzIG5vdCB3YW50CisJCSAq IFhJRCBhc3NpZ25lZCBhdCBhbGwsIHNvICJyYXcgaW5zZXJ0IiBpcyBhbHNvIHVzZWQgZm9yIFRP QVNULgorCQkgKgorCQkgKiBYWFggInJhdyBpbnNlcnQiIHdvdWxkIGJlIGhlbHBmdWwgZm9yIFJF UEFDSyB3L28gQ09OQ1VSUkVOVExZIHRvbywKKwkJICogYXMgaXQgd3JpdGVzIHRoZSB3aG9sZSBw YWdlcyB0byBXQUwuIFRoZSBwcm9ibGVtIGhlcmUgaXMgdGhhdCBpdAorCQkgKiBtaWdodCBjaGVj ayB0aGUgZXhpc3RlbmNlIG9mIGNodW5rIE9JRHMgaW4gdGhlIG5ldyBUT0FTVCByZWxhdGlvbgor CQkgKiAoc2VlIHRoZSBoYWNrcyB3aXRoIHJkX3RvYXN0b2lkIGluIHRvYXN0X3NhdmVfZGF0dW0o KSksIGFuZCB0aGF0CisJCSAqIGRvZXNuJ3Qgd29yayB3aGlsZSB0aGUgcmV3cml0ZSBpcyBzdGls bCBpbiBwcm9ncmVzczogdGhlIHJlbGF0aW9uCisJCSAqIHBhZ2VzIGFyZSBub3QgZ3VhcmFudGVl ZCB0byBiZSBmbHVzaGVkIHRvIGRpc2sgKGFuZCByZWFkIGludG8KKwkJICogc2hhcmVkIGJ1ZmZl cnMpIGJlZm9yZSB0aGUgZW5kIG9mIHRoZSByZXdyaXRlLgorCQkgKi8KKwkJdG9hc3RpZCA9IG5l d19oZWFwLT5yZF9yZWwtPnJlbHRvYXN0cmVsaWQ7CisJCWlmIChPaWRJc1ZhbGlkKHRvYXN0aWQp KQorCQl7CisJCQlPaWQJCQl0b2FzdGlkX29sZDsKKwkJCVJlbGF0aW9uCXRvYXN0X3JlbDsKKwkJ CVJlbGF0aW9uCXRvYXN0X3JlbF9vbGQgPSBOVUxMOworCisJCQkvKiBOZXcgcmVsYXRpb24ncyBU T0FTVCBzaG91bGQgYWxyZWFkeSBiZSBsb2NrZWQuICovCisJCQlBc3NlcnQoQ2hlY2tSZWxhdGlv bk9pZExvY2tlZEJ5TWUodG9hc3RpZCwgQWNjZXNzRXhjbHVzaXZlTG9jaywKKwkJCQkJCQkJCQkJ ICBmYWxzZSkpOworCQkJdG9hc3RfcmVsID0gdGFibGVfb3Blbih0b2FzdGlkLCBOb0xvY2spOwor CisJCQl0b2FzdGlkX29sZCA9IG9sZF9oZWFwID8gb2xkX2hlYXAtPnJkX3JlbC0+cmVsdG9hc3Ry ZWxpZCA6CisJCQkJSW52YWxpZFRyYW5zYWN0aW9uSWQ7CisJCQlpZiAoT2lkSXNWYWxpZCh0b2Fz dGlkX29sZCkpCisJCQl7CisJCQkJLyoKKwkJCQkgKiBDdXJyZW50bHkgd2UgZG8gbm90IGxvY2sg dGhlIG9sZCByZWxhdGlvbidzIFRPQVNULiBVc2UgdGhlCisJCQkJICogc2FtZSBsb2NrIG1vZGUg d2UgdXNlIGZvciB0aGUgcGFyZW50IHJlbGF0aW9uLgorCQkJCSAqLworCQkJCXRvYXN0X3JlbF9v bGQgPSB0YWJsZV9vcGVuKHRvYXN0aWRfb2xkLAorCQkJCQkJCQkJCSAgIFNoYXJlVXBkYXRlRXhj bHVzaXZlTG9jayk7CisJCQl9CisKKwkJCS8qIENyZWF0ZSB0aGUgc3RhdGUgZm9yIFRPQVNUIGlu c2VydGlvbnMuICovCisJCQlzdGF0ZS0+dG9hc3QgPSBiZWdpbl9oZWFwX3Jld3JpdGVfY29tbW9u KHRvYXN0X3JlbF9vbGQsCisJCQkJCQkJCQkJCQkJIHRvYXN0X3JlbCwKKwkJCQkJCQkJCQkJCQkg b2xkZXN0X3htaW4sCisJCQkJCQkJCQkJCQkJIGZyZWV6ZV94aWQsCisJCQkJCQkJCQkJCQkJIGN1 dG9mZl9tdWx0aSk7CisJCX0KKwl9CisKKwlNZW1vcnlDb250ZXh0U3dpdGNoVG8ob2xkX2N4dCk7 CisKKwlyZXR1cm4gc3RhdGU7Cit9CisKK3N0YXRpYyBSZXdyaXRlU3RhdGUKK2JlZ2luX2hlYXBf cmV3cml0ZV9jb21tb24oUmVsYXRpb24gb2xkX2hlYXAsIFJlbGF0aW9uIG5ld19oZWFwLAorCQkJ CQkJICBUcmFuc2FjdGlvbklkIG9sZGVzdF94bWluLAorCQkJCQkJICBUcmFuc2FjdGlvbklkIGZy ZWV6ZV94aWQsIE11bHRpWGFjdElkIGN1dG9mZl9tdWx0aSkKKworeworCVJld3JpdGVTdGF0ZSBz dGF0ZTsKKwogCS8qIENyZWF0ZSBhbmQgZmlsbCBpbiB0aGUgc3RhdGUgc3RydWN0ICovCiAJc3Rh dGUgPSBwYWxsb2MwX29iamVjdChSZXdyaXRlU3RhdGVEYXRhKTsKLQogCXN0YXRlLT5yc19vbGRf cmVsID0gb2xkX2hlYXA7CiAJc3RhdGUtPnJzX25ld19yZWwgPSBuZXdfaGVhcDsKIAlzdGF0ZS0+ cnNfYnVmZmVyID0gTlVMTDsKQEAgLTI2MCwzMiArMzY0LDggQEAgYmVnaW5faGVhcF9yZXdyaXRl KFJlbGF0aW9uIG9sZF9oZWFwLCBSZWxhdGlvbiBuZXdfaGVhcCwgVHJhbnNhY3Rpb25JZCBvbGRl c3RfeG0KIAlzdGF0ZS0+cnNfb2xkZXN0X3htaW4gPSBvbGRlc3RfeG1pbjsKIAlzdGF0ZS0+cnNf ZnJlZXplX3hpZCA9IGZyZWV6ZV94aWQ7CiAJc3RhdGUtPnJzX2N1dG9mZl9tdWx0aSA9IGN1dG9m Zl9tdWx0aTsKLQlzdGF0ZS0+cnNfY3h0ID0gcndfY3h0OwogCXN0YXRlLT5yc19idWxrc3RhdGUg PSBzbWdyX2J1bGtfc3RhcnRfcmVsKG5ld19oZWFwLCBNQUlOX0ZPUktOVU0pOwogCi0JLyogSW5p dGlhbGl6ZSBoYXNoIHRhYmxlcyB1c2VkIHRvIHRyYWNrIHVwZGF0ZSBjaGFpbnMgKi8KLQloYXNo X2N0bC5rZXlzaXplID0gc2l6ZW9mKFRpZEhhc2hLZXkpOwotCWhhc2hfY3RsLmVudHJ5c2l6ZSA9 IHNpemVvZihVbnJlc29sdmVkVHVwRGF0YSk7Ci0JaGFzaF9jdGwuaGN4dCA9IHN0YXRlLT5yc19j eHQ7Ci0KLQlzdGF0ZS0+cnNfdW5yZXNvbHZlZF90dXBzID0KLQkJaGFzaF9jcmVhdGUoIlJld3Jp dGUgLyBVbnJlc29sdmVkIGN0aWRzIiwKLQkJCQkJMTI4LAkJLyogYXJiaXRyYXJ5IGluaXRpYWwg c2l6ZSAqLwotCQkJCQkmaGFzaF9jdGwsCi0JCQkJCUhBU0hfRUxFTSB8IEhBU0hfQkxPQlMgfCBI QVNIX0NPTlRFWFQpOwotCi0JaGFzaF9jdGwuZW50cnlzaXplID0gc2l6ZW9mKE9sZFRvTmV3TWFw cGluZ0RhdGEpOwotCi0Jc3RhdGUtPnJzX29sZF9uZXdfdGlkX21hcCA9Ci0JCWhhc2hfY3JlYXRl KCJSZXdyaXRlIC8gT2xkIHRvIG5ldyB0aWQgbWFwIiwKLQkJCQkJMTI4LAkJLyogYXJiaXRyYXJ5 IGluaXRpYWwgc2l6ZSAqLwotCQkJCQkmaGFzaF9jdGwsCi0JCQkJCUhBU0hfRUxFTSB8IEhBU0hf QkxPQlMgfCBIQVNIX0NPTlRFWFQpOwotCi0JTWVtb3J5Q29udGV4dFN3aXRjaFRvKG9sZF9jeHQp OwotCi0JbG9naWNhbF9iZWdpbl9oZWFwX3Jld3JpdGUoc3RhdGUpOwotCiAJcmV0dXJuIHN0YXRl OwogfQogCkBAIC0zMDAsMTYgKzM4MCwyMCBAQCBlbmRfaGVhcF9yZXdyaXRlKFJld3JpdGVTdGF0 ZSBzdGF0ZSkKIAlIQVNIX1NFUV9TVEFUVVMgc2VxX3N0YXR1czsKIAlVbnJlc29sdmVkVHVwIHVu cmVzb2x2ZWQ7CiAKLQkvKgotCSAqIFdyaXRlIGFueSByZW1haW5pbmcgdHVwbGVzIGluIHRoZSBV bnJlc29sdmVkVHVwcyB0YWJsZS4gSWYgd2UgaGF2ZSBhbnkKLQkgKiBsZWZ0LCB0aGV5IHNob3Vs ZCBpbiBmYWN0IGJlIGRlYWQsIGJ1dCBsZXQncyBlcnIgb24gdGhlIHNhZmUgc2lkZS4KLQkgKi8K LQloYXNoX3NlcV9pbml0KCZzZXFfc3RhdHVzLCBzdGF0ZS0+cnNfdW5yZXNvbHZlZF90dXBzKTsK LQotCXdoaWxlICgodW5yZXNvbHZlZCA9IGhhc2hfc2VxX3NlYXJjaCgmc2VxX3N0YXR1cykpICE9 IE5VTEwpCisJaWYgKHN0YXRlLT5yc191bnJlc29sdmVkX3R1cHMpCiAJewotCQlJdGVtUG9pbnRl clNldEludmFsaWQoJnVucmVzb2x2ZWQtPnR1cGxlLT50X2RhdGEtPnRfY3RpZCk7Ci0JCXJhd19o ZWFwX2luc2VydChzdGF0ZSwgdW5yZXNvbHZlZC0+dHVwbGUpOworCQkvKgorCQkgKiBXcml0ZSBh bnkgcmVtYWluaW5nIHR1cGxlcyBpbiB0aGUgVW5yZXNvbHZlZFR1cHMgdGFibGUuIElmIHdlIGhh dmUKKwkJICogYW55IGxlZnQsIHRoZXkgc2hvdWxkIGluIGZhY3QgYmUgZGVhZCwgYnV0IGxldCdz IGVyciBvbiB0aGUgc2FmZQorCQkgKiBzaWRlLgorCQkgKi8KKwkJaGFzaF9zZXFfaW5pdCgmc2Vx X3N0YXR1cywgc3RhdGUtPnJzX3VucmVzb2x2ZWRfdHVwcyk7CisKKwkJd2hpbGUgKCh1bnJlc29s dmVkID0gaGFzaF9zZXFfc2VhcmNoKCZzZXFfc3RhdHVzKSkgIT0gTlVMTCkKKwkJeworCQkJSXRl bVBvaW50ZXJTZXRJbnZhbGlkKCZ1bnJlc29sdmVkLT50dXBsZS0+dF9kYXRhLT50X2N0aWQpOwor CQkJcmF3X2hlYXBfaW5zZXJ0KHN0YXRlLCB1bnJlc29sdmVkLT50dXBsZSk7CisJCX0KIAl9CiAK IAkvKiBXcml0ZSB0aGUgbGFzdCBwYWdlLCBpZiBhbnkgKi8KQEAgLTMxOCwxMCArNDAyLDI5IEBA IGVuZF9oZWFwX3Jld3JpdGUoUmV3cml0ZVN0YXRlIHN0YXRlKQogCQlzbWdyX2J1bGtfd3JpdGUo c3RhdGUtPnJzX2J1bGtzdGF0ZSwgc3RhdGUtPnJzX2Jsb2Nrbm8sIHN0YXRlLT5yc19idWZmZXIs IHRydWUpOwogCQlzdGF0ZS0+cnNfYnVmZmVyID0gTlVMTDsKIAl9Ci0KIAlzbWdyX2J1bGtfZmlu aXNoKHN0YXRlLT5yc19idWxrc3RhdGUpOwogCi0JbG9naWNhbF9lbmRfaGVhcF9yZXdyaXRlKHN0 YXRlKTsKKwkvKiBUaGUgc2FtZSBmb3IgVE9BU1QgKi8KKwlpZiAoc3RhdGUtPnRvYXN0KQorCXsK KwkJUmV3cml0ZVN0YXRlIHRvYXN0ID0gc3RhdGUtPnRvYXN0OworCisJCWlmICh0b2FzdC0+cnNf YnVmZmVyKQorCQl7CisJCQlzbWdyX2J1bGtfd3JpdGUodG9hc3QtPnJzX2J1bGtzdGF0ZSwgdG9h c3QtPnJzX2Jsb2Nrbm8sCisJCQkJCQkJdG9hc3QtPnJzX2J1ZmZlciwgdHJ1ZSk7CisJCQl0b2Fz dC0+cnNfYnVmZmVyID0gTlVMTDsKKwkJfQorCQlzbWdyX2J1bGtfZmluaXNoKHRvYXN0LT5yc19i dWxrc3RhdGUpOworCisJCS8qIENsb3NlIHJlbGF0aW9uKHMpIG9wZW5lZCBieSBiZWdpbl9oZWFw X3Jld3JpdGUoKS4gKi8KKwkJdGFibGVfY2xvc2UodG9hc3QtPnJzX25ld19yZWwsIE5vTG9jayk7 CisJCWlmICh0b2FzdC0+cnNfb2xkX3JlbCkKKwkJCXRhYmxlX2Nsb3NlKHRvYXN0LT5yc19vbGRf cmVsLCBTaGFyZVVwZGF0ZUV4Y2x1c2l2ZUxvY2spOworCX0KKworCWlmIChzdGF0ZS0+cnNfbG9n aWNhbF9yZXdyaXRlKQorCQlsb2dpY2FsX2VuZF9oZWFwX3Jld3JpdGUoc3RhdGUpOwogCiAJLyog RGVsZXRpbmcgdGhlIGNvbnRleHQgZnJlZXMgZXZlcnl0aGluZyAqLwogCU1lbW9yeUNvbnRleHRE ZWxldGUoc3RhdGUtPnJzX2N4dCk7CkBAIC0zNTAsMzAgKzQ1MywxMyBAQCByZXdyaXRlX2hlYXBf dHVwbGUoUmV3cml0ZVN0YXRlIHN0YXRlLAogCiAJb2xkX2N4dCA9IE1lbW9yeUNvbnRleHRTd2l0 Y2hUbyhzdGF0ZS0+cnNfY3h0KTsKIAotCS8qCi0JICogQ29weSB0aGUgb3JpZ2luYWwgdHVwbGUn cyB2aXNpYmlsaXR5IGluZm9ybWF0aW9uIGludG8gbmV3X3R1cGxlLgotCSAqCi0JICogWFhYIHdl IG1pZ2h0IGxhdGVyIG5lZWQgdG8gY29weSBzb21lIHRfaW5mb21hc2syIGJpdHMsIHRvbz8gUmln aHQgbm93LAotCSAqIHdlIGludGVudGlvbmFsbHkgY2xlYXIgdGhlIEhPVCBzdGF0dXMgYml0cy4K LQkgKi8KLQltZW1jcHkoJm5ld190dXBsZS0+dF9kYXRhLT50X2Nob2ljZS50X2hlYXAsCi0JCSAg ICZvbGRfdHVwbGUtPnRfZGF0YS0+dF9jaG9pY2UudF9oZWFwLAotCQkgICBzaXplb2YoSGVhcFR1 cGxlRmllbGRzKSk7Ci0KLQluZXdfdHVwbGUtPnRfZGF0YS0+dF9pbmZvbWFzayAmPSB+SEVBUF9Y QUNUX01BU0s7Ci0JbmV3X3R1cGxlLT50X2RhdGEtPnRfaW5mb21hc2syICY9IH5IRUFQMl9YQUNU X01BU0s7Ci0JbmV3X3R1cGxlLT50X2RhdGEtPnRfaW5mb21hc2sgfD0KLQkJb2xkX3R1cGxlLT50 X2RhdGEtPnRfaW5mb21hc2sgJiBIRUFQX1hBQ1RfTUFTSzsKKwlyZXdyaXRlX2NvcHlfdmlzaWJp bGl0eV9pbmZvKG5ld190dXBsZSwgb2xkX3R1cGxlKTsKIAogCS8qCiAJICogV2hpbGUgd2UgaGF2 ZSBvdXIgaGFuZHMgb24gdGhlIHR1cGxlLCB3ZSBtYXkgYXMgd2VsbCBmcmVlemUgYW55CiAJICog ZWxpZ2libGUgeG1pbiBvciB4bWF4LCBzbyB0aGF0IGZ1dHVyZSBWQUNVVU0gZWZmb3J0IGNhbiBi ZSBzYXZlZC4KIAkgKi8KLQloZWFwX2ZyZWV6ZV90dXBsZShuZXdfdHVwbGUtPnRfZGF0YSwKLQkJ CQkJICBzdGF0ZS0+cnNfb2xkX3JlbC0+cmRfcmVsLT5yZWxmcm96ZW54aWQsCi0JCQkJCSAgc3Rh dGUtPnJzX29sZF9yZWwtPnJkX3JlbC0+cmVsbWlubXhpZCwKLQkJCQkJICBzdGF0ZS0+cnNfZnJl ZXplX3hpZCwKLQkJCQkJICBzdGF0ZS0+cnNfY3V0b2ZmX211bHRpKTsKKwlyZXdyaXRlX2ZyZWV6 ZV90dXBsZShzdGF0ZSwgbmV3X3R1cGxlKTsKIAogCS8qCiAJICogSW52YWxpZCBjdGlkIG1lYW5z IHRoYXQgY3RpZCBzaG91bGQgcG9pbnQgdG8gdGhlIHR1cGxlIGl0c2VsZi4gV2UnbGwKQEAgLTU0 MSw2ICs2MjcsMzMgQEAgcmV3cml0ZV9oZWFwX3R1cGxlKFJld3JpdGVTdGF0ZSBzdGF0ZSwKIAlN ZW1vcnlDb250ZXh0U3dpdGNoVG8ob2xkX2N4dCk7CiB9CiAKKy8qCisgKiBMaWtlIHJld3JpdGVf aGVhcF90dXBsZSgpLCBidXQgZG8gbm90IGNhcmUgYWJvdXQgSE9UIGNoYWlucy4gVGhlIHVzZXIK KyAqIHNob3VsZCBoYXZlIHVzZWQgdGhlIGFwcHJvcHJpYXRlIHNuYXBzaG90IHRvIHBpY2sgYXQg bW9zdCBvbmUgdHVwbGUgb2YgdGhlCisgKiBjaGFpbiAtIHRoaXMgaXMgdHlwaWNhbCBmb3IgUkVQ QUNLIChDT05DVVJSRU5UTFkpLgorICovCit2b2lkCityZXdyaXRlX2hlYXBfdHVwbGVfbm9fY2hh aW5zKFJld3JpdGVTdGF0ZSBzdGF0ZSwgSGVhcFR1cGxlIG9sZF90dXBsZSwKKwkJCQkJCQkgSGVh cFR1cGxlIG5ld190dXBsZSwgYm9vbCBjbGVhcl94bWF4LAorCQkJCQkJCSBib29sIGZyZWV6ZSkK K3sKKwlpZiAobmV3X3R1cGxlICE9IG9sZF90dXBsZSkKKwkJcmV3cml0ZV9jb3B5X3Zpc2liaWxp dHlfaW5mbyhuZXdfdHVwbGUsIG9sZF90dXBsZSk7CisKKwlpZiAoY2xlYXJfeG1heCkKKwl7CisJ CUhlYXBUdXBsZUhlYWRlcgloZHIgPSBuZXdfdHVwbGUtPnRfZGF0YTsKKworCQlIZWFwVHVwbGVI ZWFkZXJTZXRYbWF4KGhkciwgMCk7CisJCWhkci0+dF9pbmZvbWFzayB8PSBIRUFQX1hNQVhfSU5W QUxJRDsKKwl9CisKKwlpZiAoZnJlZXplKQorCQlyZXdyaXRlX2ZyZWV6ZV90dXBsZShzdGF0ZSwg bmV3X3R1cGxlKTsKKworCXJhd19oZWFwX2luc2VydChzdGF0ZSwgbmV3X3R1cGxlKTsKK30KKwog LyoKICAqIFJlZ2lzdGVyIGEgZGVhZCB0dXBsZSB3aXRoIGFuIG9uZ29pbmcgcmV3cml0ZS4gRGVh ZCB0dXBsZXMgYXJlIG5vdAogICogY29waWVkIHRvIHRoZSBuZXcgdGFibGUsIGJ1dCB3ZSBzdGls bCBtYWtlIG5vdGUgb2YgdGhlbSBzbyB0aGF0IHdlCkBAIC02MzgsNyArNzUxLDcgQEAgcmF3X2hl YXBfaW5zZXJ0KFJld3JpdGVTdGF0ZSBzdGF0ZSwgSGVhcFR1cGxlIHR1cCkKIAkJb3B0aW9ucyB8 PSBIRUFQX0lOU0VSVF9OT19MT0dJQ0FMOwogCiAJCWhlYXB0dXAgPSBoZWFwX3RvYXN0X2luc2Vy dF9vcl91cGRhdGUoc3RhdGUtPnJzX25ld19yZWwsIHR1cCwgTlVMTCwKLQkJCQkJCQkJCQkJICBv cHRpb25zKTsKKwkJCQkJCQkJCQkJICBzdGF0ZS0+dG9hc3QsIG9wdGlvbnMpOwogCX0KIAllbHNl CiAJCWhlYXB0dXAgPSB0dXA7CkBAIC03MTQsNiArODI3LDQ3IEBAIHJhd19oZWFwX2luc2VydChS ZXdyaXRlU3RhdGUgc3RhdGUsIEhlYXBUdXBsZSB0dXApCiAJCWhlYXBfZnJlZXR1cGxlKGhlYXB0 dXApOwogfQogCisvKgorICogRnJlZXplIHR1cGxlLiAnb2xkX3R1cGxlJyBwcm92aWRlcyB0aGUg aW5pdGlhbCB2aXNpYmlsaXR5IGluZm9ybWF0aW9uLgorICovCit2b2lkCityZXdyaXRlX2ZyZWV6 ZV90dXBsZShSZXdyaXRlU3RhdGUgc3RhdGUsIEhlYXBUdXBsZSB0dXBsZSkKK3sKKwlUcmFuc2Fj dGlvbklkIHJlbGZyb3plbnhpZCA9IEludmFsaWRUcmFuc2FjdGlvbklkOworCU11bHRpWGFjdElk IHJlbG1pbm14aWQgPSBJbnZhbGlkTXVsdGlYYWN0SWQ7CisKKwkvKiBUaGUgb2xkIHJlbGF0aW9u IG1heSBiZSBtaXNzaW5nIGlmIGRlYWxpbmcgd2l0aCBUT0FTVC4gKi8KKwlpZiAoc3RhdGUtPnJz X29sZF9yZWwpCisJeworCQlyZWxmcm96ZW54aWQgPSBzdGF0ZS0+cnNfb2xkX3JlbC0+cmRfcmVs LT5yZWxmcm96ZW54aWQ7CisJCXJlbG1pbm14aWQgPSBzdGF0ZS0+cnNfb2xkX3JlbC0+cmRfcmVs LT5yZWxtaW5teGlkOworCX0KKworCWhlYXBfZnJlZXplX3R1cGxlKHR1cGxlLT50X2RhdGEsIHJl bGZyb3plbnhpZCwgcmVsbWlubXhpZCwKKwkJCQkJICBzdGF0ZS0+cnNfZnJlZXplX3hpZCwKKwkJ CQkJICBzdGF0ZS0+cnNfY3V0b2ZmX211bHRpKTsKK30KKworLyoKKyAqIENvcHkgdGhlIG9sZCB0 dXBsZSdzIHZpc2liaWxpdHkgaW5mb3JtYXRpb24gaW50byB0aGUgbmV3IHR1cGxlLgorICovCit2 b2lkCityZXdyaXRlX2NvcHlfdmlzaWJpbGl0eV9pbmZvKEhlYXBUdXBsZSBuZXdfdHVwbGUsIEhl YXBUdXBsZSBvbGRfdHVwbGUpCit7CisJLyoKKwkgKiBYWFggd2UgbWlnaHQgbGF0ZXIgbmVlZCB0 byBjb3B5IHNvbWUgdF9pbmZvbWFzazIgYml0cywgdG9vPyBSaWdodCBub3csCisJICogd2UgaW50 ZW50aW9uYWxseSBjbGVhciB0aGUgSE9UIHN0YXR1cyBiaXRzLgorCSAqLworCW1lbWNweSgmbmV3 X3R1cGxlLT50X2RhdGEtPnRfY2hvaWNlLnRfaGVhcCwKKwkJICAgJm9sZF90dXBsZS0+dF9kYXRh LT50X2Nob2ljZS50X2hlYXAsCisJCSAgIHNpemVvZihIZWFwVHVwbGVGaWVsZHMpKTsKKworCW5l d190dXBsZS0+dF9kYXRhLT50X2luZm9tYXNrICY9IH5IRUFQX1hBQ1RfTUFTSzsKKwluZXdfdHVw bGUtPnRfZGF0YS0+dF9pbmZvbWFzazIgJj0gfkhFQVAyX1hBQ1RfTUFTSzsKKwluZXdfdHVwbGUt PnRfZGF0YS0+dF9pbmZvbWFzayB8PQorCQlvbGRfdHVwbGUtPnRfZGF0YS0+dF9pbmZvbWFzayAm IEhFQVBfWEFDVF9NQVNLOworfQorCiAvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAqIExvZ2ljYWwgcmV3 cml0ZSBzdXBwb3J0CiAgKgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvYWNjZXNzL3RhYmxlL3Rh YmxlYW0uYyBiL3NyYy9iYWNrZW5kL2FjY2Vzcy90YWJsZS90YWJsZWFtLmMKaW5kZXggM2ExZmY5 YTFkNDYuLjI5N2M0YWNlZDJhIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9hY2Nlc3MvdGFibGUv dGFibGVhbS5jCisrKyBiL3NyYy9iYWNrZW5kL2FjY2Vzcy90YWJsZS90YWJsZWFtLmMKQEAgLTI4 MSw2ICsyODEsNyBAQCBzaW1wbGVfdGFibGVfdHVwbGVfZGVsZXRlKFJlbGF0aW9uIHJlbCwgSXRl bVBvaW50ZXIgdGlkLCBTbmFwc2hvdCBzbmFwc2hvdCkKIAlUTV9GYWlsdXJlRGF0YSB0bWZkOwog CiAJcmVzdWx0ID0gdGFibGVfdHVwbGVfZGVsZXRlKHJlbCwgdGlkLAorCQkJCQkJCQlJbnZhbGlk VHJhbnNhY3Rpb25JZCwKIAkJCQkJCQkJR2V0Q3VycmVudENvbW1hbmRJZCh0cnVlKSwKIAkJCQkJ CQkJMCwgc25hcHNob3QsIEludmFsaWRTbmFwc2hvdCwKIAkJCQkJCQkJdHJ1ZSAvKiB3YWl0IGZv ciBjb21taXQgKi8gLApkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvYWNjZXNzL3RhYmxlL3RvYXN0 X2hlbHBlci5jIGIvc3JjL2JhY2tlbmQvYWNjZXNzL3RhYmxlL3RvYXN0X2hlbHBlci5jCmluZGV4 IDI2MTNkOWRjMDk1Li4wOWFjNDhlNDRhMiAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvYWNjZXNz L3RhYmxlL3RvYXN0X2hlbHBlci5jCisrKyBiL3NyYy9iYWNrZW5kL2FjY2Vzcy90YWJsZS90b2Fz dF9oZWxwZXIuYwpAQCAtMjc3LDcgKzI3Nyw3IEBAIHRvYXN0X3R1cGxlX2V4dGVybmFsaXplKFRv YXN0VHVwbGVDb250ZXh0ICp0dGMsIGludCBhdHRyaWJ1dGUsIHVpbnQzMiBvcHRpb25zKQogCiAJ YXR0ci0+dGFpX2NvbGZsYWdzIHw9IFRPQVNUQ09MX0lHTk9SRTsKIAkqdmFsdWUgPSB0b2FzdF9z YXZlX2RhdHVtKHR0Yy0+dHRjX3JlbCwgb2xkX3ZhbHVlLCBhdHRyLT50YWlfb2xkZXh0ZXJuYWws Ci0JCQkJCQkJICBvcHRpb25zKTsKKwkJCQkJCQkgIHR0Yy0+dHRjX3J3c3RhdGUsIHR0Yy0+dHRj X3R1cF9tYWluLCBvcHRpb25zKTsKIAlpZiAoKGF0dHItPnRhaV9jb2xmbGFncyAmIFRPQVNUQ09M X05FRURTX0ZSRUUpICE9IDApCiAJCXBmcmVlKERhdHVtR2V0UG9pbnRlcihvbGRfdmFsdWUpKTsK IAlhdHRyLT50YWlfY29sZmxhZ3MgfD0gVE9BU1RDT0xfTkVFRFNfRlJFRTsKQEAgLTI4OCw3ICsy ODgsNyBAQCB0b2FzdF90dXBsZV9leHRlcm5hbGl6ZShUb2FzdFR1cGxlQ29udGV4dCAqdHRjLCBp bnQgYXR0cmlidXRlLCB1aW50MzIgb3B0aW9ucykKICAqIFBlcmZvcm0gYXBwcm9wcmlhdGUgY2xl YW51cCBhZnRlciBvbmUgdHVwbGUgaGFzIGJlZW4gc3ViamVjdGVkIHRvIFRPQVNULgogICovCiB2 b2lkCi10b2FzdF90dXBsZV9jbGVhbnVwKFRvYXN0VHVwbGVDb250ZXh0ICp0dGMpCit0b2FzdF90 dXBsZV9jbGVhbnVwKFRvYXN0VHVwbGVDb250ZXh0ICp0dGMsIFRyYW5zYWN0aW9uSWQgeGlkKQog ewogCVR1cGxlRGVzYwl0dXBsZURlc2MgPSB0dGMtPnR0Y19yZWwtPnJkX2F0dDsKIAlpbnQJCQlu dW1BdHRycyA9IHR1cGxlRGVzYy0+bmF0dHM7CkBAIC0zMjEsNyArMzIxLDggQEAgdG9hc3RfdHVw bGVfY2xlYW51cChUb2FzdFR1cGxlQ29udGV4dCAqdHRjKQogCQkJVG9hc3RBdHRySW5mbyAqYXR0 ciA9ICZ0dGMtPnR0Y19hdHRyW2ldOwogCiAJCQlpZiAoKGF0dHItPnRhaV9jb2xmbGFncyAmIFRP QVNUQ09MX05FRURTX0RFTEVURV9PTEQpICE9IDApCi0JCQkJdG9hc3RfZGVsZXRlX2RhdHVtKHR0 Yy0+dHRjX3JlbCwgdHRjLT50dGNfb2xkdmFsdWVzW2ldLCBmYWxzZSk7CisJCQkJdG9hc3RfZGVs ZXRlX2RhdHVtKHR0Yy0+dHRjX3JlbCwgdHRjLT50dGNfb2xkdmFsdWVzW2ldLCBmYWxzZSwKKwkJ CQkJCQkJICAgeGlkKTsKIAkJfQogCX0KIH0KQEAgLTMzMiw3ICszMzMsNyBAQCB0b2FzdF90dXBs ZV9jbGVhbnVwKFRvYXN0VHVwbGVDb250ZXh0ICp0dGMpCiAgKi8KIHZvaWQKIHRvYXN0X2RlbGV0 ZV9leHRlcm5hbChSZWxhdGlvbiByZWwsIGNvbnN0IERhdHVtICp2YWx1ZXMsIGNvbnN0IGJvb2wg KmlzbnVsbCwKLQkJCQkJICBib29sIGlzX3NwZWN1bGF0aXZlKQorCQkJCQkgIGJvb2wgaXNfc3Bl Y3VsYXRpdmUsIFRyYW5zYWN0aW9uSWQgeGlkKQogewogCVR1cGxlRGVzYwl0dXBsZURlc2MgPSBy ZWwtPnJkX2F0dDsKIAlpbnQJCQludW1BdHRycyA9IHR1cGxlRGVzYy0+bmF0dHM7CkBAIC0zNDcs NyArMzQ4LDcgQEAgdG9hc3RfZGVsZXRlX2V4dGVybmFsKFJlbGF0aW9uIHJlbCwgY29uc3QgRGF0 dW0gKnZhbHVlcywgY29uc3QgYm9vbCAqaXNudWxsLAogCQkJaWYgKGlzbnVsbFtpXSkKIAkJCQlj b250aW51ZTsKIAkJCWVsc2UgaWYgKFZBUkFUVF9JU19FWFRFUk5BTF9PTkRJU0soRGF0dW1HZXRQ b2ludGVyKHZhbHVlKSkpCi0JCQkJdG9hc3RfZGVsZXRlX2RhdHVtKHJlbCwgdmFsdWUsIGlzX3Nw ZWN1bGF0aXZlKTsKKwkJCQl0b2FzdF9kZWxldGVfZGF0dW0ocmVsLCB2YWx1ZSwgaXNfc3BlY3Vs YXRpdmUsIHhpZCk7CiAJCX0KIAl9CiB9CmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9hY2Nlc3Mv dHJhbnNhbS94bG9naW5zZXJ0LmMgYi9zcmMvYmFja2VuZC9hY2Nlc3MvdHJhbnNhbS94bG9naW5z ZXJ0LmMKaW5kZXggMzQxZGViN2I4MGQuLjVkYzFiNGQ3YWI3IDEwMDY0NAotLS0gYS9zcmMvYmFj a2VuZC9hY2Nlc3MvdHJhbnNhbS94bG9naW5zZXJ0LmMKKysrIGIvc3JjL2JhY2tlbmQvYWNjZXNz L3RyYW5zYW0veGxvZ2luc2VydC5jCkBAIC0xMDUsNiArMTA1LDkgQEAgc3RhdGljIHVpbnQ2NCBt YWlucmRhdGFfbGVuOwkvKiB0b3RhbCAjIG9mIGJ5dGVzIGluIGNoYWluICovCiAvKiBmbGFncyBm b3IgdGhlIGluLXByb2dyZXNzIGluc2VydGlvbiAqLwogc3RhdGljIHVpbnQ4IGN1cmluc2VydF9m bGFncyA9IDA7CiAKKy8qIFhJRCB0byBvdmVycmlkZSB0aGUgWElEIG9mIHRoZSBjdXJyZW50IHRy YW5zYWN0aW9uLiAqLworc3RhdGljIFRyYW5zYWN0aW9uSWQgY3VyaW5zZXJ0X3hpZCA9IEludmFs aWRUcmFuc2FjdGlvbklkOworCiAvKgogICogVGhlc2UgYXJlIHVzZWQgdG8gaG9sZCB0aGUgcmVj b3JkIGhlYWRlciB3aGlsZSBjb25zdHJ1Y3RpbmcgYSByZWNvcmQuCiAgKiAnaGRyX3NjcmF0Y2gn IGlzIG5vdCBhIHBsYWluIHZhcmlhYmxlLCBidXQgaXMgcGFsbG9jJ2QgYXQgaW5pdGlhbGl6YXRp b24sCkBAIC0yMzksNiArMjQyLDcgQEAgWExvZ1Jlc2V0SW5zZXJ0aW9uKHZvaWQpCiAJbWFpbnJk YXRhX2xlbiA9IDA7CiAJbWFpbnJkYXRhX2xhc3QgPSAoWExvZ1JlY0RhdGEgKikgJm1haW5yZGF0 YV9oZWFkOwogCWN1cmluc2VydF9mbGFncyA9IDA7CisJY3VyaW5zZXJ0X3hpZCA9IEludmFsaWRU cmFuc2FjdGlvbklkOwogCWJlZ2luaW5zZXJ0X2NhbGxlZCA9IGZhbHNlOwogfQogCkBAIC00NzEs NiArNDc1LDE4IEBAIFhMb2dTZXRSZWNvcmRGbGFncyh1aW50OCBmbGFncykKIAljdXJpbnNlcnRf ZmxhZ3MgfD0gZmxhZ3M7CiB9CiAKKy8qCisgKiBTZXQgWElEIHN0YXR1cyBmbGFncyBmb3IgdGhl IHVwY29taW5nIFdBTCByZWNvcmQuCisgKgorICogVXNlZnVsIHdoZW4gY3JlYXRpbmcgV0FMIHJl Y29yZHMgb24gYmVoYWxmIG9mIGFub3RoZXIgdHJhbnNhY3Rpb24uCisgKi8KK3ZvaWQKK1hMb2dT ZXRSZWNvcmRYaWQoVHJhbnNhY3Rpb25JZCB4aWQpCit7CisJQXNzZXJ0KGJlZ2luaW5zZXJ0X2Nh bGxlZCk7CisJY3VyaW5zZXJ0X3hpZCA9IHhpZDsKK30KKwogLyoKICAqIEluc2VydCBhbiBYTE9H IHJlY29yZCBoYXZpbmcgdGhlIHNwZWNpZmllZCBSTUlEIGFuZCBpbmZvIGJ5dGVzLCB3aXRoIHRo ZQogICogYm9keSBvZiB0aGUgcmVjb3JkIGJlaW5nIHRoZSBkYXRhIGFuZCBidWZmZXIgcmVmZXJl bmNlcyByZWdpc3RlcmVkIGVhcmxpZXIKQEAgLTkzNyw2ICs5NTMsMTIgQEAgWExvZ1JlY29yZEFz c2VtYmxlKFJtZ3JJZCBybWlkLCB1aW50OCBpbmZvLAogCXsKIAkJVHJhbnNhY3Rpb25JZCB4aWQg PSBHZXRUb3BUcmFuc2FjdGlvbklkSWZBbnkoKTsKIAorCQkvKgorCQkgKiBPbiBjdXJpbnNlcnRf eGlkOiBpZiBpdCdzIHNldCwgaXQncyBvbmx5IGZvciByZWNvdmVyeSBhbmQgc3RyZWFtaW5nCisJ CSAqIHJlcGxpY2F0aW9uIHRvIHdvcmsuIE9uIHRoZSBvdGhlciBoYW5kLCB0aGUgcmVjb3JkIHNo b3VsZG4ndCBiZQorCQkgKiBsb2dpY2FsbHkgZGVjb2RlZCwgc28gd2UgZG9uJ3QgY2FyZSBpZiB0 aGUgdG9wbGV2ZWwgWElEIGlzIGludmFsaWQuCisJCSAqLworCiAJCS8qIFNldCB0aGUgZmxhZyB0 aGF0IHRoZSB0b3AgeGlkIGlzIGluY2x1ZGVkIGluIHRoZSBXQUwgKi8KIAkJKnRvcHhpZF9pbmNs dWRlZCA9IHRydWU7CiAKQEAgLTEwMDksNyArMTAzMSwxNCBAQCBYTG9nUmVjb3JkQXNzZW1ibGUo Um1ncklkIHJtaWQsIHVpbnQ4IGluZm8sCiAJICogb25jZSB3ZSBrbm93IHdoZXJlIGluIHRoZSBX QUwgdGhlIHJlY29yZCB3aWxsIGJlIGluc2VydGVkLiBUaGUgQ1JDIGRvZXMKIAkgKiBub3QgaW5j bHVkZSB0aGUgcmVjb3JkIGhlYWRlciB5ZXQuCiAJICovCi0JcmVjaGRyLT54bF94aWQgPSBHZXRD dXJyZW50VHJhbnNhY3Rpb25JZElmQW55KCk7CisJaWYgKCFUcmFuc2FjdGlvbklkSXNWYWxpZChj dXJpbnNlcnRfeGlkKSkKKwkJcmVjaGRyLT54bF94aWQgPSBHZXRDdXJyZW50VHJhbnNhY3Rpb25J ZElmQW55KCk7CisJZWxzZQorCXsKKwkJLyogVGhlIG92ZXJyaWRpbmcgWElEIHNob3VsZCBiZSBo YW5kbGVkIHNwZWNpYWxseS4gKi8KKwkJcmVjaGRyLT54bF94aWQgPSBjdXJpbnNlcnRfeGlkOwor CQlpbmZvIHw9IFhMUl9YSURfUkVQTEFZRUQ7CisJfQogCXJlY2hkci0+eGxfdG90X2xlbiA9ICh1 aW50MzIpIHRvdGFsX2xlbjsKIAlyZWNoZHItPnhsX2luZm8gPSBpbmZvOwogCXJlY2hkci0+eGxf cm1pZCA9IHJtaWQ7CmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9hY2Nlc3MvdHJhbnNhbS94bG9n cmVjb3ZlcnkuYyBiL3NyYy9iYWNrZW5kL2FjY2Vzcy90cmFuc2FtL3hsb2dyZWNvdmVyeS5jCmlu ZGV4IDUyYWM2ZDU4NDIzLi5kNDhjNmI1NWU0ZiAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvYWNj ZXNzL3RyYW5zYW0veGxvZ3JlY292ZXJ5LmMKKysrIGIvc3JjL2JhY2tlbmQvYWNjZXNzL3RyYW5z YW0veGxvZ3JlY292ZXJ5LmMKQEAgLTE5NzIsMTAgKzE5NzIsMTMgQEAgQXBwbHlXYWxSZWNvcmQo WExvZ1JlYWRlclN0YXRlICp4bG9ncmVhZGVyLCBYTG9nUmVjb3JkICpyZWNvcmQsIFRpbWVMaW5l SUQgKnJlcGwKIAlTcGluTG9ja1JlbGVhc2UoJlhMb2dSZWNvdmVyeUN0bC0+aW5mb19sY2spOwog CiAJLyoKLQkgKiBJZiB3ZSBhcmUgYXR0ZW1wdGluZyB0byBlbnRlciBIb3QgU3RhbmRieSBtb2Rl LCBwcm9jZXNzIFhJRHMgd2Ugc2VlCisJICogSWYgd2UgYXJlIGF0dGVtcHRpbmcgdG8gZW50ZXIg SG90IFN0YW5kYnkgbW9kZSwgcHJvY2VzcyBYSURzIHdlIHNlZS4KKwkgKgorCSAqICJyZXBsYXll ZCIgY2hhbmdlcyBzaG91bGQgbm90IGdldCBpbnRvIHRoZSBhcnJheSBhZ2Fpbi4KIAkgKi8KIAlp ZiAoc3RhbmRieVN0YXRlID49IFNUQU5EQllfSU5JVElBTElaRUQgJiYKLQkJVHJhbnNhY3Rpb25J ZElzVmFsaWQocmVjb3JkLT54bF94aWQpKQorCQlUcmFuc2FjdGlvbklkSXNWYWxpZChyZWNvcmQt PnhsX3hpZCkgJiYKKwkJKHJlY29yZC0+eGxfaW5mbyAmIFhMUl9YSURfUkVQTEFZRUQpID09IDAp CiAJCVJlY29yZEtub3duQXNzaWduZWRUcmFuc2FjdGlvbklkcyhyZWNvcmQtPnhsX3hpZCk7CiAK IAkvKgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvY2F0YWxvZy9pbmRleGluZy5jIGIvc3JjL2Jh Y2tlbmQvY2F0YWxvZy9pbmRleGluZy5jCmluZGV4IGZkN2QyZWMwZTNhLi5lMDllOWZjZDhhYyAx MDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvY2F0YWxvZy9pbmRleGluZy5jCisrKyBiL3NyYy9iYWNr ZW5kL2NhdGFsb2cvaW5kZXhpbmcuYwpAQCAtMzY0LDUgKzM2NCw1IEBAIENhdGFsb2dUdXBsZVVw ZGF0ZVdpdGhJbmZvKFJlbGF0aW9uIGhlYXBSZWwsIGNvbnN0IEl0ZW1Qb2ludGVyRGF0YSAqb3Rp ZCwgSGVhcFR1CiB2b2lkCiBDYXRhbG9nVHVwbGVEZWxldGUoUmVsYXRpb24gaGVhcFJlbCwgY29u c3QgSXRlbVBvaW50ZXJEYXRhICp0aWQpCiB7Ci0Jc2ltcGxlX2hlYXBfZGVsZXRlKGhlYXBSZWws IHRpZCk7CisJc2ltcGxlX2hlYXBfZGVsZXRlKGhlYXBSZWwsIHRpZCwgSW52YWxpZFRyYW5zYWN0 aW9uSWQpOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvbWF0dmlldy5jIGIv c3JjL2JhY2tlbmQvY29tbWFuZHMvbWF0dmlldy5jCmluZGV4IGRmOTBkMDk5OTBkLi41ZTZhZWU0 Yjg2MCAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvbWF0dmlldy5jCisrKyBiL3Ny Yy9iYWNrZW5kL2NvbW1hbmRzL21hdHZpZXcuYwpAQCAtODk1LDcgKzg5NSw4IEBAIHJlZnJlc2hf YnlfaGVhcF9zd2FwKE9pZCBtYXR2aWV3T2lkLCBPaWQgT0lETmV3SGVhcCwgY2hhciByZWxwZXJz aXN0ZW5jZSkKIHsKIAlmaW5pc2hfaGVhcF9zd2FwKG1hdHZpZXdPaWQsIE9JRE5ld0hlYXAsIGZh bHNlLCBmYWxzZSwgdHJ1ZSwgdHJ1ZSwKIAkJCQkJIHRydWUsCQkvKiByZWluZGV4ICovCi0JCQkJ CSBSZWNlbnRYbWluLCBSZWFkTmV4dE11bHRpWGFjdElkKCksIHJlbHBlcnNpc3RlbmNlKTsKKwkJ CQkJIFJlY2VudFhtaW4sIFJlYWROZXh0TXVsdGlYYWN0SWQoKSwgZmFsc2UsCisJCQkJCSByZWxw ZXJzaXN0ZW5jZSk7CiB9CiAKIC8qCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9jb21tYW5kcy9y ZXBhY2suYyBiL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3JlcGFjay5jCmluZGV4IDNkYzk4MzJlZjY2 Li44ZmE2ZmUyYmQyNyAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvcmVwYWNrLmMK KysrIGIvc3JjL2JhY2tlbmQvY29tbWFuZHMvcmVwYWNrLmMKQEAgLTczLDYgKzczLDcgQEAKICNp bmNsdWRlICJzdG9yYWdlL2xtZ3IuaCIKICNpbmNsdWRlICJzdG9yYWdlL3ByZWRpY2F0ZS5oIgog I2luY2x1ZGUgInN0b3JhZ2UvcHJvYy5oIgorI2luY2x1ZGUgInN0b3JhZ2UvcHJvY2FycmF5Lmgi CiAjaW5jbHVkZSAidXRpbHMvYWNsLmgiCiAjaW5jbHVkZSAidXRpbHMvYnVpbHRpbnMuaCIKICNp bmNsdWRlICJ1dGlscy9mbWdyb2lkcy5oIgpAQCAtMTMyLDYgKzEzMyw3IEBAIHR5cGVkZWYgc3Ry dWN0IENoYW5nZUNvbnRleEJhY2t1cAogCWludAkJCWZpbGVfc2VxX3NuYXBzaG90OwogCWludAkJ CWZpbGVfc2VxX2NoYW5nZXM7CiAJT2lkCQkJY2x1c3RlcmluZ19pbmRleDsKKwlUcmFuc2FjdGlv bklkCWxhc3Rfc25hcHNob3RfeG1pbjsKIH0gQ2hhbmdlQ29udGV4dEJhY2t1cDsKIAogLyoKQEAg LTE5Myw3ICsxOTUsMTEgQEAgc3RhdGljIHZvaWQgY29weV90YWJsZV9kYXRhKFJlbGF0aW9uIE5l d0hlYXAsIFJlbGF0aW9uIE9sZEhlYXAsIFJlbGF0aW9uIE9sZEluZGUKIAkJCQkJCQlib29sICpw U3dhcFRvYXN0QnlDb250ZW50LAogCQkJCQkJCVRyYW5zYWN0aW9uSWQgKnBGcmVlemVYaWQsCiAJ CQkJCQkJTXVsdGlYYWN0SWQgKnBDdXRvZmZNdWx0aSwKKwkJCQkJCQlkb3VibGUgKnBfbnVtX3R1 cGxlcywKIAkJCQkJCQlDaGFuZ2VDb250ZXh0ICpjaGdjeHQpOworc3RhdGljIHZvaWQgY29weV90 YWJsZV9kYXRhX3VwZGF0ZV9zdGF0cyhSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBOZXdIZWFw LAorCQkJCQkJCQkJCSBCbG9ja051bWJlciBudW1fcGFnZXMsCisJCQkJCQkJCQkJIGRvdWJsZSBu dW1fdHVwbGVzKTsKIHN0YXRpYyB2b2lkIHVwZGF0ZV9yZWxhdGlvbl9jdXRvZmZzKE9pZCByZWxp ZCwgVHJhbnNhY3Rpb25JZCBmcm96ZW5YaWQsCiAJCQkJCQkJCQlNdWx0aVhhY3RJZCBjdXRvZmZN dWx0aSk7CiBzdGF0aWMgTGlzdCAqZ2V0X3RhYmxlc190b19yZXBhY2soUmVwYWNrQ29tbWFuZCBj bWQsIGJvb2wgdXNpbmdpbmRleCwKQEAgLTIwOSwxNCArMjE1LDIxIEBAIHN0YXRpYyB2b2lkIGFw cGx5X2NvbmN1cnJlbnRfY2hhbmdlcyhDaGFuZ2VDb250ZXh0ICpjaGdjeHQsCiAJCQkJCQkJCQkg QmxvY2tOdW1iZXIgcmFuZ2Vfc3RhcnQsCiAJCQkJCQkJCQkgQmxvY2tOdW1iZXIgcmFuZ2VfZW5k LAogCQkJCQkJCQkJIEJsb2NrTnVtYmVyIG5ibG9ja3MpOwotc3RhdGljIHZvaWQgYXBwbHlfY29u Y3VycmVudF9pbnNlcnQoUmVwYWNrRGVzdCAqZGVzdCwgVHVwbGVUYWJsZVNsb3QgKnNsb3QpOwor c3RhdGljIHZvaWQgYXBwbHlfY29uY3VycmVudF9pbnNlcnQoUmVwYWNrRGVzdCAqZGVzdCwKKwkJ CQkJCQkJCVR1cGxlVGFibGVTbG90ICpzcGlsbF90dXBsZSwKKwkJCQkJCQkJCVR1cGxlVGFibGVT bG90ICpuZXdfdHVwbGUsCisJCQkJCQkJCQlUcmFuc2FjdGlvbklkIHhpZCk7CiBzdGF0aWMgdm9p ZCBhcHBseV9jb25jdXJyZW50X3VwZGF0ZShSZXBhY2tEZXN0ICpkZXN0LAogCQkJCQkJCQkJVHVw bGVUYWJsZVNsb3QgKnNwaWxsZWRfdHVwbGUsCi0JCQkJCQkJCQlUdXBsZVRhYmxlU2xvdCAqb25k aXNrX3R1cGxlKTsKLXN0YXRpYyB2b2lkIGFwcGx5X2NvbmN1cnJlbnRfZGVsZXRlKFJlbGF0aW9u IHJlbCwgVHVwbGVUYWJsZVNsb3QgKnNsb3QpOworCQkJCQkJCQkJVHVwbGVUYWJsZVNsb3QgKm9u ZGlza190dXBsZSwKKwkJCQkJCQkJCVR1cGxlVGFibGVTbG90ICpuZXdfdHVwbGUsCisJCQkJCQkJ CQlUcmFuc2FjdGlvbklkIHhpZCk7CitzdGF0aWMgdm9pZCBhcHBseV9jb25jdXJyZW50X2RlbGV0 ZShSZWxhdGlvbiByZWwsIFR1cGxlVGFibGVTbG90ICpzbG90LAorCQkJCQkJCQkJVHJhbnNhY3Rp b25JZCB4aWQpOwogc3RhdGljIHZvaWQgcmVzdG9yZV90dXBsZShCdWZGaWxlICpmaWxlLCBSZWxh dGlvbiByZWxhdGlvbiwKIAkJCQkJCSAgVHVwbGVUYWJsZVNsb3QgKnNsb3QsIEJsb2NrTnVtYmVy ICpibG9ja19ucl9wLAotCQkJCQkJICBCbG9ja051bWJlciAqb2xkX2Jsb2NrX25yX3ApOworCQkJ CQkJICBCbG9ja051bWJlciAqb2xkX2Jsb2NrX25yX3AsCisJCQkJCQkgIFRyYW5zYWN0aW9uSWQg KnhpZF9wKTsKIHN0YXRpYyB2b2lkIHByZXBhcmVfY29uY3VycmVudF91cGRhdGUoVHVwbGVUYWJs ZVNsb3QgKmRlc3QsCiAJCQkJCQkJCQkgIFR1cGxlVGFibGVTbG90ICpzcmMpOwogc3RhdGljIGJv b2wgZmluZF90YXJnZXRfdHVwbGUoUmVwYWNrRGVzdCAqZGVzdCwgVHVwbGVUYWJsZVNsb3QgKmxv Y2F0b3IsCkBAIC0yNDUsMTEgKzI1OCwxNCBAQCBzdGF0aWMgdm9pZCByZWJ1aWxkX3JlbGF0aW9u X2ZpbmlzaF9jb25jdXJyZW50KFJlbGF0aW9uIE5ld0hlYXAsIFJlbGF0aW9uIE9sZEhlYQogCQkJ CQkJCQkJCQkgICBPaWQgaWRlbnRJZHgsCiAJCQkJCQkJCQkJCSAgIFRyYW5zYWN0aW9uSWQgZnJv emVuWGlkLAogCQkJCQkJCQkJCQkgICBNdWx0aVhhY3RJZCBjdXRvZmZNdWx0aSwKKwkJCQkJCQkJ CQkJICAgZG91YmxlIG51bV90dXBsZXMsCiAJCQkJCQkJCQkJCSAgIENoYW5nZUNvbnRleHQgKmNo Z2N4dCk7CiBzdGF0aWMgQ2hhbmdlQ29udGV4dCAqcHJvY2Vzc19hdXhpbGlhcnlfdGFibGUoQ2hh bmdlQ29udGV4dCAqY2hnY3h0LAogCQkJCQkJCQkJCQkgIFJlbGF0aW9uICpwT2xkSGVhcCwKIAkJ CQkJCQkJCQkJICBSZWxhdGlvbiAqcE5ld0hlYXAsCi0JCQkJCQkJCQkJCSAgT2lkIGlkZW50SWR4 KTsKKwkJCQkJCQkJCQkJICBPaWQgaWRlbnRJZHgsCisJCQkJCQkJCQkJCSAgVHJhbnNhY3Rpb25J ZCBmcmVlemVfeGlkLAorCQkJCQkJCQkJCQkgIE11bHRpWGFjdElkIGN1dG9mZl9tdWx0aSk7CiBz dGF0aWMgTGlzdCAqYnVpbGRfbmV3X2luZGV4ZXMoTGlzdCAqT2xkSW5kZXhlcywgUmVsYXRpb24g KnBfb2xkLAogCQkJCQkJCSAgIFJlbGF0aW9uICpwX25ldywKIAkJCQkJCQkgICBDaGFuZ2VDb250 ZXh0ICoqcF9jaGdjeHQpOwpAQCAtMTE2NSw2ICsxMTgxLDcgQEAgcmVidWlsZF9yZWxhdGlvbihS ZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBpbmRleCwgYm9vbCB2ZXJib3NlLAogCVRyYW5zYWN0 aW9uSWQgZnJvemVuWGlkOwogCU11bHRpWGFjdElkIGN1dG9mZk11bHRpOwogCWJvb2wJCWNvbmN1 cnJlbnQgPSBPaWRJc1ZhbGlkKGlkZW50X2lkeCk7CisJZG91YmxlCQludW1fdHVwbGVzID0gMDsK IAlJbmRleEJ1aWxkU2VjdXJpdHkgaWJzZWM7CiAJQ2hhbmdlQ29udGV4dCAqY2hnY3h0ID0gTlVM TDsKICNpZiBVU0VfQVNTRVJUX0NIRUNLSU5HCkBAIC0xMjYwLDE2ICsxMjc3LDEwIEBAIHJlYnVp bGRfcmVsYXRpb24oUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gaW5kZXgsIGJvb2wgdmVyYm9z ZSwKIAkvKiBDb3B5IHRoZSBoZWFwIGRhdGEgaW50byB0aGUgbmV3IHRhYmxlIGluIHRoZSBkZXNp cmVkIG9yZGVyICovCiAJY29weV90YWJsZV9kYXRhKE5ld0hlYXAsIE9sZEhlYXAsIGluZGV4LCB2 ZXJib3NlLAogCQkJCQkmc3dhcF90b2FzdF9ieV9jb250ZW50LCAmZnJvemVuWGlkLCAmY3V0b2Zm TXVsdGksCi0JCQkJCWNoZ2N4dCk7CisJCQkJCSZudW1fdHVwbGVzLCBjaGdjeHQpOwogCiAJaWYg KGNvbmN1cnJlbnQpCiAJewotCQkvKgotCQkgKiBNYWtlIHN1cmUgdGhlIGFjdGl2ZSBzbmFwc2hv dCBjYW4gc2VlIHRoZSBkYXRhIGNvcGllZCwgc28gdGhlIHJvd3MKLQkJICogY2FuIGJlIHVwZGF0 ZWQgLyBkZWxldGVkLgotCQkgKi8KLQkJVXBkYXRlQWN0aXZlU25hcHNob3RDb21tYW5kSWQoKTsK LQogCQlBc3NlcnQoIXN3YXBfdG9hc3RfYnlfY29udGVudCk7CiAKIAkJLyoKQEAgLTEyODAsNyAr MTI5MSw4IEBAIHJlYnVpbGRfcmVsYXRpb24oUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gaW5k ZXgsIGJvb2wgdmVyYm9zZSwKIAkJCWluZGV4X2Nsb3NlKGluZGV4LCBOb0xvY2spOwogCiAJCXJl YnVpbGRfcmVsYXRpb25fZmluaXNoX2NvbmN1cnJlbnQoTmV3SGVhcCwgT2xkSGVhcCwgaWRlbnRf aWR4LAotCQkJCQkJCQkJCSAgIGZyb3plblhpZCwgY3V0b2ZmTXVsdGksIGNoZ2N4dCk7CisJCQkJ CQkJCQkJICAgZnJvemVuWGlkLCBjdXRvZmZNdWx0aSwgbnVtX3R1cGxlcywKKwkJCQkJCQkJCQkg ICBjaGdjeHQpOwogCiAJCXBnc3RhdF9wcm9ncmVzc191cGRhdGVfcGFyYW0oUFJPR1JFU1NfUkVQ QUNLX1BIQVNFLAogCQkJCQkJCQkJIFBST0dSRVNTX1JFUEFDS19QSEFTRV9GSU5BTF9DTEVBTlVQ KTsKQEAgLTEzMTAsMTEgKzEzMjIsMTUgQEAgcmVidWlsZF9yZWxhdGlvbihSZWxhdGlvbiBPbGRI ZWFwLCBSZWxhdGlvbiBpbmRleCwgYm9vbCB2ZXJib3NlLAogCQkvKgogCQkgKiBTd2FwIHRoZSBw aHlzaWNhbCBmaWxlcyBvZiB0aGUgdGFyZ2V0IGFuZCB0cmFuc2llbnQgdGFibGVzLCB0aGVuCiAJ CSAqIHJlYnVpbGQgdGhlIHRhcmdldCdzIGluZGV4ZXMgYW5kIHRocm93IGF3YXkgdGhlIHRyYW5z aWVudCB0YWJsZS4KKwkJICoKKwkJICogSWYgc3dhcF90b2FzdF9ieV9jb250ZW50IGlzIGZhbHNl LCB3ZSBkb24ndCBuZWVkIHRvIHVwZGF0ZSB0aGUKKwkJICogY3V0b2ZmcyBiZWNhdXNlIHRoZSBU T0FTVCByZWxhdGlvbiBpcyBuZXcuCiAJCSAqLwogCQlmaW5pc2hfaGVhcF9zd2FwKHRhYmxlT2lk LCBPSUROZXdIZWFwLCBpc19zeXN0ZW1fY2F0YWxvZywKIAkJCQkJCSBzd2FwX3RvYXN0X2J5X2Nv bnRlbnQsIGZhbHNlLCB0cnVlLAogCQkJCQkJIHRydWUsCS8qIHJlaW5kZXggKi8KIAkJCQkJCSBm cm96ZW5YaWQsIGN1dG9mZk11bHRpLAorCQkJCQkJIHN3YXBfdG9hc3RfYnlfY29udGVudCwgLyog dXBkYXRlX3RvYXN0X2N1dG9mZnMgKi8KIAkJCQkJCSByZWxwZXJzaXN0ZW5jZSk7CiAJfQogCkBA IC0xNzgyLDY3ICsxNzk4LDYgQEAgbWFrZV9uZXdfaGVhcChPaWQgT0lET2xkSGVhcCwgT2lkIE5l d1RhYmxlU3BhY2UsIE9pZCBOZXdBY2Nlc3NNZXRob2QsCiAJcmV0dXJuIE9JRE5ld0hlYXA7CiB9 CiAKLS8qCi0gKiBJbnNlcnQgdHVwbGUgd2hlbiBwcm9jZXNzaW5nIFJFUEFDSyBDT05DVVJSRU5U TFkuCi0gKgotICogcmV3cml0ZWhlYXAuYyBpcyBub3QgdXNlZCBpbiB0aGUgQ09OQ1VSUkVOVExZ IGNhc2UgYmVjYXVzZSBpdCdkIGJlCi0gKiBkaWZmaWN1bHQgdG8gZG8gdGhlIHNhbWUgaW4gdGhl IGNhdGNoLXVwIHBoYXNlIChhcyB0aGUgbG9naWNhbCBkZWNvZGluZwotICogZG9lcyBub3QgcHJv dmlkZSB1cyB3aXRoIHN1ZmZpY2llbnQgdmlzaWJpbGl0eSBpbmZvcm1hdGlvbikuIFRodXMgd2Ug bXVzdAotICogdXNlIGhlYXBfaW5zZXJ0KCkgYm90aCBkdXJpbmcgdGhlIGNhdGNoLXVwIGFuZCBo ZXJlLgotICoKLSAqICdyZWZvcm0nIGlzIGEgc2xvdCB0byB1c2UgZm9yIHR1cGxlICJyZWZvcm1p bmciLCB0eXBpY2FsbHkgdG8gZ2V0IHNldAotICogdmFsdWVzIG9mIGRyb3BwZWQgY29sdW1ucyB0 byBOVUxMLgotICoKLSAqIFdlIHBhc3MgdGhlIE5PX0xPR0lDQUwgZmxhZyB0byBoZWFwX2luc2Vy dCgpIGluIG9yZGVyIHRvIHNraXAgbG9naWNhbAotICogZGVjb2Rpbmc6IGFzIHNvb24gYXMgUkVQ QUNLIENPTkNVUlJFTlRMWSBzd2FwcyB0aGUgcmVsYXRpb24gZmlsZXMsIGl0IGRyb3BzCi0gKiB0 aGlzIHJlbGF0aW9uLCBzbyBubyBsb2dpY2FsIHJlcGxpY2F0aW9uIHN1YnNjcmlwdGlvbiBzaG91 bGQgbmVlZCB0aGUgZGF0YS4KLSAqLwotdm9pZAotaGVhcF9pbnNlcnRfZm9yX3JlcGFjayhDaGFu Z2VDb250ZXh0ICpjaGdjeHQsIFR1cGxlVGFibGVTbG90ICpzcmMsCi0JCQkJCSAgIFR1cGxlVGFi bGVTbG90ICpyZWZvcm0pCi17Ci0JSGVhcFR1cGxlCXR1cGxlOwotCWJvb2wJCXNob3VsZEZyZWU7 Ci0JVHVwbGVUYWJsZVNsb3QgKnNsb3Q7Ci0JUmVwYWNrRGVzdCAqZGVzdDsKLQotCS8qCi0JICog VXNlIHRoZSBjdXJyZW50IGF1eGlsaWFyeSB0YWJsZSBhcyBvdXRwdXQgaWYgb25lIGlzIGFjdGl2 ZSwgb3RoZXJ3aXNlCi0JICogaW5zZXJ0IHRoZSB0dXBsZSBpbnRvIHRoZSBhY3R1YWwgZGVzdGlu YXRpb24gdGFibGUuCi0JICovCi0JaWYgKGNoZ2N4dC0+Y2NfZGVzdF9hdXgpCi0JCWRlc3QgPSBj aGdjeHQtPmNjX2Rlc3RfYXV4OwotCWVsc2UKLQkJZGVzdCA9ICZjaGdjeHQtPmNjX2Rlc3Q7Ci0K LQl0dXBsZSA9IEV4ZWNGZXRjaFNsb3RIZWFwVHVwbGUoc3JjLCBmYWxzZSwgJnNob3VsZEZyZWUp OwotCi0JLyoKLQkgKiBUaGUgc291cmNlIHNsb3QgaXMgbm90IGV4cGVjdGVkIHRvIGNyZWF0ZSBh IGNvcHkgb2YgdGhlIHR1cGxlLgotCSAqLwotCUFzc2VydChUVFNfSVNfQlVGRkVSVFVQTEUoc3Jj KSk7Ci0JQXNzZXJ0KCFzaG91bGRGcmVlKTsKLQotCWlmIChyZWZvcm0gIT0gTlVMTCAmJiB0dXBs ZV9uZWVkc19yZWZvcm0odHVwbGUsIHNyYy0+dHRzX3R1cGxlRGVzY3JpcHRvcikpCi0JewotCQlj bGVhcl9kcm9wcGVkX2F0dHJpYnV0ZXModHVwbGUsIHJlZm9ybSk7Ci0JCXNsb3QgPSByZWZvcm07 Ci0JfQotCWVsc2UKLQkJc2xvdCA9IHNyYzsKLQotCXRhYmxlX3R1cGxlX2luc2VydChkZXN0LT5y ZWwsIHNsb3QsIEdldEN1cnJlbnRDb21tYW5kSWQodHJ1ZSksCi0JCQkJCSAgIFRBQkxFX0lOU0VS VF9OT19MT0dJQ0FMLCBkZXN0LT5iaXN0YXRlKTsKLQotCS8qCi0JICogSW5zZXJ0IHRoZSB0dXBs ZSBpbnRvIHRoZSBpZGVudGl0eSBpbmRleC4gaW5pdGlhbGl6ZV9jaGFuZ2VfY29udGV4dCgpCi0J ICogbWF5IHNraXAgb3BlbmluZyBvZiBpbmRleGVzIGlmIHRoZSBpZGVudGl0eSBpbmRleCBpcyBu b3QgbmVlZGVkCi0JICogaW1tZWRpYXRlbHkuCi0JICovCi0JaWYgKGRlc3QtPnJyaSkKLQkJRXhl Y0luc2VydEluZGV4VHVwbGVzKGRlc3QtPnJyaSwgZGVzdC0+ZXN0YXRlLCAwLCBzbG90LCBOSUws IE5VTEwpOwotfQotCiBib29sCiB0dXBsZV9uZWVkc19yZWZvcm0oSGVhcFR1cGxlIHR1cGxlLCBU dXBsZURlc2MgdHVwRGVzYykKIHsKQEAgLTE4NzYsMTQgKzE4MzEsMjIgQEAgY2xlYXJfZHJvcHBl ZF9hdHRyaWJ1dGVzKEhlYXBUdXBsZSB0dXBsZSwgVHVwbGVUYWJsZVNsb3QgKnJlZm9ybSkKIHsK IAlUdXBsZURlc2MJdHVwRGVzYyA9IHJlZm9ybS0+dHRzX3R1cGxlRGVzY3JpcHRvcjsKIAotCS8q IEFzc3VtaW5nICdyZWZvcm0nIGlzIHZpcnR1YWwsIHRoaXMgZGVmb3JtcyB0aGUgdHVwbGUuICov Ci0JQXNzZXJ0KFRUU19JU19WSVJUVUFMKHJlZm9ybSkpOworCUFzc2VydChUVFNfSVNfVklSVFVB TChyZWZvcm0pIHx8IFRUU19JU19IRUFQVFVQTEUocmVmb3JtKSk7CiAJRXhlY0ZvcmNlU3RvcmVI ZWFwVHVwbGUodHVwbGUsIHJlZm9ybSwgZmFsc2UpOwogCiAJZm9yIChpbnQgaSA9IDA7IGkgPCB0 dXBEZXNjLT5uYXR0czsgaSsrKQogCXsKIAkJaWYgKFR1cGxlRGVzY0NvbXBhY3RBdHRyKHR1cERl c2MsIGkpLT5hdHRpc2Ryb3BwZWQpCisJCXsKKwkJCS8qCisJCQkgKiBJZiAncmVmb3JtJyBpcyB2 aXJ0dWFsLCBhbGwgdGhlIGF0dHJpYnV0ZXMgYXJlIGFscmVhZHkKKwkJCSAqIGRlZm9ybWVkLiBY WFggU2hvdWxkIHdlIHVzZSB0aGUgdmlydHVhbCBzbG90IGF0IGFsbD8gLgorCQkJICovCisJCQlp ZiAoVFRTX0lTX0hFQVBUVVBMRShyZWZvcm0pKQorCQkJCXNsb3RfZ2V0c29tZWF0dHJzKHJlZm9y bSwgaSArIDEpOworCiAJCQlyZWZvcm0tPnR0c19pc251bGxbaV0gPSB0cnVlOworCQl9CiAJfQog fQogCkBAIC0xODk0LDE2ICsxODU3LDE0IEBAIGNsZWFyX2Ryb3BwZWRfYXR0cmlidXRlcyhIZWFw VHVwbGUgdHVwbGUsIFR1cGxlVGFibGVTbG90ICpyZWZvcm0pCiAgKiAqcFN3YXBUb2FzdEJ5Q29u dGVudCBpcyBzZXQgdHJ1ZSBpZiB0b2FzdCB0YWJsZXMgbXVzdCBiZSBzd2FwcGVkIGJ5IGNvbnRl bnQuCiAgKiAqcEZyZWV6ZVhpZCByZWNlaXZlcyB0aGUgVHJhbnNhY3Rpb25JZCB1c2VkIGFzIGZy ZWV6ZSBjdXRvZmYgcG9pbnQuCiAgKiAqcEN1dG9mZk11bHRpIHJlY2VpdmVzIHRoZSBNdWx0aVhh Y3RJZCB1c2VkIGFzIGEgY3V0b2ZmIHBvaW50LgorICogKnBfbnVtX3R1cGxlcyByZWNlaXZlcyB0 aGUgbnVtYmVyIG9mIHR1cGxlcyBjb3BpZWQuCiAgKi8KIHN0YXRpYyB2b2lkCiBjb3B5X3RhYmxl X2RhdGEoUmVsYXRpb24gTmV3SGVhcCwgUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gT2xkSW5k ZXgsCiAJCQkJYm9vbCB2ZXJib3NlLCBib29sICpwU3dhcFRvYXN0QnlDb250ZW50LAogCQkJCVRy YW5zYWN0aW9uSWQgKnBGcmVlemVYaWQsIE11bHRpWGFjdElkICpwQ3V0b2ZmTXVsdGksCi0JCQkJ Q2hhbmdlQ29udGV4dCAqY2hnY3h0KQorCQkJCWRvdWJsZSAqcF9udW1fdHVwbGVzLCBDaGFuZ2VD b250ZXh0ICpjaGdjeHQpCiB7Ci0JUmVsYXRpb24JcmVsUmVsYXRpb247Ci0JSGVhcFR1cGxlCXJl bHR1cDsKLQlGb3JtX3BnX2NsYXNzIHJlbGZvcm07CiAJVHVwbGVEZXNjCW9sZFR1cERlc2MgUEdf VVNFRF9GT1JfQVNTRVJUU19PTkxZOwogCVR1cGxlRGVzYwluZXdUdXBEZXNjIFBHX1VTRURfRk9S X0FTU0VSVFNfT05MWTsKIAlWYWN1dW1QYXJhbXMgcGFyYW1zOwpAQCAtMTkxMiw3ICsxODczLDYg QEAgY29weV90YWJsZV9kYXRhKFJlbGF0aW9uIE5ld0hlYXAsIFJlbGF0aW9uIE9sZEhlYXAsIFJl bGF0aW9uIE9sZEluZGV4LAogCWRvdWJsZQkJbnVtX3R1cGxlcyA9IDAsCiAJCQkJdHVwc192YWN1 dW1lZCA9IDAsCiAJCQkJdHVwc19yZWNlbnRseV9kZWFkID0gMDsKLQlCbG9ja051bWJlciBudW1f cGFnZXM7CiAJaW50CQkJZWxldmVsID0gdmVyYm9zZSA/IElORk8gOiBERUJVRzI7CiAJUEdSVXNh Z2UJcnUwOwogCWNoYXIJICAgKm5zcG5hbWU7CkBAIC0yMDk4LDggKzIwNTgsNiBAQCBjb3B5X3Rh YmxlX2RhdGEoUmVsYXRpb24gTmV3SGVhcCwgUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gT2xk SW5kZXgsCiAJICovCiAJTmV3SGVhcC0+cmRfdG9hc3RvaWQgPSBJbnZhbGlkT2lkOwogCi0JbnVt X3BhZ2VzID0gUmVsYXRpb25HZXROdW1iZXJPZkJsb2NrcyhOZXdIZWFwKTsKLQogCS8qIExvZyB3 aGF0IHdlIGRpZCAqLwogCWVyZXBvcnQoZWxldmVsLAogCQkJKGVycm1zZygiXCIlcy4lc1wiOiBm b3VuZCAlLjBmIHJlbW92YWJsZSwgJS4wZiBub25yZW1vdmFibGUgcm93IHZlcnNpb25zIGluICV1 IHBhZ2VzIiwKQEAgLTIxMTIsNiArMjA3MCwzNSBAQCBjb3B5X3RhYmxlX2RhdGEoUmVsYXRpb24g TmV3SGVhcCwgUmVsYXRpb24gT2xkSGVhcCwgUmVsYXRpb24gT2xkSW5kZXgsCiAJCQkJCSAgIHR1 cHNfcmVjZW50bHlfZGVhZCwKIAkJCQkJICAgcGdfcnVzYWdlX3Nob3coJnJ1MCkpKSk7CiAKKwkv KgorCSAqIFVwZGF0ZSBwZ19jbGFzcyBmaWVsZHMuIEluIHRoZSBDT05DVVJSRU5UTFkgY2FzZSB3 ZSBkbyBpdCBsYXRlciBiZWNhdXNlCisJICogMSkgdGhlIGNhdGFsb2cgdXBkYXRlIHRyaWdnZXJz IFhJRCBhc3NpZ25tZW50LCAyKSB0aGUgd29yayBpcyBzcGxpdAorCSAqIGludG8gc2V2ZXJhbCB0 cmFuc2FjdGlvbnMsIHNvIHRoZSBjYXRhbG9nIHVwZGF0ZSBzaG91bGQgdGFrZSBwbGFjZSBpbgor CSAqIHRoZSBsYXN0IG9uZS4KKwkgKi8KKwlpZiAoIWNvbmN1cnJlbnQpCisJeworCQlCbG9ja051 bWJlciBudW1fcGFnZXM7CisKKwkJbnVtX3BhZ2VzID0gUmVsYXRpb25HZXROdW1iZXJPZkJsb2Nr cyhOZXdIZWFwKTsKKworCQljb3B5X3RhYmxlX2RhdGFfdXBkYXRlX3N0YXRzKE9sZEhlYXAsIE5l d0hlYXAsIG51bV9wYWdlcywgbnVtX3R1cGxlcyk7CisJfQorCisJKnBfbnVtX3R1cGxlcyA9IG51 bV90dXBsZXM7Cit9CisKKy8qCisgKiBTdWItcm91dGluZSBvZiBjb3B5X3RhYmxlX2RhdGEoKSwg dG8gdXBkYXRlIHBnX2NsYXNzLgorICovCitzdGF0aWMgdm9pZAorY29weV90YWJsZV9kYXRhX3Vw ZGF0ZV9zdGF0cyhSZWxhdGlvbiBPbGRIZWFwLCBSZWxhdGlvbiBOZXdIZWFwLAorCQkJCQkJCSBC bG9ja051bWJlciBudW1fcGFnZXMsIGRvdWJsZSBudW1fdHVwbGVzKQoreworCVJlbGF0aW9uCXJl bFJlbGF0aW9uOworCUhlYXBUdXBsZQlyZWx0dXA7CisJRm9ybV9wZ19jbGFzcyByZWxmb3JtOwor CiAJLyogVXBkYXRlIHBnX2NsYXNzIHRvIHJlZmxlY3QgdGhlIGNvcnJlY3QgdmFsdWVzIG9mIHBh Z2VzIGFuZCB0dXBsZXMuICovCiAJcmVsUmVsYXRpb24gPSB0YWJsZV9vcGVuKFJlbGF0aW9uUmVs YXRpb25JZCwgUm93RXhjbHVzaXZlTG9jayk7CiAKQEAgLTI1NTksNiArMjU0Niw5IEBAIHVwZGF0 ZV9yZWxhdGlvbl9jdXRvZmZzKE9pZCByZWxpZCwgVHJhbnNhY3Rpb25JZCBmcm96ZW5YaWQsCiAv KgogICogUmVtb3ZlIHRoZSB0cmFuc2llbnQgdGFibGUgdGhhdCB3YXMgYnVpbHQgYnkgbWFrZV9u ZXdfaGVhcCwgYW5kIGZpbmlzaAogICogY2xlYW5pbmcgdXAgKGluY2x1ZGluZyByZWJ1aWxkaW5n IGFsbCBpbmRleGVzIG9uIHRoZSBvbGQgaGVhcCkuCisgKgorICogJ3VwZGF0ZV90b2FzdF9jdXRv ZmZzJyB0ZWxscyB3aGV0aGVyIHJlbGZyb3plbnhpZCBhbmQgcmVsbWlubXhpZCBvZiB0aGUKKyAq IFRPQVNUIHJlbGF0aW9uIHNob3VsZCBiZSB1cGRhdGVkIHRvby4KICAqLwogdm9pZAogZmluaXNo X2hlYXBfc3dhcChPaWQgT0lET2xkSGVhcCwgT2lkIE9JRE5ld0hlYXAsCkBAIC0yNTY5LDYgKzI1 NTksNyBAQCBmaW5pc2hfaGVhcF9zd2FwKE9pZCBPSURPbGRIZWFwLCBPaWQgT0lETmV3SGVhcCwK IAkJCQkgYm9vbCByZWluZGV4LAogCQkJCSBUcmFuc2FjdGlvbklkIGZyb3plblhpZCwKIAkJCQkg TXVsdGlYYWN0SWQgY3V0b2ZmTXVsdGksCisJCQkJIGJvb2wgdXBkYXRlX3RvYXN0X2N1dG9mZnMs CiAJCQkJIGNoYXIgbmV3cmVscGVyc2lzdGVuY2UpCiB7CiAJT2JqZWN0QWRkcmVzcyBvYmplY3Q7 CkBAIC0yNTc2LDYgKzI1NjcsMTcgQEAgZmluaXNoX2hlYXBfc3dhcChPaWQgT0lET2xkSGVhcCwg T2lkIE9JRE5ld0hlYXAsCiAJT2lkCQkJb2lkX29sZF90b2FzdGlkOwogCWludAkJCWk7CiAKKwkv KgorCSAqIEluIHRoZSBzd2FwLXRvYXN0LWJ5LWNvbnRlbnQgY2FzZSwgd2UgYWx3YXlzIG5lZWQg dG8gdXBkYXRlIHRoZQorCSAqIGN1dG9mZnMuIEluIHRoZSBzd2FwLXRvYXN0LWxpbmtzIGNhc2Us IHdlIHVzdWFsbHkgYXNzdW1lIHdlIGRvbid0IG5lZWQKKwkgKiB0byBjaGFuZ2UgdGhlIHRvYXN0 IHRhYmxlJ3MgcmVsZnJvemVueGlkOiB0aGUgbmV3IHZlcnNpb24gb2YgdGhlIHRvYXN0CisJICog dGFibGUgc2hvdWxkIGFscmVhZHkgaGF2ZSByZWxmcm96ZW54aWQgc2V0IHRvIFJlY2VudFhtaW4s IHdoaWNoIGlzIGdvb2QKKwkgKiBlbm91Z2guIEhvd2V2ZXIsIHRoZXJlJ3MgYSBzcGVjaWFsIGNh c2UgLSBSRVBBQ0sgKENPTkNVUlJFTlRMWSkgLSB3aGljaAorCSAqIHN0aWxsIG5lZWRzIHRvIHVw ZGF0ZSB0aGUgY3V0b2ZmcyAtIHNlZSB0aGUgcmVsYXRlZCBjYWxsIGZvciBtb3JlIGluZm8uCisJ ICovCisJQXNzZXJ0KChzd2FwX3RvYXN0X2J5X2NvbnRlbnQgJiYgdXBkYXRlX3RvYXN0X2N1dG9m ZnMpIHx8CisJCSAgICFzd2FwX3RvYXN0X2J5X2NvbnRlbnQpOworCiAJLyogUmVwb3J0IHRoYXQg d2UgYXJlIG5vdyBzd2FwcGluZyByZWxhdGlvbiBmaWxlcyAqLwogCXBnc3RhdF9wcm9ncmVzc191 cGRhdGVfcGFyYW0oUFJPR1JFU1NfUkVQQUNLX1BIQVNFLAogCQkJCQkJCQkgUFJPR1JFU1NfUkVQ QUNLX1BIQVNFX1NXQVBfUkVMX0ZJTEVTKTsKQEAgLTI2NTMsMTIgKzI2NTUsOCBAQCBmaW5pc2hf aGVhcF9zd2FwKE9pZCBPSURPbGRIZWFwLCBPaWQgT0lETmV3SGVhcCwKIAkgKi8KIAlDb21tYW5k Q291bnRlckluY3JlbWVudCgpOwogCXVwZGF0ZV9yZWxhdGlvbl9jdXRvZmZzKE9JRE9sZEhlYXAs IGZyb3plblhpZCwgY3V0b2ZmTXVsdGkpOwotCi0JLyoKLQkgKiBUaGUgc2FtZSBmb3IgVE9BU1Qs IGlmIG5lZWRlZC4gSW4gdGhlIHN3YXAtdG9hc3QtbGlua3MgY2FzZSwgdGhlIG5ldwotCSAqIHRv YXN0IHRhYmxlIHNob3VsZCBhbHJlYWR5IGhhdmUgcmVsZnJvemVueGlkIHNldCB0byBSZWNlbnRY bWluLgotCSAqLwotCWlmIChPaWRJc1ZhbGlkKG9pZF9vbGRfdG9hc3RpZCkgJiYgc3dhcF90b2Fz dF9ieV9jb250ZW50KQorCS8qIFRoZSBzYW1lIGZvciBUT0FTVCwgaWYgcmVxdWVzdGVkLiAqLwor CWlmIChPaWRJc1ZhbGlkKG9pZF9vbGRfdG9hc3RpZCkgJiYgdXBkYXRlX3RvYXN0X2N1dG9mZnMp CiAJCXVwZGF0ZV9yZWxhdGlvbl9jdXRvZmZzKG9pZF9vbGRfdG9hc3RpZCwgZnJvemVuWGlkLCBj dXRvZmZNdWx0aSk7CiAKIAkvKiBEZXN0cm95IG5ldyBoZWFwIHdpdGggb2xkIGZpbGVudW1iZXIg Ki8KQEAgLTMyNjksMTIgKzMyNjcsMTQgQEAgYXBwbHlfY29uY3VycmVudF9jaGFuZ2VzKENoYW5n ZUNvbnRleHQgKmNoZ2N4dCwgQmxvY2tOdW1iZXIgcmFuZ2Vfc3RhcnQsCiAJVHVwbGVUYWJsZVNs b3QgKnNwaWxsZWRfdHVwbGU7CiAJVHVwbGVUYWJsZVNsb3QgKm9sZF91cGRhdGVfdHVwbGU7CiAJ VHVwbGVUYWJsZVNsb3QgKm9uZGlza190dXBsZTsKKwlUdXBsZVRhYmxlU2xvdCAqbmV3X3R1cGxl OwogCWJvb2wJCWhhdmVfb2xkX3R1cGxlID0gZmFsc2U7CiAJYm9vbAkJY2hlY2tfcmFuZ2U7CiAJ TWVtb3J5Q29udGV4dCBvbGRjeHQ7CiAJRGVjb2RpbmdXb3JrZXJTaGFyZWQgKnNoYXJlZDsKIAlj aGFyCQlmbmFtZVtNQVhQR1BBVEhdOwogCUJ1ZkZpbGUgICAgKmZpbGU7CisJU25hcHNob3REYXRh IFNuYXBzaG90TmV3SGVhcDsKIAogCS8qCiAJICogVXNlIHRoZSBhdXhpbGlhcnkgdGFibGUgaWYg b25lIGV4aXN0cywgb3RoZXJ3aXNlIHRoZSAiZmluYWwiCkBAIC0zMzE3LDE2ICszMzE3LDI1IEBA IGFwcGx5X2NvbmN1cnJlbnRfY2hhbmdlcyhDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIEJsb2NrTnVt YmVyIHJhbmdlX3N0YXJ0LAogCW9sZF91cGRhdGVfdHVwbGUgPSBNYWtlU2luZ2xlVHVwbGVUYWJs ZVNsb3QoY2hnY3h0LT5jY190dXBkZXNjLCAmVFRTT3BzVmlydHVhbCk7CiAJb25kaXNrX3R1cGxl ID0gTWFrZVNpbmdsZVR1cGxlVGFibGVTbG90KFJlbGF0aW9uR2V0RGVzY3IocmVsKSwKIAkJCQkJ CQkJCQkJdGFibGVfc2xvdF9jYWxsYmFja3MocmVsKSk7CisJbmV3X3R1cGxlID0gTWFrZVNpbmds ZVR1cGxlVGFibGVTbG90KFJlbGF0aW9uR2V0RGVzY3IocmVsKSwKKwkJCQkJCQkJCQkgJlRUU09w c0hlYXBUdXBsZSk7CiAKIAlvbGRjeHQgPSBNZW1vcnlDb250ZXh0U3dpdGNoVG8oR2V0UGVyVHVw bGVNZW1vcnlDb250ZXh0KGRlc3QtPmVzdGF0ZSkpOwogCisJLyoKKwkgKiBGaW5kaW5nIHR1cGxl cyB0byBVUERBVEUgLyBERUxFVEUgaXMgZXhhY3RseSB0aGUgcHVycG9zZSBvZgorCSAqIFNOQVBT SE9UX05FV19IRUFQLgorCSAqLworCUluaXROZXdIZWFwU25hcHNob3QoU25hcHNob3ROZXdIZWFw KTsKKwlQdXNoQWN0aXZlU25hcHNob3QoJlNuYXBzaG90TmV3SGVhcCk7CisKIAl3aGlsZSAodHJ1 ZSkKIAl7CiAJCXNpemVfdAkJbnJlYWQ7Ci0JCUNvbmN1cnJlbnRDaGFuZ2VLaW5kIHByZXZraW5k ID0ga2luZDsKIAkJQmxvY2tOdW1iZXIgYmxvY2ssCiAJCQkJCW9sZF9ibG9jazsKIAkJQmxvY2tO dW1iZXIgKm9sZF9ibG9ja19wOworCQlUcmFuc2FjdGlvbklkIHhpZDsKIAogCQlDSEVDS19GT1Jf SU5URVJSVVBUUygpOwogCkBAIC0zMzQxLDM1ICszMzUwLDE4IEBAIGFwcGx5X2NvbmN1cnJlbnRf Y2hhbmdlcyhDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIEJsb2NrTnVtYmVyIHJhbmdlX3N0YXJ0LAog CQkgKi8KIAkJaWYgKGtpbmQgPT0gQ0hBTkdFX1VQREFURV9PTEQpCiAJCXsKLQkJCXJlc3RvcmVf dHVwbGUoZmlsZSwgcmVsLCBvbGRfdXBkYXRlX3R1cGxlLCBOVUxMLCBOVUxMKTsKKwkJCXJlc3Rv cmVfdHVwbGUoZmlsZSwgcmVsLCBvbGRfdXBkYXRlX3R1cGxlLCBOVUxMLCBOVUxMLCBOVUxMKTsK IAkJCWhhdmVfb2xkX3R1cGxlID0gdHJ1ZTsKIAkJCWNvbnRpbnVlOwogCQl9CiAKLQkJLyoKLQkJ ICogSnVzdCBiZWZvcmUgYW4gVVBEQVRFIG9yIERFTEVURSwgd2UgbXVzdCB1cGRhdGUgdGhlIGNv bW1hbmQKLQkJICogY291bnRlciwgYmVjYXVzZSB0aGUgY2hhbmdlIGNvdWxkIHJlZmVyIHRvIGEg dHVwbGUgdGhhdCB3ZSBoYXZlCi0JCSAqIGp1c3QgaW5zZXJ0ZWQ7IGFuZCBiZWZvcmUgYW4gSU5T RVJULCB3ZSBoYXZlIHRvIGRvIHRoaXMgYWxzbyBpZiB0aGUKLQkJICogcHJldmlvdXMgY29tbWFu ZCB3YXMgZWl0aGVyIHVwZGF0ZSBvciBkZWxldGUuCi0JCSAqCi0JCSAqIFdpdGggdGhpcyBhcHBy b2FjaCB3ZSBkb24ndCBzcGVuZCBzbyBtYW55IENDSXMgZm9yIGxvbmcgc3RyaW5ncyBvZgotCQkg KiBvbmx5IElOU0VSVHMsIHdoaWNoIGNhbid0IGFmZmVjdCBvbmUgYW5vdGhlci4KLQkJICovCi0J CWlmIChraW5kID09IENIQU5HRV9VUERBVEVfTkVXIHx8IGtpbmQgPT0gQ0hBTkdFX0RFTEVURSB8 fAotCQkJKGtpbmQgPT0gQ0hBTkdFX0lOU0VSVCAmJiAocHJldmtpbmQgPT0gQ0hBTkdFX1VQREFU RV9ORVcgfHwKLQkJCQkJCQkJCSAgIHByZXZraW5kID09IENIQU5HRV9ERUxFVEUpKSkKLQkJewot CQkJQ29tbWFuZENvdW50ZXJJbmNyZW1lbnQoKTsKLQkJCVVwZGF0ZUFjdGl2ZVNuYXBzaG90Q29t bWFuZElkKCk7Ci0JCX0KLQogCQkvKgogCQkgKiBOb3cgcmVzdG9yZSB0aGUgdHVwbGUgaW50byB0 aGUgc2xvdCBhbmQgZXhlY3V0ZSB0aGUgY2hhbmdlLgogCQkgKgogCQkgKiBvbGRfYmxvY2sgaXMg b25seSBzdG9yZWQgd2l0aCBVUERBVEVfTkVXLgogCQkgKi8KIAkJb2xkX2Jsb2NrX3AgPSBraW5k ID09IENIQU5HRV9VUERBVEVfTkVXID8gJm9sZF9ibG9jayA6IE5VTEw7Ci0JCXJlc3RvcmVfdHVw bGUoZmlsZSwgcmVsLCBzcGlsbGVkX3R1cGxlLCAmYmxvY2ssIG9sZF9ibG9ja19wKTsKKwkJcmVz dG9yZV90dXBsZShmaWxlLCByZWwsIHNwaWxsZWRfdHVwbGUsICZibG9jaywgb2xkX2Jsb2NrX3As ICZ4aWQpOwogCiAJCWlmIChraW5kID09IENIQU5HRV9JTlNFUlQpCiAJCXsKQEAgLTMzNzksNyAr MzM3MSw3IEBAIGFwcGx5X2NvbmN1cnJlbnRfY2hhbmdlcyhDaGFuZ2VDb250ZXh0ICpjaGdjeHQs IEJsb2NrTnVtYmVyIHJhbmdlX3N0YXJ0LAogCQkJICovCiAJCQlpZiAoIWNoZWNrX3JhbmdlIHx8 CiAJCQkJcmVwYWNrX2Jsb2NrX2luX3JhbmdlKGJsb2NrLCByYW5nZV9zdGFydCwgcmFuZ2VfZW5k LCBuYmxvY2tzKSkKLQkJCQlhcHBseV9jb25jdXJyZW50X2luc2VydChkZXN0LCBzcGlsbGVkX3R1 cGxlKTsKKwkJCQlhcHBseV9jb25jdXJyZW50X2luc2VydChkZXN0LCBzcGlsbGVkX3R1cGxlLCBu ZXdfdHVwbGUsIHhpZCk7CiAJCX0KIAkJZWxzZSBpZiAoa2luZCA9PSBDSEFOR0VfREVMRVRFKQog CQl7CkBAIC0zMzk2LDcgKzMzODgsNyBAQCBhcHBseV9jb25jdXJyZW50X2NoYW5nZXMoQ2hhbmdl Q29udGV4dCAqY2hnY3h0LCBCbG9ja051bWJlciByYW5nZV9zdGFydCwKIAkJCQlmb3VuZCA9IGZp bmRfdGFyZ2V0X3R1cGxlKGRlc3QsIHNwaWxsZWRfdHVwbGUsIG9uZGlza190dXBsZSk7CiAJCQkJ aWYgKCFmb3VuZCkKIAkJCQkJZWxvZyhFUlJPUiwgImNvdWxkIG5vdCBmaW5kIHRhcmdldCB0dXBs ZSIpOwotCQkJCWFwcGx5X2NvbmN1cnJlbnRfZGVsZXRlKHJlbCwgb25kaXNrX3R1cGxlKTsKKwkJ CQlhcHBseV9jb25jdXJyZW50X2RlbGV0ZShyZWwsIG9uZGlza190dXBsZSwgeGlkKTsKIAkJCX0K IAkJfQogCQllbHNlIGlmIChraW5kID09IENIQU5HRV9VUERBVEVfTkVXKQpAQCAtMzQxNCwxMCAr MzQwNiw4IEBAIGFwcGx5X2NvbmN1cnJlbnRfY2hhbmdlcyhDaGFuZ2VDb250ZXh0ICpjaGdjeHQs IEJsb2NrTnVtYmVyIHJhbmdlX3N0YXJ0LAogCQkJICogY3VycmVudCByYW5nZS4KIAkJCSAqLwog CQkJaWYgKCFjaGVja19yYW5nZSB8fAotCQkJCShyZXBhY2tfYmxvY2tfaW5fcmFuZ2Uob2xkX2Js b2NrLCByYW5nZV9zdGFydCwgcmFuZ2VfZW5kLAotCQkJCQkJCQkJICAgbmJsb2NrcykgJiYKLQkJ CQkgcmVwYWNrX2Jsb2NrX2luX3JhbmdlKGJsb2NrLCByYW5nZV9zdGFydCwgcmFuZ2VfZW5kLAot CQkJCQkJCQkJICAgbmJsb2NrcykpKQorCQkJCShyZXBhY2tfYmxvY2tfaW5fcmFuZ2Uob2xkX2Js b2NrLCByYW5nZV9zdGFydCwgcmFuZ2VfZW5kLCBuYmxvY2tzKSAmJgorCQkJCSByZXBhY2tfYmxv Y2tfaW5fcmFuZ2UoYmxvY2ssIHJhbmdlX3N0YXJ0LCByYW5nZV9lbmQsIG5ibG9ja3MpKSkKIAkJ CXsKIAkJCQkvKiBGaW5kIHRoZSB0dXBsZSB0byBiZSB1cGRhdGVkIG9yIGRlbGV0ZWQuICovCiAJ CQkJZm91bmQgPSBmaW5kX3RhcmdldF90dXBsZShkZXN0LCBrZXksIG9uZGlza190dXBsZSk7CkBA IC0zNDI1LDIwICszNDE1LDIwIEBAIGFwcGx5X2NvbmN1cnJlbnRfY2hhbmdlcyhDaGFuZ2VDb250 ZXh0ICpjaGdjeHQsIEJsb2NrTnVtYmVyIHJhbmdlX3N0YXJ0LAogCQkJCQllbG9nKEVSUk9SLCAi Y291bGQgbm90IGZpbmQgdGFyZ2V0IHR1cGxlIik7CiAKIAkJCQkvKgotCQkJCSAqIEFkanVzdCBz cGlsbGVkX3R1cGxlIHNvIHRoYXQgaXQgY2FuIGJlIHVzZWQgYXMgdGhlIG5ldwotCQkJCSAqIHR1 cGxlIGluIHRoZSB1cGRhdGUgdGhhdCB3ZSdyZSBhYm91dCB0byByZXBsYXkuICBUaGlzIGZpeGVz Ci0JCQkJICogVE9BU1QgcG9pbnRlcnMuCisJCQkJICogQWRqdXN0IHNwaWxsZWRfdHVwbGUgc28g dGhhdCBpdCBjYW4gYmUgdXNlZCBhcyB0aGUgbmV3IHR1cGxlIGluCisJCQkJICogdGhlIHVwZGF0 ZSB0aGF0IHdlJ3JlIGFib3V0IHRvIHJlcGxheS4gIFRoaXMgZml4ZXMgVE9BU1QKKwkJCQkgKiBw b2ludGVycy4KIAkJCQkgKi8KIAkJCQlwcmVwYXJlX2NvbmN1cnJlbnRfdXBkYXRlKHNwaWxsZWRf dHVwbGUsIG9uZGlza190dXBsZSk7CiAKLQkJCQlhcHBseV9jb25jdXJyZW50X3VwZGF0ZShkZXN0 LCBzcGlsbGVkX3R1cGxlLCBvbmRpc2tfdHVwbGUpOworCQkJCWFwcGx5X2NvbmN1cnJlbnRfdXBk YXRlKGRlc3QsIHNwaWxsZWRfdHVwbGUsIG9uZGlza190dXBsZSwKKwkJCQkJCQkJCQluZXdfdHVw bGUsIHhpZCk7CiAJCQl9CiAJCQllbHNlCiAJCQl7CiAJCQkJQXNzZXJ0KGNoZWNrX3JhbmdlKTsK IAotCQkJCWlmIChyZXBhY2tfYmxvY2tfaW5fcmFuZ2UoYmxvY2ssIHJhbmdlX3N0YXJ0LCByYW5n ZV9lbmQsCi0JCQkJCQkJCQkJICBuYmxvY2tzKSkKKwkJCQlpZiAocmVwYWNrX2Jsb2NrX2luX3Jh bmdlKGJsb2NrLCByYW5nZV9zdGFydCwgcmFuZ2VfZW5kLCBuYmxvY2tzKSkKIAkJCQl7CiAJCQkJ CS8qCiAJCQkJCSAqIFRoZSBvbGQga2V5IGlzIGluIGFub3RoZXIgcmFuZ2UsIHNvIG9ubHkgaW5z ZXJ0IHRoZSBuZXcKQEAgLTM0NTMsMTAgKzM0NDMsMTAgQEAgYXBwbHlfY29uY3VycmVudF9jaGFu Z2VzKENoYW5nZUNvbnRleHQgKmNoZ2N4dCwgQmxvY2tOdW1iZXIgcmFuZ2Vfc3RhcnQsCiAJCQkJ CSAqLwogCQkJCQlwcmVwYXJlX2NvbmN1cnJlbnRfdXBkYXRlKHNwaWxsZWRfdHVwbGUsIE5VTEwp OwogCi0JCQkJCWFwcGx5X2NvbmN1cnJlbnRfaW5zZXJ0KGRlc3QsIHNwaWxsZWRfdHVwbGUpOwor CQkJCQlhcHBseV9jb25jdXJyZW50X2luc2VydChkZXN0LCBzcGlsbGVkX3R1cGxlLCBuZXdfdHVw bGUsCisJCQkJCQkJCQkJCXhpZCk7CiAJCQkJfQotCQkJCWVsc2UgaWYgKHJlcGFja19ibG9ja19p bl9yYW5nZShvbGRfYmxvY2ssIHJhbmdlX3N0YXJ0LAotCQkJCQkJCQkJCQkgICByYW5nZV9lbmQs CisJCQkJZWxzZSBpZiAocmVwYWNrX2Jsb2NrX2luX3JhbmdlKG9sZF9ibG9jaywgcmFuZ2Vfc3Rh cnQsIHJhbmdlX2VuZCwKIAkJCQkJCQkJCQkJICAgbmJsb2NrcykpCiAJCQkJewogCQkJCQlmb3Vu ZCA9IGZpbmRfdGFyZ2V0X3R1cGxlKGRlc3QsIGtleSwgb25kaXNrX3R1cGxlKTsKQEAgLTM0Njks NyArMzQ1OSw3IEBAIGFwcGx5X2NvbmN1cnJlbnRfY2hhbmdlcyhDaGFuZ2VDb250ZXh0ICpjaGdj eHQsIEJsb2NrTnVtYmVyIHJhbmdlX3N0YXJ0LAogCQkJCQkgKiB2aXNpYmxlIHRvIHRoZSBzbmFw c2hvdCB0aGF0IHdlJ2xsIHVzZSB0byBjb3B5IHRoZQogCQkJCQkgKiBvdGhlciByYW5nZS4KIAkJ CQkJICovCi0JCQkJCWFwcGx5X2NvbmN1cnJlbnRfZGVsZXRlKHJlbCwgb25kaXNrX3R1cGxlKTsK KwkJCQkJYXBwbHlfY29uY3VycmVudF9kZWxldGUocmVsLCBvbmRpc2tfdHVwbGUsIHhpZCk7CiAJ CQkJfQogCiAJCQkJLyoKQEAgLTM0ODYsMTEgKzM0NzYsMTMgQEAgYXBwbHlfY29uY3VycmVudF9j aGFuZ2VzKENoYW5nZUNvbnRleHQgKmNoZ2N4dCwgQmxvY2tOdW1iZXIgcmFuZ2Vfc3RhcnQsCiAK IAkJUmVzZXRQZXJUdXBsZUV4cHJDb250ZXh0KGRlc3QtPmVzdGF0ZSk7CiAJfQorCVBvcEFjdGl2 ZVNuYXBzaG90KCk7CiAKIAkvKiBDbGVhbnVwLiAqLwogCUV4ZWNEcm9wU2luZ2xlVHVwbGVUYWJs ZVNsb3Qoc3BpbGxlZF90dXBsZSk7CiAJRXhlY0Ryb3BTaW5nbGVUdXBsZVRhYmxlU2xvdChvbmRp c2tfdHVwbGUpOwogCUV4ZWNEcm9wU2luZ2xlVHVwbGVUYWJsZVNsb3Qob2xkX3VwZGF0ZV90dXBs ZSk7CisJRXhlY0Ryb3BTaW5nbGVUdXBsZVRhYmxlU2xvdChuZXdfdHVwbGUpOwogCiAJTWVtb3J5 Q29udGV4dFN3aXRjaFRvKG9sZGN4dCk7CiAKQEAgLTM0OTksNDQgKzM0OTEsODUgQEAgYXBwbHlf Y29uY3VycmVudF9jaGFuZ2VzKENoYW5nZUNvbnRleHQgKmNoZ2N4dCwgQmxvY2tOdW1iZXIgcmFu Z2Vfc3RhcnQsCiAKIC8qCiAgKiBBcHBseSBhbiBpbnNlcnQgZnJvbSB0aGUgc3BpbGwgb2YgY29u Y3VycmVudCBjaGFuZ2VzIHRvIHRoZSBuZXcgY29weSBvZiB0aGUKLSAqIHRhYmxlLgorICogdGFi bGUuICduZXdfdHVwbGUnIGlzIHRoZSBzb3VyY2UgZm9yIHRhYmxlIEFNLgogICovCiBzdGF0aWMg dm9pZAotYXBwbHlfY29uY3VycmVudF9pbnNlcnQoUmVwYWNrRGVzdCAqZGVzdCwgVHVwbGVUYWJs ZVNsb3QgKnNsb3QpCithcHBseV9jb25jdXJyZW50X2luc2VydChSZXBhY2tEZXN0ICpkZXN0LCBU dXBsZVRhYmxlU2xvdCAqc3BpbGxfdHVwbGUsCisJCQkJCQlUdXBsZVRhYmxlU2xvdCAqbmV3X3R1 cGxlLCBUcmFuc2FjdGlvbklkIHhpZCkKIHsKLQkvKiBQdXQgdGhlIHR1cGxlIGluIHRoZSB0YWJs ZSwgYnV0IG1ha2Ugc3VyZSBpdCB3b24ndCBiZSBkZWNvZGVkICovCi0JdGFibGVfdHVwbGVfaW5z ZXJ0KGRlc3QtPnJlbCwgc2xvdCwgR2V0Q3VycmVudENvbW1hbmRJZCh0cnVlKSwKLQkJCQkJICAg VEFCTEVfSU5TRVJUX05PX0xPR0lDQUwsIE5VTEwpOworCUhlYXBUdXBsZQl0dXA7CisJYm9vbAkJ c2hvdWxkRnJlZTsKKworCS8qIENvcHkgdGhlIGNvbnRlbnRzIHRvIGEgc2xvdCB0aGF0IHByZXNl cnZlcyB0aGUgaGVhZGVyIGZpZWxkcy4gKi8KKwlBc3NlcnQoVFRTX0lTX0hFQVBUVVBMRShuZXdf dHVwbGUpKTsKKwlFeGVjQ29weVNsb3QobmV3X3R1cGxlLCBzcGlsbF90dXBsZSk7CisKKwkvKiBH ZXQgcG9pbnRlciB0byB0aGUgY29udGFpbmVkIHR1cGxlIChub3QgYSBjb3B5KS4gKi8KKwl0dXAg PSBFeGVjRmV0Y2hTbG90SGVhcFR1cGxlKG5ld190dXBsZSwgZmFsc2UsICZzaG91bGRGcmVlKTsK KwlBc3NlcnQoIXNob3VsZEZyZWUpOworCisJLyogU2V0IHRoZSBYSUQuICovCisJSGVhcFR1cGxl SGVhZGVyU2V0WG1pbih0dXAtPnRfZGF0YSwgeGlkKTsKKworCS8qCisJICogUHV0IHRoZSB0dXBs ZSBpbiB0aGUgdGFibGUsIGJ1dCBtYWtlIHN1cmUgaXQgd29uJ3QgYmUgZGVjb2RlZC4gQXQgdGhl CisJICogc2FtZSB0aW1lLCByZXF1ZXN0IHRoYXQgdGhlIFhJRCB3ZSBzZXQgYWJvdmUgaXMgdXNl ZCwgaW5zdGVhZCBvZgorCSAqIGdlbmVyYXRpbmcgYSBuZXcgb25lLgorCSAqCisJICogRmlyc3RD b21tYW5kSWQgaXMgb2sgaW4gdGhlIG5ldyB0YWJsZSBiZWNhdXNlIHRoZSB0cmFuc2FjdGlvbiB0 aGF0CisJICogaW5zZXJ0ZWQgdGhlIHR1cGxlIGhhcyBhbHJlYWR5IGNvbW1pdHRlZCwgYW5kIG5v IG90aGVyIHRyYW5zYWN0aW9uCisJICogc2hvdWxkIGV2ZXIgbmVlZCB0aGUgQ0lELgorCSAqLwor CXRhYmxlX3R1cGxlX2luc2VydChkZXN0LT5yZWwsIG5ld190dXBsZSwgRmlyc3RDb21tYW5kSWQs CisJCQkJCSAgIFRBQkxFX0lOU0VSVF9OT19MT0dJQ0FMIHwgVEFCTEVfUkVVU0VfWElELAorCQkJ CQkgICBOVUxMKTsKIAogCS8qIFVwZGF0ZSBpbmRleGVzIHdpdGggdGhpcyBuZXcgdHVwbGUuICov CiAJRXhlY0luc2VydEluZGV4VHVwbGVzKGRlc3QtPnJyaSwKIAkJCQkJCSAgZGVzdC0+ZXN0YXRl LAogCQkJCQkJICAwLAotCQkJCQkJICBzbG90LAorCQkJCQkJICBuZXdfdHVwbGUsCiAJCQkJCQkg IE5JTCwgTlVMTCk7CiAJcGdzdGF0X3Byb2dyZXNzX2luY3JfcGFyYW0oUFJPR1JFU1NfUkVQQUNL X0hFQVBfVFVQTEVTX0lOU0VSVEVELCAxKTsKIH0KIAogLyoKICAqIEFwcGx5IGFuIHVwZGF0ZSBm cm9tIHRoZSBzcGlsbCBvZiBjb25jdXJyZW50IGNoYW5nZXMgdG8gdGhlIG5ldyBjb3B5IG9mIHRo ZQotICogdGFibGUuCisgKiB0YWJsZS4gJ25ld190dXBsZScgaXMgdGhlIHNvdXJjZSBmb3IgdGFi bGUgQU0uCiAgKi8KIHN0YXRpYyB2b2lkCiBhcHBseV9jb25jdXJyZW50X3VwZGF0ZShSZXBhY2tE ZXN0ICpkZXN0LCBUdXBsZVRhYmxlU2xvdCAqc3BpbGxlZF90dXBsZSwKLQkJCQkJCVR1cGxlVGFi bGVTbG90ICpvbmRpc2tfdHVwbGUpCisJCQkJCQlUdXBsZVRhYmxlU2xvdCAqb25kaXNrX3R1cGxl LAorCQkJCQkJVHVwbGVUYWJsZVNsb3QgKm5ld190dXBsZSwgVHJhbnNhY3Rpb25JZCB4aWQpCiB7 CisJSGVhcFR1cGxlCXR1cDsKKwlib29sCQlzaG91bGRGcmVlOwogCVJlbGF0aW9uCXJlbCA9IGRl c3QtPnJlbDsKIAlMb2NrVHVwbGVNb2RlIGxvY2ttb2RlOwogCVRNX0ZhaWx1cmVEYXRhIHRtZmQ7 CiAJVFVfVXBkYXRlSW5kZXhlcyB1cGRhdGVfaW5kZXhlczsKIAlUTV9SZXN1bHQJcmVzOwogCisJ LyogQ29weSB0aGUgY29udGVudHMgdG8gYSBzbG90IHRoYXQgcHJlc2VydmVzIHRoZSBoZWFkZXIg ZmllbGRzLiAqLworCUFzc2VydChUVFNfSVNfSEVBUFRVUExFKG5ld190dXBsZSkpOworCUV4ZWND b3B5U2xvdChuZXdfdHVwbGUsIHNwaWxsZWRfdHVwbGUpOworCisJLyogR2V0IHBvaW50ZXIgdG8g dGhlIGNvbnRhaW5lZCB0dXBsZSAobm90IGEgY29weSkuICovCisJdHVwID0gRXhlY0ZldGNoU2xv dEhlYXBUdXBsZShuZXdfdHVwbGUsIGZhbHNlLCAmc2hvdWxkRnJlZSk7CisJQXNzZXJ0KCFzaG91 bGRGcmVlKTsKKworCS8qIFNldCB0aGUgWElELiAqLworCUhlYXBUdXBsZUhlYWRlclNldFhtaW4o dHVwLT50X2RhdGEsIHhpZCk7CisKIAkvKgogCSAqIENhcnJ5IG91dCB0aGUgdXBkYXRlLCBza2lw cGluZyBsb2dpY2FsIGRlY29kaW5nIGZvciBpdC4KKwkgKgorCSAqIFNlZSBjb21tZW50cyBpbiBh cHBseV9jb25jdXJyZW50X2luc2VydCgpIHRvIHVuZGVyc3RhbmQgd2h5CisJICogRmlyc3RDb21t YW5kSWQgaXMgb2sgaW4gdGhlIG5ldyB0YWJsZS4KIAkgKi8KLQlyZXMgPSB0YWJsZV90dXBsZV91 cGRhdGUocmVsLCAmKG9uZGlza190dXBsZS0+dHRzX3RpZCksIHNwaWxsZWRfdHVwbGUsCi0JCQkJ CQkJIEdldEN1cnJlbnRDb21tYW5kSWQodHJ1ZSksCi0JCQkJCQkJIFRBQkxFX1VQREFURV9OT19M T0dJQ0FMLAorCXJlcyA9IHRhYmxlX3R1cGxlX3VwZGF0ZShyZWwsICYob25kaXNrX3R1cGxlLT50 dHNfdGlkKSwgbmV3X3R1cGxlLAorCQkJCQkJCSBGaXJzdENvbW1hbmRJZCwKKwkJCQkJCQkgVEFC TEVfVVBEQVRFX05PX0xPR0lDQUwgfCBUQUJMRV9SRVVTRV9YSUQsCiAJCQkJCQkJIEludmFsaWRT bmFwc2hvdCwKIAkJCQkJCQkgSW52YWxpZFNuYXBzaG90LAogCQkJCQkJCSBmYWxzZSwKQEAgLTM1 NTYsNyArMzU4OSw3IEBAIGFwcGx5X2NvbmN1cnJlbnRfdXBkYXRlKFJlcGFja0Rlc3QgKmRlc3Qs IFR1cGxlVGFibGVTbG90ICpzcGlsbGVkX3R1cGxlLAogCQlFeGVjSW5zZXJ0SW5kZXhUdXBsZXMo ZGVzdC0+cnJpLAogCQkJCQkJCSAgZGVzdC0+ZXN0YXRlLAogCQkJCQkJCSAgZmxhZ3MsCi0JCQkJ CQkJICBzcGlsbGVkX3R1cGxlLAorCQkJCQkJCSAgbmV3X3R1cGxlLAogCQkJCQkJCSAgTklMLCBO VUxMKTsKIAl9CiAKQEAgLTM1NjQsMTYgKzM1OTcsMjIgQEAgYXBwbHlfY29uY3VycmVudF91cGRh dGUoUmVwYWNrRGVzdCAqZGVzdCwgVHVwbGVUYWJsZVNsb3QgKnNwaWxsZWRfdHVwbGUsCiB9CiAK IHN0YXRpYyB2b2lkCi1hcHBseV9jb25jdXJyZW50X2RlbGV0ZShSZWxhdGlvbiByZWwsIFR1cGxl VGFibGVTbG90ICpzbG90KQorYXBwbHlfY29uY3VycmVudF9kZWxldGUoUmVsYXRpb24gcmVsLCBU dXBsZVRhYmxlU2xvdCAqc2xvdCwgVHJhbnNhY3Rpb25JZCB4aWQpCiB7CiAJVE1fUmVzdWx0CXJl czsKIAlUTV9GYWlsdXJlRGF0YSB0bWZkOwogCiAJLyoKIAkgKiBEZWxldGUgdHVwbGUgZnJvbSB0 aGUgbmV3IGhlYXAsIHNraXBwaW5nIGxvZ2ljYWwgZGVjb2RpbmcgZm9yIGl0LgorCSAqCisJICog U2VlIGNvbW1lbnRzIGluIGhlYXBfaW5zZXJ0X2Zvcl9yZXBhY2soKSB0byB1bmRlcnN0YW5kIHdo eQorCSAqIEZpcnN0Q29tbWFuZElkIGlzIG9rIGluIHRoZSBuZXcgdGFibGUuCisJICoKKwkgKiBT ZWUgY29tbWVudHMgaW4gYXBwbHlfY29uY3VycmVudF9pbnNlcnQoKSB0byB1bmRlcnN0YW5kIHdo eQorCSAqIEZpcnN0Q29tbWFuZElkIGlzIG9rIGluIHRoZSBuZXcgdGFibGUuCiAJICovCiAJcmVz ID0gdGFibGVfdHVwbGVfZGVsZXRlKHJlbCwgJihzbG90LT50dHNfdGlkKSwKLQkJCQkJCQkgR2V0 Q3VycmVudENvbW1hbmRJZCh0cnVlKSwKKwkJCQkJCQkgeGlkLCBGaXJzdENvbW1hbmRJZCwKIAkJ CQkJCQkgVEFCTEVfREVMRVRFX05PX0xPR0lDQUwsCiAJCQkJCQkJIEludmFsaWRTbmFwc2hvdCwg SW52YWxpZFNuYXBzaG90LAogCQkJCQkJCSBmYWxzZSwKQEAgLTM1OTksNyArMzYzOCw4IEBAIGFw cGx5X2NvbmN1cnJlbnRfZGVsZXRlKFJlbGF0aW9uIHJlbCwgVHVwbGVUYWJsZVNsb3QgKnNsb3Qp CiAgKi8KIHN0YXRpYyB2b2lkCiByZXN0b3JlX3R1cGxlKEJ1ZkZpbGUgKmZpbGUsIFJlbGF0aW9u IHJlbGF0aW9uLCBUdXBsZVRhYmxlU2xvdCAqc2xvdCwKLQkJCSAgQmxvY2tOdW1iZXIgKmJsb2Nr X25yX3AsIEJsb2NrTnVtYmVyICpvbGRfYmxvY2tfbnJfcCkKKwkJCSAgQmxvY2tOdW1iZXIgKmJs b2NrX25yX3AsIEJsb2NrTnVtYmVyICpvbGRfYmxvY2tfbnJfcCwKKwkJCSAgVHJhbnNhY3Rpb25J ZCAqeGlkX3ApCiB7CiAJdWludDMyCQl0X2xlbjsKIAlIZWFwVHVwbGUJdHVwOwpAQCAtMzYyMyw2 ICszNjYzLDggQEAgcmVzdG9yZV90dXBsZShCdWZGaWxlICpmaWxlLCBSZWxhdGlvbiByZWxhdGlv biwgVHVwbGVUYWJsZVNsb3QgKnNsb3QsCiAJLyogSGFuZGxlIFRJRCBzZXBhcmF0ZSBiZWNhdXNl IG5vdCBhbGwgdHVwbGUgc2xvdHMgY2FyZSBhYm91dCBpdC4gKi8KIAlpZiAoYmxvY2tfbnJfcCkK IAkJKmJsb2NrX25yX3AgPSBJdGVtUG9pbnRlckdldEJsb2NrTnVtYmVyKCZ0dXAtPnRfZGF0YS0+ dF9jdGlkKTsKKwlpZiAoeGlkX3ApCisJCSp4aWRfcCA9IEhlYXBUdXBsZUhlYWRlckdldFhtaW4o dHVwLT50X2RhdGEpOwogCWlmIChvbGRfYmxvY2tfbnJfcCkKIAkJQnVmRmlsZVJlYWRFeGFjdChm aWxlLCBvbGRfYmxvY2tfbnJfcCwgc2l6ZW9mKEJsb2NrTnVtYmVyKSk7CiAKQEAgLTM4NzUsNiAr MzkxNyw3IEBAIGluaXRpYWxpemVfY2hhbmdlX2NvbnRleHQoQ2hhbmdlQ29udGV4dCAqY2hnY3h0 LAogCiAJY2hnY3h0LT5jY19kZXN0X2F1eCA9IE5VTEw7CiAJY2hnY3h0LT5jY19jbHVzdGVyaW5n X2luZGV4ID0gSW52YWxpZE9pZDsKKwljaGdjeHQtPmNjX2xhc3Rfc25hcHNob3RfeG1pbiA9IElu dmFsaWRUcmFuc2FjdGlvbklkOwogfQogCiAvKgpAQCAtNDA5Niw2ICs0MTM5LDcgQEAgYmFja3Vw X2NoYW5nZV9jb250ZXh0KENoYW5nZUNvbnRleHQgKmNoZ2N4dCwgUmVsYXRpb24gKnBfb2xkLAog CWJhY2t1cC0+ZmlsZV9zZXFfc25hcHNob3QgPSBjaGdjeHQtPmNjX2ZpbGVfc2VxX3NuYXBzaG90 OwogCWJhY2t1cC0+ZmlsZV9zZXFfY2hhbmdlcyA9IGNoZ2N4dC0+Y2NfZmlsZV9zZXFfY2hhbmdl czsKIAliYWNrdXAtPmNsdXN0ZXJpbmdfaW5kZXggPSBjaGdjeHQtPmNjX2NsdXN0ZXJpbmdfaW5k ZXg7CisJYmFja3VwLT5sYXN0X3NuYXBzaG90X3htaW4gPSBjaGdjeHQtPmNjX2xhc3Rfc25hcHNo b3RfeG1pbjsKIH0KIAogLyoKQEAgLTQxNDAsNiArNDE4NCw3IEBAIHJlaW5pdGlhbGl6ZV9jaGFu Z2VfY29udGV4dChDaGFuZ2VDb250ZXh0QmFja3VwICpiYWNrdXApCiAJY2hnY3h0LT5jY19maWxl X3NlcV9zbmFwc2hvdCA9IGJhY2t1cC0+ZmlsZV9zZXFfc25hcHNob3Q7CiAJY2hnY3h0LT5jY19m aWxlX3NlcV9jaGFuZ2VzID0gYmFja3VwLT5maWxlX3NlcV9jaGFuZ2VzOwogCWNoZ2N4dC0+Y2Nf Y2x1c3RlcmluZ19pbmRleCA9IGJhY2t1cC0+Y2x1c3RlcmluZ19pbmRleDsKKwljaGdjeHQtPmNj X2xhc3Rfc25hcHNob3RfeG1pbiA9IGJhY2t1cC0+bGFzdF9zbmFwc2hvdF94bWluOwogCiAJcmV0 dXJuIGNoZ2N4dDsKIH0KQEAgLTQyNTIsNiArNDI5Nyw3IEBAIHN0YXRpYyB2b2lkCiByZWJ1aWxk X3JlbGF0aW9uX2ZpbmlzaF9jb25jdXJyZW50KFJlbGF0aW9uIE5ld0hlYXAsIFJlbGF0aW9uIE9s ZEhlYXAsCiAJCQkJCQkJCSAgIE9pZCBpZGVudElkeCwgVHJhbnNhY3Rpb25JZCBmcm96ZW5YaWQs CiAJCQkJCQkJCSAgIE11bHRpWGFjdElkIGN1dG9mZk11bHRpLAorCQkJCQkJCQkgICBkb3VibGUg bnVtX3R1cGxlcywKIAkJCQkJCQkJICAgQ2hhbmdlQ29udGV4dCAqY2hnY3h0KQogewogCUxpc3QJ ICAgKmluZF9vaWRzX25ldzsKQEAgLTQyNjYsNiArNDMxMiw3IEBAIHJlYnVpbGRfcmVsYXRpb25f ZmluaXNoX2NvbmN1cnJlbnQoUmVsYXRpb24gTmV3SGVhcCwgUmVsYXRpb24gT2xkSGVhcCwKIAlN ZW1vcnlDb250ZXh0IG9sZGN4dDsKIAlMaXN0CSAgICppbmRleHJlbHM7CiAJTGlzdAkgICAqaW5k c190bXAgPSBOSUw7CisJQmxvY2tOdW1iZXIgbnVtX3BhZ2VzOwogCiAJQXNzZXJ0KENoZWNrUmVs YXRpb25Mb2NrZWRCeU1lKE9sZEhlYXAsIFNoYXJlVXBkYXRlRXhjbHVzaXZlTG9jaywgZmFsc2Up KTsKIAlBc3NlcnQoQ2hlY2tSZWxhdGlvbkxvY2tlZEJ5TWUoTmV3SGVhcCwgQWNjZXNzRXhjbHVz aXZlTG9jaywgZmFsc2UpKTsKQEAgLTQyNzcsNyArNDMyNCw4IEBAIHJlYnVpbGRfcmVsYXRpb25f ZmluaXNoX2NvbmN1cnJlbnQoUmVsYXRpb24gTmV3SGVhcCwgUmVsYXRpb24gT2xkSGVhcCwKIAkg KiBjYWNoZSBlbnRyaWVzIHVwZGF0ZWQuCiAJICovCiAJaWYgKGNoZ2N4dC0+Y2NfZGVzdF9hdXgp Ci0JCWNoZ2N4dCA9IHByb2Nlc3NfYXV4aWxpYXJ5X3RhYmxlKGNoZ2N4dCwgJk9sZEhlYXAsICZO ZXdIZWFwLCBpZGVudElkeCk7CisJCWNoZ2N4dCA9IHByb2Nlc3NfYXV4aWxpYXJ5X3RhYmxlKGNo Z2N4dCwgJk9sZEhlYXAsICZOZXdIZWFwLCBpZGVudElkeCwKKwkJCQkJCQkJCQkgZnJvemVuWGlk LCBjdXRvZmZNdWx0aSk7CiAKIAkvKgogCSAqIFVubGlrZSB0aGUgZXhjbHVzaXZlIGNhc2UsIHdl IGJ1aWxkIG5ldyBpbmRleGVzIGZvciB0aGUgbmV3IHJlbGF0aW9uCkBAIC00MzE5LDYgKzQzNjcs NDUgQEAgcmVidWlsZF9yZWxhdGlvbl9maW5pc2hfY29uY3VycmVudChSZWxhdGlvbiBOZXdIZWFw LCBSZWxhdGlvbiBPbGRIZWFwLAogCWluZF9vaWRzX25ldyA9IGxhcHBlbmRfb2lkKGluZF9vaWRz X25ldywKIAkJCQkJCQkgICBSZWxhdGlvbkdldFJlbGlkKGNoZ2N4dC0+Y2NfZGVzdC5pZGVudF9p bmRleCkpOwogCisJLyoKKwkgKiBTaW5jZSB3ZSBoYXZlbid0IGNvcGllZCAicmVjZW50bHkgZGVh ZCIgdHVwbGVzIGludG8gdGhlIG5ldyBoZWFwLCB3ZQorCSAqIG11c3Qgbm90IGZpbmlzaCB0aGUg cHJvY2Vzc2luZyB1bnRpbCB0aGV5IGFyZSBjb25zaWRlcmVkIGRlYWQgYnkgYWxsCisJICogYmFj a2VuZHMuCisJICoKKwkgKiBJbiBwYXJ0aWN1bGFyLCB0aGUgVkFDVVVNIHhtaW4gaG9yaXpvbiBm b3IgdGhlIHRhYmxlIG11c3QgYmUgYXQgbGVhc3QKKwkgKiB4bWluIG9mIHRoZSBsYXN0IHNuYXBz aG90IHRoYXQgd2UgdXNlZCB0byBjb3B5IHRoZSBkYXRhLiAgVGhhdCBtZWFucworCSAqIGV2ZW4g dGhlIGxlYXN0IHJlY2VudGx5IGRlbGV0ZWQgdHVwbGVzIHdlIG9taXR0ZWQgZnJvbSB0aGUgY29w eWluZworCSAqIChiZWNhdXNlIHdlIGNvbnNpZGVyZWQgdGhlbSBkZWFkKSBtdXN0IGJlIGNvbnNp ZGVyZWQgZGVhZCBieSBhbnlvbmUuCisJICoKKwkgKiBOb3RlOiBBbHRob3VnaCBzb21lIHRpbWUg c2hvdWxkIGhhdmUgZWxhcHNlZCBzaW5jZSB0aGUgZGF0YSBjb3B5aW5nCisJICogc3RhZ2UgKGF0 IGxlYXN0IHRoZSB0aW1lIHRvIGJ1aWxkIHRoZSBpbmRleGVzKSwgd2UgbWlnaHQgZ2V0IHN0dWNr IGhlcmUKKwkgKiBkdWUgdG8gYW5vdGhlciBiYWNrZW5kIHJ1bm5pbmcgUkVQQUNLIChvciBhbnkg bG9uZyBydW5uaW5nIHF1ZXJ5KQorCSAqIGJlY2F1c2UgaXRzIHNuYXBzaG90IGRvZXMgbm90IGFs bG93IHRoZSB4bWluIGhvcml6b24gdG8gYWR2YW5jZSBmb3IKKwkgKiBzb21lIHRpbWUuIFRPRE8g Q29uc2lkZXIgdGhpcyB3aGVuIGRldGVybWluaW5nIHRoZSB2YWx1ZSBvZgorCSAqIHJlcGFja19w YWdlc19wZXJfc25hcHNob3QgKGN1cnJlbnRseSBHVUMsIGluIHRoZSBmdXR1cmUgcHJlZmVyYWJs eSBhCisJICogY29uc3RhbnQpLgorCSAqCisJICogVE9ETyBUaGlzIHdhaXRpbmcgaXMgcHJvYmFi bHkgd29ydGggYSBzZXBhcmF0ZSBwaGFzZSBpbiBwcm9ncmVzcworCSAqIHJlcG9ydGluZy4gV2hh dCB3b3VsZCBiZSB0aGUgYXBwcm9wcmlhdGUgcGhhc2UgbmFtZT8KKwkgKi8KKwlBc3NlcnQoVHJh bnNhY3Rpb25JZElzVmFsaWQoY2hnY3h0LT5jY19sYXN0X3NuYXBzaG90X3htaW4pKTsKKwl3aGls ZSAodHJ1ZSkKKwl7CisJCVRyYW5zYWN0aW9uSWQgb2xkZXN0X3htaW47CisKKwkJb2xkZXN0X3ht aW4gPSBHZXRPbGRlc3ROb25SZW1vdmFibGVUcmFuc2FjdGlvbklkKE9sZEhlYXApOworCQlpZiAo VHJhbnNhY3Rpb25JZEZvbGxvd3NPckVxdWFscyhvbGRlc3RfeG1pbiwKKwkJCQkJCQkJCQkgY2hn Y3h0LT5jY19sYXN0X3NuYXBzaG90X3htaW4pKQorCQkJYnJlYWs7CisKKwkJLyogV2FpdCBiZWZv cmUgdGhlIG5leHQgY2hlY2suICovCisJCSh2b2lkKSBXYWl0TGF0Y2goTXlMYXRjaCwKKwkJCQkJ CSBXTF9MQVRDSF9TRVQgfCBXTF9USU1FT1VUIHwgV0xfRVhJVF9PTl9QTV9ERUFUSCwKKwkJCQkJ CSAxMDAwTCwKKwkJCQkJCSBXQUlUX0VWRU5UX1JFUEFDS19NVkNDX1NBRkVUWSk7CisJCVJlc2V0 TGF0Y2goTXlMYXRjaCk7CisJfQorCiAJLyoKIAkgKiBEdXJpbmcgdGVzdGluZywgd2FpdCBmb3Ig YW5vdGhlciBiYWNrZW5kIHRvIHBlcmZvcm0gY29uY3VycmVudCBkYXRhCiAJICogY2hhbmdlcyB3 aGljaCB3ZSB3aWxsIHByb2Nlc3MgYmVsb3cuCkBAIC00NDQyLDYgKzQ1MjksMTAgQEAgcmVidWls ZF9yZWxhdGlvbl9maW5pc2hfY29uY3VycmVudChSZWxhdGlvbiBOZXdIZWFwLCBSZWxhdGlvbiBP bGRIZWFwLAogCS8qIFRoZSBuZXcgaW5kZXhlcyBtdXN0IGJlIHZpc2libGUgZm9yIGRlbGV0aW9u LiAqLwogCUNvbW1hbmRDb3VudGVySW5jcmVtZW50KCk7CiAKKwkvKiBVcGRhdGUgdGhlIG51bWJl cnMgb2YgcGFnZXMgYW5kIHR1cGxlcyBpbiBwZ19jbGFzcy4gKi8KKwludW1fcGFnZXMgPSBSZWxh dGlvbkdldE51bWJlck9mQmxvY2tzKE5ld0hlYXApOworCWNvcHlfdGFibGVfZGF0YV91cGRhdGVf c3RhdHMoT2xkSGVhcCwgTmV3SGVhcCwgbnVtX3BhZ2VzLCBudW1fdHVwbGVzKTsKKwogCS8qIENs b3NlIHRoZSBvbGQgaGVhcCBidXQga2VlcCBsb2NrIHVudGlsIHRyYW5zYWN0aW9uIGNvbW1pdC4g Ki8KIAl0YWJsZV9jbG9zZShPbGRIZWFwLCBOb0xvY2spOwogCS8qIENsb3NlIHRoZSBuZXcgaGVh cC4gKFdlIGRpZG4ndCBoYXZlIHRvIG9wZW4gaXRzIGluZGV4ZXMpLiAqLwpAQCAtNDQ1NCw2ICs0 NTQ1LDEyIEBAIHJlYnVpbGRfcmVsYXRpb25fZmluaXNoX2NvbmN1cnJlbnQoUmVsYXRpb24gTmV3 SGVhcCwgUmVsYXRpb24gT2xkSGVhcCwKIAkgKiBTd2FwIHRoZSByZWxhdGlvbnMgYW5kIHRoZWly IFRPQVNUIHJlbGF0aW9ucyBhbmQgVE9BU1QgaW5kZXhlcy4gVGhpcwogCSAqIGFsc28gZHJvcHMg dGhlIG5ldyByZWxhdGlvbiBhbmQgaXRzIGluZGV4ZXMuCiAJICoKKwkgKiB1cGRhdGVfdG9hc3Rf Y3V0b2ZmcyBpcyB0cnVlIGJlY2F1c2UgUkVQQUNLIChDT05DVVJSRU5UTFkpIGRvZXMgbm90CisJ ICogZnJlZXplIHR1cGxlcyBkZWNvZGVkIGZyb20gV0FMLCBhbmQgYmVjYXVzZSBSZWNlbnRYbWlu IGlzIG5vdCBhZmZlY3RlZAorCSAqIGJ5IGxvZ2ljYWwgZGVjb2RpbmcuIFRodXMgaWYgd2UgYWNj ZXB0ZWQgcmVsZnJvemVueGlkIG9mIHRoZSBuZXcgVE9BU1QKKwkgKiByZWxhdGlvbiAoZGVyaXZl ZCBmcm9tIFJlY2VudFhtaW4pLCBpdCBjb3VsZCBpbmNvcnJlY3RseSB0ZWxsIHRoYXQgd2UKKwkg KiBmcm96ZSBtb3JlIHJlY2VudCBYSUQncyB0aGFuIHdlIGFjdHVhbGx5IGRpZC4KKwkgKgogCSAq IChTeXN0ZW0gY2F0YWxvZ3MgYXJlIGN1cnJlbnRseSBub3Qgc3VwcG9ydGVkLikKIAkgKi8KIAlB c3NlcnQoIWlzX3N5c3RlbV9jYXRhbG9nKTsKQEAgLTQ0NjQsNiArNDU2MSw3IEBAIHJlYnVpbGRf cmVsYXRpb25fZmluaXNoX2NvbmN1cnJlbnQoUmVsYXRpb24gTmV3SGVhcCwgUmVsYXRpb24gT2xk SGVhcCwKIAkJCQkJIHRydWUsCiAJCQkJCSBmYWxzZSwJCS8qIHJlaW5kZXggKi8KIAkJCQkJIGZy b3plblhpZCwgY3V0b2ZmTXVsdGksCisJCQkJCSB0cnVlLAkJLyogdXBkYXRlX3RvYXN0X2N1dG9m ZnMgKi8KIAkJCQkJIHJlbHBlcnNpc3RlbmNlKTsKIH0KIApAQCAtNDQ3OCw3ICs0NTc2LDggQEAg cmVidWlsZF9yZWxhdGlvbl9maW5pc2hfY29uY3VycmVudChSZWxhdGlvbiBOZXdIZWFwLCBSZWxh dGlvbiBPbGRIZWFwLAogICovCiBzdGF0aWMgQ2hhbmdlQ29udGV4dCAqCiBwcm9jZXNzX2F1eGls aWFyeV90YWJsZShDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIFJlbGF0aW9uICpwT2xkSGVhcCwKLQkJ CQkJCVJlbGF0aW9uICpwTmV3SGVhcCwgT2lkIGlkZW50SWR4KQorCQkJCQkJUmVsYXRpb24gKnBO ZXdIZWFwLCBPaWQgaWRlbnRJZHgsCisJCQkJCQlUcmFuc2FjdGlvbklkIGZyZWV6ZV94aWQsIE11 bHRpWGFjdElkIGN1dG9mZl9tdWx0aSkKIHsKIAlSZXBhY2tEZXN0ICpkZXN0ID0gY2hnY3h0LT5j Y19kZXN0X2F1eDsKIAlPaWQJCQlpZGVudF9pZHhfbmV3OwpAQCAtNDQ4OCw2ICs0NTg3LDkgQEAg cHJvY2Vzc19hdXhpbGlhcnlfdGFibGUoQ2hhbmdlQ29udGV4dCAqY2hnY3h0LCBSZWxhdGlvbiAq cE9sZEhlYXAsCiAJT2lkCQkJYXV4X29pZDsKIAlPYmplY3RBZGRyZXNzIG9iamVjdDsKIAlSZWxh dGlvbglyZWw7CisJU25hcHNob3REYXRhIFNuYXBzaG90TmV3SGVhcDsKKwlSZXdyaXRlU3RhdGUg cndzdGF0ZTsKKwlkb3VibGUJbnR1cGxlcyA9IDA7CiAKIAkvKgogCSAqIEZpcnN0LCBtYWtlIHN1 cmUgdGhlIGNsdXN0ZXJpbmcgaW5kZXggZXhpc3RzLgpAQCAtNDUxNywzNyArNDYxOSw4OSBAQCBw cm9jZXNzX2F1eGlsaWFyeV90YWJsZShDaGFuZ2VDb250ZXh0ICpjaGdjeHQsIFJlbGF0aW9uICpw T2xkSGVhcCwKIAkJY2x1c3RlcmluZ19pbmRleCA9IGRlc3QtPmlkZW50X2luZGV4OwogCX0KIAor CS8qIE5vdyBkbyB0aGUgY29weWluZy4gKi8KKwlzbG90ID0gdGFibGVfc2xvdF9jcmVhdGUoZGVz dC0+cmVsLCBOVUxMKTsKKwogCS8qCi0JICogTm93IGRvIHRoZSBjb3B5aW5nLiBCZWZvcmUgc3Rh cnRpbmcsIGNsZWFyIC0+Y2NfZGVzdF9hdXggc28gdGhhdAotCSAqIGluc2VydGlvbnMgZ28gdG8g dGhlIGZpbmFsIHRhYmxlLCByYXRoZXIgdGhhbiB0aGUgYXV4aWxpYXJ5IG9uZS4KKwkgKiBObyBw b2ludCBpbiBzcGVjaWZ5aW5nIHRoZSBhdXhpbGlhcnkgcmVsYXRpb24gYXMgdGhlIG9sZCBvbmU6 IHdlCisJICogaGF2ZW4ndCBmcm96ZW4gdHVwbGVzIHdoZW4gaW5zZXJ0aW5nIHRoZW0gKG9uZSBm cmVlemluZyBpcyBlbm91Z2gsIHNlZQorCSAqIGJlbG93KSwgc28gdGhlIHR1cGxlcyBkbyBub3Qg c2F0aXNmeSB0aGUgcmVsZnJvemVueGlkIC8gcmVsbWlubXhpZAorCSAqIGxpbWl0cywgYW5kIHRo dXMgdGhlIGZvbGxvd2luZyBmcmVlemluZyB3b3VsZCBmYWlsLgogCSAqLwotCWNoZ2N4dC0+Y2Nf ZGVzdF9hdXggPSBOVUxMOwotCXNsb3QgPSB0YWJsZV9zbG90X2NyZWF0ZShkZXN0LT5yZWwsIE5V TEwpOworCXJ3c3RhdGUgPSBiZWdpbl9oZWFwX3Jld3JpdGUoTlVMTCwgY2hnY3h0LT5jY19kZXN0 LnJlbCwKKwkvKiBvbGRlc3RfeG1pbiBvbmx5IG5lZWRlZCBmb3IgcmV3cml0aW5nICovCisJCQkJ CQkJCSBJbnZhbGlkVHJhbnNhY3Rpb25JZCwKKwkJCQkJCQkJIGZyZWV6ZV94aWQsIGN1dG9mZl9t dWx0aSwKKwkJCQkJCQkJIHRydWUpOwogCiAJLyoKLQkgKiBOb3RlOiB0aGUgY3VycmVudCBhY3Rp dmUgc25hcHNob3QgYmxvY2tzIHRoZSBwcm9ncmVzcyBvZiB4bWluCi0JICogaG9yaXpvbihzKS4g VGhlIG5leHQgcGF0Y2hlcyBpbiB0aGUgc2VyaWVzIHNob3VsZCBmaXggdGhpcyBieSB1c2luZyBh Ci0JICogbmV3IGtpbmQgb2Ygc25hcHNob3QgKHdoaWNoIHdlIGNhbiB1c2UgaGVyZSBiZWNhdXNl IHRoZXJlIGFyZSBubwotCSAqIHRyYW5zYWN0aW9uIGFib3J0cyBpbiB0aGUgYXV4aWxpYXJ5IHRh YmxlKS4KKwkgKiBTY2FuIG9mIHRoZSBhdXhpbGlhcnkgdGFibGUgY2FuIHRha2UgbG9uZyB0aW1l LCBidXQgdGhlIFNuYXBzaG90TmV3SGVhcAorCSAqIHNuYXBzaG90IGNhbiBiZSB1c2VkIGhlcmUg KGJlY2F1c2UgdGhlcmUgc2hvdWxkIGJlIG5vIGFib3J0ZWQKKwkgKiBpbnNlcnRpb25zIGluIHRo ZSB0YWJsZSksIHNvIHRoZSBzY2FuIHNob3VsZCBub3QgYWZmZWN0IHRoZSB4bWluCisJICogaG9y aXpvbnMuCiAJICovCisJUG9wQWN0aXZlU25hcHNob3QoKTsKKwlJbml0TmV3SGVhcFNuYXBzaG90 KFNuYXBzaG90TmV3SGVhcCk7CisJUHVzaEFjdGl2ZVNuYXBzaG90KCZTbmFwc2hvdE5ld0hlYXAp OwogCXNjYW4gPSBpbmRleF9iZWdpbnNjYW4oZGVzdC0+cmVsLCBjbHVzdGVyaW5nX2luZGV4LCBm YWxzZSwKIAkJCQkJCSAgIEdldEFjdGl2ZVNuYXBzaG90KCksIE5VTEwsIDAsIDAsIFNPX05PTkUp OwogCWluZGV4X3Jlc2NhbihzY2FuLCBOVUxMLCAwLCBOVUxMLCAwKTsKKwlwZ3N0YXRfcHJvZ3Jl c3NfdXBkYXRlX3BhcmFtKFBST0dSRVNTX1JFUEFDS19QSEFTRSwKKwkJCQkJCQkJIFBST0dSRVNT X1JFUEFDS19QSEFTRV9XUklURV9ORVdfSEVBUCk7CiAJZm9yICg7OykKIAl7CisJCUhlYXBUdXBs ZQl0dXBsZTsKKwkJYm9vbAkJc2hvdWxkRnJlZTsKKwogCQlDSEVDS19GT1JfSU5URVJSVVBUUygp OwogCiAJCWlmICghdGFibGVfaW5kZXhfZ2V0bmV4dF9zbG90KHNjYW4sIEZvcndhcmRTY2FuRGly ZWN0aW9uLCBzbG90KSkKIAkJCWJyZWFrOwogCisJCS8qIE1ha2Ugc3VyZSB3ZSBoYXZlIGEgd3Jp dGFibGUgY29weSBvZiB0aGUgdHVwbGUuICovCisJCXR1cGxlID0gRXhlY0ZldGNoU2xvdEhlYXBU dXBsZShzbG90LCB0cnVlLCAmc2hvdWxkRnJlZSk7CisKIAkJLyoKLQkJICogUmVmb3JtaW5nIHNo b3VsZCBoYXZlIGJlZW4gcGVyZm9ybWVkIGR1cmluZyBpbnNlcnRpb25zIGludG8gdGhlCi0JCSAq IGF1eGlsaWFyeSB0YWJsZS4KKwkJICogVGhpcyBraW5kIG9mIHNsb3QgbWFpbnRhaW5zIHRoZSB0 dXBsZSBoZWFkZXIuIFdlIGRvbid0IG5lZWQgdG8gY29weQorCQkgKiB0aGUgY29udGVudHMgaW50 byBhIHNsb3Qgb2Ygb3RoZXIga2luZCBiZWNhdXNlIHJlZm9ybWluZyB3YXMKKwkJICogcGVyZm9y bWVkIHdoZW4gcG9wdWxhdGluZyB0aGUgYXV4aWxpYXJ5IHRhYmxlLgogCQkgKi8KLQkJaGVhcF9p bnNlcnRfZm9yX3JlcGFjayhjaGdjeHQsIHNsb3QsIE5VTEwpOworCQlBc3NlcnQoVFRTX0lTX0JV RkZFUlRVUExFKHNsb3QpKTsKKwkJQXNzZXJ0KFRyYW5zYWN0aW9uSWRJc1ZhbGlkKEhlYXBUdXBs ZUhlYWRlckdldFhtaW4odHVwbGUtPnRfZGF0YSkpKTsKKworCQkvKgorCQkgKiBJbnNlcnQgdGhl IHR1cGxlIGludG8gdGhlIG5ldyByZWxhdGlvbiwgYW5kIGZyZWV6ZSBpdCB3aGlsZSBkb2luZwor CQkgKiBzby4KKwkJICoKKwkJICogUmVnYXJkaW5nIGNsZWFyX3htYXgsIHNlZSBjb21tZW50cyBp biBoZWFwX2luc2VydF9mb3JfcmVwYWNrKCkuCisJCSAqCisJCSAqIFNpbmNlIG91ciBjb3B5IGlz IGFscmVhZHkgd3JpdGFibGUsIHRoZSB0dXBsZSBjYW4gYmUgcGFzc2VkIGZvcgorCQkgKiBib3Ro IG9sZCBhbmQgbmV3IHR1cGxlLgorCQkgKi8KKwkJcmV3cml0ZV9oZWFwX3R1cGxlX25vX2NoYWlu cyhyd3N0YXRlLCB0dXBsZSwgdHVwbGUsIHRydWUsIHRydWUpOworCisJCWlmIChzaG91bGRGcmVl KQorCQkJcGZyZWUodHVwbGUpOworCisJCS8qIFJlcG9ydCBudHVwbGVzICovCisJCXBnc3RhdF9w cm9ncmVzc191cGRhdGVfcGFyYW0oUFJPR1JFU1NfUkVQQUNLX0hFQVBfVFVQTEVTX0lOU0VSVEVE LAorCQkJCQkJCQkJICsrbnR1cGxlcyk7CiAJfQogCWluZGV4X2VuZHNjYW4oc2Nhbik7CisJUG9w QWN0aXZlU25hcHNob3QoKTsKKwlJbnZhbGlkYXRlQ2F0YWxvZ1NuYXBzaG90KCk7CisKKwkvKgor CSAqIFdlIHNob3VsZCBub3QgYmUgcmVzdHJpY3RpbmcgdGhlIHByb2dyZXNzIG9mIHhtaW4gaG9y aXpvbnMgYXQgdGhlCisJICogbW9tZW50LgorCSAqLworCUFzc2VydCghVHJhbnNhY3Rpb25JZElz VmFsaWQoTXlQcm9jLT54bWluKSk7CisJQXNzZXJ0KCFUcmFuc2FjdGlvbklkSXNWYWxpZChNeVBy b2MtPnhpZCkpOworCUFzc2VydCghSGF2ZVJlZ2lzdGVyZWRPckFjdGl2ZVNuYXBzaG90KCkpOwor CisJUHVzaEFjdGl2ZVNuYXBzaG90KEdldFRyYW5zYWN0aW9uU25hcHNob3QoKSk7CiAJRXhlY0Ry b3BTaW5nbGVUdXBsZVRhYmxlU2xvdChzbG90KTsKKwllbmRfaGVhcF9yZXdyaXRlKHJ3c3RhdGUp OwogCiAJLyoKIAkgKiBDbG9zZSB0aGUgcmVsYXRpb24sIGl0cyBpZGVudGl0eSBpbmRleCBhbmQg Y2x1c3RlcmluZyBpbmRleCBpZiB3ZSBoYWQKQEAgLTQ1NTksNiArNDcxMyw3IEBAIHByb2Nlc3Nf YXV4aWxpYXJ5X3RhYmxlKENoYW5nZUNvbnRleHQgKmNoZ2N4dCwgUmVsYXRpb24gKnBPbGRIZWFw LAogCQlpbmRleF9jbG9zZShjbHVzdGVyaW5nX2luZGV4LCBOb0xvY2spOwogCS8qIEhlcmUgd2Ug Y2xvc2UgdGhlIG90aGVyIGluZGV4ZXMuICovCiAJcmVsZWFzZV9jaGFuZ2VfZGVzdChkZXN0KTsK KwljaGdjeHQtPmNjX2Rlc3RfYXV4ID0gTlVMTDsKIAogCS8qIERyb3AgdGhlIGF1eGlsaWFyeSB0 YWJsZS4gKi8KIAlvYmplY3QuY2xhc3NJZCA9IFJlbGF0aW9uUmVsYXRpb25JZDsKZGlmZiAtLWdp dCBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3RhYmxlY21kcy5jIGIvc3JjL2JhY2tlbmQvY29tbWFu ZHMvdGFibGVjbWRzLmMKaW5kZXggNWU3NWEyYmM4NDQuLmVjZTNlM2NhOTI2IDEwMDY0NAotLS0g YS9zcmMvYmFja2VuZC9jb21tYW5kcy90YWJsZWNtZHMuYworKysgYi9zcmMvYmFja2VuZC9jb21t YW5kcy90YWJsZWNtZHMuYwpAQCAtNjA4OSw2ICs2MDg5LDcgQEAgQVRSZXdyaXRlVGFibGVzKEFs dGVyVGFibGVTdG10ICpwYXJzZXRyZWUsIExpc3QgKip3cXVldWUsIExPQ0tNT0RFIGxvY2ttb2Rl LAogCQkJCQkJCSB0cnVlLAkvKiByZWluZGV4ICovCiAJCQkJCQkJIFJlY2VudFhtaW4sCiAJCQkJ CQkJIFJlYWROZXh0TXVsdGlYYWN0SWQoKSwKKwkJCQkJCQkgZmFsc2UsIC8qIHVwZGF0ZV90b2Fz dF9jdXRvZmZzICovCiAJCQkJCQkJIHBlcnNpc3RlbmNlKTsKIAogCQkJSW52b2tlT2JqZWN0UG9z dEFsdGVySG9vayhSZWxhdGlvblJlbGF0aW9uSWQsIHRhYi0+cmVsaWQsIDApOwpkaWZmIC0tZ2l0 IGEvc3JjL2JhY2tlbmQvZXhlY3V0b3Ivbm9kZU1vZGlmeVRhYmxlLmMgYi9zcmMvYmFja2VuZC9l eGVjdXRvci9ub2RlTW9kaWZ5VGFibGUuYwppbmRleCBjYjczY2M2MTgyMS4uODdhZDk5ZTlhMzgg MTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2V4ZWN1dG9yL25vZGVNb2RpZnlUYWJsZS5jCisrKyBi L3NyYy9iYWNrZW5kL2V4ZWN1dG9yL25vZGVNb2RpZnlUYWJsZS5jCkBAIC0xNTM4LDYgKzE1Mzgs NyBAQCBFeGVjRGVsZXRlQWN0KE1vZGlmeVRhYmxlQ29udGV4dCAqY29udGV4dCwgUmVzdWx0UmVs SW5mbyAqcmVzdWx0UmVsSW5mbywKIAkJb3B0aW9ucyB8PSBUQUJMRV9ERUxFVEVfQ0hBTkdJTkdf UEFSVElUSU9OOwogCiAJcmV0dXJuIHRhYmxlX3R1cGxlX2RlbGV0ZShyZXN1bHRSZWxJbmZvLT5y aV9SZWxhdGlvbkRlc2MsIHR1cGxlaWQsCisJCQkJCQkJICBJbnZhbGlkVHJhbnNhY3Rpb25JZCwK IAkJCQkJCQkgIGVzdGF0ZS0+ZXNfb3V0cHV0X2NpZCwKIAkJCQkJCQkgIG9wdGlvbnMsCiAJCQkJ CQkJICBlc3RhdGUtPmVzX3NuYXBzaG90LApkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvcmVwbGlj YXRpb24vbG9naWNhbC9kZWNvZGUuYyBiL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwv ZGVjb2RlLmMKaW5kZXggYzVhOTIxMGRlMDcuLjg5OWZkMGVmYTRjIDEwMDY0NAotLS0gYS9zcmMv YmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL2RlY29kZS5jCisrKyBiL3NyYy9iYWNrZW5kL3Jl cGxpY2F0aW9uL2xvZ2ljYWwvZGVjb2RlLmMKQEAgLTQyNSw2ICs0MjUsMTggQEAgaGVhcDJfZGVj b2RlKExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCwgWExvZ1JlY29yZEJ1ZmZlciAqYnVmKQog CVRyYW5zYWN0aW9uSWQgeGlkID0gWExvZ1JlY0dldFhpZChidWYtPnJlY29yZCk7CiAJU25hcEJ1 aWxkICAqYnVpbGRlciA9IGN0eC0+c25hcHNob3RfYnVpbGRlcjsKIAorCS8qCisJICogWExPR19I RUFQMl9NVUxUSV9JTlNFUlQgaXMgbm90IHJlcGxheWVkLgorCSAqLworCUFzc2VydCgoWExvZ1Jl Y0dldEluZm8oYnVmLT5yZWNvcmQpICYgWExSX1hJRF9SRVBMQVlFRCkgPT0gMCk7CisKKwkvKiBT ZWUgaGVhcF9kZWNvZGUoKS4gKi8KKwlpZiAoY2hhbmdlX3VzZWxlc3NfZm9yX3JlcGFjayhidWYp KQorCXsKKwkJQXNzZXJ0KCFjdHgtPmZhc3RfZm9yd2FyZCk7CisJCXJldHVybjsKKwl9CisKIAlS ZW9yZGVyQnVmZmVyUHJvY2Vzc1hpZChjdHgtPnJlb3JkZXIsIHhpZCwgYnVmLT5vcmlncHRyKTsK IAogCS8qCkBAIC00NDIsOCArNDU0LDcgQEAgaGVhcDJfZGVjb2RlKExvZ2ljYWxEZWNvZGluZ0Nv bnRleHQgKmN0eCwgWExvZ1JlY29yZEJ1ZmZlciAqYnVmKQogCXsKIAkJY2FzZSBYTE9HX0hFQVAy X01VTFRJX0lOU0VSVDoKIAkJCWlmIChTbmFwQnVpbGRQcm9jZXNzQ2hhbmdlKGJ1aWxkZXIsIHhp ZCwgYnVmLT5vcmlncHRyKSAmJgotCQkJCSFjdHgtPmZhc3RfZm9yd2FyZCAmJgotCQkJCSFjaGFu Z2VfdXNlbGVzc19mb3JfcmVwYWNrKGJ1ZikpCisJCQkJIWN0eC0+ZmFzdF9mb3J3YXJkKQogCQkJ CURlY29kZU11bHRpSW5zZXJ0KGN0eCwgYnVmKTsKIAkJCWJyZWFrOwogCQljYXNlIFhMT0dfSEVB UDJfTkVXX0NJRDoKQEAgLTQ4OCw2ICs0OTksNTAgQEAgaGVhcF9kZWNvZGUoTG9naWNhbERlY29k aW5nQ29udGV4dCAqY3R4LCBYTG9nUmVjb3JkQnVmZmVyICpidWYpCiAJVHJhbnNhY3Rpb25JZCB4 aWQgPSBYTG9nUmVjR2V0WGlkKGJ1Zi0+cmVjb3JkKTsKIAlTbmFwQnVpbGQgICpidWlsZGVyID0g Y3R4LT5zbmFwc2hvdF9idWlsZGVyOwogCisJLyoKKwkgKiBSRVBBQ0sgZGVjb2Rpbmcgc2hvdWxk IG9ubHkgZGVjb2RlIGNoYW5nZXMgb2YgdGhlIHJlbGF0aW9uIGJlaW5nCisJICogcHJvY2Vzc2Vk LiBEZWNvZGluZyBjaGFuZ2VzIG9mIG90aGVyIHRhYmxlcyB3b3VsZCBub3Qgb25seSBpbnRyb2R1 Y2UKKwkgKiBwZXJmb3JtYW5jZSBvdmVyaGVhZCwgaXQgd291bGQgYWxzbyBtYWtlIHVzIHByb2Nl c3MgYWxyZWFkeSBjb21taXR0ZWQKKwkgKiAoYW5kIHJlcGxheWVkKSBYSURzIGFnYWluIC0gdGhh dCdzIHByb2JhYmx5IG5vdCBleHBlY3RlZCBieSB0aGUgbG9naWNhbAorCSAqIGRlY29kaW5nIHN5 c3RlbS4KKwkgKgorCSAqIFRoZSBwcm9ibGVtIGlzIHRoYXQgZHVyaW5nIHRoZSByZXBsYXksIFJF UEFDSyBjYW4gKGFuZCBkb2VzKSBhdm9pZCBXQUwKKwkgKiBsb2dnaW5nIHRoZSBleHRyYSBpbmZv cm1hdGlvbiBuZWVkZWQgZm9yIGxvZ2ljYWwgZGVjb2RpbmcsIGhvd2V2ZXIgdGhpcworCSAqIGlz IGNoZWNrZWQgaW4gRGVjb2RlSW5zZXJ0KCksIERlY29kZVVwZGF0ZSgpLCBldGMuLCB3aGljaCBp cyB0b28gbGF0ZS4KKwkgKiBNb3Jlb3ZlciwgdGhlc2UgZnVuY3Rpb24gZG8gbm90IGRpc3Rpbmd1 aXNoIHdoZXRoZXIgdGhlIHRyYW5zYWN0aW9uIGlzCisJICogYmVpbmcgZGVjb2RlZCB0aGUgZmly c3QgdGltZSwgb3IgaWYgdGhlIFdBTCByZWNvcmRzIG9yaWdpbmF0ZSBmcm9tIHRoZQorCSAqIHJl cGxheSBwaGFzZSBvZiBSRVBBQ0suCisJICoKKwkgKiBVbmxpa2UgdGhlIGZhc3QtZm9yd2FyZCBj YXNlIChzZWUgY29tbWVudHMgYmVsb3cpLCBSRVBBQ0sgZG9lcyBub3QgbmVlZAorCSAqIHRoZSBi YXNlIHNuYXBzaG90IGZvciB0aGUgdHJhbnNhY3Rpb24gdW50aWwgaXQgcmVjZWl2ZXMgYSBjaGFu Z2UgdGhhdAorCSAqIHJlYWxseSBuZWVkcyB0byBiZSBkZWNvZGVkLiBUaHVzIGl0J3Mgb2sgdG8g c2tpcAorCSAqIFNuYXBCdWlsZFByb2Nlc3NDaGFuZ2UoKS4KKwkgKgorCSAqIChXaXRoIGZhc3Qt Zm9yd2FyZCwgd2UgbXVzdCBub3Qgb21pdCB0aGUgc2V0dXAgb2YgdGhlIHRyYW5zYWN0aW9uIGJh c2UKKwkgKiBzbmFwc2hvdCBiZWNhdXNlIHRoZSBjaGFuZ2VzIHNraXBwZWQgYnkgZmFzdC1mb3J3 YXJkIGluaXRpYWxseSBtYXkgbmVlZAorCSAqIHRvIGJlIGRlY29kZWQgYWZ0ZXIgcmVzdGFydC4g VGh1cyB0aGUgYmFzZSBzbmFwc2hvdCBtYXkgYmUgbmVlZGVkIGFmdGVyCisJICogdGhlIHJlc3Rh cnQgdG9vLiBJZiB3ZSBkaWRuJ3QgY3JlYXRlIHRoZSBzbmFwc2hvdCBpbiB0aGUgZmFzdC1mb3J3 YXJkCisJICogbW9kZSwgdGhlIHNuYXBzaG90IGJ1aWxkZXIncyB4bWluIHdvdWxkIGFkdmFuY2Ug dG9vIGVhZ2VybHksIHNvIHRoZQorCSAqIHNhbWUgc25hcHNob3Qgd291bGRuJ3Qgd29yayBhZnRl ciByZXN0YXJ0LikKKwkgKgorCSAqIEZpcnN0LCBmaWx0ZXIgb3V0IFdBTCByZWNvcmRzIGdlbmVy YXRlZCBieSBSRVBBQ0sgKENPTkNVUlJFTlRMWSkKKwkgKiByZXBsYXlpbmcgdGhlIGRhdGEgY2hh bmdlcyBvZiBvdGhlciB0cmFuc2FjdGlvbnMgLSB0aGVzZSB0cmFuc2FjdGlvbnMKKwkgKiBoYXZl IGFscmVhZHkgYmVlbiBkZWNvZGVkLCBzbyBubyBiYWNrZW5kIC8gd29ya2VyIHNob3VsZCBkZWNv ZGUgdGhlbQorCSAqIGFnYWluLgorCSAqLworCWlmIChYTG9nUmVjR2V0SW5mbyhidWYtPnJlY29y ZCkgJiBYTFJfWElEX1JFUExBWUVEKQorCQlyZXR1cm47CisKKwkvKgorCSAqIE5vdyBsZXQgUkVQ QUNLIGRlY29kaW5nIHdvcmtlciBmaWx0ZXIgb3V0IGNoYW5nZXMgb2YgdGFibGVzIG90aGVyIHRo YW4KKwkgKiB0aGUgb25lIHdob3NlIFJFUEFDS2luZyBpdCdzIGludm9sdmVkIGluLgorCSAqLwor CWlmIChjaGFuZ2VfdXNlbGVzc19mb3JfcmVwYWNrKGJ1ZikpCisJeworCQlBc3NlcnQoIWN0eC0+ ZmFzdF9mb3J3YXJkKTsKKwkJcmV0dXJuOworCX0KKwogCVJlb3JkZXJCdWZmZXJQcm9jZXNzWGlk KGN0eC0+cmVvcmRlciwgeGlkLCBidWYtPm9yaWdwdHIpOwogCiAJLyoKQEAgLTUwNSw4ICs1NjAs NyBAQCBoZWFwX2RlY29kZShMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICpjdHgsIFhMb2dSZWNvcmRC dWZmZXIgKmJ1ZikKIAl7CiAJCWNhc2UgWExPR19IRUFQX0lOU0VSVDoKIAkJCWlmIChTbmFwQnVp bGRQcm9jZXNzQ2hhbmdlKGJ1aWxkZXIsIHhpZCwgYnVmLT5vcmlncHRyKSAmJgotCQkJCSFjdHgt PmZhc3RfZm9yd2FyZCAmJgotCQkJCSFjaGFuZ2VfdXNlbGVzc19mb3JfcmVwYWNrKGJ1ZikpCisJ CQkJIWN0eC0+ZmFzdF9mb3J3YXJkKQogCQkJCURlY29kZUluc2VydChjdHgsIGJ1Zik7CiAJCQli cmVhazsKIApAQCAtNTE4LDIyICs1NzIsMTkgQEAgaGVhcF9kZWNvZGUoTG9naWNhbERlY29kaW5n Q29udGV4dCAqY3R4LCBYTG9nUmVjb3JkQnVmZmVyICpidWYpCiAJCWNhc2UgWExPR19IRUFQX0hP VF9VUERBVEU6CiAJCWNhc2UgWExPR19IRUFQX1VQREFURToKIAkJCWlmIChTbmFwQnVpbGRQcm9j ZXNzQ2hhbmdlKGJ1aWxkZXIsIHhpZCwgYnVmLT5vcmlncHRyKSAmJgotCQkJCSFjdHgtPmZhc3Rf Zm9yd2FyZCAmJgotCQkJCSFjaGFuZ2VfdXNlbGVzc19mb3JfcmVwYWNrKGJ1ZikpCisJCQkJIWN0 eC0+ZmFzdF9mb3J3YXJkKQogCQkJCURlY29kZVVwZGF0ZShjdHgsIGJ1Zik7CiAJCQlicmVhazsK IAogCQljYXNlIFhMT0dfSEVBUF9ERUxFVEU6CiAJCQlpZiAoU25hcEJ1aWxkUHJvY2Vzc0NoYW5n ZShidWlsZGVyLCB4aWQsIGJ1Zi0+b3JpZ3B0cikgJiYKLQkJCQkhY3R4LT5mYXN0X2ZvcndhcmQg JiYKLQkJCQkhY2hhbmdlX3VzZWxlc3NfZm9yX3JlcGFjayhidWYpKQorCQkJCSFjdHgtPmZhc3Rf Zm9yd2FyZCkKIAkJCQlEZWNvZGVEZWxldGUoY3R4LCBidWYpOwogCQkJYnJlYWs7CiAKIAkJY2Fz ZSBYTE9HX0hFQVBfVFJVTkNBVEU6CiAJCQlpZiAoU25hcEJ1aWxkUHJvY2Vzc0NoYW5nZShidWls ZGVyLCB4aWQsIGJ1Zi0+b3JpZ3B0cikgJiYKLQkJCQkhY3R4LT5mYXN0X2ZvcndhcmQgJiYKLQkJ CQkhY2hhbmdlX3VzZWxlc3NfZm9yX3JlcGFjayhidWYpKQorCQkJCSFjdHgtPmZhc3RfZm9yd2Fy ZCkKIAkJCQlEZWNvZGVUcnVuY2F0ZShjdHgsIGJ1Zik7CiAJCQlicmVhazsKIApAQCAtNTQ5LDgg KzYwMCw3IEBAIGhlYXBfZGVjb2RlKExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKmN0eCwgWExvZ1Jl Y29yZEJ1ZmZlciAqYnVmKQogCiAJCWNhc2UgWExPR19IRUFQX0NPTkZJUk06CiAJCQlpZiAoU25h cEJ1aWxkUHJvY2Vzc0NoYW5nZShidWlsZGVyLCB4aWQsIGJ1Zi0+b3JpZ3B0cikgJiYKLQkJCQkh Y3R4LT5mYXN0X2ZvcndhcmQgJiYKLQkJCQkhY2hhbmdlX3VzZWxlc3NfZm9yX3JlcGFjayhidWYp KQorCQkJCSFjdHgtPmZhc3RfZm9yd2FyZCkKIAkJCQlEZWNvZGVTcGVjQ29uZmlybShjdHgsIGJ1 Zik7CiAJCQlicmVhazsKIApAQCAtOTY3LDE1ICsxMDE3LDE3IEBAIERlY29kZUluc2VydChMb2dp Y2FsRGVjb2RpbmdDb250ZXh0ICpjdHgsIFhMb2dSZWNvcmRCdWZmZXIgKmJ1ZikKIAlEZWNvZGVY TG9nVHVwbGUodHVwbGVkYXRhLCBkYXRhbGVuLCBjaGFuZ2UtPmRhdGEudHAubmV3dHVwbGUpOwog CiAJLyoKLQkgKiBSRVBBQ0sgKENPTkNVUlJFTlRMWSkgbmVlZHMgYmxvY2sgbnVtYmVyIHRvIGNo ZWNrIGlmIHRoZSBjb3JyZXNwb25kaW5nCi0JICogcGFydCBvZiB0aGUgdGFibGUgd2FzIGFscmVh ZHkgY29waWVkLiAgWFhYIFNob3VsZCB3ZSBvbmx5IGRvIHRoaXMgaWYKLQkgKiBBbVJlcGFja1dv cmtlcigpPyBJdCBtaWdodCBzYXZlIGEgZmV3IGN5Y2xlcywgYnV0IG5vdCBzdXJlIGl0J3MgZ29v ZCB0bwotCSAqIGxlYXZlIHRoZSBmaWVsZHMgdW5zZXQgaW4gb3RoZXIgY2FzZXMuCisJICogUkVQ QUNLIChDT05DVVJSRU5UTFkpIG5lZWRzIHhtaW4gdG8gcHJlc2VydmUgdmlzaWJpbGl0eSBpbmZv cm1hdGlvbiBhbmQKKwkgKiBibG9jayBudW1iZXIgdG8gY2hlY2sgaWYgdGhlIGNvcnJlc3BvbmRp bmcgcGFydCBvZiB0aGUgdGFibGUgd2FzCisJICogYWxyZWFkeSBjb3BpZWQuICBYWFggU2hvdWxk IHdlIG9ubHkgZG8gdGhpcyBpZiBBbVJlcGFja1dvcmtlcigpPyBJdAorCSAqIG1pZ2h0IHNhdmUg YSBmZXcgY3ljbGVzLCBidXQgbm90IHN1cmUgaXQncyBnb29kIHRvIGxlYXZlIHRoZSBmaWVsZHMK KwkgKiB1bnNldCBpbiBvdGhlciBjYXNlcy4KIAkgKi8KIAl7CiAJCUhlYXBUdXBsZUhlYWRlciBo ZWFkZXI7CiAKIAkJaGVhZGVyID0gY2hhbmdlLT5kYXRhLnRwLm5ld3R1cGxlLT50X2RhdGE7CisJ CUhlYXBUdXBsZUhlYWRlclNldFhtaW4oaGVhZGVyLCBYTG9nUmVjR2V0WGlkKHIpKTsKIAkJLyog b2ZmbnVtIGlzIG5vdCByZWFsbHkgbmVlZGVkLCBidXQgbGV0J3Mgc2V0IHZhbGlkIHBvaW50ZXIu ICovCiAJCUl0ZW1Qb2ludGVyU2V0KCZoZWFkZXItPnRfY3RpZCwgYmxrbnVtLCB4bHJlYy0+b2Zm bnVtKTsKIAl9CkBAIC0xMDQ5LDE0ICsxMTAxLDE1IEBAIERlY29kZVVwZGF0ZShMb2dpY2FsRGVj b2RpbmdDb250ZXh0ICpjdHgsIFhMb2dSZWNvcmRCdWZmZXIgKmJ1ZikKIAkJRGVjb2RlWExvZ1R1 cGxlKGRhdGEsIGRhdGFsZW4sIGNoYW5nZS0+ZGF0YS50cC5uZXd0dXBsZSk7CiAKIAkJLyoKLQkJ ICogUkVQQUNLIChDT05DVVJSRU5UTFkpIG5lZWRzIGJsb2NrIG51bWJlcnMgdG8gY2hlY2sgaWYg dGhlCi0JCSAqIGNvcnJlc3BvbmRpbmcgcGFydCBvZiB0aGUgdGFibGUgd2FzIGFscmVhZHkgY29w aWVkLiBYWFggRG8gdGhpcwotCQkgKiBvbmx5IGlmIEFtUmVwYWNrV29ya2VyKCk/CisJCSAqIFJF UEFDSyAoQ09OQ1VSUkVOVExZKSBuZWVkcyB4bWluIHRvIHByZXNlcnZlIHZpc2liaWxpdHkgaW5m b3JtYXRpb24KKwkJICogYW5kIGJsb2NrIG51bWJlcnMgdG8gY2hlY2sgaWYgdGhlIGNvcnJlc3Bv bmRpbmcgcGFydCBvZiB0aGUgdGFibGUKKwkJICogd2FzIGFscmVhZHkgY29waWVkLiBYWFggRG8g dGhpcyBvbmx5IGlmIEFtUmVwYWNrV29ya2VyKCk/CiAJCSAqLwogCQl7CiAJCQlIZWFwVHVwbGVI ZWFkZXIgaGVhZGVyOwogCiAJCQloZWFkZXIgPSBjaGFuZ2UtPmRhdGEudHAubmV3dHVwbGUtPnRf ZGF0YTsKKwkJCUhlYXBUdXBsZUhlYWRlclNldFhtaW4oaGVhZGVyLCBYTG9nUmVjR2V0WGlkKHIp KTsKIAkJCS8qIG9mZm51bSBpcyBub3QgcmVhbGx5IG5lZWRlZCwgYnV0IGxldCdzIHNldCB2YWxp ZCBwb2ludGVyLiAqLwogCQkJSXRlbVBvaW50ZXJTZXQoJmhlYWRlci0+dF9jdGlkLCBuZXdfYmxr bnVtLCB4bHJlYy0+bmV3X29mZm51bSk7CiAJCQljaGFuZ2UtPmRhdGEudHAub2xkX2Jsa251bSA9 IG9sZF9ibGtudW07CkBAIC0xMTQ1LDE0ICsxMTk4LDIwIEBAIERlY29kZURlbGV0ZShMb2dpY2Fs RGVjb2RpbmdDb250ZXh0ICpjdHgsIFhMb2dSZWNvcmRCdWZmZXIgKmJ1ZikKIAkJCQkJCWRhdGFs ZW4sIGNoYW5nZS0+ZGF0YS50cC5vbGR0dXBsZSk7CiAKIAkJLyoKLQkJICogUkVQQUNLIChDT05D VVJSRU5UTFkpIG5lZWRzIGJsb2NrIG51bWJlciB0byBjaGVjayBpZiB0aGUKLQkJICogY29ycmVz cG9uZGluZyBwYXJ0IG9mIHRoZSB0YWJsZSB3YXMgYWxyZWFkeSBjb3BpZWQuIFhYWCBEbyB0aGlz Ci0JCSAqIG9ubHkgaWYgQW1SZXBhY2tXb3JrZXIoKT8KKwkJICogUkVQQUNLIChDT05DVVJSRU5U TFkpIG5lZWRzIHhtYXggdG8gcHJlc2VydmUgdmlzaWJpbGl0eSBpbmZvcm1hdGlvbgorCQkgKiBh bmQgYmxvY2sgbnVtYmVyIHRvIGNoZWNrIGlmIHRoZSBjb3JyZXNwb25kaW5nIHBhcnQgb2YgdGhl IHRhYmxlCisJCSAqIHdhcyBhbHJlYWR5IGNvcGllZC4gWFhYIERvIHRoaXMgb25seSBpZiBBbVJl cGFja1dvcmtlcigpPwogCQkgKi8KIAkJewogCQkJSGVhcFR1cGxlSGVhZGVyIGhlYWRlcjsKIAog CQkJaGVhZGVyID0gY2hhbmdlLT5kYXRhLnRwLm9sZHR1cGxlLT50X2RhdGE7CisKKwkJCS8qCisJ CQkgKiB4bWF4IG1ha2VzIG1vcmUgc2Vuc2UgaGVyZSwgYnV0IHdlIGRvbid0IHdhbnQgcmVzdG9y ZV90dXBsZSgpCisJCQkgKiB0byBwYXkgYXR0ZW50aW9uIHRvIHRoZSBjaGFuZ2Uga2luZCwgc28g dXNlIHhtaW4gaGVyZSBhcyB3ZWxsLgorCQkJICovCisJCQlIZWFwVHVwbGVIZWFkZXJTZXRYbWlu KGhlYWRlciwgWExvZ1JlY0dldFhpZChyKSk7CiAJCQkvKiBvZmZudW0gaXMgbm90IHJlYWxseSBu ZWVkZWQsIGJ1dCBsZXQncyBzZXQgdmFsaWQgcG9pbnRlci4gKi8KIAkJCUl0ZW1Qb2ludGVyU2V0 KCZoZWFkZXItPnRfY3RpZCwgYmxrbnVtLCB4bHJlYy0+b2ZmbnVtKTsKIAkJfQpAQCAtMTI5OCwx MyArMTM1NywxNiBAQCBEZWNvZGVNdWx0aUluc2VydChMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICpj dHgsIFhMb2dSZWNvcmRCdWZmZXIgKmJ1ZikKIAkJCWNoYW5nZS0+ZGF0YS50cC5jbGVhcl90b2Fz dF9hZnRlcndhcmRzID0gZmFsc2U7CiAKIAkJLyoKLQkJICogUkVQQUNLIChDT05DVVJSRU5UTFkp IG5lZWRzIGJsb2NrIG51bWJlciB0byBjaGVjayBpZiB0aGUKLQkJICogY29ycmVzcG9uZGluZyBw YXJ0IG9mIHRoZSB0YWJsZSB3YXMgYWxyZWFkeSBjb3BpZWQuCisJCSAqIFJFUEFDSyAoQ09OQ1VS UkVOVExZKSBuZWVkcyB4bWluIHRvIHByZXNlcnZlIHZpc2liaWxpdHkgaW5mb3JtYXRpb24KKwkJ ICogYW5kIGJsb2NrIG51bWJlciB0byBjaGVjayBpZiB0aGUgY29ycmVzcG9uZGluZyBwYXJ0IG9m IHRoZSB0YWJsZQorCQkgKiB3YXMgYWxyZWFkeSBjb3BpZWQuCiAJCSAqLwogCQlpZiAoQW1SZXBh Y2tXb3JrZXIoKSkKIAkJewogCQkJT2Zmc2V0TnVtYmVyIG9mZm51bTsKIAorCQkJSGVhcFR1cGxl SGVhZGVyU2V0WG1pbihoZWFkZXIsIFhMb2dSZWNHZXRYaWQocikpOworCiAJCQkvKgogCQkJICog b2ZmbnVtIGlzIG5vdCByZWFsbHkgbmVlZGVkLCBidXQgbGV0J3Mgc2V0IHZhbGlkIHBvaW50ZXIu IChJdAogCQkJICogd2lsbCBiZSBpbnZhbGlkIGFueXdheSBpZiB0aGUgcGFnZSB3YXMgaW5pdGlh bGx5IGVtcHR5LikKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwv cmVvcmRlcmJ1ZmZlci5jIGIvc3JjL2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC9yZW9yZGVy YnVmZmVyLmMKaW5kZXggMTUyZTdkMzQ0MDAuLjc1MTIwZGRmYTg1IDEwMDY0NAotLS0gYS9zcmMv YmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL3Jlb3JkZXJidWZmZXIuYworKysgYi9zcmMvYmFj a2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL3Jlb3JkZXJidWZmZXIuYwpAQCAtNTQxNiw2ICs1NDE2 LDkgQEAgUmVvcmRlckJ1ZmZlclRvYXN0UmVwbGFjZShSZW9yZGVyQnVmZmVyICpyYiwgUmVvcmRl ckJ1ZmZlclRYTiAqdHhuLAogCSAqIFNob3VsZG4ndCB3ZSBhZGQgYSBuZXcgZmllbGQgdG8gUmVv cmRlckJ1ZmZlckNoYW5nZSBpbnN0ZWFkPwogCSAqLwogCXRtcGh0dXAtPnRfZGF0YS0+dF9jdGlk ID0gbmV3dHVwLT50X2RhdGEtPnRfY3RpZDsKKwkvKiBMaWtld2lzZSwgcHJlc2VydmUgWElEIC0g UkVQQUNLIG5lZWRzIGl0IHRvIGJlIE1WQ0Mtc2FmZS4gKi8KKwlIZWFwVHVwbGVIZWFkZXJTZXRY bWluKHRtcGh0dXAtPnRfZGF0YSwKKwkJCQkJCSAgIEhlYXBUdXBsZUhlYWRlckdldFhtaW4obmV3 dHVwLT50X2RhdGEpKTsKIAogCW1lbWNweShuZXd0dXAtPnRfZGF0YSwgdG1waHR1cC0+dF9kYXRh LCB0bXBodHVwLT50X2xlbik7CiAJbmV3dHVwLT50X2xlbiA9IHRtcGh0dXAtPnRfbGVuOwpkaWZm IC0tZ2l0IGEvc3JjL2JhY2tlbmQvdXRpbHMvYWN0aXZpdHkvd2FpdF9ldmVudF9uYW1lcy50eHQg Yi9zcmMvYmFja2VuZC91dGlscy9hY3Rpdml0eS93YWl0X2V2ZW50X25hbWVzLnR4dAppbmRleCAz ZDM2NmZkMTExNC4uOGRhZjkzZmEzMDUgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3V0aWxzL2Fj dGl2aXR5L3dhaXRfZXZlbnRfbmFtZXMudHh0CisrKyBiL3NyYy9iYWNrZW5kL3V0aWxzL2FjdGl2 aXR5L3dhaXRfZXZlbnRfbmFtZXMudHh0CkBAIC0xODUsNiArMTg1LDcgQEAgUEdfU0xFRVAJIldh aXRpbmcgZHVlIHRvIGEgY2FsbCB0byA8ZnVuY3Rpb24+cGdfc2xlZXA8L2Z1bmN0aW9uPiBvciBh IHNpYmxpbmcgZnUKIFJFQ09WRVJZX0FQUExZX0RFTEFZCSJXYWl0aW5nIHRvIGFwcGx5IFdBTCBk dXJpbmcgcmVjb3ZlcnkgYmVjYXVzZSBvZiBhIGRlbGF5IHNldHRpbmcuIgogUkVDT1ZFUllfUkVU UklFVkVfUkVUUllfSU5URVJWQUwJIldhaXRpbmcgZHVyaW5nIHJlY292ZXJ5IHdoZW4gV0FMIGRh dGEgaXMgbm90IGF2YWlsYWJsZSBmcm9tIGFueSBzb3VyY2UgKDxmaWxlbmFtZT5wZ193YWw8L2Zp bGVuYW1lPiwgYXJjaGl2ZSBvciBzdHJlYW0pLiIKIFJFR0lTVEVSX1NZTkNfUkVRVUVTVAkiV2Fp dGluZyB3aGlsZSBzZW5kaW5nIHN5bmNocm9uaXphdGlvbiByZXF1ZXN0cyB0byB0aGUgY2hlY2tw b2ludGVyLCBiZWNhdXNlIHRoZSByZXF1ZXN0IHF1ZXVlIGlzIGZ1bGwuIgorUkVQQUNLX01WQ0Nf U0FGRVRZCSJXYWl0aW5nIHVudGlsIG5vdCBjb3BpZWQgdHVwbGVzIGFyZSBjb25zaWRlcmVkIGRl YWQuIgogU1BJTl9ERUxBWQkiV2FpdGluZyB3aGlsZSBhY3F1aXJpbmcgYSBjb250ZW5kZWQgc3Bp bmxvY2suIgogVkFDVVVNX0RFTEFZCSJXYWl0aW5nIGluIGEgY29zdC1iYXNlZCB2YWN1dW0gZGVs YXkgcG9pbnQuIgogVkFDVVVNX1RSVU5DQVRFCSJXYWl0aW5nIHRvIGFjcXVpcmUgYW4gZXhjbHVz aXZlIGxvY2sgdG8gdHJ1bmNhdGUgb2ZmIGFueSBlbXB0eSBwYWdlcyBhdCB0aGUgZW5kIG9mIGEg dGFibGUgdmFjdXVtZWQuIgpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvYWNjZXNzL2hlYXBhbS5o IGIvc3JjL2luY2x1ZGUvYWNjZXNzL2hlYXBhbS5oCmluZGV4IDllMzU5NjFmYjllLi4yNmUwMDM5 NDg0MSAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvYWNjZXNzL2hlYXBhbS5oCisrKyBiL3NyYy9p bmNsdWRlL2FjY2Vzcy9oZWFwYW0uaApAQCAtMzgxLDYgKzM4MSw3IEBAIGV4dGVybiB2b2lkIGhl YXBfbXVsdGlfaW5zZXJ0KFJlbGF0aW9uIHJlbGF0aW9uLCBUdXBsZVRhYmxlU2xvdCAqKnNsb3Rz LAogCQkJCQkJCSAgaW50IG50dXBsZXMsIENvbW1hbmRJZCBjaWQsIHVpbnQzMiBvcHRpb25zLAog CQkJCQkJCSAgQnVsa0luc2VydFN0YXRlIGJpc3RhdGUpOwogZXh0ZXJuIFRNX1Jlc3VsdCBoZWFw X2RlbGV0ZShSZWxhdGlvbiByZWxhdGlvbiwgY29uc3QgSXRlbVBvaW50ZXJEYXRhICp0aWQsCisJ CQkJCQkJIFRyYW5zYWN0aW9uSWQgeGlkLAogCQkJCQkJCSBDb21tYW5kSWQgY2lkLCB1aW50MzIg b3B0aW9ucywgU25hcHNob3QgY3Jvc3NjaGVjaywKIAkJCQkJCQkgYm9vbCB3YWl0LCBUTV9GYWls dXJlRGF0YSAqdG1mZCk7CiBleHRlcm4gdm9pZCBoZWFwX2ZpbmlzaF9zcGVjdWxhdGl2ZShSZWxh dGlvbiByZWxhdGlvbiwgY29uc3QgSXRlbVBvaW50ZXJEYXRhICp0aWQpOwpAQCAtNDIzLDcgKzQy NCw4IEBAIGV4dGVybiBib29sIGhlYXBfdHVwbGVfc2hvdWxkX2ZyZWV6ZShIZWFwVHVwbGVIZWFk ZXIgdHVwbGUsCiBleHRlcm4gYm9vbCBoZWFwX3R1cGxlX25lZWRzX2V2ZW50dWFsX2ZyZWV6ZShI ZWFwVHVwbGVIZWFkZXIgdHVwbGUpOwogCiBleHRlcm4gdm9pZCBzaW1wbGVfaGVhcF9pbnNlcnQo UmVsYXRpb24gcmVsYXRpb24sIEhlYXBUdXBsZSB0dXApOwotZXh0ZXJuIHZvaWQgc2ltcGxlX2hl YXBfZGVsZXRlKFJlbGF0aW9uIHJlbGF0aW9uLCBjb25zdCBJdGVtUG9pbnRlckRhdGEgKnRpZCk7 CitleHRlcm4gdm9pZCBzaW1wbGVfaGVhcF9kZWxldGUoUmVsYXRpb24gcmVsYXRpb24sIGNvbnN0 IEl0ZW1Qb2ludGVyRGF0YSAqdGlkLAorCQkJCQkJCSAgIFRyYW5zYWN0aW9uSWQgeGlkKTsKIGV4 dGVybiB2b2lkIHNpbXBsZV9oZWFwX3VwZGF0ZShSZWxhdGlvbiByZWxhdGlvbiwgY29uc3QgSXRl bVBvaW50ZXJEYXRhICpvdGlkLAogCQkJCQkJCSAgIEhlYXBUdXBsZSB0dXAsIFRVX1VwZGF0ZUlu ZGV4ZXMgKnVwZGF0ZV9pbmRleGVzKTsKIApkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvYWNjZXNz L2hlYXB0b2FzdC5oIGIvc3JjL2luY2x1ZGUvYWNjZXNzL2hlYXB0b2FzdC5oCmluZGV4IDRjM2Zk YThhNWY5Li5jNzRkNTllZGI2YSAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvYWNjZXNzL2hlYXB0 b2FzdC5oCisrKyBiL3NyYy9pbmNsdWRlL2FjY2Vzcy9oZWFwdG9hc3QuaApAQCAtMTQsNiArMTQs NyBAQAogI2RlZmluZSBIRUFQVE9BU1RfSAogCiAjaW5jbHVkZSAiYWNjZXNzL2h0dXBfZGV0YWls cy5oIgorI2luY2x1ZGUgImFjY2Vzcy9yZXdyaXRlaGVhcC5oIgogI2luY2x1ZGUgInN0b3JhZ2Uv bG9ja2RlZnMuaCIKICNpbmNsdWRlICJ1dGlscy9yZWxjYWNoZS5oIgogCkBAIC0xMDksNyArMTEw LDkgQEAKICAqIC0tLS0tLS0tLS0KICAqLwogZXh0ZXJuIEhlYXBUdXBsZSBoZWFwX3RvYXN0X2lu c2VydF9vcl91cGRhdGUoUmVsYXRpb24gcmVsLCBIZWFwVHVwbGUgbmV3dHVwLAotCQkJCQkJCQkJ CQkgSGVhcFR1cGxlIG9sZHR1cCwgdWludDMyIG9wdGlvbnMpOworCQkJCQkJCQkJCQkgSGVhcFR1 cGxlIG9sZHR1cCwKKwkJCQkJCQkJCQkJIFJld3JpdGVTdGF0ZSByd3N0YXRlLAorCQkJCQkJCQkJ CQkgdWludDMyIG9wdGlvbnMpOwogCiAvKiAtLS0tLS0tLS0tCiAgKiBoZWFwX3RvYXN0X2RlbGV0 ZSAtCkBAIC0xMTgsNyArMTIxLDcgQEAgZXh0ZXJuIEhlYXBUdXBsZSBoZWFwX3RvYXN0X2luc2Vy dF9vcl91cGRhdGUoUmVsYXRpb24gcmVsLCBIZWFwVHVwbGUgbmV3dHVwLAogICogLS0tLS0tLS0t LQogICovCiBleHRlcm4gdm9pZCBoZWFwX3RvYXN0X2RlbGV0ZShSZWxhdGlvbiByZWwsIEhlYXBU dXBsZSBvbGR0dXAsCi0JCQkJCQkJICBib29sIGlzX3NwZWN1bGF0aXZlKTsKKwkJCQkJCQkgIGJv b2wgaXNfc3BlY3VsYXRpdmUsIFRyYW5zYWN0aW9uSWQgeGlkKTsKIAogLyogLS0tLS0tLS0tLQog ICogdG9hc3RfZmxhdHRlbl90dXBsZSAtCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9hY2Nlc3Mv cmV3cml0ZWhlYXAuaCBiL3NyYy9pbmNsdWRlL2FjY2Vzcy9yZXdyaXRlaGVhcC5oCmluZGV4IDZj Y2Y3YjQ1YzA0Li41ODEwNjQ3N2ViMiAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvYWNjZXNzL3Jl d3JpdGVoZWFwLmgKKysrIGIvc3JjL2luY2x1ZGUvYWNjZXNzL3Jld3JpdGVoZWFwLmgKQEAgLTIy LDEyICsyMiwyMiBAQAogdHlwZWRlZiBzdHJ1Y3QgUmV3cml0ZVN0YXRlRGF0YSAqUmV3cml0ZVN0 YXRlOwogCiBleHRlcm4gUmV3cml0ZVN0YXRlIGJlZ2luX2hlYXBfcmV3cml0ZShSZWxhdGlvbiBv bGRfaGVhcCwgUmVsYXRpb24gbmV3X2hlYXAsCi0JCQkJCQkJCQkgICBUcmFuc2FjdGlvbklkIG9s ZGVzdF94bWluLCBUcmFuc2FjdGlvbklkIGZyZWV6ZV94aWQsCi0JCQkJCQkJCQkgICBNdWx0aVhh Y3RJZCBjdXRvZmZfbXVsdGkpOworCQkJCQkJCQkJICAgVHJhbnNhY3Rpb25JZCBvbGRlc3RfeG1p biwKKwkJCQkJCQkJCSAgIFRyYW5zYWN0aW9uSWQgZnJlZXplX3hpZCwKKwkJCQkJCQkJCSAgIE11 bHRpWGFjdElkIGN1dG9mZl9tdWx0aSwKKwkJCQkJCQkJCSAgIGJvb2wgbm9fY2hhaW5zKTsKIGV4 dGVybiB2b2lkIGVuZF9oZWFwX3Jld3JpdGUoUmV3cml0ZVN0YXRlIHN0YXRlKTsKIGV4dGVybiB2 b2lkIHJld3JpdGVfaGVhcF90dXBsZShSZXdyaXRlU3RhdGUgc3RhdGUsIEhlYXBUdXBsZSBvbGRf dHVwbGUsCiAJCQkJCQkJICAgSGVhcFR1cGxlIG5ld190dXBsZSk7CitleHRlcm4gdm9pZCByZXdy aXRlX2hlYXBfdHVwbGVfbm9fY2hhaW5zKFJld3JpdGVTdGF0ZSBzdGF0ZSwKKwkJCQkJCQkJCQkg SGVhcFR1cGxlIG9sZF90dXBsZSwKKwkJCQkJCQkJCQkgSGVhcFR1cGxlIG5ld190dXBsZSwKKwkJ CQkJCQkJCQkgYm9vbCBjbGVhcl94bWF4LAorCQkJCQkJCQkJCSBib29sIGZyZWV6ZSk7CiBleHRl cm4gYm9vbCByZXdyaXRlX2hlYXBfZGVhZF90dXBsZShSZXdyaXRlU3RhdGUgc3RhdGUsIEhlYXBU dXBsZSBvbGRfdHVwbGUpOworZXh0ZXJuIHZvaWQgcmV3cml0ZV9mcmVlemVfdHVwbGUoUmV3cml0 ZVN0YXRlIHN0YXRlLCBIZWFwVHVwbGUgdHVwbGUpOworZXh0ZXJuIHZvaWQgcmV3cml0ZV9jb3B5 X3Zpc2liaWxpdHlfaW5mbyhIZWFwVHVwbGUgbmV3X3R1cGxlLAorCQkJCQkJCQkJCSBIZWFwVHVw bGUgb2xkX3R1cGxlKTsKIAogLyoKICAqIE9uLURpc2sgZGF0YSBmb3JtYXQgZm9yIGFuIGluZGl2 aWR1YWwgbG9naWNhbCByZXdyaXRlIG1hcHBpbmcuCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9h Y2Nlc3MvdGFibGVhbS5oIGIvc3JjL2luY2x1ZGUvYWNjZXNzL3RhYmxlYW0uaAppbmRleCBhNWFk NzZkMzcyMS4uZGQ3NDIzMjQ1NWMgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2FjY2Vzcy90YWJs ZWFtLmgKKysrIGIvc3JjL2luY2x1ZGUvYWNjZXNzL3RhYmxlYW0uaApAQCAtMjkzLDYgKzI5Mywx MiBAQCB0eXBlZGVmIHN0cnVjdCBUTV9JbmRleERlbGV0ZU9wCiAvKiAib3B0aW9ucyIgZmxhZyBi aXRzIGZvciB0YWJsZV90dXBsZV91cGRhdGUgKi8KICNkZWZpbmUgVEFCTEVfVVBEQVRFX05PX0xP R0lDQUwJCQkJCSgxIDw8IDApCiAKKy8qCisgKiBGb3IgSU5TRVJUIG9yIFVQREFURSwgdXNlIFhJ RCAoeG1pbikgY29udGFpbmVkIHRoZSBpbiBuZXcgdHVwbGUgcmF0aGVyIHRoYW4KKyAqIHRoZSBY SUQgb2YgdGhlIGN1cnJlbnQgdHJhbnNhY3Rpb24uCisgKi8KKyNkZWZpbmUgVEFCTEVfUkVVU0Vf WElECQkJCQkJCSgxIDw8IDMxKQorCiAvKiBmbGFnIGJpdHMgZm9yIHRhYmxlX3R1cGxlX2xvY2sg Ki8KIC8qIEZvbGxvdyB0dXBsZXMgd2hvc2UgdXBkYXRlIGlzIGluIHByb2dyZXNzIGlmIGxvY2sg bW9kZXMgZG9uJ3QgY29uZmxpY3QgICovCiAjZGVmaW5lIFRVUExFX0xPQ0tfRkxBR19MT0NLX1VQ REFURV9JTl9QUk9HUkVTUwkoMSA8PCAwKQpAQCAtNTY4LDYgKzU3NCw3IEBAIHR5cGVkZWYgc3Ry dWN0IFRhYmxlQW1Sb3V0aW5lCiAJLyogc2VlIHRhYmxlX3R1cGxlX2RlbGV0ZSgpIGZvciByZWZl cmVuY2UgYWJvdXQgcGFyYW1ldGVycyAqLwogCVRNX1Jlc3VsdAkoKnR1cGxlX2RlbGV0ZSkgKFJl bGF0aW9uIHJlbCwKIAkJCQkJCQkJIEl0ZW1Qb2ludGVyIHRpZCwKKwkJCQkJCQkJIFRyYW5zYWN0 aW9uSWQgeGlkLAogCQkJCQkJCQkgQ29tbWFuZElkIGNpZCwKIAkJCQkJCQkJIHVpbnQzMiBvcHRp b25zLAogCQkJCQkJCQkgU25hcHNob3Qgc25hcHNob3QsCkBAIC0xNDc2LDYgKzE0ODMsMTQgQEAg c3RhdGljIGlubGluZSB2b2lkCiB0YWJsZV90dXBsZV9pbnNlcnQoUmVsYXRpb24gcmVsLCBUdXBs ZVRhYmxlU2xvdCAqc2xvdCwgQ29tbWFuZElkIGNpZCwKIAkJCQkgICB1aW50MzIgb3B0aW9ucywg QnVsa0luc2VydFN0YXRlRGF0YSAqYmlzdGF0ZSkKIHsKKwkvKgorCSAqIFRBQkxFX1JFVVNFX1hJ RCByZXN0cmljdHMgdGhlIHNsb3QgdHlwZSBiZWNhdXNlIG5vdCBhbGwgc2xvdHMgcHJlc2VydmUK KwkgKiB0aGUgdmlzaWJpbGl0eSBpbmZvcm1hdGlvbi4gWFhYIElzbid0IHRoaXMgYSByZWFzb24g dG8gcGFzcyB0aGUgeGlkIGFzCisJICogYW4gYXJndW1lbnQ/CisJICovCisJQXNzZXJ0KChvcHRp b25zICYgVEFCTEVfUkVVU0VfWElEKSA9PSAwIHx8IFRUU19JU19IRUFQVFVQTEUoc2xvdCkgfHwK KwkJICAgVFRTX0lTX0JVRkZFUlRVUExFKHNsb3QpKTsKKwogCXJlbC0+cmRfdGFibGVhbS0+dHVw bGVfaW5zZXJ0KHJlbCwgc2xvdCwgY2lkLCBvcHRpb25zLAogCQkJCQkJCQkgIGJpc3RhdGUpOwog fQpAQCAtMTQ5Nyw2ICsxNTEyLDkgQEAgdGFibGVfdHVwbGVfaW5zZXJ0X3NwZWN1bGF0aXZlKFJl bGF0aW9uIHJlbCwgVHVwbGVUYWJsZVNsb3QgKnNsb3QsCiAJCQkJCQkJICAgQnVsa0luc2VydFN0 YXRlRGF0YSAqYmlzdGF0ZSwKIAkJCQkJCQkgICB1aW50MzIgc3BlY1Rva2VuKQogeworCS8qIFRB QkxFX1JFVVNFX1hJRCBpcyBjdXJyZW50bHkgbm90IG5lZWRlZCBoZXJlLiAqLworCUFzc2VydCgo b3B0aW9ucyAmIFRBQkxFX1JFVVNFX1hJRCkgPT0gMCk7CisKIAlyZWwtPnJkX3RhYmxlYW0tPnR1 cGxlX2luc2VydF9zcGVjdWxhdGl2ZShyZWwsIHNsb3QsIGNpZCwgb3B0aW9ucywKIAkJCQkJCQkJ CQkJICBiaXN0YXRlLCBzcGVjVG9rZW4pOwogfQpAQCAtMTU0NCw2ICsxNTYyLDcgQEAgdGFibGVf bXVsdGlfaW5zZXJ0KFJlbGF0aW9uIHJlbCwgVHVwbGVUYWJsZVNsb3QgKipzbG90cywgaW50IG5z bG90cywKICAqIElucHV0IHBhcmFtZXRlcnM6CiAgKglyZWwgLSB0YWJsZSB0byBiZSBtb2RpZmll ZCAoY2FsbGVyIG11c3QgaG9sZCBzdWl0YWJsZSBsb2NrKQogICoJdGlkIC0gVElEIG9mIHR1cGxl IHRvIGJlIGRlbGV0ZWQKKyAqCXhpZCAtIFhJRCB0byB1c2Ugb3IgSW52YWxpZFRyYW5zYWN0aW9u SWQgZm9yIHRoZSBjdXJyZW50IHRyYW5zYWN0aW9uCiAgKgljaWQgLSBkZWxldGUgY29tbWFuZCBJ RCAodXNlZCBmb3IgdmlzaWJpbGl0eSB0ZXN0LCBhbmQgc3RvcmVkIGludG8KICAqCQljbWF4IGlm IHN1Y2Nlc3NmdWwpCiAgKglvcHRpb25zIC0gYml0bWFzayBvZiBvcHRpb25zLiAgU3VwcG9ydGVk IHZhbHVlczoKQEAgLTE1NjgsMTEgKzE1ODcsMTIgQEAgdGFibGVfbXVsdGlfaW5zZXJ0KFJlbGF0 aW9uIHJlbCwgVHVwbGVUYWJsZVNsb3QgKipzbG90cywgaW50IG5zbG90cywKICAqIFRNX0ZhaWx1 cmVEYXRhIGZvciBhZGRpdGlvbmFsIGluZm8uCiAgKi8KIHN0YXRpYyBpbmxpbmUgVE1fUmVzdWx0 Ci10YWJsZV90dXBsZV9kZWxldGUoUmVsYXRpb24gcmVsLCBJdGVtUG9pbnRlciB0aWQsIENvbW1h bmRJZCBjaWQsCit0YWJsZV90dXBsZV9kZWxldGUoUmVsYXRpb24gcmVsLCBJdGVtUG9pbnRlciB0 aWQsIFRyYW5zYWN0aW9uSWQgeGlkLAorCQkJCSAgIENvbW1hbmRJZCBjaWQsCiAJCQkJICAgdWlu dDMyIG9wdGlvbnMsIFNuYXBzaG90IHNuYXBzaG90LCBTbmFwc2hvdCBjcm9zc2NoZWNrLAogCQkJ CSAgIGJvb2wgd2FpdCwgVE1fRmFpbHVyZURhdGEgKnRtZmQpCiB7Ci0JcmV0dXJuIHJlbC0+cmRf dGFibGVhbS0+dHVwbGVfZGVsZXRlKHJlbCwgdGlkLCBjaWQsIG9wdGlvbnMsCisJcmV0dXJuIHJl bC0+cmRfdGFibGVhbS0+dHVwbGVfZGVsZXRlKHJlbCwgdGlkLCB4aWQsIGNpZCwgb3B0aW9ucywK IAkJCQkJCQkJCQkgc25hcHNob3QsIGNyb3NzY2hlY2ssCiAJCQkJCQkJCQkJIHdhaXQsIHRtZmQp OwogfQpAQCAtMTYyMyw2ICsxNjQzLDEwIEBAIHRhYmxlX3R1cGxlX3VwZGF0ZShSZWxhdGlvbiBy ZWwsIEl0ZW1Qb2ludGVyIG90aWQsIFR1cGxlVGFibGVTbG90ICpzbG90LAogCQkJCSAgIGJvb2wg d2FpdCwgVE1fRmFpbHVyZURhdGEgKnRtZmQsIExvY2tUdXBsZU1vZGUgKmxvY2ttb2RlLAogCQkJ CSAgIFRVX1VwZGF0ZUluZGV4ZXMgKnVwZGF0ZV9pbmRleGVzKQogeworCS8qIFNlZSB0YWJsZV90 dXBsZV9pbnNlcnQoKS4gKi8KKwlBc3NlcnQoKG9wdGlvbnMgJiBUQUJMRV9SRVVTRV9YSUQpID09 IDAgfHwgVFRTX0lTX0hFQVBUVVBMRShzbG90KSB8fAorCQkgICBUVFNfSVNfQlVGRkVSVFVQTEUo c2xvdCkpOworCiAJcmV0dXJuIHJlbC0+cmRfdGFibGVhbS0+dHVwbGVfdXBkYXRlKHJlbCwgb3Rp ZCwgc2xvdCwKIAkJCQkJCQkJCQkgY2lkLCBvcHRpb25zLCBzbmFwc2hvdCwgY3Jvc3NjaGVjaywK IAkJCQkJCQkJCQkgd2FpdCwgdG1mZCwKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2FjY2Vzcy90 b2FzdF9oZWxwZXIuaCBiL3NyYy9pbmNsdWRlL2FjY2Vzcy90b2FzdF9oZWxwZXIuaAppbmRleCAy ZWM5MjM5N2YyNi4uZjg2Zjg4Yzc3NGUgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2FjY2Vzcy90 b2FzdF9oZWxwZXIuaAorKysgYi9zcmMvaW5jbHVkZS9hY2Nlc3MvdG9hc3RfaGVscGVyLmgKQEAg LTE0LDYgKzE0LDcgQEAKICNpZm5kZWYgVE9BU1RfSEVMUEVSX0gKICNkZWZpbmUgVE9BU1RfSEVM UEVSX0gKIAorI2luY2x1ZGUgImFjY2Vzcy9yZXdyaXRlaGVhcC5oIgogI2luY2x1ZGUgInV0aWxz L3JlbC5oIgogCiAvKgpAQCAtNjAsNiArNjEsMTUgQEAgdHlwZWRlZiBzdHJ1Y3QKIAkgKi8KIAl1 aW50OAkJdHRjX2ZsYWdzOwogCVRvYXN0QXR0ckluZm8gKnR0Y19hdHRyOworCisJLyoKKwkgKiBU aGVzZSBmaWVsZHMgYXJlIG5lZWRlZCB3aGVuIHRoZSBvcHRpb24gSEVBUF9JTlNFUlRfUkVVU0Vf WElEX0ZSRUVaRQorCSAqIHdhcyBwYXNzZWQgdG8gaGVhcF90b2FzdF9pbnNlcnRfb3JfdXBkYXRl KCkuIFdlIGNvdWxkIGFjdHVhbGx5IHVzZQorCSAqIG5vcm1hbCBpbnNlcnQsIGJ1dCB0aGF0IHdv dWxkIHJlcXVpcmUgV0FMIHN1cHBvcnQgb2YKKwkgKiBoZWFwX2ZyZWV6ZV90dXBsZSgpLgorCSAq LworCVJld3JpdGVTdGF0ZSB0dGNfcndzdGF0ZTsKKwlIZWFwVHVwbGUJdHRjX3R1cF9tYWluOwog fSBUb2FzdFR1cGxlQ29udGV4dDsKIAogLyoKQEAgLTEwOCw5ICsxMTgsOSBAQCBleHRlcm4gaW50 CXRvYXN0X3R1cGxlX2ZpbmRfYmlnZ2VzdF9hdHRyaWJ1dGUoVG9hc3RUdXBsZUNvbnRleHQgKnR0 YywKIGV4dGVybiB2b2lkIHRvYXN0X3R1cGxlX3RyeV9jb21wcmVzc2lvbihUb2FzdFR1cGxlQ29u dGV4dCAqdHRjLCBpbnQgYXR0cmlidXRlKTsKIGV4dGVybiB2b2lkIHRvYXN0X3R1cGxlX2V4dGVy bmFsaXplKFRvYXN0VHVwbGVDb250ZXh0ICp0dGMsIGludCBhdHRyaWJ1dGUsCiAJCQkJCQkJCQl1 aW50MzIgb3B0aW9ucyk7Ci1leHRlcm4gdm9pZCB0b2FzdF90dXBsZV9jbGVhbnVwKFRvYXN0VHVw bGVDb250ZXh0ICp0dGMpOworZXh0ZXJuIHZvaWQgdG9hc3RfdHVwbGVfY2xlYW51cChUb2FzdFR1 cGxlQ29udGV4dCAqdHRjLCBUcmFuc2FjdGlvbklkIHhpZCk7CiAKIGV4dGVybiB2b2lkIHRvYXN0 X2RlbGV0ZV9leHRlcm5hbChSZWxhdGlvbiByZWwsIGNvbnN0IERhdHVtICp2YWx1ZXMsIGNvbnN0 IGJvb2wgKmlzbnVsbCwKLQkJCQkJCQkJICBib29sIGlzX3NwZWN1bGF0aXZlKTsKKwkJCQkJCQkJ ICBib29sIGlzX3NwZWN1bGF0aXZlLCBUcmFuc2FjdGlvbklkIHhpZCk7CiAKICNlbmRpZgpkaWZm IC0tZ2l0IGEvc3JjL2luY2x1ZGUvYWNjZXNzL3RvYXN0X2ludGVybmFscy5oIGIvc3JjL2luY2x1 ZGUvYWNjZXNzL3RvYXN0X2ludGVybmFscy5oCmluZGV4IGEzMWI0N2Y4ZGY1Li44OWE5ZGQ5MzJl NSAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvYWNjZXNzL3RvYXN0X2ludGVybmFscy5oCisrKyBi L3NyYy9pbmNsdWRlL2FjY2Vzcy90b2FzdF9pbnRlcm5hbHMuaApAQCAtMTIsNiArMTIsNyBAQAog I2lmbmRlZiBUT0FTVF9JTlRFUk5BTFNfSAogI2RlZmluZSBUT0FTVF9JTlRFUk5BTFNfSAogCisj aW5jbHVkZSAiYWNjZXNzL3Jld3JpdGVoZWFwLmgiCiAjaW5jbHVkZSAiYWNjZXNzL3NrZXkuaCIK ICNpbmNsdWRlICJzdG9yYWdlL2xvY2tkZWZzLmgiCiAjaW5jbHVkZSAidXRpbHMvcmVsY2FjaGUu aCIKQEAgLTIwLDkgKzIxLDEzIEBACiBleHRlcm4gRGF0dW0gdG9hc3RfY29tcHJlc3NfZGF0dW0o RGF0dW0gdmFsdWUsIGNoYXIgY21ldGhvZCk7CiBleHRlcm4gT2lkCXRvYXN0X2dldF92YWxpZF9p bmRleChPaWQgdG9hc3RvaWQsIExPQ0tNT0RFIGxvY2spOwogCi1leHRlcm4gdm9pZCB0b2FzdF9k ZWxldGVfZGF0dW0oUmVsYXRpb24gcmVsLCBEYXR1bSB2YWx1ZSwgYm9vbCBpc19zcGVjdWxhdGl2 ZSk7CitleHRlcm4gdm9pZCB0b2FzdF9kZWxldGVfZGF0dW0oUmVsYXRpb24gcmVsLCBEYXR1bSB2 YWx1ZSwgYm9vbCBpc19zcGVjdWxhdGl2ZSwKKwkJCQkJCQkgICBUcmFuc2FjdGlvbklkIHhpZCk7 CiBleHRlcm4gRGF0dW0gdG9hc3Rfc2F2ZV9kYXR1bShSZWxhdGlvbiByZWwsIERhdHVtIHZhbHVl LAotCQkJCQkJCSAgdmFybGVuYSAqb2xkZXh0ZXJuYWwsIHVpbnQzMiBvcHRpb25zKTsKKwkJCQkJ CQkgIHZhcmxlbmEgKm9sZGV4dGVybmFsLAorCQkJCQkJCSAgUmV3cml0ZVN0YXRlIHJ3c3RhdGUs CisJCQkJCQkJICBIZWFwVHVwbGUgdHVwX21haW4sCisJCQkJCQkJICB1aW50MzIgb3B0aW9ucyk7 CiAKIGV4dGVybiB2b2lkIHRvYXN0X3ZhbHVlaWRfc2NhbmtleV9pbml0KFNjYW5LZXkgZW50cnks IE9pZCB0b2FzdF90eXBpZCwKIAkJCQkJCQkJCSAgIE9pZDggdmFsdWVpZCk7CmRpZmYgLS1naXQg YS9zcmMvaW5jbHVkZS9hY2Nlc3MveGxvZ19pbnRlcm5hbC5oIGIvc3JjL2luY2x1ZGUvYWNjZXNz L3hsb2dfaW50ZXJuYWwuaAppbmRleCBiZjYwOWMzYzcwMy4uZWQ4ZjQ4OGRkYTUgMTAwNjQ0Ci0t LSBhL3NyYy9pbmNsdWRlL2FjY2Vzcy94bG9nX2ludGVybmFsLmgKKysrIGIvc3JjL2luY2x1ZGUv YWNjZXNzL3hsb2dfaW50ZXJuYWwuaApAQCAtMzIsNyArMzIsNyBAQAogLyoKICAqIEVhY2ggcGFn ZSBvZiBYTE9HIGZpbGUgaGFzIGEgaGVhZGVyIGxpa2UgdGhpczoKICAqLwotI2RlZmluZSBYTE9H X1BBR0VfTUFHSUMgMHhEMTIyCS8qIGNhbiBiZSB1c2VkIGFzIFdBTCB2ZXJzaW9uIGluZGljYXRv ciAqLworI2RlZmluZSBYTE9HX1BBR0VfTUFHSUMgMHhEMTIzCS8qIGNhbiBiZSB1c2VkIGFzIFdB TCB2ZXJzaW9uIGluZGljYXRvciAqLwogCiB0eXBlZGVmIHN0cnVjdCBYTG9nUGFnZUhlYWRlckRh dGEKIHsKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2FjY2Vzcy94bG9naW5zZXJ0LmggYi9zcmMv aW5jbHVkZS9hY2Nlc3MveGxvZ2luc2VydC5oCmluZGV4IDg2MjY0NTY0ZWJiLi5lYzgyMzQwN2Q1 NyAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvYWNjZXNzL3hsb2dpbnNlcnQuaAorKysgYi9zcmMv aW5jbHVkZS9hY2Nlc3MveGxvZ2luc2VydC5oCkBAIC00NSw2ICs0NSw3IEBACiAvKiBwcm90b3R5 cGVzIGZvciBwdWJsaWMgZnVuY3Rpb25zIGluIHhsb2dpbnNlcnQuYzogKi8KIGV4dGVybiB2b2lk IFhMb2dCZWdpbkluc2VydCh2b2lkKTsKIGV4dGVybiB2b2lkIFhMb2dTZXRSZWNvcmRGbGFncyh1 aW50OCBmbGFncyk7CitleHRlcm4gdm9pZCBYTG9nU2V0UmVjb3JkWGlkKFRyYW5zYWN0aW9uSWQg eGlkKTsKIGV4dGVybiBYTG9nUmVjUHRyIFhMb2dJbnNlcnQoUm1ncklkIHJtaWQsIHVpbnQ4IGlu Zm8pOwogZXh0ZXJuIFhMb2dSZWNQdHIgWExvZ1NpbXBsZUluc2VydEludDY0KFJtZ3JJZCBybWlk LCB1aW50OCBpbmZvLCBpbnQ2NCB2YWx1ZSk7CiBleHRlcm4gdm9pZCBYTG9nRW5zdXJlUmVjb3Jk U3BhY2UoaW50IG1heF9ibG9ja19pZCwgaW50IG5kYXRhcyk7CmRpZmYgLS1naXQgYS9zcmMvaW5j bHVkZS9hY2Nlc3MveGxvZ3JlY29yZC5oIGIvc3JjL2luY2x1ZGUvYWNjZXNzL3hsb2dyZWNvcmQu aAppbmRleCBlODk5OWQzZmU5MS4uYmYzYzE5NjVlMDUgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRl L2FjY2Vzcy94bG9ncmVjb3JkLmgKKysrIGIvc3JjL2luY2x1ZGUvYWNjZXNzL3hsb2dyZWNvcmQu aApAQCAtOTAsNiArOTAsMTQgQEAgdHlwZWRlZiBzdHJ1Y3QgWExvZ1JlY29yZAogICovCiAjZGVm aW5lIFhMUl9DSEVDS19DT05TSVNURU5DWQkweDAyCiAKKy8qCisgKiBUaGUgcmVjb3JkIGNvbnRh aW5zIGEgZGF0YSBjaGFuZ2UgdGhhdCB3YXMgYWxyZWFkeSBjb21taXR0ZWQgYW5kIG5vdyBpcwor ICogYmVpbmcgYXBwbGllZCB0byBhIG5ldyByZWxhdGlvbiBkdWUgdG8gcmV3cml0aW5nLiBUaGUg b3JpZ2luYWwgWElEIGlzCisgKiBuZWVkZWQgdG8ga2VlcCB0aGUgcmV3cml0aW5nIE1WQ0Mtc2Fm ZSwgaG93ZXZlciB0aGUgdHJhbnNhY3Rpb24gc2hvdWxkIGJlCisgKiBpZ25vcmVkIGJ5IGxvZ2lj YWwgZGVjb2RpbmcgYW5kIGl0IHNob3VsZCBub3QgZ2V0IGludG8gS25vd25Bc3NpZ25lZFhpZHMu CisgKi8KKyNkZWZpbmUgWExSX1hJRF9SRVBMQVlFRAkJMHgwNAorCiAvKgogICogSGVhZGVyIGlu Zm8gZm9yIGJsb2NrIGRhdGEgYXBwZW5kZWQgdG8gYW4gWExPRyByZWNvcmQuCiAgKgpkaWZmIC0t Z2l0IGEvc3JjL2luY2x1ZGUvY29tbWFuZHMvcmVwYWNrLmggYi9zcmMvaW5jbHVkZS9jb21tYW5k cy9yZXBhY2suaAppbmRleCA1Nzk5ZDQzYzczYS4uYzkxZjVjYzFhNDggMTAwNjQ0Ci0tLSBhL3Ny Yy9pbmNsdWRlL2NvbW1hbmRzL3JlcGFjay5oCisrKyBiL3NyYy9pbmNsdWRlL2NvbW1hbmRzL3Jl cGFjay5oCkBAIC0xNiw2ICsxNiw3IEBACiAjaW5jbHVkZSA8c2lnbmFsLmg+CiAKICNpbmNsdWRl ICJhY2Nlc3MvaGlvLmgiCisjaW5jbHVkZSAiYWNjZXNzL3Jld3JpdGVoZWFwLmgiCiAjaW5jbHVk ZSAiYWNjZXNzL3NrZXkuaCIKICNpbmNsdWRlICJhY2Nlc3MveGxvZ2RlZnMuaCIKICNpbmNsdWRl ICJjYXRhbG9nL2luZGV4LmgiCkBAIC0xMTYsMTAgKzExNywxMCBAQCB0eXBlZGVmIHN0cnVjdCBD aGFuZ2VDb250ZXh0CiAJICogTm90IHN1cmUsIGl0J2QgcmVxdWlyZSBkaXNrIHNwYWNlIGZvciBv bmUgbW9yZSBjb3B5IGFuZCB0aGUgY29weWluZwogCSAqIGl0c2VsZiBpcyBub3QgZnJlZS4KIAkg KgotCSAqIFRPRE8gMSkgbWFrZSB0aGUgdGFibGVzIHVubG9nZ2VkLCAyKSBpZiBSRVBBQ0sgbG9j a3MgdGhlIFRPQVNUIHJlbGF0aW9uCi0JICogdG9vIChub3Qgc3VyZSBpdCBkb2VzKSB0cnkgdG8g cHJlc2VydmUgVE9BU1QgcG9pbnRlcnMsIGluc3RlYWQgb2YKLQkgKiBzdG9yaW5nIHRoZW0gdG8g VE9BU1QgcmVsYXRpb25zIG9mIHRoZXNlIHRhYmxlcywgMykgQ2hlY2sgdGhhdCB0aGUKLQkgKiB0 YWJsZXMgYXJlIGRyb3BwZWQgb24gdHJhbnNhY3Rpb24gYWJvcnQuCisJICogWFhYIFJFUEFDSyBj dXJyZW50bHkgZG9lcyBub3QgbG9jayB0aGUgb2xkIFRPQVNUIHJlbGF0aW9uLiBJZiBpdCBkaWQs CisJICogd2UgY291bGQgcGVyaGFwcyBjb3B5IFRPQVNUIHBvaW50ZXJzIGZyb20gdGhlIG9sZCBy ZWxhdGlvbiB0byB0aGUKKwkgKiBhdXhpbGlhcnkgcmVsYXRpb24sIHNvIHRoYXQgdGhlIGF1eGls aWFyeSByZWxhdGlvbiB3b3VsZCBub3QgbmVlZCBpdHMKKwkgKiBvd24gVE9BU1QgcmVsYXRpb24u CiAJICovCiAJUmVwYWNrRGVzdCAqY2NfZGVzdF9hdXg7CiAKQEAgLTEzMyw2ICsxMzQsMTEgQEAg dHlwZWRlZiBzdHJ1Y3QgQ2hhbmdlQ29udGV4dAogCSAqIGZ1bmN0aW9ucy4gVGhpcyBpcyBuZWVk ZWQgd2hlbiBzdGFydGluZyBhIG5ldyB0cmFuc2FjdGlvbi4KIAkgKi8KIAlJbmRleEJ1aWxkU2Vj dXJpdHkgY2NfaW5kX2J1aWxkX3NlYzsKKworCS8qCisJICogeG1pbiBvZiB0aGUgbGFzdCBzbmFw c2hvdCB1c2VkIHRvIGNvcHkgZGF0YS4KKwkgKi8KKwlUcmFuc2FjdGlvbklkIGNjX2xhc3Rfc25h cHNob3RfeG1pbjsKIH0gQ2hhbmdlQ29udGV4dDsKIAogZXh0ZXJuIFBHRExMSU1QT1JUIGludCBy ZXBhY2tfcGFnZXNfcGVyX3NuYXBzaG90OwpAQCAtMTQ4LDggKzE1NCw2IEBAIGV4dGVybiB2b2lk IG1hcmtfaW5kZXhfY2x1c3RlcmVkKFJlbGF0aW9uIHJlbCwgT2lkIGluZGV4T2lkLCBib29sIGlz X2ludGVybmFsKTsKIGV4dGVybiBPaWQJbWFrZV9uZXdfaGVhcChPaWQgT0lET2xkSGVhcCwgT2lk IE5ld1RhYmxlU3BhY2UsIE9pZCBOZXdBY2Nlc3NNZXRob2QsCiAJCQkJCQkgIGNoYXIgcmVscGVy c2lzdGVuY2UsIExPQ0tNT0RFIGxvY2ttb2RlLAogCQkJCQkJICBjb25zdCBjaGFyICpzdWZmaXgp OwotZXh0ZXJuIHZvaWQgaGVhcF9pbnNlcnRfZm9yX3JlcGFjayhDaGFuZ2VDb250ZXh0ICpjaGdj eHQsIFR1cGxlVGFibGVTbG90ICpzcmMsCi0JCQkJCQkJCSAgIFR1cGxlVGFibGVTbG90ICpyZWZv cm0pOwogZXh0ZXJuIGJvb2wgdHVwbGVfbmVlZHNfcmVmb3JtKEhlYXBUdXBsZSB0dXBsZSwgVHVw bGVEZXNjIHR1cERlc2MpOwogZXh0ZXJuIHZvaWQgY2xlYXJfZHJvcHBlZF9hdHRyaWJ1dGVzKEhl YXBUdXBsZSB0dXBsZSwgVHVwbGVUYWJsZVNsb3QgKnJlZm9ybSk7CiBleHRlcm4gdm9pZCBmaW5p c2hfaGVhcF9zd2FwKE9pZCBPSURPbGRIZWFwLCBPaWQgT0lETmV3SGVhcCwKQEAgLTE2MCw2ICsx NjQsNyBAQCBleHRlcm4gdm9pZCBmaW5pc2hfaGVhcF9zd2FwKE9pZCBPSURPbGRIZWFwLCBPaWQg T0lETmV3SGVhcCwKIAkJCQkJCQkgYm9vbCByZWluZGV4LAogCQkJCQkJCSBUcmFuc2FjdGlvbklk IGZyb3plblhpZCwKIAkJCQkJCQkgTXVsdGlYYWN0SWQgY3V0b2ZmTXVsdGksCisJCQkJCQkJIGJv b2wgdXBkYXRlX3RvYXN0X2N1dG9mZnMsCiAJCQkJCQkJIGNoYXIgbmV3cmVscGVyc2lzdGVuY2Up OwogZXh0ZXJuIGJvb2wgcmVwYWNrX2Jsb2NrX2luX3JhbmdlKEJsb2NrTnVtYmVyIGJsa251bSwg QmxvY2tOdW1iZXIgc3RhcnQsCiAJCQkJCQkJCSAgQmxvY2tOdW1iZXIgZW5kLCBCbG9ja051bWJl ciBuYmxvY2tzKTsKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL3V0aWxzL3NuYXBtZ3IuaCBiL3Ny Yy9pbmNsdWRlL3V0aWxzL3NuYXBtZ3IuaAppbmRleCBiZTNiMmU1ZTVjOS4uOTFkZTZhYjBlZWIg MTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL3V0aWxzL3NuYXBtZ3IuaAorKysgYi9zcmMvaW5jbHVk ZS91dGlscy9zbmFwbWdyLmgKQEAgLTUxLDYgKzUxLDE4IEBAIGV4dGVybiBQR0RMTElNUE9SVCBT bmFwc2hvdERhdGEgU25hcHNob3RUb2FzdERhdGE7CiAJKChzbmFwc2hvdGRhdGEpLnNuYXBzaG90 X3R5cGUgPSBTTkFQU0hPVF9OT05fVkFDVVVNQUJMRSwgXAogCSAoc25hcHNob3RkYXRhKS52aXN0 ZXN0ID0gKHZpc3Rlc3RwKSkKIAorLyoKKyAqIE5ld0hlYXAgc25hcHNob3QgbmVlZHMgdG8gYmUg dXNlZCBhcyB0aGUgYWN0aXZlIHNuYXBzaG90IGF0IHNvbWUgcG9pbnQsIHNvCisgKiBpbml0aWFs aXplIHRoZSBmaWVsZHMgcmVsYXRlZCB0byBQdXNoQWN0aXZlU25hcHNob3QoKS4KKyAqLworI2Rl ZmluZSBJbml0TmV3SGVhcFNuYXBzaG90KHNuYXBzaG90ZGF0YSkgIFwKKwkoKHNuYXBzaG90ZGF0 YSkuc25hcHNob3RfdHlwZSA9IFNOQVBTSE9UX05FV19IRUFQLCBcCisJIChzbmFwc2hvdGRhdGEp LnJlZ2RfY291bnQgPSAwLCBcCisJIChzbmFwc2hvdGRhdGEpLmFjdGl2ZV9jb3VudCA9IDAsIFwK KwkgKHNuYXBzaG90ZGF0YSkuY29waWVkID0gZmFsc2UsIFwKKwkgKHNuYXBzaG90ZGF0YSkueGNu dCA9IDAsIFwKKwkgKHNuYXBzaG90ZGF0YSkuc3VieGNudCA9IDApCisKIC8qCiAgKiBJcyB0aGUg c25hcHNob3QgaW1wbGVtZW50ZWQgYXMgYW4gTVZDQyBzbmFwc2hvdCAoaS5lLiBpdCB1c2VzCiAg KiBTTkFQU0hPVF9NVkNDKT8gSWYgc28sIHRoZXJlIHdpbGwgYmUgYXQgbW9zdCBvbmUgdmlzaWJs ZSB0dXBsZSBpbiBhIGNoYWluCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS91dGlscy9zbmFwc2hv dC5oIGIvc3JjL2luY2x1ZGUvdXRpbHMvc25hcHNob3QuaAppbmRleCA5NzY2YWFiY2FkNC4uZjkx Y2I0M2E1YTIgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL3V0aWxzL3NuYXBzaG90LmgKKysrIGIv c3JjL2luY2x1ZGUvdXRpbHMvc25hcHNob3QuaApAQCAtMTEyLDYgKzExMiwyOSBAQCB0eXBlZGVm IGVudW0gU25hcHNob3RUeXBlCiAJICogaG9yaXpvbiB0byB1c2UuCiAJICovCiAJU05BUFNIT1Rf Tk9OX1ZBQ1VVTUFCTEUsCisKKwkvKgorCSAqIFRoZSBlZmZlY3RzIG9mIGFsbCB0cmFuc2FjdGlv bnMgYXJlIHZpc2libGUuIFVubGlrZSBTTkFQU0hPVF9ESVJUWSwKKwkgKiBhYm9ydGVkIChzdWIp dHJhbnNhY3Rpb25zIGFyZSBub3QgZXhwZWN0ZWQuCisJICoKKwkgKiBUaGlzIGlzIHNwZWNpZmlj IHRvIGFwcGx5aW5nIGRhdGEgY2hhbmdlcyB0byB0aGUgbmV3IGhlYXAgYnkgdGhlIFJFUEFDSwor CSAqIGNvbW1hbmQgLSB0aGF0IHJlcGxheXMgYXBwbGllcyBjaGFuZ2VzIGRvbmUgaW4gdGhlIG9s ZCBoZWFwIGJ5CisJICogdHJhbnNhY3Rpb25zIHRoYXQgaGF2ZSBhbHJlYWR5IGNvbW1pdHRlZC4g Tm8gb3RoZXIgdHJhbnNhY3Rpb25zIGNhbgorCSAqIGFjY2VzcyB0aGUgbmV3IGhlYXAgd2hpbGUg dGhpcyBzbmFwc2hvdCBpcyBpbiB1c2UuCisJICoKKwkgKiBUaGVyZWZvcmUsIHdoZW5ldmVyIGEg dHJhbnNhY3Rpb24gYmVpbmcgYXBwbGllZCBsb29rcyBmb3IgYSB0dXBsZSB0bworCSAqIHVwZGF0 ZSBvciBkZWxldGUsIGl0IGNhbiBhc3N1bWUgdGhhdCB0aGUgaW5zZXJ0aW9uIG9mIGFueSBjYW5k aWRhdGUKKwkgKiB0dXBsZSB3YXMgYWxyZWFkeSBjb21taXR0ZWQgLSBvdGhlcndpc2UgdGhlIGlu c2VydGluZyB0cmFuc2FjdGlvbgorCSAqIHdvdWxkbid0IGhhdmUgYmVlbiBhcHBsaWVkLgorCSAq CisJICogQnkgY29uc2lkZXJpbmcgZWZmZWN0cyBvZiBhbGwgdHJhbnNhY3Rpb25zIHZpc2libGUg d2UgYWxzbyBlbnN1cmUgdGhhdAorCSAqIGEgdHJhbnNhY3Rpb24gY2FuIHVwZGF0ZSAvIGRlbGV0 ZSB0dXBsZXMgdGhhdCBpdCBpbnNlcnRlZCBpdHNlbGYuCisJICoKKwkgKiBUT0RPIENvbnNpZGVy IGJldHRlciBuYW1lLiBXb3VsZCBTTkFQU0hPVF9CT09UU1RSQVAgYmUgY29uZnVzaW5nPworCSAq IER1cmluZyBjbHVzdGVyIGJvb3RzdHJhcCB3ZSBhbHNvIGNvbnNpZGVyIGFsbCBjaGFuZ2VzIGNv bW1pdHRlZAorCSAqIGltbWVkaWF0ZWx5LgorCSAqLworCVNOQVBTSE9UX05FV19IRUFQLAogfSBT bmFwc2hvdFR5cGU7CiAKIHR5cGVkZWYgc3RydWN0IFNuYXBzaG90RGF0YSAqU25hcHNob3Q7CkBA IC0xMjcsOCArMTUwLDggQEAgdHlwZWRlZiBzdHJ1Y3QgU25hcHNob3REYXRhICpTbmFwc2hvdDsK ICAqICogSGlzdG9yaWMgTVZDQyBzbmFwc2hvdHMgdXNlZCBkdXJpbmcgbG9naWNhbCBkZWNvZGlu ZwogICogKiBzbmFwc2hvdHMgcGFzc2VkIHRvIEhlYXBUdXBsZVNhdGlzZmllc0RpcnR5KCkKICAq ICogc25hcHNob3RzIHBhc3NlZCB0byBIZWFwVHVwbGVTYXRpc2ZpZXNOb25WYWN1dW1hYmxlKCkK LSAqICogc25hcHNob3RzIHVzZWQgZm9yIFNhdGlzZmllc0FueSwgVG9hc3QsIFNlbGYgd2hlcmUg bm8gbWVtYmVycyBhcmUKLSAqCSBhY2Nlc3NlZC4KKyAqICogc25hcHNob3RzIHVzZWQgZm9yIFNh dGlzZmllc0FueSwgVG9hc3QsIFNlbGYsIE5ld0hlYXAgd2hlcmUgbm8gbWVtYmVycworICoJIGFy ZSBhY2Nlc3NlZC4KICAqCiAgKiBUT0RPOiBJdCdzIHByb2JhYmx5IGEgZ29vZCBpZGVhIHRvIHNw bGl0IHRoaXMgc3RydWN0IHVzaW5nIGEgTm9kZVRhZwogICogc2ltaWxhciB0byBob3cgcGFyc2Vy IGFuZCBleGVjdXRvciBub2RlcyBhcmUgaGFuZGxlZCwgd2l0aCBvbmUgdHlwZSBmb3IKZGlmZiAt LWdpdCBhL3NyYy90ZXN0L21vZHVsZXMvaW5qZWN0aW9uX3BvaW50cy9leHBlY3RlZC9yZXBhY2su b3V0IGIvc3JjL3Rlc3QvbW9kdWxlcy9pbmplY3Rpb25fcG9pbnRzL2V4cGVjdGVkL3JlcGFjay5v dXQKaW5kZXggYjU3NWU5MDUyZWUuLjk5MTljOTNmZTdmIDEwMDY0NAotLS0gYS9zcmMvdGVzdC9t b2R1bGVzL2luamVjdGlvbl9wb2ludHMvZXhwZWN0ZWQvcmVwYWNrLm91dAorKysgYi9zcmMvdGVz dC9tb2R1bGVzL2luamVjdGlvbl9wb2ludHMvZXhwZWN0ZWQvcmVwYWNrLm91dApAQCAtNDUsOCAr NDUsOCBAQCBzdGVwIGNoZWNrMjoKIAogCVNFTEVDVCBpLCBqIEZST00gcmVwYWNrX3Rlc3QgT1JE RVIgQlkgaSwgajsKIAotCUlOU0VSVCBJTlRPIGRhdGFfczIoaSwgaikKLQlTRUxFQ1QgaSwgaiBG Uk9NIHJlcGFja190ZXN0OworCUlOU0VSVCBJTlRPIGRhdGFfczIoaSwgaiwgX3htaW4pCisJU0VM RUNUIGksIGosIHhtaW4gRlJPTSByZXBhY2tfdGVzdDsKIAogICBpfCAgagogLS0tKy0tLQpAQCAt NzcsMTEgKzc3LDExIEBAIHN0ZXAgY2hlY2sxOgogCiAJU0VMRUNUIGksIGogRlJPTSByZXBhY2tf dGVzdCBPUkRFUiBCWSBpLCBqOwogCi0JSU5TRVJUIElOVE8gZGF0YV9zMShpLCBqKQotCVNFTEVD VCBpLCBqIEZST00gcmVwYWNrX3Rlc3Q7CisJSU5TRVJUIElOVE8gZGF0YV9zMShpLCBqLCBfeG1p bikKKwlTRUxFQ1QgaSwgaiwgeG1pbiBGUk9NIHJlcGFja190ZXN0OwogCiAJU0VMRUNUIGNvdW50 KCopCi0JRlJPTSBkYXRhX3MxIGQxIEZVTEwgSk9JTiBkYXRhX3MyIGQyIFVTSU5HIChpLCBqKQor CUZST00gZGF0YV9zMSBkMSBGVUxMIEpPSU4gZGF0YV9zMiBkMiBVU0lORyAoaSwgaiwgX3htaW4p CiAJV0hFUkUgZDEuaSBJU05VTEwgT1IgZDIuaSBJU05VTEw7CiAKIGNvdW50CmRpZmYgLS1naXQg YS9zcmMvdGVzdC9tb2R1bGVzL2luamVjdGlvbl9wb2ludHMvc3BlY3MvcmVwYWNrLnNwZWMgYi9z cmMvdGVzdC9tb2R1bGVzL2luamVjdGlvbl9wb2ludHMvc3BlY3MvcmVwYWNrLnNwZWMKaW5kZXgg Nzg5NmQxNDU2YWQuLjNlMTVmNWRiMzFmIDEwMDY0NAotLS0gYS9zcmMvdGVzdC9tb2R1bGVzL2lu amVjdGlvbl9wb2ludHMvc3BlY3MvcmVwYWNrLnNwZWMKKysrIGIvc3JjL3Rlc3QvbW9kdWxlcy9p bmplY3Rpb25fcG9pbnRzL3NwZWNzL3JlcGFjay5zcGVjCkBAIC05LDggKzksOCBAQCBzZXR1cAog CiAJQ1JFQVRFIFRBQkxFIHJlbGZpbGVub2Rlcyhub2RlIG9pZCk7CiAKLQlDUkVBVEUgVEFCTEUg ZGF0YV9zMShpIGludCwgaiBpbnQpOwotCUNSRUFURSBUQUJMRSBkYXRhX3MyKGkgaW50LCBqIGlu dCk7CisJQ1JFQVRFIFRBQkxFIGRhdGFfczEoaSBpbnQsIGogaW50LCBfeG1pbiB4aWQpOworCUNS RUFURSBUQUJMRSBkYXRhX3MyKGkgaW50LCBqIGludCwgX3htaW4geGlkKTsKIH0KIAogdGVhcmRv d24KQEAgLTM5LDcgKzM5LDggQEAgc3RlcCB3YWl0X2JlZm9yZV9sb2NrCiAjIEJlc2lkZXMgdGhl IGNvbnRlbnRzLCB3ZSBhbHNvIGNoZWNrIHRoYXQgcmVsZmlsZW5vZGUgaGFzIGNoYW5nZWQuCiAK ICMgSGF2ZSBlYWNoIHNlc3Npb24gd3JpdGUgdGhlIGNvbnRlbnRzIGludG8gYSB0YWJsZSBhbmQg dXNlIEZVTEwgSk9JTiB0byBjaGVjawotIyBpZiB0aGUgb3V0cHV0cyBhcmUgaWRlbnRpY2FsLgor IyBpZiB0aGUgb3V0cHV0cyBhcmUgaWRlbnRpY2FsLiB4bWluIGlzIGluY2x1ZGVkIGluIG9yZGVy IHRvIGNoZWNrIHRoZSBNVkNDCisjIHNhZmV0eS4KIHN0ZXAgY2hlY2sxCiB7CiAJSU5TRVJUIElO VE8gcmVsZmlsZW5vZGVzKG5vZGUpCkBAIC00OSwxMSArNTAsMTEgQEAgc3RlcCBjaGVjazEKIAog CVNFTEVDVCBpLCBqIEZST00gcmVwYWNrX3Rlc3QgT1JERVIgQlkgaSwgajsKIAotCUlOU0VSVCBJ TlRPIGRhdGFfczEoaSwgaikKLQlTRUxFQ1QgaSwgaiBGUk9NIHJlcGFja190ZXN0OworCUlOU0VS VCBJTlRPIGRhdGFfczEoaSwgaiwgX3htaW4pCisJU0VMRUNUIGksIGosIHhtaW4gRlJPTSByZXBh Y2tfdGVzdDsKIAogCVNFTEVDVCBjb3VudCgqKQotCUZST00gZGF0YV9zMSBkMSBGVUxMIEpPSU4g ZGF0YV9zMiBkMiBVU0lORyAoaSwgaikKKwlGUk9NIGRhdGFfczEgZDEgRlVMTCBKT0lOIGRhdGFf czIgZDIgVVNJTkcgKGksIGosIF94bWluKQogCVdIRVJFIGQxLmkgSVNOVUxMIE9SIGQyLmkgSVNO VUxMOwogfQogdGVhcmRvd24KQEAgLTg1LDEwICs4Niw2IEBAIHN0ZXAgY2hhbmdlX25ldwogCiAj IFdoZW4gYXBwbHlpbmcgY29uY3VycmVudCBkYXRhIGNoYW5nZXMsIHdlIHNob3VsZCBzZWUgdGhl IGVmZmVjdHMgb2YgYW4KICMgaW4tcHJvZ3Jlc3Mgc3VidHJhbnNhY3Rpb24uCi0jCi0jIFhYWCBO b3Qgc3VyZSB0aGlzIHRlc3QgaXMgdXNlZnVsIG5vdyAtIGl0IHdhcyBkZXNpZ25lZCBmb3IgdGhl IHBhdGNoIHRoYXQKLSMgcHJlc2VydmVzIHR1cGxlIHZpc2liaWxpdHkgYW5kIHdoaWNoIHRoZXJl Zm9yZSBtb2RpZmllcwotIyBUcmFuc2FjdGlvbklkSXNDdXJyZW50VHJhbnNhY3Rpb25JZCgpLgog c3RlcCBjaGFuZ2Vfc3VieGFjdDEKIHsKIAlCRUdJTjsKQEAgLTEwMiw4ICs5OSw2IEBAIHN0ZXAg Y2hhbmdlX3N1YnhhY3QxCiAKICMgV2hlbiBhcHBseWluZyBjb25jdXJyZW50IGRhdGEgY2hhbmdl cywgd2Ugc2hvdWxkIG5vdCBzZWUgdGhlIGVmZmVjdHMgb2YgYQogIyByb2xsZWQgYmFjayBzdWJ0 cmFuc2FjdGlvbi4KLSMKLSMgWFhYIElzIHRoaXMgdGVzdCB1c2VmdWw/IFNlZSBhYm92ZS4KIHN0 ZXAgY2hhbmdlX3N1YnhhY3QyCiB7CiAJQkVHSU47CkBAIC0xMjIsOCArMTE3LDggQEAgc3RlcCBj aGVjazIKIAogCVNFTEVDVCBpLCBqIEZST00gcmVwYWNrX3Rlc3QgT1JERVIgQlkgaSwgajsKIAot CUlOU0VSVCBJTlRPIGRhdGFfczIoaSwgaikKLQlTRUxFQ1QgaSwgaiBGUk9NIHJlcGFja190ZXN0 OworCUlOU0VSVCBJTlRPIGRhdGFfczIoaSwgaiwgX3htaW4pCisJU0VMRUNUIGksIGosIHhtaW4g RlJPTSByZXBhY2tfdGVzdDsKIH0KIHN0ZXAgd2FrZXVwX2JlZm9yZV9sb2NrCiB7CmRpZmYgLS1n aXQgYS9zcmMvdGVzdC9yZWdyZXNzL2V4cGVjdGVkL3J1bGVzLm91dCBiL3NyYy90ZXN0L3JlZ3Jl c3MvZXhwZWN0ZWQvcnVsZXMub3V0CmluZGV4IGFjYmU0NjY3ZDg5Li43ZTNkMzY0Y2M2YiAxMDA2 NDQKLS0tIGEvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9ydWxlcy5vdXQKKysrIGIvc3JjL3Rl c3QvcmVncmVzcy9leHBlY3RlZC9ydWxlcy5vdXQKQEAgLTIxNzAsMTYgKzIxNzAsMTggQEAgcGdf c3RhdF9wcm9ncmVzc19yZXBhY2t8IFNFTEVDVCBzLnBpZCwKICAgICAgICAgICAgIFdIRU4gOCBU SEVOICdwZXJmb3JtaW5nIGZpbmFsIGNsZWFudXAnOjp0ZXh0CiAgICAgICAgICAgICBXSEVOIDkg VEhFTiAnZW5hYmxpbmcgbG9naWNhbCBkZWNvZGluZyc6OnRleHQKICAgICAgICAgICAgIFdIRU4g MTAgVEhFTiAnaW5pdGlhbGl6aW5nIGxvZ2ljYWwgZGVjb2RpbmcnOjp0ZXh0CisgICAgICAgICAg ICBXSEVOIDExIFRIRU4gJ2J1aWxkaW5nIGF1eGlsaWFyeSByZWxhdGlvbiBpbmRleCc6OnRleHQK ICAgICAgICAgICAgIEVMU0UgTlVMTDo6dGV4dAogICAgICAgICBFTkQgQVMgcGhhc2UsCiAgICAg KHMucGFyYW0zKTo6b2lkIEFTIHJlcGFja19pbmRleF9yZWxpZCwKICAgICBzLnBhcmFtNCBBUyBo ZWFwX3R1cGxlc19zY2FubmVkLAogICAgIHMucGFyYW01IEFTIGhlYXBfdHVwbGVzX2luc2VydGVk LAotICAgIHMucGFyYW02IEFTIGhlYXBfdHVwbGVzX3VwZGF0ZWQsCi0gICAgcy5wYXJhbTcgQVMg aGVhcF90dXBsZXNfZGVsZXRlZCwKLSAgICBzLnBhcmFtOCBBUyBoZWFwX2Jsa3NfdG90YWwsCi0g ICAgcy5wYXJhbTkgQVMgaGVhcF9ibGtzX3NjYW5uZWQsCi0gICAgcy5wYXJhbTEwIEFTIGluZGV4 X3JlYnVpbGRfY291bnQKKyAgICBzLnBhcmFtNiBBUyBoZWFwX3R1cGxlc19pbnNlcnRlZF9hdXgs CisgICAgcy5wYXJhbTcgQVMgaGVhcF90dXBsZXNfdXBkYXRlZCwKKyAgICBzLnBhcmFtOCBBUyBo ZWFwX3R1cGxlc19kZWxldGVkLAorICAgIHMucGFyYW05IEFTIGhlYXBfYmxrc190b3RhbCwKKyAg ICBzLnBhcmFtMTAgQVMgaGVhcF9ibGtzX3NjYW5uZWQsCisgICAgcy5wYXJhbTExIEFTIGluZGV4 X3JlYnVpbGRfY291bnQKICAgIEZST00gKHBnX3N0YXRfZ2V0X3Byb2dyZXNzX2luZm8oJ1JFUEFD Syc6OnRleHQpIHMocGlkLCBkYXRpZCwgcmVsaWQsIHBhcmFtMSwgcGFyYW0yLCBwYXJhbTMsIHBh cmFtNCwgcGFyYW01LCBwYXJhbTYsIHBhcmFtNywgcGFyYW04LCBwYXJhbTksIHBhcmFtMTAsIHBh cmFtMTEsIHBhcmFtMTIsIHBhcmFtMTMsIHBhcmFtMTQsIHBhcmFtMTUsIHBhcmFtMTYsIHBhcmFt MTcsIHBhcmFtMTgsIHBhcmFtMTksIHBhcmFtMjApCiAgICAgIExFRlQgSk9JTiBwZ19kYXRhYmFz ZSBkIE9OICgocy5kYXRpZCA9IGQub2lkKSkpOwogcGdfc3RhdF9wcm9ncmVzc192YWN1dW18IFNF TEVDVCBzLnBpZCwKLS0gCjIuNTEuMAoK --=-=-=--