From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-ati 2/2] Use reference counting for tracking KMS framebuffer lifetimes Date: Wed, 10 May 2017 18:05:59 +0900 Message-ID: <20170510090559.4649-2-michel@daenzer.net> References: <20170502074034.17211-1-michel@daenzer.net> <20170510090559.4649-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170510090559.4649-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpSZWZlcmVuY2Vz IGFyZSBoZWxkIGJ5IHRoZSBwaXhtYXBzIGNvcnJlc3BvbmRpbmcgdG8gdGhlIEZCcyAoc28KdGhl IHNhbWUgS01TIEZCIGNhbiBiZSByZXVzZWQgYXMgbG9uZyBhcyB0aGUgcGl4bWFwIGV4aXN0cykg YW5kIGJ5IHRoZQpDUlRDcyBzY2FubmluZyBvdXQgZnJvbSB0aGVtIChzbyBhIEtNUyBGQiBpcyBv bmx5IGRlc3Ryb3llZCBvbmNlIGl0J3MKbm90IGJlaW5nIHNjYW5uZWQgb3V0IGFueW1vcmUsIHBy ZXZlbnRpbmcgaW50ZXJtaXR0ZW50IGJsYWNrIHNjcmVlbnMgYW5kCndvcnNlIGlzc3VlcyBkdWUg dG8gYSBDUlRDIHR1cm5pbmcgb2ZmIHdoZW4gaXQgc2hvdWxkIGJlIG9uKS4KCnYyOgoqIE9ubHkg aW5jcmVhc2UgcmVmZXJlbmNlIGNvdW50IGluIGRybW1vZGVfZmJfcmVmZXJlbmNlIGlmIGl0IHdh cyBzYW5lCiAgYmVmb3JlCiogTWFrZSBkcm1tb2RlX2ZiX3JlZmVyZW5jZSdzIGluZGVudGF0aW9u IG1hdGNoIHRoZSByZXN0IG9mCiAgZHJtbW9kZV9kaXNwbGF5LmgKClJldmlld2VkLWJ5OiBBbGV4 IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+ICMgdjEKU2lnbmVkLW9mZi1ieTog TWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+Ci0tLQogc3JjL2RybW1vZGVf ZGlzcGxheS5jICB8IDE0NyArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiBzcmMvZHJtbW9kZV9kaXNwbGF5LmggIHwgIDM5ICsrKysrKysrKysrLS0KIHNy Yy9yYWRlb24uaCAgICAgICAgICAgfCAgNzMgKysrKysrKysrKysrKysrKysrKysrKysrCiBzcmMv cmFkZW9uX2JvX2hlbHBlci5oIHwgICAzIC0KIHNyYy9yYWRlb25fZXhhLmMgICAgICAgfCAgIDIg Kwogc3JjL3JhZGVvbl9rbXMuYyAgICAgICB8ICA2NCArKysrKysrKysrKysrKysrKystLS0KIHNy Yy9yYWRlb25fcHJlc2VudC5jICAgfCAgIDggLS0tCiA3IGZpbGVzIGNoYW5nZWQsIDIyNiBpbnNl cnRpb25zKCspLCAxMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2RybW1vZGVfZGlz cGxheS5jIGIvc3JjL2RybW1vZGVfZGlzcGxheS5jCmluZGV4IGExMDFhYzIzMy4uZWMzMDcyNjIx IDEwMDY0NAotLS0gYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKKysrIGIvc3JjL2RybW1vZGVfZGlz cGxheS5jCkBAIC0zNzUsNiArMzc1LDcgQEAgZHJtbW9kZV9jcnRjX2RwbXMoeGY4NkNydGNQdHIg Y3J0YywgaW50IG1vZGUpCiAKIAkJZHJtTW9kZVNldENydGMoZHJtbW9kZS0+ZmQsIGRybW1vZGVf Y3J0Yy0+bW9kZV9jcnRjLT5jcnRjX2lkLAogCQkJICAgICAgIDAsIDAsIDAsIE5VTEwsIDAsIE5V TEwpOworCQlkcm1tb2RlX2ZiX3JlZmVyZW5jZShkcm1tb2RlLT5mZCwgJmRybW1vZGVfY3J0Yy0+ ZmIsIE5VTEwpOwogCX0gZWxzZSBpZiAoZHJtbW9kZV9jcnRjLT5kcG1zX21vZGUgIT0gRFBNU01v ZGVPbikKIAkJY3J0Yy0+ZnVuY3MtPnNldF9tb2RlX21ham9yKGNydGMsICZjcnRjLT5tb2RlLCBj cnRjLT5yb3RhdGlvbiwKIAkJCQkJICAgIGNydGMtPngsIGNydGMtPnkpOwpAQCAtNDQ3LDggKzQ0 OCw5IEBAIHZvaWQgZHJtbW9kZV9jb3B5X2ZiKFNjcm5JbmZvUHRyIHBTY3JuLCBkcm1tb2RlX3B0 ciBkcm1tb2RlKQogewogCXhmODZDcnRjQ29uZmlnUHRyICAgeGY4Nl9jb25maWcgPSBYRjg2X0NS VENfQ09ORklHX1BUUihwU2Nybik7CiAJUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHBT Y3JuKTsKLQlQaXhtYXBQdHIgc3JjLCBkc3Q7CiAJU2NyZWVuUHRyIHBTY3JlZW4gPSBwU2Nybi0+ cFNjcmVlbjsKKwlQaXhtYXBQdHIgc3JjLCBkc3QgPSBwU2NyZWVuLT5HZXRTY3JlZW5QaXhtYXAo cFNjcmVlbik7CisJc3RydWN0IGRybW1vZGVfZmIgKmZiID0gcmFkZW9uX3BpeG1hcF9nZXRfZmIo ZHN0KTsKIAlpbnQgZmJjb25faWQgPSAwOwogCUJvb2wgZm9yY2U7CiAJR0NQdHIgZ2M7CkBAIC00 NjQsNyArNDY2LDcgQEAgdm9pZCBkcm1tb2RlX2NvcHlfZmIoU2NybkluZm9QdHIgcFNjcm4sIGRy bW1vZGVfcHRyIGRybW1vZGUpCiAJaWYgKCFmYmNvbl9pZCkKIAkJcmV0dXJuOwogCi0JaWYgKGZi Y29uX2lkID09IGRybW1vZGUtPmZiX2lkKSB7CisJaWYgKGZiY29uX2lkID09IGZiLT5oYW5kbGUp IHsKIAkJLyogaW4gc29tZSByYXJlIGNhc2UgdGhlcmUgbWlnaHQgYmUgbm8gZmJjb24gYW5kIHdl IG1pZ2h0IGFscmVhZHkKIAkJICogYmUgdGhlIG9uZSB3aXRoIHRoZSBjdXJyZW50IGZiIHRvIGF2 b2lkIGEgZmFsc2UgZGVhZGxjayBpbgogCQkgKiBrZXJuZWwgdHRtIGNvZGUganVzdCBkbyBub3Ro aW5nIGFzIGFueXdheSB0aGVyZSBpcyBub3RoaW5nCkBAIC00NzcsOCArNDc5LDYgQEAgdm9pZCBk cm1tb2RlX2NvcHlfZmIoU2NybkluZm9QdHIgcFNjcm4sIGRybW1vZGVfcHRyIGRybW1vZGUpCiAJ aWYgKCFzcmMpCiAJCXJldHVybjsKIAotCWRzdCA9IHBTY3JlZW4tPkdldFNjcmVlblBpeG1hcChw U2NyZWVuKTsKLQogCWdjID0gR2V0U2NyYXRjaEdDKHBTY3JuLT5kZXB0aCwgcFNjcmVlbik7CiAJ VmFsaWRhdGVHQygmZHN0LT5kcmF3YWJsZSwgZ2MpOwogCkBAIC01MDUsOCArNTA1LDYgQEAgZHJt bW9kZV9jcnRjX3NjYW5vdXRfZGVzdHJveShkcm1tb2RlX3B0ciBkcm1tb2RlLAogCX0KIAogCWlm IChzY2Fub3V0LT5ibykgewotCQlkcm1Nb2RlUm1GQihkcm1tb2RlLT5mZCwgc2Nhbm91dC0+ZmJf aWQpOwotCQlzY2Fub3V0LT5mYl9pZCA9IDA7CiAJCXJhZGVvbl9ib191bm1hcChzY2Fub3V0LT5i byk7CiAJCXJhZGVvbl9ib191bnJlZihzY2Fub3V0LT5ibyk7CiAJCXNjYW5vdXQtPmJvID0gTlVM TDsKQEAgLTU3MSwxNSArNTY5LDkgQEAgZHJtbW9kZV9jcnRjX3NjYW5vdXRfY3JlYXRlKHhmODZD cnRjUHRyIGNydGMsIHN0cnVjdCBkcm1tb2RlX3NjYW5vdXQgKnNjYW5vdXQsCiAJc2Nhbm91dC0+ Ym8gPSByYWRlb25fYWxsb2NfcGl4bWFwX2JvKHBTY3JuLCB3aWR0aCwgaGVpZ2h0LCBwU2Nybi0+ ZGVwdGgsCiAJCQkJCSAgICAgdGlsaW5nLCBwU2Nybi0+Yml0c1BlclBpeGVsLAogCQkJCQkgICAg ICZwaXRjaCwgJnN1cmZhY2UsICZ0aWxpbmcpOwotCWlmIChzY2Fub3V0LT5ibyA9PSBOVUxMKQot CQlnb3RvIGVycm9yOwotCi0JaWYgKGRybU1vZGVBZGRGQihkcm1tb2RlLT5mZCwgd2lkdGgsIGhl aWdodCwgcFNjcm4tPmRlcHRoLAotCQkJICAgcFNjcm4tPmJpdHNQZXJQaXhlbCwgcGl0Y2gsCi0J CQkgICBzY2Fub3V0LT5iby0+aGFuZGxlLAotCQkJICAgJnNjYW5vdXQtPmZiX2lkKSAhPSAwKSB7 Ci0JCUVycm9yRigiZmFpbGVkIHRvIGFkZCBzY2Fub3V0IGZiXG4iKTsKLQkJZ290byBlcnJvcjsK KwlpZiAoIXNjYW5vdXQtPmJvKSB7CisJCUVycm9yRigiZmFpbGVkIHRvIGNyZWF0ZSBDUlRDIHNj YW5vdXQgQk9cbiIpOworCQlyZXR1cm4gTlVMTDsKIAl9CiAKIAlzY2Fub3V0LT5waXhtYXAgPSBk cm1tb2RlX2NyZWF0ZV9ib19waXhtYXAocFNjcm4sCkBAIC01ODcsMTMgKzU3OSwxNyBAQCBkcm1t b2RlX2NydGNfc2Nhbm91dF9jcmVhdGUoeGY4NkNydGNQdHIgY3J0Yywgc3RydWN0IGRybW1vZGVf c2Nhbm91dCAqc2Nhbm91dCwKIAkJCQkJCSBwU2Nybi0+ZGVwdGgsCiAJCQkJCQkgcFNjcm4tPmJp dHNQZXJQaXhlbCwKIAkJCQkJCSBwaXRjaCwgc2Nhbm91dC0+Ym8sIE5VTEwpOwotCWlmIChzY2Fu b3V0LT5waXhtYXApIHsKKwlpZiAoIXNjYW5vdXQtPnBpeG1hcCkgeworCQlFcnJvckYoImZhaWxl ZCB0byBjcmVhdGUgQ1JUQyBzY2Fub3V0IHBpeG1hcFxuIik7CisJCWdvdG8gZXJyb3I7CisJfQor CisJaWYgKHJhZGVvbl9waXhtYXBfZ2V0X2ZiKHNjYW5vdXQtPnBpeG1hcCkpIHsKIAkJc2Nhbm91 dC0+d2lkdGggPSB3aWR0aDsKIAkJc2Nhbm91dC0+aGVpZ2h0ID0gaGVpZ2h0OwogCX0gZWxzZSB7 Ci0JCXhmODZEcnZNc2cocFNjcm4tPnNjcm5JbmRleCwgWF9FUlJPUiwKLQkJCSAgICJDb3VsZG4n dCBhbGxvY2F0ZSBzY2Fub3V0IHBpeG1hcCBmb3IgQ1JUQ1xuIik7Ci1lcnJvcjoKKwkJRXJyb3JG KCJmYWlsZWQgdG8gY3JlYXRlIENSVEMgc2Nhbm91dCBGQlxuIik7CitlcnJvcjoJCQogCQlkcm1t b2RlX2NydGNfc2Nhbm91dF9kZXN0cm95KGRybW1vZGUsIHNjYW5vdXQpOwogCX0KIApAQCAtNzA2 LDggKzcwMiw4IEBAIGRybW1vZGVfaGFuZGxlX3RyYW5zZm9ybSh4Zjg2Q3J0Y1B0ciBjcnRjKQog CiBzdGF0aWMgdm9pZAogZHJtbW9kZV9jcnRjX3ByaW1lX3NjYW5vdXRfdXBkYXRlKHhmODZDcnRj UHRyIGNydGMsIERpc3BsYXlNb2RlUHRyIG1vZGUsCi0JCQkJICB1bnNpZ25lZCBzY2Fub3V0X2lk LCBpbnQgKmZiX2lkLCBpbnQgKngsCi0JCQkJICBpbnQgKnkpCisJCQkJICB1bnNpZ25lZCBzY2Fu b3V0X2lkLCBzdHJ1Y3QgZHJtbW9kZV9mYiAqKmZiLAorCQkJCSAgaW50ICp4LCBpbnQgKnkpCiB7 CiAJU2NybkluZm9QdHIgc2NybiA9IGNydGMtPnNjcm47CiAJU2NyZWVuUHRyIHNjcmVlbiA9IHNj cm4tPnBTY3JlZW47CkBAIC03NTksNyArNzU1LDcgQEAgZHJtbW9kZV9jcnRjX3ByaW1lX3NjYW5v dXRfdXBkYXRlKHhmODZDcnRjUHRyIGNydGMsIERpc3BsYXlNb2RlUHRyIG1vZGUsCiAJCX0KIAl9 CiAKLQkqZmJfaWQgPSBkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9pZF0uZmJfaWQ7CisJ KmZiID0gcmFkZW9uX3BpeG1hcF9nZXRfZmIoZHJtbW9kZV9jcnRjLT5zY2Fub3V0W3NjYW5vdXRf aWRdLnBpeG1hcCk7CiAJKnggPSAqeSA9IDA7CiAJZHJtbW9kZV9jcnRjLT5zY2Fub3V0X2lkID0g c2Nhbm91dF9pZDsKIH0KQEAgLTc2OCw3ICs3NjQsOCBAQCBkcm1tb2RlX2NydGNfcHJpbWVfc2Nh bm91dF91cGRhdGUoeGY4NkNydGNQdHIgY3J0YywgRGlzcGxheU1vZGVQdHIgbW9kZSwKIAogc3Rh dGljIHZvaWQKIGRybW1vZGVfY3J0Y19zY2Fub3V0X3VwZGF0ZSh4Zjg2Q3J0Y1B0ciBjcnRjLCBE aXNwbGF5TW9kZVB0ciBtb2RlLAotCQkJICAgIHVuc2lnbmVkIHNjYW5vdXRfaWQsIGludCAqZmJf aWQsIGludCAqeCwgaW50ICp5KQorCQkJICAgIHVuc2lnbmVkIHNjYW5vdXRfaWQsIHN0cnVjdCBk cm1tb2RlX2ZiICoqZmIsIGludCAqeCwKKwkJCSAgICBpbnQgKnkpCiB7CiAJU2NybkluZm9QdHIg c2NybiA9IGNydGMtPnNjcm47CiAJU2NyZWVuUHRyIHNjcmVlbiA9IHNjcm4tPnBTY3JlZW47CkBA IC04MDQsNyArODAxLDcgQEAgZHJtbW9kZV9jcnRjX3NjYW5vdXRfdXBkYXRlKHhmODZDcnRjUHRy IGNydGMsIERpc3BsYXlNb2RlUHRyIG1vZGUsCiAJCWJveC0+eDIgPSBtYXgoYm94LT54Miwgc2Ny bi0+dmlydHVhbFgpOwogCQlib3gtPnkyID0gbWF4KGJveC0+eTIsIHNjcm4tPnZpcnR1YWxZKTsK IAotCQkqZmJfaWQgPSBkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9pZF0uZmJfaWQ7CisJ CSpmYiA9IHJhZGVvbl9waXhtYXBfZ2V0X2ZiKGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtzY2Fub3V0 X2lkXS5waXhtYXApOwogCQkqeCA9ICp5ID0gMDsKIAogCQlyYWRlb25fc2Nhbm91dF9kb191cGRh dGUoY3J0Yywgc2Nhbm91dF9pZCk7CkBAIC04NDEsNyArODM4LDcgQEAgZHJtbW9kZV9zZXRfbW9k ZV9tYWpvcih4Zjg2Q3J0Y1B0ciBjcnRjLCBEaXNwbGF5TW9kZVB0ciBtb2RlLAogCWludCBvdXRw dXRfY291bnQgPSAwOwogCUJvb2wgcmV0ID0gRkFMU0U7CiAJaW50IGk7Ci0JaW50IGZiX2lkOwor CXN0cnVjdCBkcm1tb2RlX2ZiICpmYiA9IE5VTEw7CiAJZHJtTW9kZU1vZGVJbmZvIGttb2RlOwog CiAJLyogVGhlIHJvb3Qgd2luZG93IGNvbnRlbnRzIG1heSBiZSB1bmRlZmluZWQgYmVmb3JlIHRo ZSBXaW5kb3dFeHBvc3VyZXMKQEAgLTg4OSwxNSArODg2LDE0IEBAIGRybW1vZGVfc2V0X21vZGVf bWFqb3IoeGY4NkNydGNQdHIgY3J0YywgRGlzcGxheU1vZGVQdHIgbW9kZSwKIAogCQlkcm1tb2Rl X0NvbnZlcnRUb0tNb2RlKGNydGMtPnNjcm4sICZrbW9kZSwgbW9kZSk7CiAKLQkJZmJfaWQgPSBk cm1tb2RlLT5mYl9pZDsKICNpZmRlZiBSQURFT05fUElYTUFQX1NIQVJJTkcKIAkJaWYgKGNydGMt PnJhbmRyX2NydGMgJiYgY3J0Yy0+cmFuZHJfY3J0Yy0+c2Nhbm91dF9waXhtYXApIHsKIAkJCWRy bW1vZGVfY3J0Y19wcmltZV9zY2Fub3V0X3VwZGF0ZShjcnRjLCBtb2RlLCBzY2Fub3V0X2lkLAot CQkJCQkJCSAgJmZiX2lkLCAmeCwgJnkpOworCQkJCQkJCSAgJmZiLCAmeCwgJnkpOwogCQl9IGVs c2UKICNlbmRpZgotCQlpZiAoZHJtbW9kZV9jcnRjLT5yb3RhdGUuZmJfaWQpIHsKLQkJCWZiX2lk ID0gZHJtbW9kZV9jcnRjLT5yb3RhdGUuZmJfaWQ7CisJCWlmIChkcm1tb2RlX2NydGMtPnJvdGF0 ZS5waXhtYXApIHsKKwkJCWZiID0gcmFkZW9uX3BpeG1hcF9nZXRfZmIoZHJtbW9kZV9jcnRjLT5y b3RhdGUucGl4bWFwKTsKIAkJCXggPSB5ID0gMDsKIAogCQl9IGVsc2UgaWYgKCFyYWRlb25faXNf Z3B1X3NjcmVlbihwU2NyZWVuKSAmJgpAQCAtOTA3LDIyICs5MDMsMjQgQEAgZHJtbW9kZV9zZXRf bW9kZV9tYWpvcih4Zjg2Q3J0Y1B0ciBjcnRjLCBEaXNwbGF5TW9kZVB0ciBtb2RlLAogI2VuZGlm CiAJCQkgICAgaW5mby0+c2hhZG93X3ByaW1hcnkpKSB7CiAJCQlkcm1tb2RlX2NydGNfc2Nhbm91 dF91cGRhdGUoY3J0YywgbW9kZSwgc2Nhbm91dF9pZCwKLQkJCQkJCSAgICAmZmJfaWQsICZ4LCAm eSk7CisJCQkJCQkgICAgJmZiLCAmeCwgJnkpOwogCQl9CiAKLQkJaWYgKGZiX2lkID09IDApIHsK LQkJCWlmIChkcm1Nb2RlQWRkRkIoZHJtbW9kZS0+ZmQsCi0JCQkJCSBwU2Nybi0+dmlydHVhbFgs Ci0JCQkJCSBwU2Nybi0+dmlydHVhbFksCi0JCQkJCSBwU2Nybi0+ZGVwdGgsIHBTY3JuLT5iaXRz UGVyUGl4ZWwsCi0JCQkJCSBwU2Nybi0+ZGlzcGxheVdpZHRoICogaW5mby0+cGl4ZWxfYnl0ZXMs Ci0JCQkJCSBpbmZvLT5mcm9udF9iby0+aGFuZGxlLAotCQkJCQkgJmRybW1vZGUtPmZiX2lkKSA8 IDApIHsKLQkJCQlFcnJvckYoImZhaWxlZCB0byBhZGQgZmJcbiIpOwotCQkJCWdvdG8gZG9uZTsK LQkJCX0KLQotCQkJZmJfaWQgPSBkcm1tb2RlLT5mYl9pZDsKKwkJaWYgKCFmYikKKwkJCWZiID0g cmFkZW9uX3BpeG1hcF9nZXRfZmIocFNjcmVlbi0+R2V0V2luZG93UGl4bWFwKHBTY3JlZW4tPnJv b3QpKTsKKwkJaWYgKCFmYikgeworCQkJZmIgPSByYWRlb25fZmJfY3JlYXRlKGRybW1vZGUtPmZk LCBwU2Nybi0+dmlydHVhbFgsCisJCQkJCSAgICAgIHBTY3JuLT52aXJ0dWFsWSwgcFNjcm4tPmRl cHRoLAorCQkJCQkgICAgICBwU2Nybi0+Yml0c1BlclBpeGVsLAorCQkJCQkgICAgICBwU2Nybi0+ ZGlzcGxheVdpZHRoICogaW5mby0+cGl4ZWxfYnl0ZXMsCisJCQkJCSAgICAgIGluZm8tPmZyb250 X2JvLT5oYW5kbGUpOworCQkJLyogUHJldmVudCByZWZjbnQgb2YgYWQtaG9jIEZCcyBmcm9tIHJl YWNoaW5nIDIgKi8KKwkJCWRybW1vZGVfZmJfcmVmZXJlbmNlKGRybW1vZGUtPmZkLCAmZHJtbW9k ZV9jcnRjLT5mYiwgTlVMTCk7CisJCQlkcm1tb2RlX2NydGMtPmZiID0gZmI7CisJCX0KKwkJaWYg KCFmYikgeworCQkJRXJyb3JGKCJmYWlsZWQgdG8gYWRkIEZCIGZvciBtb2Rlc2V0XG4iKTsKKwkJ CWdvdG8gZG9uZTsKIAkJfQogCiAJCS8qIFdhaXQgZm9yIGFueSBwZW5kaW5nIGZsaXAgdG8gZmlu aXNoICovCkBAIC05MzIsMTMgKzkzMCwxNSBAQCBkcm1tb2RlX3NldF9tb2RlX21ham9yKHhmODZD cnRjUHRyIGNydGMsIERpc3BsYXlNb2RlUHRyIG1vZGUsCiAKIAkJaWYgKGRybU1vZGVTZXRDcnRj KGRybW1vZGUtPmZkLAogCQkJCSAgIGRybW1vZGVfY3J0Yy0+bW9kZV9jcnRjLT5jcnRjX2lkLAot CQkJCSAgIGZiX2lkLCB4LCB5LCBvdXRwdXRfaWRzLAorCQkJCSAgIGZiLT5oYW5kbGUsIHgsIHks IG91dHB1dF9pZHMsCiAJCQkJICAgb3V0cHV0X2NvdW50LCAma21vZGUpICE9IDApIHsKIAkJCXhm ODZEcnZNc2coY3J0Yy0+c2Nybi0+c2NybkluZGV4LCBYX0VSUk9SLAogCQkJCSAgICJmYWlsZWQg dG8gc2V0IG1vZGU6ICVzXG4iLCBzdHJlcnJvcihlcnJubykpOwogCQkJZ290byBkb25lOwotCQl9 IGVsc2UKKwkJfSBlbHNlIHsKIAkJCXJldCA9IFRSVUU7CisJCQlkcm1tb2RlX2ZiX3JlZmVyZW5j ZShkcm1tb2RlLT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsIGZiKTsKKwkJfQogCiAJCWlmIChwU2Ny ZWVuKQogCQkJeGY4NkNydGNTZXRTY3JlZW5TdWJwaXhlbE9yZGVyKHBTY3JlZW4pOwpAQCAtOTgz LDcgKzk4Myw5IEBAIGRvbmU6CiAJfSBlbHNlIHsKIAkJY3J0Yy0+YWN0aXZlID0gVFJVRTsKIAot CQlpZiAoZmJfaWQgIT0gZHJtbW9kZV9jcnRjLT5zY2Fub3V0W3NjYW5vdXRfaWRdLmZiX2lkKQor CQlpZiAoZHJtbW9kZV9jcnRjLT5zY2Fub3V0W3NjYW5vdXRfaWRdLnBpeG1hcCAmJgorCQkgICAg ZmIgIT0gcmFkZW9uX3BpeG1hcF9nZXRfZmIoZHJtbW9kZV9jcnRjLT4KKwkJCQkJICAgICAgIHNj YW5vdXRbc2Nhbm91dF9pZF0ucGl4bWFwKSkKIAkJCWRybW1vZGVfY3J0Y19zY2Fub3V0X2ZyZWUo ZHJtbW9kZV9jcnRjKTsKIAkJZWxzZSBpZiAoIWRybW1vZGVfY3J0Yy0+dGVhcl9mcmVlKSB7CiAJ CQlkcm1tb2RlX2NydGNfc2Nhbm91dF9kZXN0cm95KGRybW1vZGUsCkBAIC0yMTU3LDEzICsyMTU5 LDkgQEAgc3RhdGljIEJvb2wKIGRybW1vZGVfeGY4NmNydGNfcmVzaXplIChTY3JuSW5mb1B0ciBz Y3JuLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiB7CiAJeGY4NkNydGNDb25maWdQdHIgeGY4Nl9j b25maWcgPSBYRjg2X0NSVENfQ09ORklHX1BUUihzY3JuKTsKLQlkcm1tb2RlX2NydGNfcHJpdmF0 ZV9wdHIKLQkJICAgIGRybW1vZGVfY3J0YyA9IHhmODZfY29uZmlnLT5jcnRjWzBdLT5kcml2ZXJf cHJpdmF0ZTsKLQlkcm1tb2RlX3B0ciBkcm1tb2RlID0gZHJtbW9kZV9jcnRjLT5kcm1tb2RlOwog CVJBREVPTkluZm9QdHIgaW5mbyA9IFJBREVPTlBUUihzY3JuKTsKIAlzdHJ1Y3QgcmFkZW9uX2Jv ICpvbGRfZnJvbnQgPSBOVUxMOwogCVNjcmVlblB0ciAgIHNjcmVlbiA9IHhmODZTY3JuVG9TY3Jl ZW4oc2Nybik7Ci0JdWludDMyX3QgICAgb2xkX2ZiX2lkOwogCWludAkgICAgaSwgcGl0Y2gsIG9s ZF93aWR0aCwgb2xkX2hlaWdodCwgb2xkX3BpdGNoOwogCWludCBhbGlnbmVkX2hlaWdodDsKIAl1 aW50MzJfdCBzY3JlZW5fc2l6ZTsKQEAgLTIyNjMsOCArMjI2MSw2IEBAIGRybW1vZGVfeGY4NmNy dGNfcmVzaXplIChTY3JuSW5mb1B0ciBzY3JuLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAJb2xk X3dpZHRoID0gc2Nybi0+dmlydHVhbFg7CiAJb2xkX2hlaWdodCA9IHNjcm4tPnZpcnR1YWxZOwog CW9sZF9waXRjaCA9IHNjcm4tPmRpc3BsYXlXaWR0aDsKLQlvbGRfZmJfaWQgPSBkcm1tb2RlLT5m Yl9pZDsKLQlkcm1tb2RlLT5mYl9pZCA9IDA7CiAJb2xkX2Zyb250ID0gaW5mby0+ZnJvbnRfYm87 CiAKIAlzY3JuLT52aXJ0dWFsWCA9IHdpZHRoOwpAQCAtMjM0Niw4ICsyMzQyLDYgQEAgZHJtbW9k ZV94Zjg2Y3J0Y19yZXNpemUgKFNjcm5JbmZvUHRyIHNjcm4sIGludCB3aWR0aCwgaW50IGhlaWdo dCkKIAkJCQkgICAgICAgY3J0Yy0+cm90YXRpb24sIGNydGMtPngsIGNydGMtPnkpOwogCX0KIAot CWlmIChvbGRfZmJfaWQpCi0JCWRybU1vZGVSbUZCKGRybW1vZGUtPmZkLCBvbGRfZmJfaWQpOwog CWlmIChvbGRfZnJvbnQpCiAJCXJhZGVvbl9ib191bnJlZihvbGRfZnJvbnQpOwogCkBAIC0yMzYx LDcgKzIzNTUsNiBAQCBkcm1tb2RlX3hmODZjcnRjX3Jlc2l6ZSAoU2NybkluZm9QdHIgc2Nybiwg aW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogCXNjcm4tPnZpcnR1YWxYID0gb2xkX3dpZHRoOwogCXNj cm4tPnZpcnR1YWxZID0gb2xkX2hlaWdodDsKIAlzY3JuLT5kaXNwbGF5V2lkdGggPSBvbGRfcGl0 Y2g7Ci0JZHJtbW9kZS0+ZmJfaWQgPSBvbGRfZmJfaWQ7CiAKIAlyZXR1cm4gRkFMU0U7CiB9CkBA IC0yMzc1LDcgKzIzNjgsNyBAQCBkcm1tb2RlX2NsZWFyX3BlbmRpbmdfZmxpcCh4Zjg2Q3J0Y1B0 ciBjcnRjKQogewogCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjcnRj LT5kcml2ZXJfcHJpdmF0ZTsKIAotCWRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nID0gRkFMU0U7 CisJZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcgPSBOVUxMOwogCiAJaWYgKCFjcnRjLT5lbmFi bGVkIHx8CiAJICAgIChkcm1tb2RlX2NydGMtPnBlbmRpbmdfZHBtc19tb2RlICE9IERQTVNNb2Rl T24gJiYKQEAgLTI0MTksNyArMjQxMiw3IEBAIGRybW1vZGVfZmxpcF9hYm9ydCh4Zjg2Q3J0Y1B0 ciBjcnRjLCB2b2lkICpldmVudF9kYXRhKQogc3RhdGljIHZvaWQKIGRybW1vZGVfZmxpcF9oYW5k bGVyKHhmODZDcnRjUHRyIGNydGMsIHVpbnQzMl90IGZyYW1lLCB1aW50NjRfdCB1c2VjLCB2b2lk ICpldmVudF9kYXRhKQogewotCVJBREVPTkluZm9QdHIgaW5mbyA9IFJBREVPTlBUUihjcnRjLT5z Y3JuKTsKKwlkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0gY3J0Yy0+ZHJp dmVyX3ByaXZhdGU7CiAJZHJtbW9kZV9mbGlwZGF0YV9wdHIgZmxpcGRhdGEgPSBldmVudF9kYXRh OwogCiAJLyogSXMgdGhpcyB0aGUgZXZlbnQgd2hvc2UgaW5mbyBzaGFsbCBiZSBkZWxpdmVyZWQg dG8gaGlnaGVyIGxldmVsPyAqLwpAQCAtMjQzOSwxMiArMjQzMiwxMSBAQCBkcm1tb2RlX2ZsaXBf aGFuZGxlcih4Zjg2Q3J0Y1B0ciBjcnRjLCB1aW50MzJfdCBmcmFtZSwgdWludDY0X3QgdXNlYywg dm9pZCAqZXZlbgogCQllbHNlCiAJCQlmbGlwZGF0YS0+aGFuZGxlcihjcnRjLCBmcmFtZSwgdXNl YywgZmxpcGRhdGEtPmV2ZW50X2RhdGEpOwogCi0JCS8qIFJlbGVhc2UgZnJhbWVidWZmZXIgKi8K LQkJZHJtTW9kZVJtRkIoaW5mby0+ZHJtbW9kZS5mZCwgZmxpcGRhdGEtPm9sZF9mYl9pZCk7Ci0K IAkJZnJlZShmbGlwZGF0YSk7CiAJfQogCisJZHJtbW9kZV9mYl9yZWZlcmVuY2UoZHJtbW9kZV9j cnRjLT5kcm1tb2RlLT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsCisJCQkgICAgIGRybW1vZGVfY3J0 Yy0+ZmxpcF9wZW5kaW5nKTsKIAlkcm1tb2RlX2NsZWFyX3BlbmRpbmdfZmxpcChjcnRjKTsKIH0K IApAQCAtMjcwMSw2ICsyNjkzLDggQEAgQm9vbCBkcm1tb2RlX3NldF9kZXNpcmVkX21vZGVzKFNj cm5JbmZvUHRyIHBTY3JuLCBkcm1tb2RlX3B0ciBkcm1tb2RlLAogCQkJCWRybU1vZGVTZXRDcnRj KGRybW1vZGUtPmZkLAogCQkJCQkgICAgICAgZHJtbW9kZV9jcnRjLT5tb2RlX2NydGMtPmNydGNf aWQsCiAJCQkJCSAgICAgICAwLCAwLCAwLCBOVUxMLCAwLCBOVUxMKTsKKwkJCQlkcm1tb2RlX2Zi X3JlZmVyZW5jZShkcm1tb2RlLT5mZCwKKwkJCQkJCSAgICAgJmRybW1vZGVfY3J0Yy0+ZmIsIE5V TEwpOwogCQkJfQogCQkJY29udGludWU7CiAJCX0KQEAgLTI5NjAsMTggKzI5NTQsMTEgQEAgQm9v bCByYWRlb25fZG9fcGFnZWZsaXAoU2NybkluZm9QdHIgc2NybiwgQ2xpZW50UHRyIGNsaWVudCwK IAl4Zjg2Q3J0Y0NvbmZpZ1B0ciBjb25maWcgPSBYRjg2X0NSVENfQ09ORklHX1BUUihzY3JuKTsK IAl4Zjg2Q3J0Y1B0ciBjcnRjID0gTlVMTDsKIAlkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJt bW9kZV9jcnRjID0gY29uZmlnLT5jcnRjWzBdLT5kcml2ZXJfcHJpdmF0ZTsKLQlkcm1tb2RlX3B0 ciBkcm1tb2RlID0gZHJtbW9kZV9jcnRjLT5kcm1tb2RlOwogCWludCBpOwogCXVpbnQzMl90IGZs aXBfZmxhZ3MgPSBmbGlwX3N5bmMgPT0gRkxJUF9BU1lOQyA/IERSTV9NT0RFX1BBR0VfRkxJUF9B U1lOQyA6IDA7CiAJZHJtbW9kZV9mbGlwZGF0YV9wdHIgZmxpcGRhdGE7CiAJdWludHB0cl90IGRy bV9xdWV1ZV9zZXEgPSAwOwotCXVpbnQzMl90IG5ld19mcm9udF9oYW5kbGU7Ci0KLQlpZiAoIXJh ZGVvbl9nZXRfcGl4bWFwX2hhbmRsZShuZXdfZnJvbnQsICZuZXdfZnJvbnRfaGFuZGxlKSkgewot CQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLAotCQkJICAgImZsaXAgcXVl dWU6IGZhaWxlZCB0byBnZXQgbmV3IGZyb250IGhhbmRsZVxuIik7Ci0JCXJldHVybiBGQUxTRTsK LQl9CisJc3RydWN0IGRybW1vZGVfZmIgKmZiOwogCiAgICAgICAgIGZsaXBkYXRhID0gY2FsbG9j KDEsIHNpemVvZihkcm1tb2RlX2ZsaXBkYXRhX3JlYykpOwogICAgICAgICBpZiAoIWZsaXBkYXRh KSB7CkBAIC0yOTgwLDE1ICsyOTY3LDExIEBAIEJvb2wgcmFkZW9uX2RvX3BhZ2VmbGlwKFNjcm5J bmZvUHRyIHNjcm4sIENsaWVudFB0ciBjbGllbnQsCiAgICAgICAgICAgICAgZ290byBlcnJvcjsK ICAgICAgICAgfQogCi0JLyoKLQkgKiBDcmVhdGUgYSBuZXcgaGFuZGxlIGZvciB0aGUgYmFjayBi dWZmZXIKLQkgKi8KLQlmbGlwZGF0YS0+b2xkX2ZiX2lkID0gZHJtbW9kZS0+ZmJfaWQ7Ci0JaWYg KGRybU1vZGVBZGRGQihkcm1tb2RlLT5mZCwgbmV3X2Zyb250LT5kcmF3YWJsZS53aWR0aCwKLQkJ CSBuZXdfZnJvbnQtPmRyYXdhYmxlLmhlaWdodCwgc2Nybi0+ZGVwdGgsCi0JCQkgc2Nybi0+Yml0 c1BlclBpeGVsLCBuZXdfZnJvbnQtPmRldktpbmQsCi0JCQkgbmV3X2Zyb250X2hhbmRsZSwgJmRy bW1vZGUtPmZiX2lkKSkKKwlmYiA9IHJhZGVvbl9waXhtYXBfZ2V0X2ZiKG5ld19mcm9udCk7CisJ aWYgKCFmYikgeworCQlFcnJvckYoIkZhaWxlZCB0byBnZXQgRkIgZm9yIGZsaXBcbiIpOwogCQln b3RvIGVycm9yOworCX0KIAogCS8qCiAJICogUXVldWUgZmxpcHMgb24gYWxsIGVuYWJsZWQgQ1JU Q3MKQEAgLTMwMzIsNyArMzAxNSw3IEBAIEJvb2wgcmFkZW9uX2RvX3BhZ2VmbGlwKFNjcm5JbmZv UHRyIHNjcm4sIENsaWVudFB0ciBjbGllbnQsCiAJCWlmIChkcm1tb2RlX2NydGMtPmh3X2lkID09 IHJlZl9jcnRjX2h3X2lkKSB7CiAJCQlpZiAoZHJtbW9kZV9wYWdlX2ZsaXBfdGFyZ2V0X2Fic29s dXRlKHBSQURFT05FbnQsCiAJCQkJCQkJICAgICAgZHJtbW9kZV9jcnRjLAotCQkJCQkJCSAgICAg IGRybW1vZGUtPmZiX2lkLAorCQkJCQkJCSAgICAgIGZiLT5oYW5kbGUsCiAJCQkJCQkJICAgICAg ZmxpcF9mbGFncywKIAkJCQkJCQkgICAgICBkcm1fcXVldWVfc2VxLAogCQkJCQkJCSAgICAgIHRh cmdldF9tc2MpICE9IDApCkBAIC0zMDQwLDEzICszMDIzLDEzIEBAIEJvb2wgcmFkZW9uX2RvX3Bh Z2VmbGlwKFNjcm5JbmZvUHRyIHNjcm4sIENsaWVudFB0ciBjbGllbnQsCiAJCX0gZWxzZSB7CiAJ CQlpZiAoZHJtbW9kZV9wYWdlX2ZsaXBfdGFyZ2V0X3JlbGF0aXZlKHBSQURFT05FbnQsCiAJCQkJ CQkJICAgICAgZHJtbW9kZV9jcnRjLAotCQkJCQkJCSAgICAgIGRybW1vZGUtPmZiX2lkLAorCQkJ CQkJCSAgICAgIGZiLT5oYW5kbGUsCiAJCQkJCQkJICAgICAgZmxpcF9mbGFncywKIAkJCQkJCQkg ICAgICBkcm1fcXVldWVfc2VxLCAwKSAhPSAwKQogCQkJCWdvdG8gZmxpcF9lcnJvcjsKIAkJfQog Ci0JCWRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nID0gVFJVRTsKKwkJZHJtbW9kZV9jcnRjLT5m bGlwX3BlbmRpbmcgPSBmYjsKIAkJZHJtX3F1ZXVlX3NlcSA9IDA7CiAJfQogCkBAIC0zMDU4LDEy ICszMDQxLDYgQEAgZmxpcF9lcnJvcjoKIAkJICAgc3RyZXJyb3IoZXJybm8pKTsKIAogZXJyb3I6 Ci0JaWYgKGZsaXBkYXRhICYmIGZsaXBkYXRhLT5mbGlwX2NvdW50IDw9IDEgJiYKLQkgICAgZHJt bW9kZS0+ZmJfaWQgIT0gZmxpcGRhdGEtPm9sZF9mYl9pZCkgewotCQlkcm1Nb2RlUm1GQihkcm1t b2RlLT5mZCwgZHJtbW9kZS0+ZmJfaWQpOwotCQlkcm1tb2RlLT5mYl9pZCA9IGZsaXBkYXRhLT5v bGRfZmJfaWQ7Ci0JfQotCiAJaWYgKGRybV9xdWV1ZV9zZXEpCiAJCXJhZGVvbl9kcm1fYWJvcnRf ZW50cnkoZHJtX3F1ZXVlX3NlcSk7CiAJZWxzZSBpZiAoY3J0YykKZGlmZiAtLWdpdCBhL3NyYy9k cm1tb2RlX2Rpc3BsYXkuaCBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuaAppbmRleCAzNWQ2NDE3OWQu LjE0ZDFjYjAzNCAxMDA2NDQKLS0tIGEvc3JjL2RybW1vZGVfZGlzcGxheS5oCisrKyBiL3NyYy9k cm1tb2RlX2Rpc3BsYXkuaApAQCAtNDEsNyArNDEsNiBAQAogCiB0eXBlZGVmIHN0cnVjdCB7CiAg IGludCBmZDsKLSAgdW5zaWduZWQgZmJfaWQ7CiAgIGRybU1vZGVGQlB0ciBtb2RlX2ZiOwogICBp bnQgY3BwOwogICBzdHJ1Y3QgcmFkZW9uX2JvX21hbmFnZXIgKmJ1Zm1ncjsKQEAgLTYwLDcgKzU5 LDYgQEAgdHlwZWRlZiBzdHJ1Y3QgewogfSBkcm1tb2RlX3JlYywgKmRybW1vZGVfcHRyOwogCiB0 eXBlZGVmIHN0cnVjdCB7Ci0gIHVuc2lnbmVkIG9sZF9mYl9pZDsKICAgaW50IGZsaXBfY291bnQ7 CiAgIHZvaWQgKmV2ZW50X2RhdGE7CiAgIHVuc2lnbmVkIGludCBmZV9mcmFtZTsKQEAgLTcwLDEw ICs2OCwxNCBAQCB0eXBlZGVmIHN0cnVjdCB7CiAgIHJhZGVvbl9kcm1fYWJvcnRfcHJvYyBhYm9y dDsKIH0gZHJtbW9kZV9mbGlwZGF0YV9yZWMsICpkcm1tb2RlX2ZsaXBkYXRhX3B0cjsKIAorc3Ry dWN0IGRybW1vZGVfZmIgeworCWludCByZWZjbnQ7CisJdWludDMyX3QgaGFuZGxlOworfTsKKwog c3RydWN0IGRybW1vZGVfc2Nhbm91dCB7CiAgICAgc3RydWN0IHJhZGVvbl9ibyAqYm87CiAgICAg UGl4bWFwUHRyIHBpeG1hcDsKLSAgICB1bnNpZ25lZCBmYl9pZDsKICAgICBpbnQgd2lkdGgsIGhl aWdodDsKIH07CiAKQEAgLTEwMiw4ICsxMDQsMTAgQEAgdHlwZWRlZiBzdHJ1Y3QgewogICAgICAq IG1vZGVzZXQpCiAgICAgICovCiAgICAgQm9vbCBuZWVkX21vZGVzZXQ7Ci0gICAgLyogQSBmbGlw IGlzIHBlbmRpbmcgZm9yIHRoaXMgQ1JUQyAqLwotICAgIEJvb2wgZmxpcF9wZW5kaW5nOworICAg IC8qIEEgZmxpcCB0byB0aGlzIEZCIGlzIHBlbmRpbmcgZm9yIHRoaXMgQ1JUQyAqLworICAgIHN0 cnVjdCBkcm1tb2RlX2ZiICpmbGlwX3BlbmRpbmc7CisgICAgLyogVGhlIEZCIGN1cnJlbnRseSBi ZWluZyBzY2FubmVkIG91dCBieSB0aGlzIENSVEMsIGlmIGFueSAqLworICAgIHN0cnVjdCBkcm1t b2RlX2ZiICpmYjsKIH0gZHJtbW9kZV9jcnRjX3ByaXZhdGVfcmVjLCAqZHJtbW9kZV9jcnRjX3By aXZhdGVfcHRyOwogCiB0eXBlZGVmIHN0cnVjdCB7CkBAIC0xMzUsNiArMTM5LDMxIEBAIGVudW0g ZHJtbW9kZV9mbGlwX3N5bmMgewogfTsKIAogCitzdGF0aWMgaW5saW5lIHZvaWQKK2RybW1vZGVf ZmJfcmVmZXJlbmNlKGludCBkcm1fZmQsIHN0cnVjdCBkcm1tb2RlX2ZiICoqb2xkLCBzdHJ1Y3Qg ZHJtbW9kZV9mYiAqbmV3KQoreworICAgIGlmIChuZXcpIHsKKwlpZiAobmV3LT5yZWZjbnQgPD0g MCkKKwkgICAgRXJyb3JGKCJOZXcgRkIncyByZWZjbnQgd2FzICVkIGluICVzXG4iLCBuZXctPnJl ZmNudCwgX19mdW5jX18pOworCWVsc2UKKwkgICAgbmV3LT5yZWZjbnQrKzsKKyAgICB9CisKKyAg ICBpZiAoKm9sZCkgeworCWlmICgoKm9sZCktPnJlZmNudCA8PSAwKSB7CisJICAgIEVycm9yRigi T2xkIEZCJ3MgcmVmY250IHdhcyAlZCBpbiAlc1xuIiwgKCpvbGQpLT5yZWZjbnQsIF9fZnVuY19f KTsKKwl9IGVsc2UgeworCSAgICBpZiAoLS0oKm9sZCktPnJlZmNudCA9PSAwKSB7CisJCWRybU1v ZGVSbUZCKGRybV9mZCwgKCpvbGQpLT5oYW5kbGUpOworCQlmcmVlKCpvbGQpOworCSAgICB9CisJ fQorICAgIH0KKworICAgICpvbGQgPSBuZXc7Cit9CisKKwogZXh0ZXJuIGludCBkcm1tb2RlX3Bh Z2VfZmxpcF90YXJnZXRfYWJzb2x1dGUoUkFERU9ORW50UHRyIHBSQURFT05FbnQsCiAJCQkJCSAg ICAgZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YywKIAkJCQkJICAgICBpbnQg ZmJfaWQsIHVpbnQzMl90IGZsYWdzLApkaWZmIC0tZ2l0IGEvc3JjL3JhZGVvbi5oIGIvc3JjL3Jh ZGVvbi5oCmluZGV4IDJjYjE4OGUxZi4uZmViZTU4MGI2IDEwMDY0NAotLS0gYS9zcmMvcmFkZW9u LmgKKysrIGIvc3JjL3JhZGVvbi5oCkBAIC0yODgsNiArMjg4LDcgQEAgc3RydWN0IHJhZGVvbl9w aXhtYXAgewogCXVpbnRfZmFzdDMyX3QgZ3B1X3dyaXRlOwogCiAJc3RydWN0IHJhZGVvbl9ibyAq Ym87CisJc3RydWN0IGRybW1vZGVfZmIgKmZiOwogCiAJdWludDMyX3QgdGlsaW5nX2ZsYWdzOwog CkBAIC0zMTMsNiArMzE0LDcgQEAgc3RhdGljIGlubGluZSB2b2lkIHJhZGVvbl9zZXRfcGl4bWFw X3ByaXZhdGUoUGl4bWFwUHRyIHBpeG1hcCwgc3RydWN0IHJhZGVvbl9waXgKIAogc3RydWN0IHJh ZGVvbl9leGFfcGl4bWFwX3ByaXYgewogICAgIHN0cnVjdCByYWRlb25fYm8gKmJvOworICAgIHN0 cnVjdCBkcm1tb2RlX2ZiICpmYjsKICAgICB1aW50MzJfdCB0aWxpbmdfZmxhZ3M7CiAgICAgc3Ry dWN0IHJhZGVvbl9zdXJmYWNlIHN1cmZhY2U7CiAgICAgQm9vbCBib19tYXBwZWQ7CkBAIC02MDks NiArNjExLDkgQEAgZXh0ZXJuIHZvaWQgIFJBREVPTkNvcHlTd2FwKHVpbnQ4X3QgKmRzdCwgdWlu dDhfdCAqc3JjLCB1bnNpZ25lZCBpbnQgc2l6ZSwgaW50IHMKIGV4dGVybiB2b2lkIFJBREVPTklu aXQzREVuZ2luZShTY3JuSW5mb1B0ciBwU2Nybik7CiBleHRlcm4gaW50IHJhZGVvbl9jc19zcGFj ZV9yZW1haW5pbmcoU2NybkluZm9QdHIgcFNjcm4pOwogCisvKiByYWRlb25fYm9faGVscGVyLmMg Ki8KK2V4dGVybiBCb29sIHJhZGVvbl9nZXRfcGl4bWFwX2hhbmRsZShQaXhtYXBQdHIgcGl4bWFw LCB1aW50MzJfdCAqaGFuZGxlKTsKKwogLyogcmFkZW9uX2NvbW1vbmZ1bmNzLmMgKi8KIGV4dGVy biB2b2lkIFJBREVPTldhaXRGb3JWTGluZShTY3JuSW5mb1B0ciBwU2NybiwgUGl4bWFwUHRyIHBQ aXgsCiAJCQkgICAgICAgeGY4NkNydGNQdHIgY3J0YywgaW50IHN0YXJ0LCBpbnQgc3RvcCk7CkBA IC03MDYsNiArNzExLDggQEAgc3RhdGljIGlubGluZSBCb29sIHJhZGVvbl9zZXRfcGl4bWFwX2Jv KFBpeG1hcFB0ciBwUGl4LCBzdHJ1Y3QgcmFkZW9uX2JvICpibykKIAkJcmFkZW9uX2JvX3VucmVm KHByaXYtPmJvKTsKIAkgICAgfQogCisJICAgIGRybW1vZGVfZmJfcmVmZXJlbmNlKGluZm8tPmRy bW1vZGUuZmQsICZwcml2LT5mYiwgTlVMTCk7CisKIAkgICAgaWYgKCFibykgewogCQlmcmVlKHBy aXYpOwogCQlwcml2ID0gTlVMTDsKQEAgLTc5MCw2ICs3OTcsNzIgQEAgc3RhdGljIGlubGluZSBC b29sIHJhZGVvbl9nZXRfcGl4bWFwX3NoYXJlZChQaXhtYXBQdHIgcFBpeCkKICAgICByZXR1cm4g RkFMU0U7CiB9CiAKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGRybW1vZGVfZmIqCityYWRlb25fZmJf Y3JlYXRlKGludCBkcm1fZmQsIHVpbnQzMl90IHdpZHRoLCB1aW50MzJfdCBoZWlnaHQsIHVpbnQ4 X3QgZGVwdGgsCisJCSB1aW50OF90IGJwcCwgdWludDMyX3QgcGl0Y2gsIHVpbnQzMl90IGhhbmRs ZSkKK3sKKyAgICBzdHJ1Y3QgZHJtbW9kZV9mYiAqZmIgID0gbWFsbG9jKHNpemVvZigqZmIpKTsK KworICAgIGlmICghZmIpCisJcmV0dXJuIE5VTEw7CisKKyAgICBmYi0+cmVmY250ID0gMTsKKyAg ICBpZiAoZHJtTW9kZUFkZEZCKGRybV9mZCwgd2lkdGgsIGhlaWdodCwgZGVwdGgsIGJwcCwgcGl0 Y2gsIGhhbmRsZSwKKwkJICAgICAmZmItPmhhbmRsZSkgPT0gMCkKKwlyZXR1cm4gZmI7CisKKyAg ICBmcmVlKGZiKTsKKyAgICByZXR1cm4gTlVMTDsKK30KKworc3RhdGljIGlubGluZSBzdHJ1Y3Qg ZHJtbW9kZV9mYioKK3JhZGVvbl9waXhtYXBfY3JlYXRlX2ZiKGludCBkcm1fZmQsIFBpeG1hcFB0 ciBwaXgpCit7CisgICAgdWludDMyX3QgaGFuZGxlOworCisgICAgaWYgKCFyYWRlb25fZ2V0X3Bp eG1hcF9oYW5kbGUocGl4LCAmaGFuZGxlKSkKKwlyZXR1cm4gTlVMTDsKKworICAgIHJldHVybiBy YWRlb25fZmJfY3JlYXRlKGRybV9mZCwgcGl4LT5kcmF3YWJsZS53aWR0aCwgcGl4LT5kcmF3YWJs ZS5oZWlnaHQsCisJCQkgICAgcGl4LT5kcmF3YWJsZS5kZXB0aCwgcGl4LT5kcmF3YWJsZS5iaXRz UGVyUGl4ZWwsCisJCQkgICAgcGl4LT5kZXZLaW5kLCBoYW5kbGUpOworfQorCitzdGF0aWMgaW5s aW5lIHN0cnVjdCBkcm1tb2RlX2ZiKgorcmFkZW9uX3BpeG1hcF9nZXRfZmIoUGl4bWFwUHRyIHBp eCkKK3sKKyAgICBSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05QVFIoeGY4NlNjcmVlblRvU2Ny bihwaXgtPmRyYXdhYmxlLnBTY3JlZW4pKTsKKworI2lmZGVmIFVTRV9HTEFNT1IKKyAgICBpZiAo aW5mby0+dXNlX2dsYW1vcikgeworCXN0cnVjdCByYWRlb25fcGl4bWFwICpwcml2ID0gcmFkZW9u X2dldF9waXhtYXBfcHJpdmF0ZShwaXgpOworCisJaWYgKCFwcml2KQorCSAgICByZXR1cm4gTlVM TDsKKworCWlmICghcHJpdi0+ZmIpCisJICAgIHByaXYtPmZiID0gcmFkZW9uX3BpeG1hcF9jcmVh dGVfZmIoaW5mby0+ZHJtbW9kZS5mZCwgcGl4KTsKKworCXJldHVybiBwcml2LT5mYjsKKyAgICB9 IGVsc2UKKyNlbmRpZgorICAgIGlmIChpbmZvLT5hY2NlbE9uKQorICAgIHsKKwlzdHJ1Y3QgcmFk ZW9uX2V4YV9waXhtYXBfcHJpdiAqZHJpdmVyX3ByaXYgPQorCSAgICBleGFHZXRQaXhtYXBEcml2 ZXJQcml2YXRlKHBpeCk7CisKKwlpZiAoIWRyaXZlcl9wcml2KQorCSAgICByZXR1cm4gTlVMTDsK KworCWlmICghZHJpdmVyX3ByaXYtPmZiKQorCSAgICBkcml2ZXJfcHJpdi0+ZmIgPSByYWRlb25f cGl4bWFwX2NyZWF0ZV9mYihpbmZvLT5kcm1tb2RlLmZkLCBwaXgpOworCisJcmV0dXJuIGRyaXZl cl9wcml2LT5mYjsKKyAgICB9CisKKyAgICByZXR1cm4gTlVMTDsKK30KKwogI2RlZmluZSBDUF9Q QUNLRVQwKHJlZywgbikJCQkJCQlcCiAJKFJBREVPTl9DUF9QQUNLRVQwIHwgKChuKSA8PCAxNikg fCAoKHJlZykgPj4gMikpCiAjZGVmaW5lIENQX1BBQ0tFVDEocmVnMCwgcmVnMSkJCQkJCQlcCmRp ZmYgLS1naXQgYS9zcmMvcmFkZW9uX2JvX2hlbHBlci5oIGIvc3JjL3JhZGVvbl9ib19oZWxwZXIu aAppbmRleCBmMWFlZDU1MTYuLjc3MTM0MjUwMiAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbl9ib19o ZWxwZXIuaAorKysgYi9zcmMvcmFkZW9uX2JvX2hlbHBlci5oCkBAIC0yOCw5ICsyOCw2IEBAIHJh ZGVvbl9hbGxvY19waXhtYXBfYm8oU2NybkluZm9QdHIgcFNjcm4sIGludCB3aWR0aCwgaW50IGhl aWdodCwgaW50IGRlcHRoLAogCQkgICAgICAgaW50IHVzYWdlX2hpbnQsIGludCBiaXRzUGVyUGl4 ZWwsIGludCAqbmV3X3BpdGNoLAogCQkgICAgICAgc3RydWN0IHJhZGVvbl9zdXJmYWNlICpuZXdf c3VyZmFjZSwgdWludDMyX3QgKm5ld190aWxpbmcpOwogCi1leHRlcm4gQm9vbAotcmFkZW9uX2dl dF9waXhtYXBfaGFuZGxlKFBpeG1hcFB0ciBwaXhtYXAsIHVpbnQzMl90ICpoYW5kbGUpOwotCiBl eHRlcm4gdWludDMyX3QKIHJhZGVvbl9nZXRfcGl4bWFwX3RpbGluZ19mbGFncyhQaXhtYXBQdHIg cFBpeCk7CiAKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fZXhhLmMgYi9zcmMvcmFkZW9uX2V4YS5j CmluZGV4IDFlNDU3YThiYi4uZDhkZDdmZGNlIDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX2V4YS5j CisrKyBiL3NyYy9yYWRlb25fZXhhLmMKQEAgLTMwMCw2ICszMDAsNyBAQCB2b2lkICpSQURFT05F WEFDcmVhdGVQaXhtYXAyKFNjcmVlblB0ciBwU2NyZWVuLCBpbnQgd2lkdGgsIGludCBoZWlnaHQs CiAKIHZvaWQgUkFERU9ORVhBRGVzdHJveVBpeG1hcChTY3JlZW5QdHIgcFNjcmVlbiwgdm9pZCAq ZHJpdmVyUHJpdikKIHsKKyAgICBSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05QVFIoeGY4NlNj cmVlblRvU2NybihwU2NyZWVuKSk7CiAgICAgc3RydWN0IHJhZGVvbl9leGFfcGl4bWFwX3ByaXYg KmRyaXZlcl9wcml2ID0gZHJpdmVyUHJpdjsKIAogICAgIGlmICghZHJpdmVyUHJpdikKQEAgLTMw Nyw2ICszMDgsNyBAQCB2b2lkIFJBREVPTkVYQURlc3Ryb3lQaXhtYXAoU2NyZWVuUHRyIHBTY3Jl ZW4sIHZvaWQgKmRyaXZlclByaXYpCiAKICAgICBpZiAoZHJpdmVyX3ByaXYtPmJvKQogCXJhZGVv bl9ib191bnJlZihkcml2ZXJfcHJpdi0+Ym8pOworICAgIGRybW1vZGVfZmJfcmVmZXJlbmNlKGlu Zm8tPmRybW1vZGUuZmQsICZkcml2ZXJfcHJpdi0+ZmIsIE5VTEwpOwogICAgIGZyZWUoZHJpdmVy UHJpdik7CiB9CiAKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fa21zLmMgYi9zcmMvcmFkZW9uX2tt cy5jCmluZGV4IGIzNDI3YzQ2Mi4uMmI0MTBlYjNkIDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX2tt cy5jCisrKyBiL3NyYy9yYWRlb25fa21zLmMKQEAgLTc3Miw2ICs3NzIsMTcgQEAgcmFkZW9uX3By aW1lX3NjYW5vdXRfZmxpcF9hYm9ydCh4Zjg2Q3J0Y1B0ciBjcnRjLCB2b2lkICpldmVudF9kYXRh KQogfQogCiBzdGF0aWMgdm9pZAorcmFkZW9uX3ByaW1lX3NjYW5vdXRfZmxpcF9oYW5kbGVyKHhm ODZDcnRjUHRyIGNydGMsIHVpbnQzMl90IG1zYywgdWludDY0X3QgdXNlYywKKwkJCQkgIHZvaWQg KmV2ZW50X2RhdGEpCit7CisgICAgZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0 YyA9IGV2ZW50X2RhdGE7CisKKyAgICBkcm1tb2RlX2ZiX3JlZmVyZW5jZShkcm1tb2RlX2NydGMt PmRybW1vZGUtPmZkLCAmZHJtbW9kZV9jcnRjLT5mYiwKKwkJCSBkcm1tb2RlX2NydGMtPmZsaXBf cGVuZGluZyk7CisgICAgcmFkZW9uX3ByaW1lX3NjYW5vdXRfZmxpcF9hYm9ydChjcnRjLCBldmVu dF9kYXRhKTsKK30KKworc3RhdGljIHZvaWQKIHJhZGVvbl9wcmltZV9zY2Fub3V0X2ZsaXAoUGl4 bWFwRGlydHlVcGRhdGVQdHIgZW50KQogewogICAgIFNjcmVlblB0ciBzY3JlZW4gPSBlbnQtPnNs YXZlX2RzdC0+ZHJhd2FibGUucFNjcmVlbjsKQEAgLTc5OCw3ICs4MDksOCBAQCByYWRlb25fcHJp bWVfc2Nhbm91dF9mbGlwKFBpeG1hcERpcnR5VXBkYXRlUHRyIGVudCkKICAgICBkcm1fcXVldWVf c2VxID0gcmFkZW9uX2RybV9xdWV1ZV9hbGxvYyhjcnRjLAogCQkJCQkgICBSQURFT05fRFJNX1FV RVVFX0NMSUVOVF9ERUZBVUxULAogCQkJCQkgICBSQURFT05fRFJNX1FVRVVFX0lEX0RFRkFVTFQs Ci0JCQkJCSAgIGRybW1vZGVfY3J0YywgTlVMTCwKKwkJCQkJICAgZHJtbW9kZV9jcnRjLAorCQkJ CQkgICByYWRlb25fcHJpbWVfc2Nhbm91dF9mbGlwX2hhbmRsZXIsCiAJCQkJCSAgIHJhZGVvbl9w cmltZV9zY2Fub3V0X2ZsaXBfYWJvcnQpOwogICAgIGlmIChkcm1fcXVldWVfc2VxID09IFJBREVP Tl9EUk1fUVVFVUVfRVJST1IpIHsKIAl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJO SU5HLApAQCAtODA2LDggKzgxOCwxNyBAQCByYWRlb25fcHJpbWVfc2Nhbm91dF9mbGlwKFBpeG1h cERpcnR5VXBkYXRlUHRyIGVudCkKIAlyZXR1cm47CiAgICAgfQogCisgICAgZHJtbW9kZV9jcnRj LT5mbGlwX3BlbmRpbmcgPQorCXJhZGVvbl9waXhtYXBfZ2V0X2ZiKGRybW1vZGVfY3J0Yy0+c2Nh bm91dFtzY2Fub3V0X2lkXS5waXhtYXApOworICAgIGlmICghZHJtbW9kZV9jcnRjLT5mbGlwX3Bl bmRpbmcpIHsKKwl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLAorCQkgICAi RmFpbGVkIHRvIGdldCBGQiBmb3IgUFJJTUUgZmxpcC5cbiIpOworCXJhZGVvbl9kcm1fYWJvcnRf ZW50cnkoZHJtX3F1ZXVlX3NlcSk7CisJcmV0dXJuOworICAgIH0KKwogICAgIGlmIChkcm1tb2Rl X3BhZ2VfZmxpcF90YXJnZXRfcmVsYXRpdmUocFJBREVPTkVudCwgZHJtbW9kZV9jcnRjLAotCQkJ CQkgIGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtzY2Fub3V0X2lkXS5mYl9pZCwKKwkJCQkJICBkcm1t b2RlX2NydGMtPmZsaXBfcGVuZGluZy0+aGFuZGxlLAogCQkJCQkgIDAsIGRybV9xdWV1ZV9zZXEs IDApICE9IDApIHsKIAl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLCAiZmxp cCBxdWV1ZSBmYWlsZWQgaW4gJXM6ICVzXG4iLAogCQkgICBfX2Z1bmNfXywgc3RyZXJyb3IoZXJy bm8pKTsKQEAgLTgxNyw3ICs4MzgsNiBAQCByYWRlb25fcHJpbWVfc2Nhbm91dF9mbGlwKFBpeG1h cERpcnR5VXBkYXRlUHRyIGVudCkKIAogICAgIGRybW1vZGVfY3J0Yy0+c2Nhbm91dF9pZCA9IHNj YW5vdXRfaWQ7CiAgICAgZHJtbW9kZV9jcnRjLT5zY2Fub3V0X3VwZGF0ZV9wZW5kaW5nID0gVFJV RTsKLSAgICBkcm1tb2RlX2NydGMtPmZsaXBfcGVuZGluZyA9IFRSVUU7CiB9CiAKIHN0YXRpYyB2 b2lkCkBAIC0xMDUzLDEwICsxMDczLDE0IEBAIHJhZGVvbl9zY2Fub3V0X3VwZGF0ZSh4Zjg2Q3J0 Y1B0ciB4Zjg2X2NydGMpCiBzdGF0aWMgdm9pZAogcmFkZW9uX3NjYW5vdXRfZmxpcF9hYm9ydCh4 Zjg2Q3J0Y1B0ciBjcnRjLCB2b2lkICpldmVudF9kYXRhKQogewotICAgIGRybW1vZGVfY3J0Y19w cml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBldmVudF9kYXRhOworICAgIHJhZGVvbl9wcmltZV9z Y2Fub3V0X2ZsaXBfYWJvcnQoY3J0YywgZXZlbnRfZGF0YSk7Cit9CiAKLSAgICBkcm1tb2RlX2Ny dGMtPnNjYW5vdXRfdXBkYXRlX3BlbmRpbmcgPSBGQUxTRTsKLSAgICBkcm1tb2RlX2NsZWFyX3Bl bmRpbmdfZmxpcChjcnRjKTsKK3N0YXRpYyB2b2lkCityYWRlb25fc2Nhbm91dF9mbGlwX2hhbmRs ZXIoeGY4NkNydGNQdHIgY3J0YywgdWludDMyX3QgbXNjLCB1aW50NjRfdCB1c2VjLAorCQkJICAg IHZvaWQgKmV2ZW50X2RhdGEpCit7CisgICAgcmFkZW9uX3ByaW1lX3NjYW5vdXRfZmxpcF9oYW5k bGVyKGNydGMsIG1zYywgdXNlYywgZXZlbnRfZGF0YSk7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC0x MDgwLDcgKzExMDQsOCBAQCByYWRlb25fc2Nhbm91dF9mbGlwKFNjcmVlblB0ciBwU2NyZWVuLCBS QURFT05JbmZvUHRyIGluZm8sCiAgICAgZHJtX3F1ZXVlX3NlcSA9IHJhZGVvbl9kcm1fcXVldWVf YWxsb2MoeGY4Nl9jcnRjLAogCQkJCQkgICBSQURFT05fRFJNX1FVRVVFX0NMSUVOVF9ERUZBVUxU LAogCQkJCQkgICBSQURFT05fRFJNX1FVRVVFX0lEX0RFRkFVTFQsCi0JCQkJCSAgIGRybW1vZGVf Y3J0YywgTlVMTCwKKwkJCQkJICAgZHJtbW9kZV9jcnRjLAorCQkJCQkgICByYWRlb25fc2Nhbm91 dF9mbGlwX2hhbmRsZXIsCiAJCQkJCSAgIHJhZGVvbl9zY2Fub3V0X2ZsaXBfYWJvcnQpOwogICAg IGlmIChkcm1fcXVldWVfc2VxID09IFJBREVPTl9EUk1fUVVFVUVfRVJST1IpIHsKIAl4Zjg2RHJ2 TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLApAQCAtMTA4OCw4ICsxMTEzLDE3IEBAIHJh ZGVvbl9zY2Fub3V0X2ZsaXAoU2NyZWVuUHRyIHBTY3JlZW4sIFJBREVPTkluZm9QdHIgaW5mbywK IAlyZXR1cm47CiAgICAgfQogCisgICAgZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcgPQorCXJh ZGVvbl9waXhtYXBfZ2V0X2ZiKGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtzY2Fub3V0X2lkXS5waXht YXApOworICAgIGlmICghZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcpIHsKKwl4Zjg2RHJ2TXNn KHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLAorCQkgICAiRmFpbGVkIHRvIGdldCBGQiBmb3Ig c2Nhbm91dCBmbGlwLlxuIik7CisJcmFkZW9uX2RybV9hYm9ydF9lbnRyeShkcm1fcXVldWVfc2Vx KTsKKwlyZXR1cm47CisgICAgfQorCiAgICAgaWYgKGRybW1vZGVfcGFnZV9mbGlwX3RhcmdldF9y ZWxhdGl2ZShwUkFERU9ORW50LCBkcm1tb2RlX2NydGMsCi0JCQkJCSAgZHJtbW9kZV9jcnRjLT5z Y2Fub3V0W3NjYW5vdXRfaWRdLmZiX2lkLAorCQkJCQkgIGRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5k aW5nLT5oYW5kbGUsCiAJCQkJCSAgMCwgZHJtX3F1ZXVlX3NlcSwgMCkgIT0gMCkgewogCXhmODZE cnZNc2coc2Nybi0+c2NybkluZGV4LCBYX1dBUk5JTkcsICJmbGlwIHF1ZXVlIGZhaWxlZCBpbiAl czogJXNcbiIsCiAJCSAgIF9fZnVuY19fLCBzdHJlcnJvcihlcnJubykpOwpAQCAtMTA5OSw3ICsx MTMzLDYgQEAgcmFkZW9uX3NjYW5vdXRfZmxpcChTY3JlZW5QdHIgcFNjcmVlbiwgUkFERU9OSW5m b1B0ciBpbmZvLAogCiAgICAgZHJtbW9kZV9jcnRjLT5zY2Fub3V0X2lkID0gc2Nhbm91dF9pZDsK ICAgICBkcm1tb2RlX2NydGMtPnNjYW5vdXRfdXBkYXRlX3BlbmRpbmcgPSBUUlVFOwotICAgIGRy bW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nID0gVFJVRTsKIH0KIAogc3RhdGljIHZvaWQgUkFERU9O QmxvY2tIYW5kbGVyX0tNUyhCTE9DS0hBTkRMRVJfQVJHU19ERUNMKQpAQCAtMTExNCw2ICsxMTQ3 LDE5IEBAIHN0YXRpYyB2b2lkIFJBREVPTkJsb2NrSGFuZGxlcl9LTVMoQkxPQ0tIQU5ETEVSX0FS R1NfREVDTCkKICAgICAoKnBTY3JlZW4tPkJsb2NrSGFuZGxlcikgKEJMT0NLSEFORExFUl9BUkdT KTsKICAgICBwU2NyZWVuLT5CbG9ja0hhbmRsZXIgPSBSQURFT05CbG9ja0hhbmRsZXJfS01TOwog CisgICAgaWYgKCFwU2Nybi0+dnRTZW1hKSB7CisJcmFkZW9uX2NzX2ZsdXNoX2luZGlyZWN0KHBT Y3JuKTsKKworCWZvciAoYyA9IDA7IGMgPCB4Zjg2X2NvbmZpZy0+bnVtX2NydGM7IGMrKykgewor CSAgICBkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0KKwkJeGY4Nl9jb25m aWctPmNydGNbY10tPmRyaXZlcl9wcml2YXRlOworCisJICAgIGRybW1vZGVfZmJfcmVmZXJlbmNl KGluZm8tPmRybW1vZGUuZmQsICZkcm1tb2RlX2NydGMtPmZiLCBOVUxMKTsKKwl9CisKKwlyZXR1 cm47CisgICAgfQorCiAgICAgaWYgKCFyYWRlb25faXNfZ3B1X3NjcmVlbihwU2NyZWVuKSkKICAg ICB7CiAJZm9yIChjID0gMDsgYyA8IHhmODZfY29uZmlnLT5udW1fY3J0YzsgYysrKSB7CmRpZmYg LS1naXQgYS9zcmMvcmFkZW9uX3ByZXNlbnQuYyBiL3NyYy9yYWRlb25fcHJlc2VudC5jCmluZGV4 IDkwNjMyZDBlYy4uNjM1ZDEwODYxIDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX3ByZXNlbnQuYwor KysgYi9zcmMvcmFkZW9uX3ByZXNlbnQuYwpAQCAtMzczLDcgKzM3Myw2IEBAIHJhZGVvbl9wcmVz ZW50X3VuZmxpcChTY3JlZW5QdHIgc2NyZWVuLCB1aW50NjRfdCBldmVudF9pZCkKICAgICBlbnVt IGRybW1vZGVfZmxpcF9zeW5jIGZsaXBfc3luYyA9CiAJKHJhZGVvbl9wcmVzZW50X3NjcmVlbl9p bmZvLmNhcGFiaWxpdGllcyAmIFByZXNlbnRDYXBhYmlsaXR5QXN5bmMpID8KIAlGTElQX0FTWU5D IDogRkxJUF9WU1lOQzsKLSAgICBpbnQgb2xkX2ZiX2lkOwogICAgIGludCBpOwogCiAgICAgcmFk ZW9uX2NzX2ZsdXNoX2luZGlyZWN0KHNjcm4pOwpAQCAtMzk2LDEyICszOTUsNiBAQCByYWRlb25f cHJlc2VudF91bmZsaXAoU2NyZWVuUHRyIHNjcmVlbiwgdWludDY0X3QgZXZlbnRfaWQpCiAJcmV0 dXJuOwogCiBtb2Rlc2V0OgotICAgIC8qIGluZm8tPmRybW1vZGUuZmJfaWQgc3RpbGwgcG9pbnRz IHRvIHRoZSBGQiBmb3IgdGhlIGxhc3QgZmxpcHBlZCBCTy4KLSAgICAgKiBDbGVhciBpdCwgZHJt bW9kZV9zZXRfbW9kZV9tYWpvciB3aWxsIHJlLWNyZWF0ZSBpdAotICAgICAqLwotICAgIG9sZF9m Yl9pZCA9IGluZm8tPmRybW1vZGUuZmJfaWQ7Ci0gICAgaW5mby0+ZHJtbW9kZS5mYl9pZCA9IDA7 Ci0KICAgICByYWRlb25fYm9fd2FpdChpbmZvLT5mcm9udF9ibyk7CiAgICAgZm9yIChpID0gMDsg aSA8IGNvbmZpZy0+bnVtX2NydGM7IGkrKykgewogCXhmODZDcnRjUHRyIGNydGMgPSBjb25maWct PmNydGNbaV07CkBAIC00MTcsNyArNDEwLDYgQEAgbW9kZXNldDoKIAkgICAgZHJtbW9kZV9jcnRj LT5uZWVkX21vZGVzZXQgPSBUUlVFOwogICAgIH0KIAotICAgIGRybU1vZGVSbUZCKGluZm8tPmRy bW1vZGUuZmQsIG9sZF9mYl9pZCk7CiAgICAgcHJlc2VudF9ldmVudF9ub3RpZnkoZXZlbnRfaWQs IDAsIDApOwogCiAgICAgaW5mby0+ZHJtbW9kZS5wcmVzZW50X2ZsaXBwaW5nID0gRkFMU0U7Ci0t IAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=