From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-ati] Use pRADEONEnt->fd exclusively for the DRM file descriptor Date: Fri, 30 Jun 2017 18:19:55 +0900 Message-ID: <20170630091955.3070-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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+CgpUaGlzIGJyaW5n cyB1cyBjbG9zZXIgdG8gYW1kZ3B1LgoKU2lnbmVkLW9mZi1ieTogTWljaGVsIETDpG56ZXIgPG1p Y2hlbC5kYWVuemVyQGFtZC5jb20+Ci0tLQogc3JjL2RybW1vZGVfZGlzcGxheS5jICB8IDE1MSAr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBzcmMvZHJt bW9kZV9kaXNwbGF5LmggIHwgICAxIC0KIHNyYy9yYWRlb24uaCAgICAgICAgICAgfCAgMTQgKysr LS0KIHNyYy9yYWRlb25fYWNjZWwuYyAgICAgfCAgIDQgKy0KIHNyYy9yYWRlb25fYm9faGVscGVy LmMgfCAgIDggKystCiBzcmMvcmFkZW9uX2RyaTIuYyAgICAgIHwgIDU0ICsrKysrKysrKystLS0t LS0tLQogc3JjL3JhZGVvbl9kcmkyLmggICAgICB8ICAgMSAtCiBzcmMvcmFkZW9uX2RyaTMuYyAg ICAgIHwgICAzICstCiBzcmMvcmFkZW9uX2V4YS5jICAgICAgIHwgICA0ICstCiBzcmMvcmFkZW9u X2dsYW1vci5jICAgIHwgICAzICstCiBzcmMvcmFkZW9uX2ttcy5jICAgICAgIHwgIDcwICsrKysr KysrKysrKy0tLS0tLS0tLS0tCiBzcmMvcmFkZW9uX3ByZXNlbnQuYyAgIHwgIDEzICsrKy0tCiAx MiBmaWxlcyBjaGFuZ2VkLCAxNzIgaW5zZXJ0aW9ucygrKSwgMTU0IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYyBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYwpp bmRleCBkZDM5NGVjMWQuLjRiOTY0YjdiOSAxMDA2NDQKLS0tIGEvc3JjL2RybW1vZGVfZGlzcGxh eS5jCisrKyBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYwpAQCAtMjcyLDcgKzI3Miw3IEBAIGludCBk cm1tb2RlX2dldF9jdXJyZW50X3VzdChpbnQgZHJtX2ZkLCBDQVJENjQgKnVzdCkKIGludCBkcm1t b2RlX2NydGNfZ2V0X3VzdF9tc2MoeGY4NkNydGNQdHIgY3J0YywgQ0FSRDY0ICp1c3QsIENBUkQ2 NCAqbXNjKQogewogICAgIFNjcm5JbmZvUHRyIHNjcm4gPSBjcnRjLT5zY3JuOwotICAgIFJBREVP TkluZm9QdHIgaW5mbyA9IFJBREVPTlBUUihzY3JuKTsKKyAgICBSQURFT05FbnRQdHIgcFJBREVP TkVudCA9IFJBREVPTkVudFByaXYoc2Nybik7CiAgICAgZHJtVkJsYW5rIHZibDsKICAgICBpbnQg cmV0OwogCkBAIC0yODAsNyArMjgwLDcgQEAgaW50IGRybW1vZGVfY3J0Y19nZXRfdXN0X21zYyh4 Zjg2Q3J0Y1B0ciBjcnRjLCBDQVJENjQgKnVzdCwgQ0FSRDY0ICptc2MpCiAgICAgdmJsLnJlcXVl c3QudHlwZSB8PSByYWRlb25fcG9wdWxhdGVfdmJsX3JlcXVlc3RfdHlwZShjcnRjKTsKICAgICB2 YmwucmVxdWVzdC5zZXF1ZW5jZSA9IDA7CiAKLSAgICByZXQgPSBkcm1XYWl0VkJsYW5rKGluZm8t PmRyaTIuZHJtX2ZkLCAmdmJsKTsKKyAgICByZXQgPSBkcm1XYWl0VkJsYW5rKHBSQURFT05FbnQt PmZkLCAmdmJsKTsKICAgICBpZiAocmV0KSB7CiAJeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgs IFhfV0FSTklORywKIAkJICAgImdldCB2YmxhbmsgY291bnRlciBmYWlsZWQ6ICVzXG4iLCBzdHJl cnJvcihlcnJubykpOwpAQCAtMjk4LDcgKzI5OCw3IEBAIGRybW1vZGVfZG9fY3J0Y19kcG1zKHhm ODZDcnRjUHRyIGNydGMsIGludCBtb2RlKQogewogCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBk cm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKIAlTY3JuSW5mb1B0ciBzY3JuID0g Y3J0Yy0+c2NybjsKLQlSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05QVFIoc2Nybik7CisJUkFE RU9ORW50UHRyIHBSQURFT05FbnQgPSBSQURFT05FbnRQcml2KHNjcm4pOwogCUNBUkQ2NCB1c3Q7 CiAJaW50IHJldDsKIApAQCAtMzE4LDcgKzMxOCw3IEBAIGRybW1vZGVfZG9fY3J0Y19kcG1zKHhm ODZDcnRjUHRyIGNydGMsIGludCBtb2RlKQogCQl2YmwucmVxdWVzdC50eXBlID0gRFJNX1ZCTEFO S19SRUxBVElWRTsKIAkJdmJsLnJlcXVlc3QudHlwZSB8PSByYWRlb25fcG9wdWxhdGVfdmJsX3Jl cXVlc3RfdHlwZShjcnRjKTsKIAkJdmJsLnJlcXVlc3Quc2VxdWVuY2UgPSAwOwotCQlyZXQgPSBk cm1XYWl0VkJsYW5rKGluZm8tPmRyaTIuZHJtX2ZkLCAmdmJsKTsKKwkJcmV0ID0gZHJtV2FpdFZC bGFuayhwUkFERU9ORW50LT5mZCwgJnZibCk7CiAJCWlmIChyZXQpCiAJCQl4Zjg2RHJ2TXNnKHNj cm4tPnNjcm5JbmRleCwgWF9FUlJPUiwKIAkJCQkgICAiJXMgY2Fubm90IGdldCBsYXN0IHZibGFu ayBjb3VudGVyXG4iLApAQCAtMzQ1LDcgKzM0NSw3IEBAIGRybW1vZGVfZG9fY3J0Y19kcG1zKHhm ODZDcnRjUHRyIGNydGMsIGludCBtb2RlKQogCQkgKiBPZmYtPk9uIHRyYW5zaXRpb246IGNhbGN1 bGF0ZSBhbmQgYWNjdW11bGF0ZSB0aGUKIAkJICogbnVtYmVyIG9mIGludGVycG9sYXRlZCB2Ymxh bmtzIHdoaWxlIHdlIHdlcmUgaW4gT2ZmIHN0YXRlCiAJCSAqLwotCQlyZXQgPSBkcm1tb2RlX2dl dF9jdXJyZW50X3VzdChpbmZvLT5kcmkyLmRybV9mZCwgJnVzdCk7CisJCXJldCA9IGRybW1vZGVf Z2V0X2N1cnJlbnRfdXN0KHBSQURFT05FbnQtPmZkLCAmdXN0KTsKIAkJaWYgKHJldCkKIAkJCXhm ODZEcnZNc2coc2Nybi0+c2NybkluZGV4LCBYX0VSUk9SLAogCQkJCSAgICIlcyBjYW5ub3QgZ2V0 IGN1cnJlbnQgdGltZVxuIiwgX19mdW5jX18pOwpAQCAtMzY1LDcgKzM2NSw3IEBAIHN0YXRpYyB2 b2lkCiBkcm1tb2RlX2NydGNfZHBtcyh4Zjg2Q3J0Y1B0ciBjcnRjLCBpbnQgbW9kZSkKIHsKIAlk cm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0gY3J0Yy0+ZHJpdmVyX3ByaXZh dGU7Ci0JZHJtbW9kZV9wdHIgZHJtbW9kZSA9IGRybW1vZGVfY3J0Yy0+ZHJtbW9kZTsKKwlSQURF T05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVudFByaXYoY3J0Yy0+c2Nybik7CiAKIAkvKiBE aXNhYmxlIHVudXNlZCBDUlRDcyAqLwogCWlmICghY3J0Yy0+ZW5hYmxlZCB8fCBtb2RlICE9IERQ TVNNb2RlT24pIHsKQEAgLTM3Myw5ICszNzMsOSBAQCBkcm1tb2RlX2NydGNfZHBtcyh4Zjg2Q3J0 Y1B0ciBjcnRjLCBpbnQgbW9kZSkKIAkJaWYgKGRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nKQog CQkJcmV0dXJuOwogCi0JCWRybU1vZGVTZXRDcnRjKGRybW1vZGUtPmZkLCBkcm1tb2RlX2NydGMt Pm1vZGVfY3J0Yy0+Y3J0Y19pZCwKKwkJZHJtTW9kZVNldENydGMocFJBREVPTkVudC0+ZmQsIGRy bW1vZGVfY3J0Yy0+bW9kZV9jcnRjLT5jcnRjX2lkLAogCQkJICAgICAgIDAsIDAsIDAsIE5VTEws IDAsIE5VTEwpOwotCQlkcm1tb2RlX2ZiX3JlZmVyZW5jZShkcm1tb2RlLT5mZCwgJmRybW1vZGVf Y3J0Yy0+ZmIsIE5VTEwpOworCQlkcm1tb2RlX2ZiX3JlZmVyZW5jZShwUkFERU9ORW50LT5mZCwg JmRybW1vZGVfY3J0Yy0+ZmIsIE5VTEwpOwogCX0gZWxzZSBpZiAoZHJtbW9kZV9jcnRjLT5kcG1z X21vZGUgIT0gRFBNU01vZGVPbikKIAkJY3J0Yy0+ZnVuY3MtPnNldF9tb2RlX21ham9yKGNydGMs ICZjcnRjLT5tb2RlLCBjcnRjLT5yb3RhdGlvbiwKIAkJCQkJICAgIGNydGMtPngsIGNydGMtPnkp OwpAQCAtMzg1LDYgKzM4NSw3IEBAIHN0YXRpYyBQaXhtYXBQdHIKIGNyZWF0ZV9waXhtYXBfZm9y X2ZiY29uKGRybW1vZGVfcHRyIGRybW1vZGUsCiAJCQlTY3JuSW5mb1B0ciBwU2NybiwgaW50IGZi Y29uX2lkKQogeworCVJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihwU2Ny bik7CiAJUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHBTY3JuKTsKIAlQaXhtYXBQdHIg cGl4bWFwID0gaW5mby0+ZmJjb25fcGl4bWFwOwogCXN0cnVjdCByYWRlb25fYm8gKmJvOwpAQCAt Mzk0LDcgKzM5NSw3IEBAIGNyZWF0ZV9waXhtYXBfZm9yX2ZiY29uKGRybW1vZGVfcHRyIGRybW1v ZGUsCiAJaWYgKHBpeG1hcCkKIAkgICAgcmV0dXJuIHBpeG1hcDsKIAotCWZiY29uID0gZHJtTW9k ZUdldEZCKGRybW1vZGUtPmZkLCBmYmNvbl9pZCk7CisJZmJjb24gPSBkcm1Nb2RlR2V0RkIocFJB REVPTkVudC0+ZmQsIGZiY29uX2lkKTsKIAlpZiAoZmJjb24gPT0gTlVMTCkKIAkJcmV0dXJuIE5V TEw7CiAKQEAgLTQwNCw3ICs0MDUsNyBAQCBjcmVhdGVfcGl4bWFwX2Zvcl9mYmNvbihkcm1tb2Rl X3B0ciBkcm1tb2RlLAogCQlnb3RvIG91dF9mcmVlX2ZiOwogCiAJZmxpbmsuaGFuZGxlID0gZmJj b24tPmhhbmRsZTsKLQlpZiAoaW9jdGwoZHJtbW9kZS0+ZmQsIERSTV9JT0NUTF9HRU1fRkxJTkss ICZmbGluaykgPCAwKSB7CisJaWYgKGlvY3RsKHBSQURFT05FbnQtPmZkLCBEUk1fSU9DVExfR0VN X0ZMSU5LLCAmZmxpbmspIDwgMCkgewogCQl4Zjg2RHJ2TXNnKHBTY3JuLT5zY3JuSW5kZXgsIFhf RVJST1IsCiAJCQkgICAiQ291bGRuJ3QgZmxpbmsgZmJjb24gaGFuZGxlXG4iKTsKIAkJZ290byBv dXRfZnJlZV9mYjsKQEAgLTgxMiw4ICs4MTMsOSBAQCBkcm1tb2RlX2NydGNfZ2FtbWFfZG9fc2V0 KHhmODZDcnRjUHRyIGNydGMsIHVpbnQxNl90ICpyZWQsIHVpbnQxNl90ICpncmVlbiwKIAkJCSAg dWludDE2X3QgKmJsdWUsIGludCBzaXplKQogewogCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBk cm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKKwlSQURFT05FbnRQdHIgcFJBREVP TkVudCA9IFJBREVPTkVudFByaXYoY3J0Yy0+c2Nybik7CiAKLQlkcm1Nb2RlQ3J0Y1NldEdhbW1h KGRybW1vZGVfY3J0Yy0+ZHJtbW9kZS0+ZmQsCisJZHJtTW9kZUNydGNTZXRHYW1tYShwUkFERU9O RW50LT5mZCwKIAkJCSAgICBkcm1tb2RlX2NydGMtPm1vZGVfY3J0Yy0+Y3J0Y19pZCwgc2l6ZSwg cmVkLCBncmVlbiwKIAkJCSAgICBibHVlKTsKIH0KQEAgLTgyNSw2ICs4MjcsNyBAQCBkcm1tb2Rl X3NldF9tb2RlX21ham9yKHhmODZDcnRjUHRyIGNydGMsIERpc3BsYXlNb2RlUHRyIG1vZGUsCiAJ U2NybkluZm9QdHIgcFNjcm4gPSBjcnRjLT5zY3JuOwogCVNjcmVlblB0ciBwU2NyZWVuID0gcFNj cm4tPnBTY3JlZW47CiAJUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHBTY3JuKTsKKwlS QURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVudFByaXYocFNjcm4pOwogCXhmODZDcnRj Q29uZmlnUHRyICAgeGY4Nl9jb25maWcgPSBYRjg2X0NSVENfQ09ORklHX1BUUihjcnRjLT5zY3Ju KTsKIAlkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0gY3J0Yy0+ZHJpdmVy X3ByaXZhdGU7CiAJdW5zaWduZWQgc2Nhbm91dF9pZCA9IDA7CkBAIC05MDcsMTMgKzkxMCwxMyBA QCBkcm1tb2RlX3NldF9tb2RlX21ham9yKHhmODZDcnRjUHRyIGNydGMsIERpc3BsYXlNb2RlUHRy IG1vZGUsCiAJCWlmICghZmIpCiAJCQlmYiA9IHJhZGVvbl9waXhtYXBfZ2V0X2ZiKHBTY3JlZW4t PkdldFdpbmRvd1BpeG1hcChwU2NyZWVuLT5yb290KSk7CiAJCWlmICghZmIpIHsKLQkJCWZiID0g cmFkZW9uX2ZiX2NyZWF0ZShkcm1tb2RlLT5mZCwgcFNjcm4tPnZpcnR1YWxYLAorCQkJZmIgPSBy YWRlb25fZmJfY3JlYXRlKHBSQURFT05FbnQtPmZkLCBwU2Nybi0+dmlydHVhbFgsCiAJCQkJCSAg ICAgIHBTY3JuLT52aXJ0dWFsWSwgcFNjcm4tPmRlcHRoLAogCQkJCQkgICAgICBwU2Nybi0+Yml0 c1BlclBpeGVsLAogCQkJCQkgICAgICBwU2Nybi0+ZGlzcGxheVdpZHRoICogaW5mby0+cGl4ZWxf Ynl0ZXMsCiAJCQkJCSAgICAgIGluZm8tPmZyb250X2JvLT5oYW5kbGUpOwogCQkJLyogUHJldmVu dCByZWZjbnQgb2YgYWQtaG9jIEZCcyBmcm9tIHJlYWNoaW5nIDIgKi8KLQkJCWRybW1vZGVfZmJf cmVmZXJlbmNlKGRybW1vZGUtPmZkLCAmZHJtbW9kZV9jcnRjLT5mYiwgTlVMTCk7CisJCQlkcm1t b2RlX2ZiX3JlZmVyZW5jZShwUkFERU9ORW50LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsIE5VTEwp OwogCQkJZHJtbW9kZV9jcnRjLT5mYiA9IGZiOwogCQl9CiAJCWlmICghZmIpIHsKQEAgLTkyMywx MCArOTI2LDEwIEBAIGRybW1vZGVfc2V0X21vZGVfbWFqb3IoeGY4NkNydGNQdHIgY3J0YywgRGlz cGxheU1vZGVQdHIgbW9kZSwKIAogCQkvKiBXYWl0IGZvciBhbnkgcGVuZGluZyBmbGlwIHRvIGZp bmlzaCAqLwogCQlkbyB7fSB3aGlsZSAoZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcgJiYKLQkJ CSAgICAgZHJtSGFuZGxlRXZlbnQoZHJtbW9kZS0+ZmQsCisJCQkgICAgIGRybUhhbmRsZUV2ZW50 KHBSQURFT05FbnQtPmZkLAogCQkJCQkgICAgJmRybW1vZGUtPmV2ZW50X2NvbnRleHQpID4gMCk7 CiAKLQkJaWYgKGRybU1vZGVTZXRDcnRjKGRybW1vZGUtPmZkLAorCQlpZiAoZHJtTW9kZVNldENy dGMocFJBREVPTkVudC0+ZmQsCiAJCQkJICAgZHJtbW9kZV9jcnRjLT5tb2RlX2NydGMtPmNydGNf aWQsCiAJCQkJICAgZmItPmhhbmRsZSwgeCwgeSwgb3V0cHV0X2lkcywKIAkJCQkgICBvdXRwdXRf Y291bnQsICZrbW9kZSkgIT0gMCkgewpAQCAtOTM1LDcgKzkzOCw3IEBAIGRybW1vZGVfc2V0X21v ZGVfbWFqb3IoeGY4NkNydGNQdHIgY3J0YywgRGlzcGxheU1vZGVQdHIgbW9kZSwKIAkJCWdvdG8g ZG9uZTsKIAkJfSBlbHNlIHsKIAkJCXJldCA9IFRSVUU7Ci0JCQlkcm1tb2RlX2ZiX3JlZmVyZW5j ZShkcm1tb2RlLT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsIGZiKTsKKwkJCWRybW1vZGVfZmJfcmVm ZXJlbmNlKHBSQURFT05FbnQtPmZkLCAmZHJtbW9kZV9jcnRjLT5mYiwgZmIpOwogCQl9CiAKIAkJ aWYgKHBTY3JlZW4pCkBAIC0xMDA2LDcgKzEwMDksNyBAQCBzdGF0aWMgdm9pZAogZHJtbW9kZV9z ZXRfY3Vyc29yX3Bvc2l0aW9uICh4Zjg2Q3J0Y1B0ciBjcnRjLCBpbnQgeCwgaW50IHkpCiB7CiAJ ZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YyA9IGNydGMtPmRyaXZlcl9wcml2 YXRlOwotCWRybW1vZGVfcHRyIGRybW1vZGUgPSBkcm1tb2RlX2NydGMtPmRybW1vZGU7CisJUkFE RU9ORW50UHRyIHBSQURFT05FbnQgPSBSQURFT05FbnRQcml2KGNydGMtPnNjcm4pOwogCiAjaWYg WEY4Nl9DUlRDX1ZFUlNJT04gPj0gNCAmJiBYRjg2X0NSVENfVkVSU0lPTiA8IDcKIAlpZiAoY3J0 Yy0+ZHJpdmVySXNQZXJmb3JtaW5nVHJhbnNmb3JtKSB7CkBAIC0xMDE2LDcgKzEwMTksNyBAQCBk cm1tb2RlX3NldF9jdXJzb3JfcG9zaXRpb24gKHhmODZDcnRjUHRyIGNydGMsIGludCB4LCBpbnQg eSkKIAl9CiAjZW5kaWYKIAotCWRybU1vZGVNb3ZlQ3Vyc29yKGRybW1vZGUtPmZkLCBkcm1tb2Rl X2NydGMtPm1vZGVfY3J0Yy0+Y3J0Y19pZCwgeCwgeSk7CisJZHJtTW9kZU1vdmVDdXJzb3IocFJB REVPTkVudC0+ZmQsIGRybW1vZGVfY3J0Yy0+bW9kZV9jcnRjLT5jcnRjX2lkLCB4LCB5KTsKIH0K IAogI2lmIFhGODZfQ1JUQ19WRVJTSU9OID49IDQgJiYgWEY4Nl9DUlRDX1ZFUlNJT04gPCA3CkBA IC0xMTM4LDkgKzExNDEsOSBAQCBkcm1tb2RlX2hpZGVfY3Vyc29yICh4Zjg2Q3J0Y1B0ciBjcnRj KQogCVNjcm5JbmZvUHRyIHBTY3JuID0gY3J0Yy0+c2NybjsKIAlSQURFT05JbmZvUHRyIGluZm8g PSBSQURFT05QVFIocFNjcm4pOwogCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2Ny dGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKLQlkcm1tb2RlX3B0ciBkcm1tb2RlID0gZHJtbW9k ZV9jcnRjLT5kcm1tb2RlOworCVJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJp dihwU2Nybik7CiAKLQlkcm1Nb2RlU2V0Q3Vyc29yKGRybW1vZGUtPmZkLCBkcm1tb2RlX2NydGMt Pm1vZGVfY3J0Yy0+Y3J0Y19pZCwgMCwKKwlkcm1Nb2RlU2V0Q3Vyc29yKHBSQURFT05FbnQtPmZk LCBkcm1tb2RlX2NydGMtPm1vZGVfY3J0Yy0+Y3J0Y19pZCwgMCwKIAkJCSBpbmZvLT5jdXJzb3Jf dywgaW5mby0+Y3Vyc29yX2gpOwogCiB9CkBAIC0xMTUxLDcgKzExNTQsNyBAQCBkcm1tb2RlX3No b3dfY3Vyc29yICh4Zjg2Q3J0Y1B0ciBjcnRjKQogCVNjcm5JbmZvUHRyIHBTY3JuID0gY3J0Yy0+ c2NybjsKIAlSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05QVFIocFNjcm4pOwogCWRybW1vZGVf Y3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKLQlk cm1tb2RlX3B0ciBkcm1tb2RlID0gZHJtbW9kZV9jcnRjLT5kcm1tb2RlOworCVJBREVPTkVudFB0 ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihwU2Nybik7CiAJdWludDMyX3QgaGFuZGxlID0g ZHJtbW9kZV9jcnRjLT5jdXJzb3JfYm8tPmhhbmRsZTsKIAlzdGF0aWMgQm9vbCB1c2Vfc2V0X2N1 cnNvcjIgPSBUUlVFOwogCkBAIC0xMTkxLDcgKzExOTQsNyBAQCBkcm1tb2RlX3Nob3dfY3Vyc29y ICh4Zjg2Q3J0Y1B0ciBjcnRjKQogCSAgICB9CiAKIAkgICAgcmV0ID0KLQkJZHJtTW9kZVNldEN1 cnNvcjIoZHJtbW9kZS0+ZmQsIGRybW1vZGVfY3J0Yy0+bW9kZV9jcnRjLT5jcnRjX2lkLAorCQlk cm1Nb2RlU2V0Q3Vyc29yMihwUkFERU9ORW50LT5mZCwgZHJtbW9kZV9jcnRjLT5tb2RlX2NydGMt PmNydGNfaWQsCiAJCQkJICBoYW5kbGUsIGluZm8tPmN1cnNvcl93LCBpbmZvLT5jdXJzb3JfaCwK IAkJCQkgIHhob3QsIHlob3QpOwogCSAgICBpZiAocmV0ID09IC1FSU5WQUwpCkBAIC0xMjAwLDcg KzEyMDMsNyBAQCBkcm1tb2RlX3Nob3dfY3Vyc29yICh4Zjg2Q3J0Y1B0ciBjcnRjKQogCQlyZXR1 cm47CiAJfQogCi0JZHJtTW9kZVNldEN1cnNvcihkcm1tb2RlLT5mZCwgZHJtbW9kZV9jcnRjLT5t b2RlX2NydGMtPmNydGNfaWQsIGhhbmRsZSwKKwlkcm1Nb2RlU2V0Q3Vyc29yKHBSQURFT05FbnQt PmZkLCBkcm1tb2RlX2NydGMtPm1vZGVfY3J0Yy0+Y3J0Y19pZCwgaGFuZGxlLAogCQkJIGluZm8t PmN1cnNvcl93LCBpbmZvLT5jdXJzb3JfaCk7CiB9CiAKQEAgLTEzNDcsOCArMTM1MCw3IEBAIGlu dCBkcm1tb2RlX2dldF9jcnRjX2lkKHhmODZDcnRjUHRyIGNydGMpCiB2b2lkIGRybW1vZGVfY3J0 Y19od19pZCh4Zjg2Q3J0Y1B0ciBjcnRjKQogewogCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBk cm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKLQlTY3JuSW5mb1B0ciBwU2NybiA9 IGNydGMtPnNjcm47Ci0JUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHBTY3JuKTsKKwlS QURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVudFByaXYoY3J0Yy0+c2Nybik7CiAJc3Ry dWN0IGRybV9yYWRlb25faW5mbyBnaW5mbzsKIAlpbnQgcjsKIAl1aW50MzJfdCB0bXA7CkBAIC0x MzU3LDcgKzEzNTksNyBAQCB2b2lkIGRybW1vZGVfY3J0Y19od19pZCh4Zjg2Q3J0Y1B0ciBjcnRj KQogCWdpbmZvLnJlcXVlc3QgPSAweDQ7CiAJdG1wID0gZHJtbW9kZV9jcnRjLT5tb2RlX2NydGMt PmNydGNfaWQ7CiAJZ2luZm8udmFsdWUgPSAodWludHB0cl90KSZ0bXA7Ci0JciA9IGRybUNvbW1h bmRXcml0ZVJlYWQoaW5mby0+ZHJpMi5kcm1fZmQsIERSTV9SQURFT05fSU5GTywgJmdpbmZvLCBz aXplb2YoZ2luZm8pKTsKKwlyID0gZHJtQ29tbWFuZFdyaXRlUmVhZChwUkFERU9ORW50LT5mZCwg RFJNX1JBREVPTl9JTkZPLCAmZ2luZm8sIHNpemVvZihnaW5mbykpOwogCWlmIChyKSB7CiAJCWRy bW1vZGVfY3J0Yy0+aHdfaWQgPSAtMTsKIAkJcmV0dXJuOwpAQCAtMTM3Nyw3ICsxMzc5LDcgQEAg ZHJtbW9kZV9jcnRjX2luaXQoU2NybkluZm9QdHIgcFNjcm4sIGRybW1vZGVfcHRyIGRybW1vZGUs IGRybU1vZGVSZXNQdHIgbW9kZV9yZXMKIAkJcmV0dXJuIDA7CiAKIAlkcm1tb2RlX2NydGMgPSB4 bmZjYWxsb2Moc2l6ZW9mKGRybW1vZGVfY3J0Y19wcml2YXRlX3JlYyksIDEpOwotCWRybW1vZGVf Y3J0Yy0+bW9kZV9jcnRjID0gZHJtTW9kZUdldENydGMoZHJtbW9kZS0+ZmQsIG1vZGVfcmVzLT5j cnRjc1tudW1dKTsKKwlkcm1tb2RlX2NydGMtPm1vZGVfY3J0YyA9IGRybU1vZGVHZXRDcnRjKHBS QURFT05FbnQtPmZkLCBtb2RlX3Jlcy0+Y3J0Y3NbbnVtXSk7CiAJZHJtbW9kZV9jcnRjLT5kcm1t b2RlID0gZHJtbW9kZTsKIAlkcm1tb2RlX2NydGMtPmRwbXNfbW9kZSA9IERQTVNNb2RlT2ZmOwog CWRybW1vZGVfY3J0Yy0+cGVuZGluZ19kcG1zX21vZGUgPSBEUE1TTW9kZU9mZjsKQEAgLTEzOTcs MTEgKzEzOTksMTEgQEAgZHJtbW9kZV9vdXRwdXRfZGV0ZWN0KHhmODZPdXRwdXRQdHIgb3V0cHV0 KQogewogCS8qIGdvIHRvIHRoZSBodyBhbmQgcmV0cmlldmUgYSBuZXcgb3V0cHV0IHN0cnVjdCAq LwogCWRybW1vZGVfb3V0cHV0X3ByaXZhdGVfcHRyIGRybW1vZGVfb3V0cHV0ID0gb3V0cHV0LT5k cml2ZXJfcHJpdmF0ZTsKLQlkcm1tb2RlX3B0ciBkcm1tb2RlID0gZHJtbW9kZV9vdXRwdXQtPmRy bW1vZGU7CisJUkFERU9ORW50UHRyIHBSQURFT05FbnQgPSBSQURFT05FbnRQcml2KG91dHB1dC0+ c2Nybik7CiAJeGY4Nk91dHB1dFN0YXR1cyBzdGF0dXM7CiAJZHJtTW9kZUZyZWVDb25uZWN0b3Io ZHJtbW9kZV9vdXRwdXQtPm1vZGVfb3V0cHV0KTsKIAotCWRybW1vZGVfb3V0cHV0LT5tb2RlX291 dHB1dCA9IGRybU1vZGVHZXRDb25uZWN0b3IoZHJtbW9kZS0+ZmQsIGRybW1vZGVfb3V0cHV0LT5v dXRwdXRfaWQpOworCWRybW1vZGVfb3V0cHV0LT5tb2RlX291dHB1dCA9IGRybU1vZGVHZXRDb25u ZWN0b3IocFJBREVPTkVudC0+ZmQsIGRybW1vZGVfb3V0cHV0LT5vdXRwdXRfaWQpOwogCWlmICgh ZHJtbW9kZV9vdXRwdXQtPm1vZGVfb3V0cHV0KQogCQlyZXR1cm4gWEY4Nk91dHB1dFN0YXR1c0Rp c2Nvbm5lY3RlZDsKIApAQCAtMTQzMSw3ICsxNDMzLDcgQEAgZHJtbW9kZV9vdXRwdXRfZ2V0X21v ZGVzKHhmODZPdXRwdXRQdHIgb3V0cHV0KQogewogCWRybW1vZGVfb3V0cHV0X3ByaXZhdGVfcHRy IGRybW1vZGVfb3V0cHV0ID0gb3V0cHV0LT5kcml2ZXJfcHJpdmF0ZTsKIAlkcm1Nb2RlQ29ubmVj dG9yUHRyIGtvdXRwdXQgPSBkcm1tb2RlX291dHB1dC0+bW9kZV9vdXRwdXQ7Ci0JZHJtbW9kZV9w dHIgZHJtbW9kZSA9IGRybW1vZGVfb3V0cHV0LT5kcm1tb2RlOworCVJBREVPTkVudFB0ciBwUkFE RU9ORW50ID0gUkFERU9ORW50UHJpdihvdXRwdXQtPnNjcm4pOwogCWludCBpOwogCURpc3BsYXlN b2RlUHRyIE1vZGVzID0gTlVMTCwgTW9kZTsKIAlkcm1Nb2RlUHJvcGVydHlQdHIgcHJvcHM7CkBA IC0xNDQyLDEyICsxNDQ0LDEyIEBAIGRybW1vZGVfb3V0cHV0X2dldF9tb2Rlcyh4Zjg2T3V0cHV0 UHRyIG91dHB1dCkKIAogCS8qIGxvb2sgZm9yIGFuIEVESUQgcHJvcGVydHkgKi8KIAlmb3IgKGkg PSAwOyBpIDwga291dHB1dC0+Y291bnRfcHJvcHM7IGkrKykgewotCQlwcm9wcyA9IGRybU1vZGVH ZXRQcm9wZXJ0eShkcm1tb2RlLT5mZCwga291dHB1dC0+cHJvcHNbaV0pOworCQlwcm9wcyA9IGRy bU1vZGVHZXRQcm9wZXJ0eShwUkFERU9ORW50LT5mZCwga291dHB1dC0+cHJvcHNbaV0pOwogCQlp ZiAocHJvcHMgJiYgKHByb3BzLT5mbGFncyAmIERSTV9NT0RFX1BST1BfQkxPQikpIHsKIAkJCWlm ICghc3RyY21wKHByb3BzLT5uYW1lLCAiRURJRCIpKSB7CiAJCQkJaWYgKGRybW1vZGVfb3V0cHV0 LT5lZGlkX2Jsb2IpCiAJCQkJCWRybU1vZGVGcmVlUHJvcGVydHlCbG9iKGRybW1vZGVfb3V0cHV0 LT5lZGlkX2Jsb2IpOwotCQkJCWRybW1vZGVfb3V0cHV0LT5lZGlkX2Jsb2IgPSBkcm1Nb2RlR2V0 UHJvcGVydHlCbG9iKGRybW1vZGUtPmZkLCBrb3V0cHV0LT5wcm9wX3ZhbHVlc1tpXSk7CisJCQkJ ZHJtbW9kZV9vdXRwdXQtPmVkaWRfYmxvYiA9IGRybU1vZGVHZXRQcm9wZXJ0eUJsb2IocFJBREVP TkVudC0+ZmQsIGtvdXRwdXQtPnByb3BfdmFsdWVzW2ldKTsKIAkJCX0KIAkJfQogCQlpZiAocHJv cHMpCkBAIC0xNTAxLDcgKzE1MDMsNyBAQCBkcm1tb2RlX291dHB1dF9kcG1zKHhmODZPdXRwdXRQ dHIgb3V0cHV0LCBpbnQgbW9kZSkKIAlkcm1tb2RlX291dHB1dF9wcml2YXRlX3B0ciBkcm1tb2Rl X291dHB1dCA9IG91dHB1dC0+ZHJpdmVyX3ByaXZhdGU7CiAJeGY4NkNydGNQdHIgY3J0YyA9IG91 dHB1dC0+Y3J0YzsKIAlkcm1Nb2RlQ29ubmVjdG9yUHRyIGtvdXRwdXQgPSBkcm1tb2RlX291dHB1 dC0+bW9kZV9vdXRwdXQ7Ci0JZHJtbW9kZV9wdHIgZHJtbW9kZSA9IGRybW1vZGVfb3V0cHV0LT5k cm1tb2RlOworCVJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihvdXRwdXQt PnNjcm4pOwogCiAJaWYgKCFrb3V0cHV0KQogCQlyZXR1cm47CkBAIC0xNTE2LDcgKzE1MTgsNyBA QCBkcm1tb2RlX291dHB1dF9kcG1zKHhmODZPdXRwdXRQdHIgb3V0cHV0LCBpbnQgbW9kZSkKIAkJ CXJldHVybjsKIAl9CiAKLQlkcm1Nb2RlQ29ubmVjdG9yU2V0UHJvcGVydHkoZHJtbW9kZS0+ZmQs IGtvdXRwdXQtPmNvbm5lY3Rvcl9pZCwKKwlkcm1Nb2RlQ29ubmVjdG9yU2V0UHJvcGVydHkocFJB REVPTkVudC0+ZmQsIGtvdXRwdXQtPmNvbm5lY3Rvcl9pZCwKIAkJCQkgICAgZHJtbW9kZV9vdXRw dXQtPmRwbXNfZW51bV9pZCwgbW9kZSk7CiAKIAlpZiAobW9kZSA9PSBEUE1TTW9kZU9uICYmIGNy dGMpIHsKQEAgLTE1NTMsNyArMTU1NSw3IEBAIGRybW1vZGVfb3V0cHV0X2NyZWF0ZV9yZXNvdXJj ZXMoeGY4Nk91dHB1dFB0ciBvdXRwdXQpCiAgICAgUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9O UFRSKG91dHB1dC0+c2Nybik7CiAgICAgZHJtbW9kZV9vdXRwdXRfcHJpdmF0ZV9wdHIgZHJtbW9k ZV9vdXRwdXQgPSBvdXRwdXQtPmRyaXZlcl9wcml2YXRlOwogICAgIGRybU1vZGVDb25uZWN0b3JQ dHIgbW9kZV9vdXRwdXQgPSBkcm1tb2RlX291dHB1dC0+bW9kZV9vdXRwdXQ7Ci0gICAgZHJtbW9k ZV9wdHIgZHJtbW9kZSA9IGRybW1vZGVfb3V0cHV0LT5kcm1tb2RlOworICAgIFJBREVPTkVudFB0 ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihvdXRwdXQtPnNjcm4pOwogICAgIGRybU1vZGVQ cm9wZXJ0eVB0ciBkcm1tb2RlX3Byb3AsIHRlYXJmcmVlX3Byb3A7CiAgICAgaW50IGksIGosIGVy cjsKIApAQCAtMTU2Myw3ICsxNTY1LDcgQEAgZHJtbW9kZV9vdXRwdXRfY3JlYXRlX3Jlc291cmNl cyh4Zjg2T3V0cHV0UHRyIG91dHB1dCkKICAgICAKICAgICBkcm1tb2RlX291dHB1dC0+bnVtX3By b3BzID0gMDsKICAgICBmb3IgKGkgPSAwLCBqID0gMDsgaSA8IG1vZGVfb3V0cHV0LT5jb3VudF9w cm9wczsgaSsrKSB7Ci0JZHJtbW9kZV9wcm9wID0gZHJtTW9kZUdldFByb3BlcnR5KGRybW1vZGUt PmZkLCBtb2RlX291dHB1dC0+cHJvcHNbaV0pOworCWRybW1vZGVfcHJvcCA9IGRybU1vZGVHZXRQ cm9wZXJ0eShwUkFERU9ORW50LT5mZCwgbW9kZV9vdXRwdXQtPnByb3BzW2ldKTsKIAlpZiAoZHJt bW9kZV9wcm9wZXJ0eV9pZ25vcmUoZHJtbW9kZV9wcm9wKSkgewogCSAgICBkcm1Nb2RlRnJlZVBy b3BlcnR5KGRybW1vZGVfcHJvcCk7CiAJICAgIGNvbnRpbnVlOwpAQCAtMTY1Nyw3ICsxNjU5LDcg QEAgZHJtbW9kZV9vdXRwdXRfc2V0X3Byb3BlcnR5KHhmODZPdXRwdXRQdHIgb3V0cHV0LCBBdG9t IHByb3BlcnR5LAogCQlSUlByb3BlcnR5VmFsdWVQdHIgdmFsdWUpCiB7CiAgICAgZHJtbW9kZV9v dXRwdXRfcHJpdmF0ZV9wdHIgZHJtbW9kZV9vdXRwdXQgPSBvdXRwdXQtPmRyaXZlcl9wcml2YXRl OwotICAgIGRybW1vZGVfcHRyIGRybW1vZGUgPSBkcm1tb2RlX291dHB1dC0+ZHJtbW9kZTsKKyAg ICBSQURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVudFByaXYob3V0cHV0LT5zY3JuKTsK ICAgICBpbnQgaTsKIAogICAgIGZvciAoaSA9IDA7IGkgPCBkcm1tb2RlX291dHB1dC0+bnVtX3By b3BzOyBpKyspIHsKQEAgLTE2NzQsNyArMTY3Niw3IEBAIGRybW1vZGVfb3V0cHV0X3NldF9wcm9w ZXJ0eSh4Zjg2T3V0cHV0UHRyIG91dHB1dCwgQXRvbSBwcm9wZXJ0eSwKIAkJcmV0dXJuIEZBTFNF OwogCSAgICB2YWwgPSAqKHVpbnQzMl90ICopdmFsdWUtPmRhdGE7CiAKLQkgICAgZHJtTW9kZUNv bm5lY3RvclNldFByb3BlcnR5KGRybW1vZGUtPmZkLCBkcm1tb2RlX291dHB1dC0+b3V0cHV0X2lk LAorCSAgICBkcm1Nb2RlQ29ubmVjdG9yU2V0UHJvcGVydHkocFJBREVPTkVudC0+ZmQsIGRybW1v ZGVfb3V0cHV0LT5vdXRwdXRfaWQsCiAJCSAgICBwLT5tb2RlX3Byb3AtPnByb3BfaWQsICh1aW50 NjRfdCl2YWwpOwogCSAgICByZXR1cm4gVFJVRTsKIAl9IGVsc2UgaWYgKHAtPm1vZGVfcHJvcC0+ ZmxhZ3MgJiBEUk1fTU9ERV9QUk9QX0VOVU0pIHsKQEAgLTE3MDMsNyArMTcwNSw3IEBAIGRybW1v ZGVfb3V0cHV0X3NldF9wcm9wZXJ0eSh4Zjg2T3V0cHV0UHRyIG91dHB1dCwgQXRvbSBwcm9wZXJ0 eSwKIAkJCSAgICB9CiAJCQl9CiAJCSAgICB9IGVsc2UgewotCQkJZHJtTW9kZUNvbm5lY3RvclNl dFByb3BlcnR5KGRybW1vZGUtPmZkLAorCQkJZHJtTW9kZUNvbm5lY3RvclNldFByb3BlcnR5KHBS QURFT05FbnQtPmZkLAogCQkJCQkJICAgIGRybW1vZGVfb3V0cHV0LT5vdXRwdXRfaWQsCiAJCQkJ CQkgICAgcC0+bW9kZV9wcm9wLT5wcm9wX2lkLAogCQkJCQkJICAgIHAtPm1vZGVfcHJvcC0+ZW51 bXNbal0udmFsdWUpOwpAQCAtMTg3Niw2ICsxODc4LDcgQEAgc3RhdGljIHVuc2lnbmVkIGludAog ZHJtbW9kZV9vdXRwdXRfaW5pdChTY3JuSW5mb1B0ciBwU2NybiwgZHJtbW9kZV9wdHIgZHJtbW9k ZSwgZHJtTW9kZVJlc1B0ciBtb2RlX3JlcywgaW50IG51bSwgaW50ICpudW1fZHZpLCBpbnQgKm51 bV9oZG1pLCBpbnQgZHluYW1pYykKIHsKIAl4Zjg2Q3J0Y0NvbmZpZ1B0ciAgIHhmODZfY29uZmln ID0gWEY4Nl9DUlRDX0NPTkZJR19QVFIocFNjcm4pOworCVJBREVPTkVudFB0ciBwUkFERU9ORW50 ID0gUkFERU9ORW50UHJpdihwU2Nybik7CiAJUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRS KHBTY3JuKTsKIAl4Zjg2T3V0cHV0UHRyIG91dHB1dDsKIAlkcm1Nb2RlQ29ubmVjdG9yUHRyIGtv dXRwdXQ7CkBAIC0xODg3LDE1ICsxODkwLDE1IEBAIGRybW1vZGVfb3V0cHV0X2luaXQoU2Nybklu Zm9QdHIgcFNjcm4sIGRybW1vZGVfcHRyIGRybW1vZGUsIGRybU1vZGVSZXNQdHIgbW9kZV9yCiAJ aW50IGk7CiAJY29uc3QgY2hhciAqczsKIAotCWtvdXRwdXQgPSBkcm1Nb2RlR2V0Q29ubmVjdG9y KGRybW1vZGUtPmZkLCBtb2RlX3Jlcy0+Y29ubmVjdG9yc1tudW1dKTsKKwlrb3V0cHV0ID0gZHJt TW9kZUdldENvbm5lY3RvcihwUkFERU9ORW50LT5mZCwgbW9kZV9yZXMtPmNvbm5lY3RvcnNbbnVt XSk7CiAJaWYgKCFrb3V0cHV0KQogCQlyZXR1cm4gMDsKIAogCWZvciAoaSA9IDA7IGkgPCBrb3V0 cHV0LT5jb3VudF9wcm9wczsgaSsrKSB7Ci0JCXByb3BzID0gZHJtTW9kZUdldFByb3BlcnR5KGRy bW1vZGUtPmZkLCBrb3V0cHV0LT5wcm9wc1tpXSk7CisJCXByb3BzID0gZHJtTW9kZUdldFByb3Bl cnR5KHBSQURFT05FbnQtPmZkLCBrb3V0cHV0LT5wcm9wc1tpXSk7CiAJCWlmIChwcm9wcyAmJiAo cHJvcHMtPmZsYWdzICYgRFJNX01PREVfUFJPUF9CTE9CKSkgewogCQkJaWYgKCFzdHJjbXAocHJv cHMtPm5hbWUsICJQQVRIIikpIHsKLQkJCQlwYXRoX2Jsb2IgPSBkcm1Nb2RlR2V0UHJvcGVydHlC bG9iKGRybW1vZGUtPmZkLCBrb3V0cHV0LT5wcm9wX3ZhbHVlc1tpXSk7CisJCQkJcGF0aF9ibG9i ID0gZHJtTW9kZUdldFByb3BlcnR5QmxvYihwUkFERU9ORW50LT5mZCwga291dHB1dC0+cHJvcF92 YWx1ZXNbaV0pOwogCQkJCWRybU1vZGVGcmVlUHJvcGVydHkocHJvcHMpOwogCQkJCWJyZWFrOwog CQkJfQpAQCAtMTkwOSw3ICsxOTEyLDcgQEAgZHJtbW9kZV9vdXRwdXRfaW5pdChTY3JuSW5mb1B0 ciBwU2NybiwgZHJtbW9kZV9wdHIgZHJtbW9kZSwgZHJtTW9kZVJlc1B0ciBtb2RlX3IKIAl9CiAK IAlmb3IgKGkgPSAwOyBpIDwga291dHB1dC0+Y291bnRfZW5jb2RlcnM7IGkrKykgewotCQlrZW5j b2RlcnNbaV0gPSBkcm1Nb2RlR2V0RW5jb2Rlcihkcm1tb2RlLT5mZCwga291dHB1dC0+ZW5jb2Rl cnNbaV0pOworCQlrZW5jb2RlcnNbaV0gPSBkcm1Nb2RlR2V0RW5jb2RlcihwUkFERU9ORW50LT5m ZCwga291dHB1dC0+ZW5jb2RlcnNbaV0pOwogCQlpZiAoIWtlbmNvZGVyc1tpXSkgewogCQkJZ290 byBvdXRfZnJlZV9lbmNvZGVyczsKIAkJfQpAQCAtMTk4Miw3ICsxOTg1LDcgQEAgZHJtbW9kZV9v dXRwdXRfaW5pdChTY3JuSW5mb1B0ciBwU2NybiwgZHJtbW9kZV9wdHIgZHJtbW9kZSwgZHJtTW9k ZVJlc1B0ciBtb2RlX3IKIAlvdXRwdXQtPnBvc3NpYmxlX2Nsb25lcyA9IDA7CiAKIAlmb3IgKGkg PSAwOyBpIDwga291dHB1dC0+Y291bnRfcHJvcHM7IGkrKykgewotCQlwcm9wcyA9IGRybU1vZGVH ZXRQcm9wZXJ0eShkcm1tb2RlLT5mZCwga291dHB1dC0+cHJvcHNbaV0pOworCQlwcm9wcyA9IGRy bU1vZGVHZXRQcm9wZXJ0eShwUkFERU9ORW50LT5mZCwga291dHB1dC0+cHJvcHNbaV0pOwogCQlp ZiAocHJvcHMgJiYgKHByb3BzLT5mbGFncyAmIERSTV9NT0RFX1BST1BfRU5VTSkpIHsKIAkJCWlm ICghc3RyY21wKHByb3BzLT5uYW1lLCAiRFBNUyIpKSB7CiAJCQkJZHJtbW9kZV9vdXRwdXQtPmRw bXNfZW51bV9pZCA9IGtvdXRwdXQtPnByb3BzW2ldOwpAQCAtMjQxOCw2ICsyNDIxLDcgQEAgc3Rh dGljIHZvaWQKIGRybW1vZGVfZmxpcF9oYW5kbGVyKHhmODZDcnRjUHRyIGNydGMsIHVpbnQzMl90 IGZyYW1lLCB1aW50NjRfdCB1c2VjLCB2b2lkICpldmVudF9kYXRhKQogewogCWRybW1vZGVfY3J0 Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKKwlSQURF T05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVudFByaXYoY3J0Yy0+c2Nybik7CiAJZHJtbW9k ZV9mbGlwZGF0YV9wdHIgZmxpcGRhdGEgPSBldmVudF9kYXRhOwogCiAJLyogSXMgdGhpcyB0aGUg ZXZlbnQgd2hvc2UgaW5mbyBzaGFsbCBiZSBkZWxpdmVyZWQgdG8gaGlnaGVyIGxldmVsPyAqLwpA QCAtMjQ0MCw3ICsyNDQ0LDcgQEAgZHJtbW9kZV9mbGlwX2hhbmRsZXIoeGY4NkNydGNQdHIgY3J0 YywgdWludDMyX3QgZnJhbWUsIHVpbnQ2NF90IHVzZWMsIHZvaWQgKmV2ZW4KIAkJZnJlZShmbGlw ZGF0YSk7CiAJfQogCi0JZHJtbW9kZV9mYl9yZWZlcmVuY2UoZHJtbW9kZV9jcnRjLT5kcm1tb2Rl LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsCisJZHJtbW9kZV9mYl9yZWZlcmVuY2UocFJBREVPTkVu dC0+ZmQsICZkcm1tb2RlX2NydGMtPmZiLAogCQkJICAgICBkcm1tb2RlX2NydGMtPmZsaXBfcGVu ZGluZyk7CiAJZHJtbW9kZV9jbGVhcl9wZW5kaW5nX2ZsaXAoY3J0Yyk7CiB9CkBAIC0yNDU0LDIz ICsyNDU4LDI2IEBAIHN0YXRpYyB2b2lkCiBkcm1fd2FrZXVwX2hhbmRsZXIocG9pbnRlciBkYXRh LCBpbnQgZXJyLCBwb2ludGVyIHApCiAjZW5kaWYKIHsKLQlkcm1tb2RlX3B0ciBkcm1tb2RlID0g ZGF0YTsKKwlTY3JuSW5mb1B0ciBzY3JuID0gZGF0YTsKKwlSQURFT05FbnRQdHIgcFJBREVPTkVu dCA9IFJBREVPTkVudFByaXYoc2Nybik7CisJUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRS KHNjcm4pOworCQogI2lmICFIQVZFX05PVElGWV9GRAogCWZkX3NldCAqcmVhZF9tYXNrID0gcDsK IAotCWlmIChlcnIgPj0gMCAmJiBGRF9JU1NFVChkcm1tb2RlLT5mZCwgcmVhZF9tYXNrKSkKKwlp ZiAoZXJyID49IDAgJiYgRkRfSVNTRVQocFJBREVPTkVudC0+ZmQsIHJlYWRfbWFzaykpCiAjZW5k aWYKIAl7Ci0JCWRybUhhbmRsZUV2ZW50KGRybW1vZGUtPmZkLCAmZHJtbW9kZS0+ZXZlbnRfY29u dGV4dCk7CisJCWRybUhhbmRsZUV2ZW50KHBSQURFT05FbnQtPmZkLCAmaW5mby0+ZHJtbW9kZS5l dmVudF9jb250ZXh0KTsKIAl9CiB9CiAKLXN0YXRpYyBCb29sIGRybW1vZGVfcHJvYmVfcGFnZV9m bGlwX3RhcmdldChkcm1tb2RlX3B0ciBkcm1tb2RlKQorc3RhdGljIEJvb2wgZHJtbW9kZV9wcm9i ZV9wYWdlX2ZsaXBfdGFyZ2V0KFJBREVPTkVudFB0ciBwUkFERU9ORW50KQogewogI2lmZGVmIERS TV9DQVBfUEFHRV9GTElQX1RBUkdFVAogCXVpbnQ2NF90IGNhcF92YWx1ZTsKIAotCXJldHVybiBk cm1HZXRDYXAoZHJtbW9kZS0+ZmQsIERSTV9DQVBfUEFHRV9GTElQX1RBUkdFVCwKKwlyZXR1cm4g ZHJtR2V0Q2FwKHBSQURFT05FbnQtPmZkLCBEUk1fQ0FQX1BBR0VfRkxJUF9UQVJHRVQsCiAJCQkg JmNhcF92YWx1ZSkgPT0gMCAmJiBjYXBfdmFsdWUgIT0gMDsKICNlbHNlCiAJcmV0dXJuIEZBTFNF OwpAQCAtMjQ3OCwxMyArMjQ4NSwxMiBAQCBzdGF0aWMgQm9vbCBkcm1tb2RlX3Byb2JlX3BhZ2Vf ZmxpcF90YXJnZXQoZHJtbW9kZV9wdHIgZHJtbW9kZSkKIH0KIAogc3RhdGljIGludAotZHJtbW9k ZV9wYWdlX2ZsaXAoZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YywgaW50IGZi X2lkLAorZHJtbW9kZV9wYWdlX2ZsaXAoUkFERU9ORW50UHRyIHBSQURFT05FbnQsCisJCSAgZHJt bW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YywgaW50IGZiX2lkLAogCQkgIHVpbnQz Ml90IGZsYWdzLCB1aW50cHRyX3QgZHJtX3F1ZXVlX3NlcSkKIHsKLQlkcm1tb2RlX3B0ciBkcm1t b2RlID0gZHJtbW9kZV9jcnRjLT5kcm1tb2RlOwotCiAJZmxhZ3MgfD0gRFJNX01PREVfUEFHRV9G TElQX0VWRU5UOwotCXJldHVybiBkcm1Nb2RlUGFnZUZsaXAoZHJtbW9kZS0+ZmQsIGRybW1vZGVf Y3J0Yy0+bW9kZV9jcnRjLT5jcnRjX2lkLAorCXJldHVybiBkcm1Nb2RlUGFnZUZsaXAocFJBREVP TkVudC0+ZmQsIGRybW1vZGVfY3J0Yy0+bW9kZV9jcnRjLT5jcnRjX2lkLAogCQkJICAgICAgIGZi X2lkLCBmbGFncywgKHZvaWQqKWRybV9xdWV1ZV9zZXEpOwogfQogCkBAIC0yNDk2LDE3ICsyNTAy LDE2IEBAIGRybW1vZGVfcGFnZV9mbGlwX3RhcmdldF9hYnNvbHV0ZShSQURFT05FbnRQdHIgcFJB REVPTkVudCwKIHsKICNpZmRlZiBEUk1fTU9ERV9QQUdFX0ZMSVBfVEFSR0VUCiAJaWYgKHBSQURF T05FbnQtPmhhc19wYWdlX2ZsaXBfdGFyZ2V0KSB7Ci0JCWRybW1vZGVfcHRyIGRybW1vZGUgPSBk cm1tb2RlX2NydGMtPmRybW1vZGU7Ci0KIAkJZmxhZ3MgfD0gRFJNX01PREVfUEFHRV9GTElQX0VW RU5UIHwgRFJNX01PREVfUEFHRV9GTElQX1RBUkdFVF9BQlNPTFVURTsKLQkJcmV0dXJuIGRybU1v ZGVQYWdlRmxpcFRhcmdldChkcm1tb2RlLT5mZCwKKwkJcmV0dXJuIGRybU1vZGVQYWdlRmxpcFRh cmdldChwUkFERU9ORW50LT5mZCwKIAkJCQkJICAgICBkcm1tb2RlX2NydGMtPm1vZGVfY3J0Yy0+ Y3J0Y19pZCwKIAkJCQkJICAgICBmYl9pZCwgZmxhZ3MsICh2b2lkKilkcm1fcXVldWVfc2VxLAog CQkJCQkgICAgIHRhcmdldF9tc2MpOwogCX0KICNlbmRpZgogCi0JcmV0dXJuIGRybW1vZGVfcGFn ZV9mbGlwKGRybW1vZGVfY3J0YywgZmJfaWQsIGZsYWdzLCBkcm1fcXVldWVfc2VxKTsKKwlyZXR1 cm4gZHJtbW9kZV9wYWdlX2ZsaXAocFJBREVPTkVudCwgZHJtbW9kZV9jcnRjLCBmYl9pZCwgZmxh Z3MsCisJCQkJIGRybV9xdWV1ZV9zZXEpOwogfQogCiBpbnQKQEAgLTI1MTcsMTcgKzI1MjIsMTYg QEAgZHJtbW9kZV9wYWdlX2ZsaXBfdGFyZ2V0X3JlbGF0aXZlKFJBREVPTkVudFB0ciBwUkFERU9O RW50LAogewogI2lmZGVmIERSTV9NT0RFX1BBR0VfRkxJUF9UQVJHRVQKIAlpZiAocFJBREVPTkVu dC0+aGFzX3BhZ2VfZmxpcF90YXJnZXQpIHsKLQkJZHJtbW9kZV9wdHIgZHJtbW9kZSA9IGRybW1v ZGVfY3J0Yy0+ZHJtbW9kZTsKLQogCQlmbGFncyB8PSBEUk1fTU9ERV9QQUdFX0ZMSVBfRVZFTlQg fCBEUk1fTU9ERV9QQUdFX0ZMSVBfVEFSR0VUX1JFTEFUSVZFOwotCQlyZXR1cm4gZHJtTW9kZVBh Z2VGbGlwVGFyZ2V0KGRybW1vZGUtPmZkLAorCQlyZXR1cm4gZHJtTW9kZVBhZ2VGbGlwVGFyZ2V0 KHBSQURFT05FbnQtPmZkLAogCQkJCQkgICAgIGRybW1vZGVfY3J0Yy0+bW9kZV9jcnRjLT5jcnRj X2lkLAogCQkJCQkgICAgIGZiX2lkLCBmbGFncywgKHZvaWQqKWRybV9xdWV1ZV9zZXEsCiAJCQkJ CSAgICAgdGFyZ2V0X21zYyk7CiAJfQogI2VuZGlmCiAKLQlyZXR1cm4gZHJtbW9kZV9wYWdlX2Zs aXAoZHJtbW9kZV9jcnRjLCBmYl9pZCwgZmxhZ3MsIGRybV9xdWV1ZV9zZXEpOworCXJldHVybiBk cm1tb2RlX3BhZ2VfZmxpcChwUkFERU9ORW50LCBkcm1tb2RlX2NydGMsIGZiX2lkLCBmbGFncywK KwkJCQkgZHJtX3F1ZXVlX3NlcSk7CiB9CiAKIEJvb2wgZHJtbW9kZV9wcmVfaW5pdChTY3JuSW5m b1B0ciBwU2NybiwgZHJtbW9kZV9wdHIgZHJtbW9kZSwgaW50IGNwcCkKQEAgLTI1NDQsNyArMjU0 OCw3IEBAIEJvb2wgZHJtbW9kZV9wcmVfaW5pdChTY3JuSW5mb1B0ciBwU2NybiwgZHJtbW9kZV9w dHIgZHJtbW9kZSwgaW50IGNwcCkKIAl4Zjg2Q3J0Y0NvbmZpZ0luaXQocFNjcm4sICZkcm1tb2Rl X3hmODZjcnRjX2NvbmZpZ19mdW5jcyk7CiAKIAlkcm1tb2RlLT5zY3JuID0gcFNjcm47Ci0JbW9k ZV9yZXMgPSBkcm1Nb2RlR2V0UmVzb3VyY2VzKGRybW1vZGUtPmZkKTsKKwltb2RlX3JlcyA9IGRy bU1vZGVHZXRSZXNvdXJjZXMocFJBREVPTkVudC0+ZmQpOwogCWlmICghbW9kZV9yZXMpCiAJCXJl dHVybiBGQUxTRTsKIApAQCAtMjU5NCw3ICsyNTk4LDcgQEAgQm9vbCBkcm1tb2RlX3ByZV9pbml0 KFNjcm5JbmZvUHRyIHBTY3JuLCBkcm1tb2RlX3B0ciBkcm1tb2RlLCBpbnQgY3BwKQogCWRybW1v ZGUtPmV2ZW50X2NvbnRleHQudmJsYW5rX2hhbmRsZXIgPSByYWRlb25fZHJtX3F1ZXVlX2hhbmRs ZXI7CiAJZHJtbW9kZS0+ZXZlbnRfY29udGV4dC5wYWdlX2ZsaXBfaGFuZGxlciA9IHJhZGVvbl9k cm1fcXVldWVfaGFuZGxlcjsKIAotCXBSQURFT05FbnQtPmhhc19wYWdlX2ZsaXBfdGFyZ2V0ID0g ZHJtbW9kZV9wcm9iZV9wYWdlX2ZsaXBfdGFyZ2V0KGRybW1vZGUpOworCXBSQURFT05FbnQtPmhh c19wYWdlX2ZsaXBfdGFyZ2V0ID0gZHJtbW9kZV9wcm9iZV9wYWdlX2ZsaXBfdGFyZ2V0KHBSQURF T05FbnQpOwogCiAJZHJtTW9kZUZyZWVSZXNvdXJjZXMobW9kZV9yZXMpOwogCXJldHVybiBUUlVF OwpAQCAtMjYxMSwxMSArMjYxNSwxMSBAQCB2b2lkIGRybW1vZGVfaW5pdChTY3JuSW5mb1B0ciBw U2NybiwgZHJtbW9kZV9wdHIgZHJtbW9kZSkKIAlpbmZvLT5kcm1tb2RlX2luaXRlZCA9IFRSVUU7 CiAJaWYgKHBSQURFT05FbnQtPmZkX3dha2V1cF9yZWdpc3RlcmVkICE9IHNlcnZlckdlbmVyYXRp b24pIHsKICNpZiBIQVZFX05PVElGWV9GRAotCQlTZXROb3RpZnlGZChkcm1tb2RlLT5mZCwgZHJt X25vdGlmeV9mZCwgWF9OT1RJRllfUkVBRCwgZHJtbW9kZSk7CisJCVNldE5vdGlmeUZkKHBSQURF T05FbnQtPmZkLCBkcm1fbm90aWZ5X2ZkLCBYX05PVElGWV9SRUFELCBwU2Nybik7CiAjZWxzZQot CQlBZGRHZW5lcmFsU29ja2V0KGRybW1vZGUtPmZkKTsKKwkJQWRkR2VuZXJhbFNvY2tldChwUkFE RU9ORW50LT5mZCk7CiAJCVJlZ2lzdGVyQmxvY2tBbmRXYWtldXBIYW5kbGVycygoQmxvY2tIYW5k bGVyUHJvY1B0cilOb29wRERBLAotCQkJCWRybV93YWtldXBfaGFuZGxlciwgZHJtbW9kZSk7CisJ CQkJZHJtX3dha2V1cF9oYW5kbGVyLCBwU2Nybik7CiAjZW5kaWYKIAkJcFJBREVPTkVudC0+ZmRf d2FrZXVwX3JlZ2lzdGVyZWQgPSBzZXJ2ZXJHZW5lcmF0aW9uOwogCQlwUkFERU9ORW50LT5mZF93 YWtldXBfcmVmID0gMTsKQEAgLTI2MzYsMTEgKzI2NDAsMTEgQEAgdm9pZCBkcm1tb2RlX2Zpbmko U2NybkluZm9QdHIgcFNjcm4sIGRybW1vZGVfcHRyIGRybW1vZGUpCiAJaWYgKHBSQURFT05FbnQt PmZkX3dha2V1cF9yZWdpc3RlcmVkID09IHNlcnZlckdlbmVyYXRpb24gJiYKIAkgICAgIS0tcFJB REVPTkVudC0+ZmRfd2FrZXVwX3JlZikgewogI2lmIEhBVkVfTk9USUZZX0ZECi0JCVJlbW92ZU5v dGlmeUZkKGRybW1vZGUtPmZkKTsKKwkJUmVtb3ZlTm90aWZ5RmQocFJBREVPTkVudC0+ZmQpOwog I2Vsc2UKLQkJUmVtb3ZlR2VuZXJhbFNvY2tldChkcm1tb2RlLT5mZCk7CisJCVJlbW92ZUdlbmVy YWxTb2NrZXQocFJBREVPTkVudC0+ZmQpOwogCQlSZW1vdmVCbG9ja0FuZFdha2V1cEhhbmRsZXJz KChCbG9ja0hhbmRsZXJQcm9jUHRyKU5vb3BEREEsCi0JCQkJZHJtX3dha2V1cF9oYW5kbGVyLCBk cm1tb2RlKTsKKwkJCQlkcm1fd2FrZXVwX2hhbmRsZXIsIHBTY3JuKTsKICNlbmRpZgogCX0KIApA QCAtMjY4Miw2ICsyNjg2LDcgQEAgQm9vbCBkcm1tb2RlX3NldF9kZXNpcmVkX21vZGVzKFNjcm5J bmZvUHRyIHBTY3JuLCBkcm1tb2RlX3B0ciBkcm1tb2RlLAogCQkJICAgICAgIEJvb2wgc2V0X2h3 KQogewogCXhmODZDcnRjQ29uZmlnUHRyICAgY29uZmlnID0gWEY4Nl9DUlRDX0NPTkZJR19QVFIo cFNjcm4pOworCVJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihwU2Nybik7 CiAJaW50IGM7CiAKIAlmb3IgKGMgPSAwOyBjIDwgY29uZmlnLT5udW1fY3J0YzsgYysrKSB7CkBA IC0yNjk0LDEwICsyNjk5LDEwIEBAIEJvb2wgZHJtbW9kZV9zZXRfZGVzaXJlZF9tb2RlcyhTY3Ju SW5mb1B0ciBwU2NybiwgZHJtbW9kZV9wdHIgZHJtbW9kZSwKIAkJaWYgKCFjcnRjLT5lbmFibGVk KSB7CiAJCQlpZiAoc2V0X2h3KSB7CiAJCQkJZHJtbW9kZV9kb19jcnRjX2RwbXMoY3J0YywgRFBN U01vZGVPZmYpOwotCQkJCWRybU1vZGVTZXRDcnRjKGRybW1vZGUtPmZkLAorCQkJCWRybU1vZGVT ZXRDcnRjKHBSQURFT05FbnQtPmZkLAogCQkJCQkgICAgICAgZHJtbW9kZV9jcnRjLT5tb2RlX2Ny dGMtPmNydGNfaWQsCiAJCQkJCSAgICAgICAwLCAwLCAwLCBOVUxMLCAwLCBOVUxMKTsKLQkJCQlk cm1tb2RlX2ZiX3JlZmVyZW5jZShkcm1tb2RlLT5mZCwKKwkJCQlkcm1tb2RlX2ZiX3JlZmVyZW5j ZShwUkFERU9ORW50LT5mZCwKIAkJCQkJCSAgICAgJmRybW1vZGVfY3J0Yy0+ZmIsIE5VTEwpOwog CQkJfQogCQkJY29udGludWU7CkBAIC0yODEyLDcgKzI4MTcsNyBAQCByYWRlb25fbW9kZV9ob3Rw bHVnKFNjcm5JbmZvUHRyIHNjcm4sIGRybW1vZGVfcHRyIGRybW1vZGUpCiAJQm9vbCBjaGFuZ2Vk ID0gRkFMU0U7CiAJaW50IG51bV9kdmkgPSAwLCBudW1faGRtaSA9IDA7CiAKLQltb2RlX3JlcyA9 IGRybU1vZGVHZXRSZXNvdXJjZXMoZHJtbW9kZS0+ZmQpOworCW1vZGVfcmVzID0gZHJtTW9kZUdl dFJlc291cmNlcyhwUkFERU9ORW50LT5mZCk7CiAJaWYgKCFtb2RlX3JlcykKIAkJZ290byBvdXQ7 CiAKZGlmZiAtLWdpdCBhL3NyYy9kcm1tb2RlX2Rpc3BsYXkuaCBiL3NyYy9kcm1tb2RlX2Rpc3Bs YXkuaAppbmRleCBkZGUyN2EwMDkuLmJhMWE3YmM4OSAxMDA2NDQKLS0tIGEvc3JjL2RybW1vZGVf ZGlzcGxheS5oCisrKyBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuaApAQCAtNDAsNyArNDAsNiBAQAog I2VuZGlmCiAKIHR5cGVkZWYgc3RydWN0IHsKLSAgaW50IGZkOwogICBzdHJ1Y3QgcmFkZW9uX2Jv X21hbmFnZXIgKmJ1Zm1ncjsKICAgU2NybkluZm9QdHIgc2NybjsKICNpZmRlZiBIQVZFX0xJQlVE RVYKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb24uaCBiL3NyYy9yYWRlb24uaAppbmRleCBmZWJlNTgw YjYuLmNhNTA5NTYxYSAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbi5oCisrKyBiL3NyYy9yYWRlb24u aApAQCAtNjk0LDcgKzY5NCw5IEBAIHVpbnQzMl90IHJhZGVvbl9nZXRfcGl4bWFwX3RpbGluZyhQ aXhtYXBQdHIgcFBpeCk7CiBzdGF0aWMgaW5saW5lIEJvb2wgcmFkZW9uX3NldF9waXhtYXBfYm8o UGl4bWFwUHRyIHBQaXgsIHN0cnVjdCByYWRlb25fYm8gKmJvKQogewogI2lmZGVmIFVTRV9HTEFN T1IKLSAgICBSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05QVFIoeGY4NlNjcmVlblRvU2Nybihw UGl4LT5kcmF3YWJsZS5wU2NyZWVuKSk7CisgICAgU2NybkluZm9QdHIgc2NybiA9IHhmODZTY3Jl ZW5Ub1Njcm4ocFBpeC0+ZHJhd2FibGUucFNjcmVlbik7CisgICAgUkFERU9ORW50UHRyIHBSQURF T05FbnQgPSBSQURFT05FbnRQcml2KHNjcm4pOworICAgIFJBREVPTkluZm9QdHIgaW5mbyA9IFJB REVPTlBUUihzY3JuKTsKIAogICAgIGlmIChpbmZvLT51c2VfZ2xhbW9yKSB7CiAJc3RydWN0IHJh ZGVvbl9waXhtYXAgKnByaXY7CkBAIC03MTEsNyArNzEzLDcgQEAgc3RhdGljIGlubGluZSBCb29s IHJhZGVvbl9zZXRfcGl4bWFwX2JvKFBpeG1hcFB0ciBwUGl4LCBzdHJ1Y3QgcmFkZW9uX2JvICpi bykKIAkJcmFkZW9uX2JvX3VucmVmKHByaXYtPmJvKTsKIAkgICAgfQogCi0JICAgIGRybW1vZGVf ZmJfcmVmZXJlbmNlKGluZm8tPmRybW1vZGUuZmQsICZwcml2LT5mYiwgTlVMTCk7CisJICAgIGRy bW1vZGVfZmJfcmVmZXJlbmNlKHBSQURFT05FbnQtPmZkLCAmcHJpdi0+ZmIsIE5VTEwpOwogCiAJ ICAgIGlmICghYm8pIHsKIAkJZnJlZShwcml2KTsKQEAgLTgzMSw3ICs4MzMsOSBAQCByYWRlb25f cGl4bWFwX2NyZWF0ZV9mYihpbnQgZHJtX2ZkLCBQaXhtYXBQdHIgcGl4KQogc3RhdGljIGlubGlu ZSBzdHJ1Y3QgZHJtbW9kZV9mYioKIHJhZGVvbl9waXhtYXBfZ2V0X2ZiKFBpeG1hcFB0ciBwaXgp CiB7Ci0gICAgUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHhmODZTY3JlZW5Ub1Njcm4o cGl4LT5kcmF3YWJsZS5wU2NyZWVuKSk7CisgICAgU2NybkluZm9QdHIgc2NybiA9IHhmODZTY3Jl ZW5Ub1Njcm4ocGl4LT5kcmF3YWJsZS5wU2NyZWVuKTsKKyAgICBSQURFT05FbnRQdHIgcFJBREVP TkVudCA9IFJBREVPTkVudFByaXYoc2Nybik7CisgICAgUkFERU9OSW5mb1B0ciBpbmZvID0gUkFE RU9OUFRSKHNjcm4pOwogCiAjaWZkZWYgVVNFX0dMQU1PUgogICAgIGlmIChpbmZvLT51c2VfZ2xh bW9yKSB7CkBAIC04NDEsNyArODQ1LDcgQEAgcmFkZW9uX3BpeG1hcF9nZXRfZmIoUGl4bWFwUHRy IHBpeCkKIAkgICAgcmV0dXJuIE5VTEw7CiAKIAlpZiAoIXByaXYtPmZiKQotCSAgICBwcml2LT5m YiA9IHJhZGVvbl9waXhtYXBfY3JlYXRlX2ZiKGluZm8tPmRybW1vZGUuZmQsIHBpeCk7CisJICAg IHByaXYtPmZiID0gcmFkZW9uX3BpeG1hcF9jcmVhdGVfZmIocFJBREVPTkVudC0+ZmQsIHBpeCk7 CiAKIAlyZXR1cm4gcHJpdi0+ZmI7CiAgICAgfSBlbHNlCkBAIC04NTUsNyArODU5LDcgQEAgcmFk ZW9uX3BpeG1hcF9nZXRfZmIoUGl4bWFwUHRyIHBpeCkKIAkgICAgcmV0dXJuIE5VTEw7CiAKIAlp ZiAoIWRyaXZlcl9wcml2LT5mYikKLQkgICAgZHJpdmVyX3ByaXYtPmZiID0gcmFkZW9uX3BpeG1h cF9jcmVhdGVfZmIoaW5mby0+ZHJtbW9kZS5mZCwgcGl4KTsKKwkgICAgZHJpdmVyX3ByaXYtPmZi ID0gcmFkZW9uX3BpeG1hcF9jcmVhdGVfZmIocFJBREVPTkVudC0+ZmQsIHBpeCk7CiAKIAlyZXR1 cm4gZHJpdmVyX3ByaXYtPmZiOwogICAgIH0KZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fYWNjZWwu YyBiL3NyYy9yYWRlb25fYWNjZWwuYwppbmRleCAxZGVmMmEzZmIuLmZjODBlZDc0NSAxMDA2NDQK LS0tIGEvc3JjL3JhZGVvbl9hY2NlbC5jCisrKyBiL3NyYy9yYWRlb25fYWNjZWwuYwpAQCAtOTQs MTEgKzk0LDExIEBACiAKIHN0YXRpYyBpbnQgUkFERU9ORFJNR2V0TnVtUGlwZXMoU2NybkluZm9Q dHIgcFNjcm4sIGludCAqbnVtX3BpcGVzKQogewotICAgIFJBREVPTkluZm9QdHIgaW5mbyA9IFJB REVPTlBUUihwU2Nybik7CisgICAgUkFERU9ORW50UHRyIHBSQURFT05FbnQgPSBSQURFT05FbnRQ cml2KHBTY3JuKTsKICAgICBzdHJ1Y3QgZHJtX3JhZGVvbl9pbmZvIG5wMjsKICAgICBucDIudmFs dWUgPSAodW5zaWduZWQgbG9uZyludW1fcGlwZXM7CiAgICAgbnAyLnJlcXVlc3QgPSBSQURFT05f SU5GT19OVU1fR0JfUElQRVM7Ci0gICAgcmV0dXJuIGRybUNvbW1hbmRXcml0ZVJlYWQoaW5mby0+ ZHJpMi5kcm1fZmQsIERSTV9SQURFT05fSU5GTywgJm5wMiwgc2l6ZW9mKG5wMikpOworICAgIHJl dHVybiBkcm1Db21tYW5kV3JpdGVSZWFkKHBSQURFT05FbnQtPmZkLCBEUk1fUkFERU9OX0lORk8s ICZucDIsIHNpemVvZihucDIpKTsKIH0KIAogLyogSW5pdGlhbGl6ZSB0aGUgYWNjZWxlcmF0aW9u IGhhcmR3YXJlICovCmRpZmYgLS1naXQgYS9zcmMvcmFkZW9uX2JvX2hlbHBlci5jIGIvc3JjL3Jh ZGVvbl9ib19oZWxwZXIuYwppbmRleCA5MzNkYzdiMzcuLmE4YmE3NjE4NSAxMDA2NDQKLS0tIGEv c3JjL3JhZGVvbl9ib19oZWxwZXIuYworKysgYi9zcmMvcmFkZW9uX2JvX2hlbHBlci5jCkBAIC0y MDEsNyArMjAxLDkgQEAgQm9vbCByYWRlb25fZ2V0X3BpeG1hcF9oYW5kbGUoUGl4bWFwUHRyIHBp eG1hcCwgdWludDMyX3QgKmhhbmRsZSkKICAgICBzdHJ1Y3QgcmFkZW9uX2JvICpibyA9IHJhZGVv bl9nZXRfcGl4bWFwX2JvKHBpeG1hcCk7CiAjaWZkZWYgVVNFX0dMQU1PUgogICAgIFNjcmVlblB0 ciBzY3JlZW4gPSBwaXhtYXAtPmRyYXdhYmxlLnBTY3JlZW47Ci0gICAgUkFERU9OSW5mb1B0ciBp bmZvID0gUkFERU9OUFRSKHhmODZTY3JlZW5Ub1Njcm4oc2NyZWVuKSk7CisgICAgU2NybkluZm9Q dHIgc2NybiA9IHhmODZTY3JlZW5Ub1Njcm4oc2NyZWVuKTsKKyAgICBSQURFT05FbnRQdHIgcFJB REVPTkVudCA9IFJBREVPTkVudFByaXYoc2Nybik7CisgICAgUkFERU9OSW5mb1B0ciBpbmZvID0g UkFERU9OUFRSKHNjcm4pOwogI2VuZGlmCiAKICAgICBpZiAoYm8pIHsKQEAgLTIzMCw3ICsyMzIs NyBAQCBCb29sIHJhZGVvbl9nZXRfcGl4bWFwX2hhbmRsZShQaXhtYXBQdHIgcGl4bWFwLCB1aW50 MzJfdCAqaGFuZGxlKQogCWlmIChmZCA8IDApCiAJICAgIHJldHVybiBGQUxTRTsKIAotCXIgPSBk cm1QcmltZUZEVG9IYW5kbGUoaW5mby0+ZHJpMi5kcm1fZmQsIGZkLCAmcHJpdi0+aGFuZGxlKTsK KwlyID0gZHJtUHJpbWVGRFRvSGFuZGxlKHBSQURFT05FbnQtPmZkLCBmZCwgJnByaXYtPmhhbmRs ZSk7CiAJY2xvc2UoZmQpOwogCWlmIChyID09IDApIHsKIAkgICAgc3RydWN0IGRybV9yYWRlb25f Z2VtX3NldF90aWxpbmcgYXJncyA9IHsgLmhhbmRsZSA9IHByaXYtPmhhbmRsZSB9OwpAQCAtMjM4 LDcgKzI0MCw3IEBAIEJvb2wgcmFkZW9uX2dldF9waXhtYXBfaGFuZGxlKFBpeG1hcFB0ciBwaXht YXAsIHVpbnQzMl90ICpoYW5kbGUpCiAJICAgIHByaXYtPmhhbmRsZV92YWxpZCA9IFRSVUU7CiAJ ICAgICpoYW5kbGUgPSBwcml2LT5oYW5kbGU7CiAKLQkgICAgaWYgKGRybUNvbW1hbmRXcml0ZVJl YWQoaW5mby0+ZHJpMi5kcm1fZmQsCisJICAgIGlmIChkcm1Db21tYW5kV3JpdGVSZWFkKHBSQURF T05FbnQtPmZkLAogCQkJCSAgICBEUk1fUkFERU9OX0dFTV9HRVRfVElMSU5HLCAmYXJncywKIAkJ CQkgICAgc2l6ZW9mKGFyZ3MpKSA9PSAwKQogCQlwcml2LT50aWxpbmdfZmxhZ3MgPSBhcmdzLnRp bGluZ19mbGFnczsKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fZHJpMi5jIGIvc3JjL3JhZGVvbl9k cmkyLmMKaW5kZXggY2M3MmJkNTJkLi40MzViZjUzOTcgMTAwNjQ0Ci0tLSBhL3NyYy9yYWRlb25f ZHJpMi5jCisrKyBiL3NyYy9yYWRlb25fZHJpMi5jCkBAIC04MSw3ICs4MSw3IEBAIHN0YXRpYyBE ZXZQcml2YXRlS2V5UmVjIGRyaTJfd2luZG93X3ByaXZhdGVfa2V5X3JlYzsKIAogLyogR2V0IEdF TSBmbGluayBuYW1lIGZvciBhIHBpeG1hcCAqLwogc3RhdGljIEJvb2wKLXJhZGVvbl9nZXRfZmxp bmtfbmFtZShSQURFT05JbmZvUHRyIGluZm8sIFBpeG1hcFB0ciBwaXhtYXAsIHVpbnQzMl90ICpu YW1lKQorcmFkZW9uX2dldF9mbGlua19uYW1lKFJBREVPTkVudFB0ciBwUkFERU9ORW50LCBQaXht YXBQdHIgcGl4bWFwLCB1aW50MzJfdCAqbmFtZSkKIHsKICAgICBzdHJ1Y3QgcmFkZW9uX2JvICpi byA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBpeG1hcCk7CiAgICAgc3RydWN0IGRybV9nZW1fZmxp bmsgZmxpbms7CkBAIC05MCw3ICs5MCw3IEBAIHJhZGVvbl9nZXRfZmxpbmtfbmFtZShSQURFT05J bmZvUHRyIGluZm8sIFBpeG1hcFB0ciBwaXhtYXAsIHVpbnQzMl90ICpuYW1lKQogCXJldHVybiBy YWRlb25fZ2VtX2dldF9rZXJuZWxfbmFtZShibywgbmFtZSkgPT0gMDsKIAogICAgIGlmIChyYWRl b25fZ2V0X3BpeG1hcF9oYW5kbGUocGl4bWFwLCAmZmxpbmsuaGFuZGxlKSkgewotCWlmIChkcm1J b2N0bChpbmZvLT5kcmkyLmRybV9mZCwgRFJNX0lPQ1RMX0dFTV9GTElOSywgJmZsaW5rKSAhPSAw KQorCWlmIChkcm1Jb2N0bChwUkFERU9ORW50LT5mZCwgRFJNX0lPQ1RMX0dFTV9GTElOSywgJmZs aW5rKSAhPSAwKQogCSAgICByZXR1cm4gRkFMU0U7CiAKIAkqbmFtZSA9IGZsaW5rLm5hbWU7CkBA IC0xMDcsNiArMTA3LDcgQEAgcmFkZW9uX2RyaTJfY3JlYXRlX2J1ZmZlcjIoU2NyZWVuUHRyIHBT Y3JlZW4sCiAJCQkgICB1bnNpZ25lZCBpbnQgZm9ybWF0KQogewogICAgIFNjcm5JbmZvUHRyIHBT Y3JuID0geGY4NlNjcmVlblRvU2NybihwU2NyZWVuKTsKKyAgICBSQURFT05FbnRQdHIgcFJBREVP TkVudCA9IFJBREVPTkVudFByaXYocFNjcm4pOwogICAgIFJBREVPTkluZm9QdHIgaW5mbyA9IFJB REVPTlBUUihwU2Nybik7CiAgICAgQnVmZmVyUHRyIGJ1ZmZlcnM7CiAgICAgc3RydWN0IGRyaTJf YnVmZmVyX3ByaXYgKnByaXZhdGVzOwpAQCAtMjUzLDcgKzI1NCw3IEBAIHJhZGVvbl9kcmkyX2Ny ZWF0ZV9idWZmZXIyKFNjcmVlblB0ciBwU2NyZWVuLAogCSAgICBwaXhtYXAtPnJlZmNudCsrOwog CX0KIAotCWlmICghcmFkZW9uX2dldF9mbGlua19uYW1lKGluZm8sIHBpeG1hcCwgJmJ1ZmZlcnMt Pm5hbWUpKQorCWlmICghcmFkZW9uX2dldF9mbGlua19uYW1lKHBSQURFT05FbnQsIHBpeG1hcCwg JmJ1ZmZlcnMtPm5hbWUpKQogCSAgICBnb3RvIGVycm9yOwogICAgIH0KIApAQCAtNTIzLDEzICs1 MjQsMTMgQEAgc3RhdGljIEJvb2wgcmFkZW9uX2RyaTJfZ2V0X2NydGNfbXNjKHhmODZDcnRjUHRy IGNydGMsIENBUkQ2NCAqdXN0LCBDQVJENjQgKm1zYykKIAkgZHJtbW9kZV9jcnRjX2dldF91c3Rf bXNjKGNydGMsIHVzdCwgbXNjKSAhPSBTdWNjZXNzKSB7CiAJLyogQ1JUQyBpcyBub3QgcnVubmlu ZywgZXh0cmFwb2xhdGUgTVNDIGFuZCB0aW1lc3RhbXAgKi8KIAlTY3JuSW5mb1B0ciBzY3JuID0g Y3J0Yy0+c2NybjsKLQlSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05QVFIoc2Nybik7CisJUkFE RU9ORW50UHRyIHBSQURFT05FbnQgPSBSQURFT05FbnRQcml2KHNjcm4pOwogCUNBUkQ2NCBub3cs IGRlbHRhX3QsIGRlbHRhX3NlcTsKIAogCWlmICghZHJtbW9kZV9jcnRjLT5kcG1zX2xhc3RfdXN0 KQogCSAgICByZXR1cm4gRkFMU0U7CiAKLQlpZiAoZHJtbW9kZV9nZXRfY3VycmVudF91c3QoaW5m by0+ZHJpMi5kcm1fZmQsICZub3cpICE9IDApIHsKKwlpZiAoZHJtbW9kZV9nZXRfY3VycmVudF91 c3QocFJBREVPTkVudC0+ZmQsICZub3cpICE9IDApIHsKIAkgICAgeGY4NkRydk1zZyhzY3JuLT5z Y3JuSW5kZXgsIFhfRVJST1IsCiAJCSAgICAgICAiJXMgY2Fubm90IGdldCBjdXJyZW50IHRpbWVc biIsIF9fZnVuY19fKTsKIAkgICAgcmV0dXJuIEZBTFNFOwpAQCAtNjg5LDcgKzY5MCw5IEBAIHN0 YXRpYyBCb29sCiB1cGRhdGVfZnJvbnQoRHJhd2FibGVQdHIgZHJhdywgRFJJMkJ1ZmZlclB0ciBm cm9udCkKIHsKICAgICBQaXhtYXBQdHIgcGl4bWFwOwotICAgIFJBREVPTkluZm9QdHIgaW5mbyA9 IFJBREVPTlBUUih4Zjg2U2NyZWVuVG9TY3JuKGRyYXctPnBTY3JlZW4pKTsKKyAgICBTY3JuSW5m b1B0ciBzY3JuID0geGY4NlNjcmVlblRvU2NybihkcmF3LT5wU2NyZWVuKTsKKyAgICBSQURFT05F bnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVudFByaXYoc2Nybik7CisgICAgUkFERU9OSW5mb1B0 ciBpbmZvID0gUkFERU9OUFRSKHNjcm4pOwogICAgIHN0cnVjdCBkcmkyX2J1ZmZlcl9wcml2ICpw cml2ID0gZnJvbnQtPmRyaXZlclByaXZhdGU7CiAKICAgICBwaXhtYXAgPSBnZXRfZHJhd2FibGVf cGl4bWFwKGRyYXcpOwpAQCAtNjk3LDcgKzcwMCw3IEBAIHVwZGF0ZV9mcm9udChEcmF3YWJsZVB0 ciBkcmF3LCBEUkkyQnVmZmVyUHRyIGZyb250KQogCiAgICAgaWYgKCFpbmZvLT51c2VfZ2xhbW9y KQogCWV4YU1vdmVJblBpeG1hcChwaXhtYXApOwotICAgIGlmICghcmFkZW9uX2dldF9mbGlua19u YW1lKGluZm8sIHBpeG1hcCwgJmZyb250LT5uYW1lKSkgeworICAgIGlmICghcmFkZW9uX2dldF9m bGlua19uYW1lKHBSQURFT05FbnQsIHBpeG1hcCwgJmZyb250LT5uYW1lKSkgewogCSgqZHJhdy0+ cFNjcmVlbi0+RGVzdHJveVBpeG1hcCkocGl4bWFwKTsKIAlyZXR1cm4gRkFMU0U7CiAgICAgfQpA QCAtOTM3LDcgKzk0MCw3IEBAIENBUkQzMiByYWRlb25fZHJpMl9leHRyYXBvbGF0ZV9tc2NfZGVs YXkoeGY4NkNydGNQdHIgY3J0YywgQ0FSRDY0ICp0YXJnZXRfbXNjLAogewogICAgIGRybW1vZGVf Y3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKICAg ICBTY3JuSW5mb1B0ciBwU2NybiA9IGNydGMtPnNjcm47Ci0gICAgUkFERU9OSW5mb1B0ciBpbmZv ID0gUkFERU9OUFRSKHBTY3JuKTsKKyAgICBSQURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVP TkVudFByaXYocFNjcm4pOwogICAgIGludCBub21pbmFsX2ZyYW1lX3JhdGUgPSBkcm1tb2RlX2Ny dGMtPmRwbXNfbGFzdF9mcHM7CiAgICAgQ0FSRDY0IGxhc3RfdmJsYW5rX3VzdCA9IGRybW1vZGVf Y3J0Yy0+ZHBtc19sYXN0X3VzdDsKICAgICB1aW50MzJfdCBsYXN0X3ZibGFua19zZXEgPSBkcm1t b2RlX2NydGMtPmRwbXNfbGFzdF9zZXE7CkBAIC05NTAsNyArOTUzLDcgQEAgQ0FSRDMyIHJhZGVv bl9kcmkyX2V4dHJhcG9sYXRlX21zY19kZWxheSh4Zjg2Q3J0Y1B0ciBjcnRjLCBDQVJENjQgKnRh cmdldF9tc2MsCiAJKnRhcmdldF9tc2MgPSAwOwogCXJldHVybiBGQUxMQkFDS19TV0FQX0RFTEFZ OwogICAgIH0KLSAgICByZXQgPSBkcm1tb2RlX2dldF9jdXJyZW50X3VzdChpbmZvLT5kcmkyLmRy bV9mZCwgJm5vdyk7CisgICAgcmV0ID0gZHJtbW9kZV9nZXRfY3VycmVudF91c3QocFJBREVPTkVu dC0+ZmQsICZub3cpOwogICAgIGlmIChyZXQpIHsKIAl4Zjg2RHJ2TXNnKHBTY3JuLT5zY3JuSW5k ZXgsIFhfRVJST1IsCiAJCSAgICIlcyBjYW5ub3QgZ2V0IGN1cnJlbnQgdGltZVxuIiwgX19mdW5j X18pOwpAQCAtMTAyOCw3ICsxMDMxLDcgQEAgQ0FSRDMyIHJhZGVvbl9kcmkyX2RlZmVycmVkX2V2 ZW50KE9zVGltZXJQdHIgdGltZXIsIENBUkQzMiBub3csIHBvaW50ZXIgZGF0YSkKICAgICBEUkky RnJhbWVFdmVudFB0ciBldmVudF9pbmZvID0gKERSSTJGcmFtZUV2ZW50UHRyKWRhdGE7CiAgICAg eGY4NkNydGNQdHIgY3J0YyA9IGV2ZW50X2luZm8tPmNydGM7CiAgICAgU2NybkluZm9QdHIgc2Ny bjsKLSAgICBSQURFT05JbmZvUHRyIGluZm87CisgICAgUkFERU9ORW50UHRyIHBSQURFT05FbnQ7 CiAgICAgQ0FSRDY0IGRybV9ub3c7CiAgICAgaW50IHJldDsKICAgICBDQVJENjQgZGVsdGFfdCwg ZGVsdGFfc2VxLCBmcmFtZTsKQEAgLTEwNTEsMTMgKzEwNTQsMTMgQEAgQ0FSRDMyIHJhZGVvbl9k cmkyX2RlZmVycmVkX2V2ZW50KE9zVGltZXJQdHIgdGltZXIsIENBUkQzMiBub3csIHBvaW50ZXIg ZGF0YSkKICAgICB9CiAKICAgICBzY3JuID0gY3J0Yy0+c2NybjsKLSAgICBpbmZvID0gUkFERU9O UFRSKHNjcm4pOwotICAgIHJldCA9IGRybW1vZGVfZ2V0X2N1cnJlbnRfdXN0KGluZm8tPmRyaTIu ZHJtX2ZkLCAmZHJtX25vdyk7CisgICAgcFJBREVPTkVudCA9IFJBREVPTkVudFByaXYoc2Nybik7 CisgICAgcmV0ID0gZHJtbW9kZV9nZXRfY3VycmVudF91c3QocFJBREVPTkVudC0+ZmQsICZkcm1f bm93KTsKICAgICBpZiAocmV0KSB7CiAJeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfRVJS T1IsCiAJCSAgICIlcyBjYW5ub3QgZ2V0IGN1cnJlbnQgdGltZVxuIiwgX19mdW5jX18pOwogCWlm IChldmVudF9pbmZvLT5kcm1fcXVldWVfc2VxKQotCSAgICByYWRlb25fZHJtX3F1ZXVlX2hhbmRs ZXIoaW5mby0+ZHJpMi5kcm1fZmQsIDAsIDAsIDAsCisJICAgIHJhZGVvbl9kcm1fcXVldWVfaGFu ZGxlcihwUkFERU9ORW50LT5mZCwgMCwgMCwgMCwKIAkJCQkgICAgICh2b2lkKilldmVudF9pbmZv LT5kcm1fcXVldWVfc2VxKTsKIAllbHNlCiAJICAgIHJhZGVvbl9kcmkyX2ZyYW1lX2V2ZW50X2hh bmRsZXIoY3J0YywgMCwgMCwgZGF0YSk7CkBAIC0xMDczLDcgKzEwNzYsNyBAQCBDQVJEMzIgcmFk ZW9uX2RyaTJfZGVmZXJyZWRfZXZlbnQoT3NUaW1lclB0ciB0aW1lciwgQ0FSRDMyIG5vdywgcG9p bnRlciBkYXRhKQogICAgIGRlbHRhX3NlcSAvPSAxMDAwMDAwOwogICAgIGZyYW1lID0gKENBUkQ2 NClkcm1tb2RlX2NydGMtPmRwbXNfbGFzdF9zZXEgKyBkZWx0YV9zZXE7CiAgICAgaWYgKGV2ZW50 X2luZm8tPmRybV9xdWV1ZV9zZXEpCi0JcmFkZW9uX2RybV9xdWV1ZV9oYW5kbGVyKGluZm8tPmRy aTIuZHJtX2ZkLCBmcmFtZSwgZHJtX25vdyAvIDEwMDAwMDAsCisJcmFkZW9uX2RybV9xdWV1ZV9o YW5kbGVyKHBSQURFT05FbnQtPmZkLCBmcmFtZSwgZHJtX25vdyAvIDEwMDAwMDAsCiAJCQkJIGRy bV9ub3cgJSAxMDAwMDAwLAogCQkJCSAodm9pZCopZXZlbnRfaW5mby0+ZHJtX3F1ZXVlX3NlcSk7 CiAgICAgZWxzZQpAQCAtMTEwNCw3ICsxMTA3LDcgQEAgc3RhdGljIGludCByYWRlb25fZHJpMl9z Y2hlZHVsZV93YWl0X21zYyhDbGllbnRQdHIgY2xpZW50LCBEcmF3YWJsZVB0ciBkcmF3LAogewog ICAgIFNjcmVlblB0ciBzY3JlZW4gPSBkcmF3LT5wU2NyZWVuOwogICAgIFNjcm5JbmZvUHRyIHNj cm4gPSB4Zjg2U2NyZWVuVG9TY3JuKHNjcmVlbik7Ci0gICAgUkFERU9OSW5mb1B0ciBpbmZvID0g UkFERU9OUFRSKHNjcm4pOworICAgIFJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50 UHJpdihzY3JuKTsKICAgICBEUkkyRnJhbWVFdmVudFB0ciB3YWl0X2luZm8gPSBOVUxMOwogICAg IHVpbnRwdHJfdCBkcm1fcXVldWVfc2VxID0gMDsKICAgICB4Zjg2Q3J0Y1B0ciBjcnRjID0gcmFk ZW9uX2RyaTJfZHJhd2FibGVfY3J0YyhkcmF3LCBUUlVFKTsKQEAgLTExNTIsNyArMTE1NSw3IEBA IHN0YXRpYyBpbnQgcmFkZW9uX2RyaTJfc2NoZWR1bGVfd2FpdF9tc2MoQ2xpZW50UHRyIGNsaWVu dCwgRHJhd2FibGVQdHIgZHJhdywKICAgICB2YmwucmVxdWVzdC50eXBlID0gRFJNX1ZCTEFOS19S RUxBVElWRTsKICAgICB2YmwucmVxdWVzdC50eXBlIHw9IHJhZGVvbl9wb3B1bGF0ZV92YmxfcmVx dWVzdF90eXBlKGNydGMpOwogICAgIHZibC5yZXF1ZXN0LnNlcXVlbmNlID0gMDsKLSAgICByZXQg PSBkcm1XYWl0VkJsYW5rKGluZm8tPmRyaTIuZHJtX2ZkLCAmdmJsKTsKKyAgICByZXQgPSBkcm1X YWl0VkJsYW5rKHBSQURFT05FbnQtPmZkLCAmdmJsKTsKICAgICBpZiAocmV0KSB7CiAgICAgICAg IHhmODZEcnZNc2coc2Nybi0+c2NybkluZGV4LCBYX1dBUk5JTkcsCiAgICAgICAgICAgICAgICAg ImdldCB2YmxhbmsgY291bnRlciBmYWlsZWQ6ICVzXG4iLCBzdHJlcnJvcihlcnJubykpOwpAQCAt MTE5MCw3ICsxMTkzLDcgQEAgc3RhdGljIGludCByYWRlb25fZHJpMl9zY2hlZHVsZV93YWl0X21z YyhDbGllbnRQdHIgY2xpZW50LCBEcmF3YWJsZVB0ciBkcmF3LAogCXZibC5yZXF1ZXN0LnR5cGUg fD0gcmFkZW9uX3BvcHVsYXRlX3ZibF9yZXF1ZXN0X3R5cGUoY3J0Yyk7CiAgICAgICAgIHZibC5y ZXF1ZXN0LnNlcXVlbmNlID0gdGFyZ2V0X21zYyAtIG1zY19kZWx0YTsKICAgICAgICAgdmJsLnJl cXVlc3Quc2lnbmFsID0gZHJtX3F1ZXVlX3NlcTsKLSAgICAgICAgcmV0ID0gZHJtV2FpdFZCbGFu ayhpbmZvLT5kcmkyLmRybV9mZCwgJnZibCk7CisgICAgICAgIHJldCA9IGRybVdhaXRWQmxhbmso cFJBREVPTkVudC0+ZmQsICZ2YmwpOwogICAgICAgICBpZiAocmV0KSB7CiAgICAgICAgICAgICB4 Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLAogICAgICAgICAgICAgICAgICAg ICAiZ2V0IHZibGFuayBjb3VudGVyIGZhaWxlZDogJXNcbiIsIHN0cmVycm9yKGVycm5vKSk7CkBA IC0xMjIxLDcgKzEyMjQsNyBAQCBzdGF0aWMgaW50IHJhZGVvbl9kcmkyX3NjaGVkdWxlX3dhaXRf bXNjKENsaWVudFB0ciBjbGllbnQsIERyYXdhYmxlUHRyIGRyYXcsCiAgICAgICAgIHZibC5yZXF1 ZXN0LnNlcXVlbmNlICs9IGRpdmlzb3I7CiAKICAgICB2YmwucmVxdWVzdC5zaWduYWwgPSBkcm1f cXVldWVfc2VxOwotICAgIHJldCA9IGRybVdhaXRWQmxhbmsoaW5mby0+ZHJpMi5kcm1fZmQsICZ2 YmwpOworICAgIHJldCA9IGRybVdhaXRWQmxhbmsocFJBREVPTkVudC0+ZmQsICZ2YmwpOwogICAg IGlmIChyZXQpIHsKICAgICAgICAgeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfV0FSTklO RywKICAgICAgICAgICAgICAgICAiZ2V0IHZibGFuayBjb3VudGVyIGZhaWxlZDogJXNcbiIsIHN0 cmVycm9yKGVycm5vKSk7CkBAIC0xMjY2LDcgKzEyNjksNyBAQCBzdGF0aWMgaW50IHJhZGVvbl9k cmkyX3NjaGVkdWxlX3N3YXAoQ2xpZW50UHRyIGNsaWVudCwgRHJhd2FibGVQdHIgZHJhdywKIHsK ICAgICBTY3JlZW5QdHIgc2NyZWVuID0gZHJhdy0+cFNjcmVlbjsKICAgICBTY3JuSW5mb1B0ciBz Y3JuID0geGY4NlNjcmVlblRvU2NybihzY3JlZW4pOwotICAgIFJBREVPTkluZm9QdHIgaW5mbyA9 IFJBREVPTlBUUihzY3JuKTsKKyAgICBSQURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVu dFByaXYoc2Nybik7CiAgICAgeGY4NkNydGNQdHIgY3J0YyA9IHJhZGVvbl9kcmkyX2RyYXdhYmxl X2NydGMoZHJhdywgVFJVRSk7CiAgICAgdWludDMyX3QgbXNjX2RlbHRhOwogICAgIGRybVZCbGFu ayB2Ymw7CkBAIC0xMzM5LDcgKzEzNDIsNyBAQCBzdGF0aWMgaW50IHJhZGVvbl9kcmkyX3NjaGVk dWxlX3N3YXAoQ2xpZW50UHRyIGNsaWVudCwgRHJhd2FibGVQdHIgZHJhdywKICAgICB2YmwucmVx dWVzdC50eXBlID0gRFJNX1ZCTEFOS19SRUxBVElWRTsKICAgICB2YmwucmVxdWVzdC50eXBlIHw9 IHJhZGVvbl9wb3B1bGF0ZV92YmxfcmVxdWVzdF90eXBlKGNydGMpOwogICAgIHZibC5yZXF1ZXN0 LnNlcXVlbmNlID0gMDsKLSAgICByZXQgPSBkcm1XYWl0VkJsYW5rKGluZm8tPmRyaTIuZHJtX2Zk LCAmdmJsKTsKKyAgICByZXQgPSBkcm1XYWl0VkJsYW5rKHBSQURFT05FbnQtPmZkLCAmdmJsKTsK ICAgICBpZiAocmV0KSB7CiAgICAgICAgIHhmODZEcnZNc2coc2Nybi0+c2NybkluZGV4LCBYX1dB Uk5JTkcsCiAgICAgICAgICAgICAgICAgImZpcnN0IGdldCB2YmxhbmsgY291bnRlciBmYWlsZWQ6 ICVzXG4iLApAQCAtMTM4Nyw3ICsxMzkwLDcgQEAgc3RhdGljIGludCByYWRlb25fZHJpMl9zY2hl ZHVsZV9zd2FwKENsaWVudFB0ciBjbGllbnQsIERyYXdhYmxlUHRyIGRyYXcsCiAKICAgICAgICAg dmJsLnJlcXVlc3Quc2VxdWVuY2UgPSAqdGFyZ2V0X21zYyAtIG1zY19kZWx0YTsKICAgICAgICAg dmJsLnJlcXVlc3Quc2lnbmFsID0gZHJtX3F1ZXVlX3NlcTsKLSAgICAgICAgcmV0ID0gZHJtV2Fp dFZCbGFuayhpbmZvLT5kcmkyLmRybV9mZCwgJnZibCk7CisgICAgICAgIHJldCA9IGRybVdhaXRW QmxhbmsocFJBREVPTkVudC0+ZmQsICZ2YmwpOwogICAgICAgICBpZiAocmV0KSB7CiAgICAgICAg ICAgICB4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLAogICAgICAgICAgICAg ICAgICAgICAiZGl2aXNvciAwIGdldCB2YmxhbmsgY291bnRlciBmYWlsZWQ6ICVzXG4iLApAQCAt MTQzMiw3ICsxNDM1LDcgQEAgc3RhdGljIGludCByYWRlb25fZHJpMl9zY2hlZHVsZV9zd2FwKENs aWVudFB0ciBjbGllbnQsIERyYXdhYmxlUHRyIGRyYXcsCiAgICAgdmJsLnJlcXVlc3Quc2VxdWVu Y2UgLT0gZmxpcDsKIAogICAgIHZibC5yZXF1ZXN0LnNpZ25hbCA9IGRybV9xdWV1ZV9zZXE7Ci0g ICAgcmV0ID0gZHJtV2FpdFZCbGFuayhpbmZvLT5kcmkyLmRybV9mZCwgJnZibCk7CisgICAgcmV0 ID0gZHJtV2FpdFZCbGFuayhwUkFERU9ORW50LT5mZCwgJnZibCk7CiAgICAgaWYgKHJldCkgewog ICAgICAgICB4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLAogICAgICAgICAg ICAgICAgICJmaW5hbCBnZXQgdmJsYW5rIGNvdW50ZXIgZmFpbGVkOiAlc1xuIiwKQEAgLTE0NzUs NiArMTQ3OCw3IEBAIEJvb2wKIHJhZGVvbl9kcmkyX3NjcmVlbl9pbml0KFNjcmVlblB0ciBwU2Ny ZWVuKQogewogICAgIFNjcm5JbmZvUHRyIHBTY3JuID0geGY4NlNjcmVlblRvU2NybihwU2NyZWVu KTsKKyAgICBSQURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVudFByaXYocFNjcm4pOwog ICAgIFJBREVPTkluZm9QdHIgaW5mbyA9IFJBREVPTlBUUihwU2Nybik7CiAgICAgRFJJMkluZm9S ZWMgZHJpMl9pbmZvID0geyAwIH07CiAgICAgY29uc3QgY2hhciAqZHJpdmVyTmFtZXNbMl07CkBA IC0xNDgzLDcgKzE0ODcsNyBAQCByYWRlb25fZHJpMl9zY3JlZW5faW5pdChTY3JlZW5QdHIgcFNj cmVlbikKICAgICBpZiAoIWluZm8tPmRyaTIuYXZhaWxhYmxlKQogICAgICAgICByZXR1cm4gRkFM U0U7CiAKLSAgICBpbmZvLT5kcmkyLmRldmljZV9uYW1lID0gZHJtR2V0RGV2aWNlTmFtZUZyb21G ZChpbmZvLT5kcmkyLmRybV9mZCk7CisgICAgaW5mby0+ZHJpMi5kZXZpY2VfbmFtZSA9IGRybUdl dERldmljZU5hbWVGcm9tRmQocFJBREVPTkVudC0+ZmQpOwogCiAgICAgaWYgKCAoaW5mby0+Q2hp cEZhbWlseSA+PSBDSElQX0ZBTUlMWV9UQUhJVEkpICkgewogICAgICAgICBkcmkyX2luZm8uZHJp dmVyTmFtZSA9IFNJX0RSSVZFUl9OQU1FOwpAQCAtMTQ5Niw3ICsxNTAwLDcgQEAgcmFkZW9uX2Ry aTJfc2NyZWVuX2luaXQoU2NyZWVuUHRyIHBTY3JlZW4pCiAgICAgfSBlbHNlIHsKICAgICAgICAg ZHJpMl9pbmZvLmRyaXZlck5hbWUgPSBSQURFT05fRFJJVkVSX05BTUU7CiAgICAgfQotICAgIGRy aTJfaW5mby5mZCA9IGluZm8tPmRyaTIuZHJtX2ZkOworICAgIGRyaTJfaW5mby5mZCA9IHBSQURF T05FbnQtPmZkOwogICAgIGRyaTJfaW5mby5kZXZpY2VOYW1lID0gaW5mby0+ZHJpMi5kZXZpY2Vf bmFtZTsKICAgICBkcmkyX2luZm8udmVyc2lvbiA9IERSSTJJTkZPUkVDX1ZFUlNJT047CiAgICAg ZHJpMl9pbmZvLkNyZWF0ZUJ1ZmZlciA9IHJhZGVvbl9kcmkyX2NyZWF0ZV9idWZmZXI7CkBAIC0x NTEzLDcgKzE1MTcsNyBAQCByYWRlb25fZHJpMl9zY3JlZW5faW5pdChTY3JlZW5QdHIgcFNjcmVl bikKICNpZmRlZiBEUk1fQ0FQX1ZCTEFOS19ISUdIX0NSVEMKIAl1aW50NjRfdCBjYXBfdmFsdWU7 CiAKLQlpZiAoZHJtR2V0Q2FwKGluZm8tPmRyaTIuZHJtX2ZkLCBEUk1fQ0FQX1ZCTEFOS19ISUdI X0NSVEMsICZjYXBfdmFsdWUpKSB7CisJaWYgKGRybUdldENhcChwUkFERU9ORW50LT5mZCwgRFJN X0NBUF9WQkxBTktfSElHSF9DUlRDLCAmY2FwX3ZhbHVlKSkgewogCSAgICB4Zjg2RHJ2TXNnKHBT Y3JuLT5zY3JuSW5kZXgsIFhfV0FSTklORywgIllvdSBuZWVkIGEgbmV3ZXIga2VybmVsICIKIAkJ ICAgICAgICJmb3IgVkJMQU5LcyBvbiBDUlRDID4gMVxuIik7CiAJICAgIHNjaGVkdWxpbmdfd29y a3MgPSBGQUxTRTsKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fZHJpMi5oIGIvc3JjL3JhZGVvbl9k cmkyLmgKaW5kZXggOWJhNDdjNzhmLi40ZDNmMzc3YjQgMTAwNjQ0Ci0tLSBhL3NyYy9yYWRlb25f ZHJpMi5oCisrKyBiL3NyYy9yYWRlb25fZHJpMi5oCkBAIC0zMSw3ICszMSw2IEBACiAKIHN0cnVj dCByYWRlb25fZHJpMiB7CiAgICAgZHJtVmVyc2lvblB0ciAgICAgcEtlcm5lbERSTVZlcnNpb247 Ci0gICAgaW50ICAgICAgICAgZHJtX2ZkOwogICAgIEJvb2wgICAgICAgIGF2YWlsYWJsZTsKICAg ICBCb29sICAgICAgICBlbmFibGVkOwogICAgIGNoYXIJKmRldmljZV9uYW1lOwpkaWZmIC0tZ2l0 IGEvc3JjL3JhZGVvbl9kcmkzLmMgYi9zcmMvcmFkZW9uX2RyaTMuYwppbmRleCBmYTI0YWJhZWUu LjNlNjg5ZmZkNyAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbl9kcmkzLmMKKysrIGIvc3JjL3JhZGVv bl9kcmkzLmMKQEAgLTQzLDYgKzQzLDcgQEAKIHN0YXRpYyBpbnQgb3Blbl9tYXN0ZXJfbm9kZShT Y3JlZW5QdHIgc2NyZWVuLCBpbnQgKm91dCkKIHsKIAlTY3JuSW5mb1B0ciBzY3JuID0geGY4NlNj cmVlblRvU2NybihzY3JlZW4pOworCVJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50 UHJpdihzY3JuKTsKIAlSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05QVFIoc2Nybik7CiAJZHJt X21hZ2ljX3QgbWFnaWM7CiAJaW50IGZkOwpAQCAtNzYsNyArNzcsNyBAQCBzdGF0aWMgaW50IG9w ZW5fbWFzdGVyX25vZGUoU2NyZWVuUHRyIHNjcmVlbiwgaW50ICpvdXQpCiAJCX0KIAl9CiAKLQlp ZiAoZHJtQXV0aE1hZ2ljKGluZm8tPmRyaTIuZHJtX2ZkLCBtYWdpYykgPCAwKSB7CisJaWYgKGRy bUF1dGhNYWdpYyhwUkFERU9ORW50LT5mZCwgbWFnaWMpIDwgMCkgewogCQljbG9zZShmZCk7CiAJ CXJldHVybiBCYWRNYXRjaDsKIAl9CmRpZmYgLS1naXQgYS9zcmMvcmFkZW9uX2V4YS5jIGIvc3Jj L3JhZGVvbl9leGEuYwppbmRleCBkOGRkN2ZkY2UuLmQzNjJlNWQ5YiAxMDA2NDQKLS0tIGEvc3Jj L3JhZGVvbl9leGEuYworKysgYi9zcmMvcmFkZW9uX2V4YS5jCkBAIC0zMDAsNyArMzAwLDcgQEAg dm9pZCAqUkFERU9ORVhBQ3JlYXRlUGl4bWFwMihTY3JlZW5QdHIgcFNjcmVlbiwgaW50IHdpZHRo LCBpbnQgaGVpZ2h0LAogCiB2b2lkIFJBREVPTkVYQURlc3Ryb3lQaXhtYXAoU2NyZWVuUHRyIHBT Y3JlZW4sIHZvaWQgKmRyaXZlclByaXYpCiB7Ci0gICAgUkFERU9OSW5mb1B0ciBpbmZvID0gUkFE RU9OUFRSKHhmODZTY3JlZW5Ub1Njcm4ocFNjcmVlbikpOworICAgIFJBREVPTkVudFB0ciBwUkFE RU9ORW50ID0gUkFERU9ORW50UHJpdih4Zjg2U2NyZWVuVG9TY3JuKHBTY3JlZW4pKTsKICAgICBz dHJ1Y3QgcmFkZW9uX2V4YV9waXhtYXBfcHJpdiAqZHJpdmVyX3ByaXYgPSBkcml2ZXJQcml2Owog CiAgICAgaWYgKCFkcml2ZXJQcml2KQpAQCAtMzA4LDcgKzMwOCw3IEBAIHZvaWQgUkFERU9ORVhB RGVzdHJveVBpeG1hcChTY3JlZW5QdHIgcFNjcmVlbiwgdm9pZCAqZHJpdmVyUHJpdikKIAogICAg IGlmIChkcml2ZXJfcHJpdi0+Ym8pCiAJcmFkZW9uX2JvX3VucmVmKGRyaXZlcl9wcml2LT5ibyk7 Ci0gICAgZHJtbW9kZV9mYl9yZWZlcmVuY2UoaW5mby0+ZHJtbW9kZS5mZCwgJmRyaXZlcl9wcml2 LT5mYiwgTlVMTCk7CisgICAgZHJtbW9kZV9mYl9yZWZlcmVuY2UocFJBREVPTkVudC0+ZmQsICZk cml2ZXJfcHJpdi0+ZmIsIE5VTEwpOwogICAgIGZyZWUoZHJpdmVyUHJpdik7CiB9CiAKZGlmZiAt LWdpdCBhL3NyYy9yYWRlb25fZ2xhbW9yLmMgYi9zcmMvcmFkZW9uX2dsYW1vci5jCmluZGV4IGU1 ZTM1NTUzYS4uMDFmZjU2MDk0IDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX2dsYW1vci5jCisrKyBi L3NyYy9yYWRlb25fZ2xhbW9yLmMKQEAgLTc0LDYgKzc0LDcgQEAgcmFkZW9uX2dsYW1vcl9jcmVh dGVfc2NyZWVuX3Jlc291cmNlcyhTY3JlZW5QdHIgc2NyZWVuKQogQm9vbAogcmFkZW9uX2dsYW1v cl9wcmVfaW5pdChTY3JuSW5mb1B0ciBzY3JuKQogeworCVJBREVPTkVudFB0ciBwUkFERU9ORW50 ID0gUkFERU9ORW50UHJpdihzY3JuKTsKIAlSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05QVFIo c2Nybik7CiAJcG9pbnRlciBnbGFtb3JfbW9kdWxlOwogCUNBUkQzMiB2ZXJzaW9uOwpAQCAtMTM1 LDcgKzEzNiw3IEBAIHJhZGVvbl9nbGFtb3JfcHJlX2luaXQoU2NybkluZm9QdHIgc2NybikKIAkJ CSJJbmNvbXBhdGlibGUgZ2xhbW9yIHZlcnNpb24sIHJlcXVpcmVkID49IDAuMy4wLlxuIik7CiAJ CQlyZXR1cm4gRkFMU0U7CiAJCX0gZWxzZSB7Ci0JCQlpZiAoZ2xhbW9yX2VnbF9pbml0KHNjcm4s IGluZm8tPmRyaTIuZHJtX2ZkKSkgeworCQkJaWYgKGdsYW1vcl9lZ2xfaW5pdChzY3JuLCBwUkFE RU9ORW50LT5mZCkpIHsKIAkJCQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9JTkZPLAog CQkJCQkgICAiZ2xhbW9yIGRldGVjdGVkLCBpbml0aWFsaXNpbmcgRUdMIGxheWVyLlxuIik7CiAJ CQl9IGVsc2UgewpkaWZmIC0tZ2l0IGEvc3JjL3JhZGVvbl9rbXMuYyBiL3NyYy9yYWRlb25fa21z LmMKaW5kZXggNjkxZmNkZjViLi4zZjE0YjQ2MjAgMTAwNjQ0Ci0tLSBhL3NyYy9yYWRlb25fa21z LmMKKysrIGIvc3JjL3JhZGVvbl9rbXMuYwpAQCAtMTg3LDYgKzE4Nyw3IEBAIHN0YXRpYyBCb29s IFJBREVPTkdldFJlYyhTY3JuSW5mb1B0ciBwU2NybikKIC8qIEZyZWUgb3VyIHByaXZhdGUgUkFE RU9OSW5mb1JlYyAqLwogc3RhdGljIHZvaWQgUkFERU9ORnJlZVJlYyhTY3JuSW5mb1B0ciBwU2Ny bikKIHsKKyAgICBSQURFT05FbnRQdHIgcFJBREVPTkVudDsKICAgICBSQURFT05JbmZvUHRyICBp bmZvOwogCiAgICAgaWYgKCFwU2NybiB8fCAhcFNjcm4tPmRyaXZlclByaXZhdGUpIHJldHVybjsK QEAgLTE5Niw3ICsxOTcsOSBAQCBzdGF0aWMgdm9pZCBSQURFT05GcmVlUmVjKFNjcm5JbmZvUHRy IHBTY3JuKQogICAgIGlmIChpbmZvLT5mYmNvbl9waXhtYXApCiAJcFNjcm4tPnBTY3JlZW4tPkRl c3Ryb3lQaXhtYXAoaW5mby0+ZmJjb25fcGl4bWFwKTsKIAotICAgIGlmIChpbmZvLT5kcmkyLmRy bV9mZCA+IDApIHsKKyAgICBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihwU2Nybik7CisKKyAg ICBpZiAocFJBREVPTkVudC0+ZmQgPiAwKSB7CiAgICAgICAgIERldlVuaW9uICpwUHJpdjsKICAg ICAgICAgUkFERU9ORW50UHRyIHBSQURFT05FbnQ7CiAgICAgICAgIHBQcml2ID0geGY4NkdldEVu dGl0eVByaXZhdGUocFNjcm4tPmVudGl0eUxpc3RbMF0sCkBAIC03MTksNiArNzIyLDcgQEAgcmFk ZW9uX3ByaW1lX3NjYW5vdXRfdXBkYXRlKFBpeG1hcERpcnR5VXBkYXRlUHRyIGRpcnR5KQogewog ICAgIFNjcmVlblB0ciBzY3JlZW4gPSBkaXJ0eS0+c2xhdmVfZHN0LT5kcmF3YWJsZS5wU2NyZWVu OwogICAgIFNjcm5JbmZvUHRyIHNjcm4gPSB4Zjg2U2NyZWVuVG9TY3JuKHNjcmVlbik7CisgICAg UkFERU9ORW50UHRyIHBSQURFT05FbnQgPSBSQURFT05FbnRQcml2KHNjcm4pOwogICAgIHhmODZD cnRjUHRyIHhmODZfY3J0YyA9IHJhZGVvbl9wcmltZV9kaXJ0eV90b19jcnRjKGRpcnR5KTsKICAg ICBkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjOwogICAgIHVpbnRwdHJfdCBk cm1fcXVldWVfc2VxOwpAQCAtNzQ4LDcgKzc1Miw3IEBAIHJhZGVvbl9wcmltZV9zY2Fub3V0X3Vw ZGF0ZShQaXhtYXBEaXJ0eVVwZGF0ZVB0ciBkaXJ0eSkKICAgICB2YmwucmVxdWVzdC50eXBlIHw9 IHJhZGVvbl9wb3B1bGF0ZV92YmxfcmVxdWVzdF90eXBlKHhmODZfY3J0Yyk7CiAgICAgdmJsLnJl cXVlc3Quc2VxdWVuY2UgPSAxOwogICAgIHZibC5yZXF1ZXN0LnNpZ25hbCA9IGRybV9xdWV1ZV9z ZXE7Ci0gICAgaWYgKGRybVdhaXRWQmxhbmsoUkFERU9OUFRSKHNjcm4pLT5kcmkyLmRybV9mZCwg JnZibCkpIHsKKyAgICBpZiAoZHJtV2FpdFZCbGFuayhwUkFERU9ORW50LT5mZCwgJnZibCkpIHsK IAl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLAogCQkgICAiZHJtV2FpdFZC bGFuayBmYWlsZWQgZm9yIFBSSU1FIHVwZGF0ZTogJXNcbiIsCiAJCSAgIHN0cmVycm9yKGVycm5v KSk7CkBAIC03NzIsOSArNzc2LDEwIEBAIHN0YXRpYyB2b2lkCiByYWRlb25fcHJpbWVfc2Nhbm91 dF9mbGlwX2hhbmRsZXIoeGY4NkNydGNQdHIgY3J0YywgdWludDMyX3QgbXNjLCB1aW50NjRfdCB1 c2VjLAogCQkJCSAgdm9pZCAqZXZlbnRfZGF0YSkKIHsKKyAgICBSQURFT05FbnRQdHIgcFJBREVP TkVudCA9IFJBREVPTkVudFByaXYoY3J0Yy0+c2Nybik7CiAgICAgZHJtbW9kZV9jcnRjX3ByaXZh dGVfcHRyIGRybW1vZGVfY3J0YyA9IGV2ZW50X2RhdGE7CiAKLSAgICBkcm1tb2RlX2ZiX3JlZmVy ZW5jZShkcm1tb2RlX2NydGMtPmRybW1vZGUtPmZkLCAmZHJtbW9kZV9jcnRjLT5mYiwKKyAgICBk cm1tb2RlX2ZiX3JlZmVyZW5jZShwUkFERU9ORW50LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsCiAJ CQkgZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcpOwogICAgIHJhZGVvbl9wcmltZV9zY2Fub3V0 X2ZsaXBfYWJvcnQoY3J0YywgZXZlbnRfZGF0YSk7CiB9CkBAIC0xMDEyLDYgKzEwMTcsNyBAQCBz dGF0aWMgdm9pZAogcmFkZW9uX3NjYW5vdXRfdXBkYXRlKHhmODZDcnRjUHRyIHhmODZfY3J0YykK IHsKICAgICBkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0geGY4Nl9jcnRj LT5kcml2ZXJfcHJpdmF0ZTsKKyAgICBSQURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVu dFByaXYoeGY4Nl9jcnRjLT5zY3JuKTsKICAgICB1aW50cHRyX3QgZHJtX3F1ZXVlX3NlcTsKICAg ICBTY3JuSW5mb1B0ciBzY3JuOwogICAgIGRybVZCbGFuayB2Ymw7CkBAIC0xMDU2LDcgKzEwNjIs NyBAQCByYWRlb25fc2Nhbm91dF91cGRhdGUoeGY4NkNydGNQdHIgeGY4Nl9jcnRjKQogICAgIHZi bC5yZXF1ZXN0LnR5cGUgfD0gcmFkZW9uX3BvcHVsYXRlX3ZibF9yZXF1ZXN0X3R5cGUoeGY4Nl9j cnRjKTsKICAgICB2YmwucmVxdWVzdC5zZXF1ZW5jZSA9IDE7CiAgICAgdmJsLnJlcXVlc3Quc2ln bmFsID0gZHJtX3F1ZXVlX3NlcTsKLSAgICBpZiAoZHJtV2FpdFZCbGFuayhSQURFT05QVFIoc2Ny biktPmRyaTIuZHJtX2ZkLCAmdmJsKSkgeworICAgIGlmIChkcm1XYWl0VkJsYW5rKHBSQURFT05F bnQtPmZkLCAmdmJsKSkgewogCXhmODZEcnZNc2coc2Nybi0+c2NybkluZGV4LCBYX1dBUk5JTkcs CiAJCSAgICJkcm1XYWl0VkJsYW5rIGZhaWxlZCBmb3Igc2Nhbm91dCB1cGRhdGU6ICVzXG4iLAog CQkgICBzdHJlcnJvcihlcnJubykpOwpAQCAtMTEzNiw2ICsxMTQyLDcgQEAgc3RhdGljIHZvaWQg UkFERU9OQmxvY2tIYW5kbGVyX0tNUyhCTE9DS0hBTkRMRVJfQVJHU19ERUNMKQogewogICAgIFND UkVFTl9QVFIoYXJnKTsKICAgICBTY3JuSW5mb1B0ciAgICBwU2NybiAgID0geGY4NlNjcmVlblRv U2NybihwU2NyZWVuKTsKKyAgICBSQURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVudFBy aXYocFNjcm4pOwogICAgIFJBREVPTkluZm9QdHIgIGluZm8gICAgPSBSQURFT05QVFIocFNjcm4p OwogICAgIHhmODZDcnRjQ29uZmlnUHRyIHhmODZfY29uZmlnID0gWEY4Nl9DUlRDX0NPTkZJR19Q VFIocFNjcm4pOwogICAgIGludCBjOwpAQCAtMTE1MSw3ICsxMTU4LDcgQEAgc3RhdGljIHZvaWQg UkFERU9OQmxvY2tIYW5kbGVyX0tNUyhCTE9DS0hBTkRMRVJfQVJHU19ERUNMKQogCSAgICBkcm1t b2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0KIAkJeGY4Nl9jb25maWctPmNydGNb Y10tPmRyaXZlcl9wcml2YXRlOwogCi0JICAgIGRybW1vZGVfZmJfcmVmZXJlbmNlKGluZm8tPmRy bW1vZGUuZmQsICZkcm1tb2RlX2NydGMtPmZiLCBOVUxMKTsKKwkgICAgZHJtbW9kZV9mYl9yZWZl cmVuY2UocFJBREVPTkVudC0+ZmQsICZkcm1tb2RlX2NydGMtPmZiLCBOVUxMKTsKIAl9CiAKIAly ZXR1cm47CkBAIC0xMTgzLDcgKzExOTAsNyBAQCBzdGF0aWMgdm9pZCBSQURFT05CbG9ja0hhbmRs ZXJfS01TKEJMT0NLSEFORExFUl9BUkdTX0RFQ0wpCiAKIHN0YXRpYyBCb29sIFJBREVPTklzRmFz dEZCV29ya2luZyhTY3JuSW5mb1B0ciBwU2NybikKIHsKLSAgICBSQURFT05JbmZvUHRyIGluZm8g PSBSQURFT05QVFIocFNjcm4pOworICAgIFJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9O RW50UHJpdihwU2Nybik7CiAgICAgc3RydWN0IGRybV9yYWRlb25faW5mbyBnaW5mbzsKICAgICBp bnQgcjsKICAgICB1aW50MzJfdCB0bXAgPSAwOwpAQCAtMTE5MSw3ICsxMTk4LDcgQEAgc3RhdGlj IEJvb2wgUkFERU9OSXNGYXN0RkJXb3JraW5nKFNjcm5JbmZvUHRyIHBTY3JuKQogICAgIG1lbXNl dCgmZ2luZm8sIDAsIHNpemVvZihnaW5mbykpOwogICAgIGdpbmZvLnJlcXVlc3QgPSBSQURFT05f SU5GT19GQVNURkJfV09SS0lORzsKICAgICBnaW5mby52YWx1ZSA9ICh1aW50cHRyX3QpJnRtcDsK LSAgICByID0gZHJtQ29tbWFuZFdyaXRlUmVhZChpbmZvLT5kcmkyLmRybV9mZCwgRFJNX1JBREVP Tl9JTkZPLCAmZ2luZm8sIHNpemVvZihnaW5mbykpOworICAgIHIgPSBkcm1Db21tYW5kV3JpdGVS ZWFkKHBSQURFT05FbnQtPmZkLCBEUk1fUkFERU9OX0lORk8sICZnaW5mbywgc2l6ZW9mKGdpbmZv KSk7CiAgICAgaWYgKHIpIHsKIAlyZXR1cm4gRkFMU0U7CiAgICAgfQpAQCAtMTIwMiw3ICsxMjA5 LDcgQEAgc3RhdGljIEJvb2wgUkFERU9OSXNGYXN0RkJXb3JraW5nKFNjcm5JbmZvUHRyIHBTY3Ju KQogCiBzdGF0aWMgQm9vbCBSQURFT05Jc0Z1c2lvbkdBUlRXb3JraW5nKFNjcm5JbmZvUHRyIHBT Y3JuKQogewotICAgIFJBREVPTkluZm9QdHIgaW5mbyA9IFJBREVPTlBUUihwU2Nybik7CisgICAg UkFERU9ORW50UHRyIHBSQURFT05FbnQgPSBSQURFT05FbnRQcml2KHBTY3JuKTsKICAgICBzdHJ1 Y3QgZHJtX3JhZGVvbl9pbmZvIGdpbmZvOwogICAgIGludCByOwogICAgIHVpbnQzMl90IHRtcDsK QEAgLTEyMTAsNyArMTIxNyw3IEBAIHN0YXRpYyBCb29sIFJBREVPTklzRnVzaW9uR0FSVFdvcmtp bmcoU2NybkluZm9QdHIgcFNjcm4pCiAgICAgbWVtc2V0KCZnaW5mbywgMCwgc2l6ZW9mKGdpbmZv KSk7CiAgICAgZ2luZm8ucmVxdWVzdCA9IFJBREVPTl9JTkZPX0ZVU0lPTl9HQVJUX1dPUktJTkc7 CiAgICAgZ2luZm8udmFsdWUgPSAodWludHB0cl90KSZ0bXA7Ci0gICAgciA9IGRybUNvbW1hbmRX cml0ZVJlYWQoaW5mby0+ZHJpMi5kcm1fZmQsIERSTV9SQURFT05fSU5GTywgJmdpbmZvLCBzaXpl b2YoZ2luZm8pKTsKKyAgICByID0gZHJtQ29tbWFuZFdyaXRlUmVhZChwUkFERU9ORW50LT5mZCwg RFJNX1JBREVPTl9JTkZPLCAmZ2luZm8sIHNpemVvZihnaW5mbykpOwogICAgIGlmIChyKSB7CiAJ cmV0dXJuIEZBTFNFOwogICAgIH0KQEAgLTEyMjEsNiArMTIyOCw3IEBAIHN0YXRpYyBCb29sIFJB REVPTklzRnVzaW9uR0FSVFdvcmtpbmcoU2NybkluZm9QdHIgcFNjcm4pCiAKIHN0YXRpYyBCb29s IFJBREVPTklzQWNjZWxXb3JraW5nKFNjcm5JbmZvUHRyIHBTY3JuKQogeworICAgIFJBREVPTkVu dFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihwU2Nybik7CiAgICAgUkFERU9OSW5mb1B0 ciBpbmZvID0gUkFERU9OUFRSKHBTY3JuKTsKICAgICBzdHJ1Y3QgZHJtX3JhZGVvbl9pbmZvIGdp bmZvOwogICAgIGludCByOwpAQCAtMTIzMiw3ICsxMjQwLDcgQEAgc3RhdGljIEJvb2wgUkFERU9O SXNBY2NlbFdvcmtpbmcoU2NybkluZm9QdHIgcFNjcm4pCiAgICAgZWxzZQogCWdpbmZvLnJlcXVl c3QgPSBSQURFT05fSU5GT19BQ0NFTF9XT1JLSU5HOwogICAgIGdpbmZvLnZhbHVlID0gKHVpbnRw dHJfdCkmdG1wOwotICAgIHIgPSBkcm1Db21tYW5kV3JpdGVSZWFkKGluZm8tPmRyaTIuZHJtX2Zk LCBEUk1fUkFERU9OX0lORk8sICZnaW5mbywgc2l6ZW9mKGdpbmZvKSk7CisgICAgciA9IGRybUNv bW1hbmRXcml0ZVJlYWQocFJBREVPTkVudC0+ZmQsIERSTV9SQURFT05fSU5GTywgJmdpbmZvLCBz aXplb2YoZ2luZm8pKTsKICAgICBpZiAocikgewogICAgICAgICAvKiBJZiBrZXJuZWwgaXMgdG9v IG9sZCBiZWZvcmUgMi42LjMyIHRoYW4gYXNzdW1lIGFjY2VsIGlzIHdvcmtpbmcgKi8KICAgICAg ICAgaWYgKHIgPT0gLUVJTlZBTCkgewpAQCAtMTQ3MCw3ICsxNDc4LDYgQEAgc3RhdGljIGludCBy YWRlb25fZ2V0X2RybV9tYXN0ZXJfZmQoU2NybkluZm9QdHIgcFNjcm4pCiAKIHN0YXRpYyBCb29s IHJhZGVvbl9vcGVuX2RybV9tYXN0ZXIoU2NybkluZm9QdHIgcFNjcm4pCiB7Ci0gICAgUkFERU9O SW5mb1B0ciAgaW5mbyAgID0gUkFERU9OUFRSKHBTY3JuKTsKICAgICBSQURFT05FbnRQdHIgcFJB REVPTkVudCA9IFJBREVPTkVudFByaXYocFNjcm4pOwogICAgIGRybVNldFZlcnNpb24gc3Y7CiAg ICAgaW50IGVycjsKQEAgLTE0NzgsMTQgKzE0ODUsMTIgQEAgc3RhdGljIEJvb2wgcmFkZW9uX29w ZW5fZHJtX21hc3RlcihTY3JuSW5mb1B0ciBwU2NybikKICAgICBpZiAocFJBREVPTkVudC0+ZmQp IHsKIAl4Zjg2RHJ2TXNnKHBTY3JuLT5zY3JuSW5kZXgsIFhfSU5GTywKIAkJICAgIiByZXVzaW5n IGZkIGZvciBzZWNvbmQgaGVhZFxuIik7Ci0KLQlpbmZvLT5kcm1tb2RlLmZkID0gaW5mby0+ZHJp Mi5kcm1fZmQgPSBwUkFERU9ORW50LT5mZDsKIAlwUkFERU9ORW50LT5mZF9yZWYrKzsKICAgICAg ICAgcmV0dXJuIFRSVUU7CiAgICAgfQogCi0gICAgaW5mby0+ZHJpMi5kcm1fZmQgPSByYWRlb25f Z2V0X2RybV9tYXN0ZXJfZmQocFNjcm4pOwotICAgIGlmIChpbmZvLT5kcmkyLmRybV9mZCA9PSAt MSkKKyAgICBwUkFERU9ORW50LT5mZCA9IHJhZGVvbl9nZXRfZHJtX21hc3Rlcl9mZChwU2Nybik7 CisgICAgaWYgKHBSQURFT05FbnQtPmZkID09IC0xKQogCXJldHVybiBGQUxTRTsKIAogICAgIC8q IENoZWNrIHRoYXQgd2hhdCB3ZSBvcGVuZWQgd2FzIGEgbWFzdGVyIG9yIGEgbWFzdGVyLWNhcGFi bGUgRkQsCkBAIC0xNDk2LDI0ICsxNTAxLDIzIEBAIHN0YXRpYyBCb29sIHJhZGVvbl9vcGVuX2Ry bV9tYXN0ZXIoU2NybkluZm9QdHIgcFNjcm4pCiAgICAgc3YuZHJtX2RpX21pbm9yID0gMTsKICAg ICBzdi5kcm1fZGRfbWFqb3IgPSAtMTsKICAgICBzdi5kcm1fZGRfbWlub3IgPSAtMTsKLSAgICBl cnIgPSBkcm1TZXRJbnRlcmZhY2VWZXJzaW9uKGluZm8tPmRyaTIuZHJtX2ZkLCAmc3YpOworICAg IGVyciA9IGRybVNldEludGVyZmFjZVZlcnNpb24ocFJBREVPTkVudC0+ZmQsICZzdik7CiAgICAg aWYgKGVyciAhPSAwKSB7CiAJeGY4NkRydk1zZyhwU2Nybi0+c2NybkluZGV4LCBYX0VSUk9SLAog CQkgICAiW2RybV0gZmFpbGVkIHRvIHNldCBkcm0gaW50ZXJmYWNlIHZlcnNpb24uXG4iKTsKLQlk cm1DbG9zZShpbmZvLT5kcmkyLmRybV9mZCk7Ci0JaW5mby0+ZHJpMi5kcm1fZmQgPSAtMTsKKwlk cm1DbG9zZShwUkFERU9ORW50LT5mZCk7CisJcFJBREVPTkVudC0+ZmQgPSAtMTsKIAogCXJldHVy biBGQUxTRTsKICAgICB9CiAKLSAgICBwUkFERU9ORW50LT5mZCA9IGluZm8tPmRyaTIuZHJtX2Zk OwogICAgIHBSQURFT05FbnQtPmZkX3JlZiA9IDE7Ci0gICAgaW5mby0+ZHJtbW9kZS5mZCA9IGlu Zm8tPmRyaTIuZHJtX2ZkOwogICAgIHJldHVybiBUUlVFOwogfQogCiBzdGF0aWMgQm9vbCByNjAw X2dldF90aWxlX2NvbmZpZyhTY3JuSW5mb1B0ciBwU2NybikKIHsKKyAgICBSQURFT05FbnRQdHIg cFJBREVPTkVudCA9IFJBREVPTkVudFByaXYocFNjcm4pOwogICAgIFJBREVPTkluZm9QdHIgIGlu Zm8gICA9IFJBREVPTlBUUihwU2Nybik7CiAgICAgc3RydWN0IGRybV9yYWRlb25faW5mbyBnaW5m bzsKICAgICBpbnQgcjsKQEAgLTE1MjUsNyArMTUyOSw3IEBAIHN0YXRpYyBCb29sIHI2MDBfZ2V0 X3RpbGVfY29uZmlnKFNjcm5JbmZvUHRyIHBTY3JuKQogICAgIG1lbXNldCgmZ2luZm8sIDAsIHNp emVvZihnaW5mbykpOwogICAgIGdpbmZvLnJlcXVlc3QgPSBSQURFT05fSU5GT19USUxJTkdfQ09O RklHOwogICAgIGdpbmZvLnZhbHVlID0gKHVpbnRwdHJfdCkmdG1wOwotICAgIHIgPSBkcm1Db21t YW5kV3JpdGVSZWFkKGluZm8tPmRyaTIuZHJtX2ZkLCBEUk1fUkFERU9OX0lORk8sICZnaW5mbywg c2l6ZW9mKGdpbmZvKSk7CisgICAgciA9IGRybUNvbW1hbmRXcml0ZVJlYWQocFJBREVPTkVudC0+ ZmQsIERSTV9SQURFT05fSU5GTywgJmdpbmZvLCBzaXplb2YoZ2luZm8pKTsKICAgICBpZiAocikK IAlyZXR1cm4gRkFMU0U7CiAKQEAgLTE2MjIsNiArMTYyNiw3IEBAIHN0YXRpYyBCb29sIHI2MDBf Z2V0X3RpbGVfY29uZmlnKFNjcm5JbmZvUHRyIHBTY3JuKQogc3RhdGljIHZvaWQgUkFERU9OU2V0 dXBDYXBhYmlsaXRpZXMoU2NybkluZm9QdHIgcFNjcm4pCiB7CiAjaWZkZWYgUkFERU9OX1BJWE1B UF9TSEFSSU5HCisgICAgUkFERU9ORW50UHRyIHBSQURFT05FbnQgPSBSQURFT05FbnRQcml2KHBT Y3JuKTsKICAgICBSQURFT05JbmZvUHRyICBpbmZvID0gUkFERU9OUFRSKHBTY3JuKTsKICAgICB1 aW50NjRfdCB2YWx1ZTsKICAgICBpbnQgcmV0OwpAQCAtMTYzMiw3ICsxNjM3LDcgQEAgc3RhdGlj IHZvaWQgUkFERU9OU2V0dXBDYXBhYmlsaXRpZXMoU2NybkluZm9QdHIgcFNjcm4pCiAgICAgaWYg KGluZm8tPnI2MDBfc2hhZG93X2ZiKQogCXJldHVybjsKIAotICAgIHJldCA9IGRybUdldENhcChp bmZvLT5kcmkyLmRybV9mZCwgRFJNX0NBUF9QUklNRSwgJnZhbHVlKTsKKyAgICByZXQgPSBkcm1H ZXRDYXAocFJBREVPTkVudC0+ZmQsIERSTV9DQVBfUFJJTUUsICZ2YWx1ZSk7CiAgICAgaWYgKHJl dCA9PSAwKSB7CiAJaWYgKHZhbHVlICYgRFJNX1BSSU1FX0NBUF9FWFBPUlQpCiAJICAgIHBTY3Ju LT5jYXBhYmlsaXRpZXMgfD0gUlJfQ2FwYWJpbGl0eV9Tb3VyY2VPdXRwdXQgfCBSUl9DYXBhYmls aXR5X1NvdXJjZU9mZmxvYWQ7CkBAIC0xNzcwLDcgKzE3NzUsNyBAQCBCb29sIFJBREVPTlByZUlu aXRfS01TKFNjcm5JbmZvUHRyIHBTY3JuLCBpbnQgZmxhZ3MpCiAKICAgICBpbmZvLT5kcmkyLmF2 YWlsYWJsZSA9IEZBTFNFOwogICAgIGluZm8tPmRyaTIuZW5hYmxlZCA9IEZBTFNFOwotICAgIGlu Zm8tPmRyaTIucEtlcm5lbERSTVZlcnNpb24gPSBkcm1HZXRWZXJzaW9uKGluZm8tPmRyaTIuZHJt X2ZkKTsKKyAgICBpbmZvLT5kcmkyLnBLZXJuZWxEUk1WZXJzaW9uID0gZHJtR2V0VmVyc2lvbihw UkFERU9ORW50LT5mZCk7CiAgICAgaWYgKGluZm8tPmRyaTIucEtlcm5lbERSTVZlcnNpb24gPT0g TlVMTCkgewogCXhmODZEcnZNc2cocFNjcm4tPnNjcm5JbmRleCwgWF9FUlJPUiwKIAkJICAgIlJB REVPTkRSSUdldFZlcnNpb24gZmFpbGVkIHRvIGdldCB0aGUgRFJNIHZlcnNpb25cbiIpOwpAQCAt MTkzNSw3ICsxOTQwLDcgQEAgQm9vbCBSQURFT05QcmVJbml0X0tNUyhTY3JuSW5mb1B0ciBwU2Ny biwgaW50IGZsYWdzKQogICAgIHsKIAlzdHJ1Y3QgZHJtX3JhZGVvbl9nZW1faW5mbyBtbWluZm87 CiAKLQlpZiAoIWRybUNvbW1hbmRXcml0ZVJlYWQoaW5mby0+ZHJpMi5kcm1fZmQsIERSTV9SQURF T05fR0VNX0lORk8sICZtbWluZm8sIHNpemVvZihtbWluZm8pKSkKKwlpZiAoIWRybUNvbW1hbmRX cml0ZVJlYWQocFJBREVPTkVudC0+ZmQsIERSTV9SQURFT05fR0VNX0lORk8sICZtbWluZm8sIHNp emVvZihtbWluZm8pKSkKIAl7CiAJICAgIGluZm8tPnZyYW1fc2l6ZSA9IG1taW5mby52cmFtX3Zp c2libGU7CiAJICAgIGluZm8tPmdhcnRfc2l6ZSA9IG1taW5mby5nYXJ0X3NpemU7CkBAIC0yMDc1 LDEwICsyMDgwLDcgQEAgc3RhdGljIEJvb2wgUkFERU9OU2F2ZVNjcmVlbl9LTVMoU2NyZWVuUHRy IHBTY3JlZW4sIGludCBtb2RlKQogCiBzdGF0aWMgQm9vbCByYWRlb25fc2V0X2RybV9tYXN0ZXIo U2NybkluZm9QdHIgcFNjcm4pCiB7Ci0gICAgUkFERU9OSW5mb1B0ciAgaW5mbyAgPSBSQURFT05Q VFIocFNjcm4pOwotI2lmZGVmIFhGODZfUERFVl9TRVJWRVJfRkQKICAgICBSQURFT05FbnRQdHIg cFJBREVPTkVudCA9IFJBREVPTkVudFByaXYocFNjcm4pOwotI2VuZGlmCiAgICAgaW50IGVycjsK IAogI2lmZGVmIFhGODZfUERFVl9TRVJWRVJfRkQKQEAgLTIwODcsNyArMjA4OSw3IEBAIHN0YXRp YyBCb29sIHJhZGVvbl9zZXRfZHJtX21hc3RlcihTY3JuSW5mb1B0ciBwU2NybikKICAgICAgICAg cmV0dXJuIFRSVUU7CiAjZW5kaWYKIAotICAgIGVyciA9IGRybVNldE1hc3RlcihpbmZvLT5kcmky LmRybV9mZCk7CisgICAgZXJyID0gZHJtU2V0TWFzdGVyKHBSQURFT05FbnQtPmZkKTsKICAgICBp ZiAoZXJyKQogICAgICAgICBFcnJvckYoIlVuYWJsZSB0byByZXRyaWV2ZSBtYXN0ZXJcbiIpOwog CkBAIC0yMDk2LDE2ICsyMDk4LDE1IEBAIHN0YXRpYyBCb29sIHJhZGVvbl9zZXRfZHJtX21hc3Rl cihTY3JuSW5mb1B0ciBwU2NybikKIAogc3RhdGljIHZvaWQgcmFkZW9uX2Ryb3BfZHJtX21hc3Rl cihTY3JuSW5mb1B0ciBwU2NybikKIHsKLSAgICBSQURFT05JbmZvUHRyICBpbmZvICA9IFJBREVP TlBUUihwU2Nybik7Ci0jaWZkZWYgWEY4Nl9QREVWX1NFUlZFUl9GRAogICAgIFJBREVPTkVudFB0 ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihwU2Nybik7CiAKKyNpZmRlZiBYRjg2X1BERVZf U0VSVkVSX0ZECiAgICAgaWYgKHBSQURFT05FbnQtPnBsYXRmb3JtX2RldiAmJgogICAgICAgICAg ICAgKHBSQURFT05FbnQtPnBsYXRmb3JtX2Rldi0+ZmxhZ3MgJiBYRjg2X1BERVZfU0VSVkVSX0ZE KSkKICAgICAgICAgcmV0dXJuOwogI2VuZGlmCiAKLSAgICBkcm1Ecm9wTWFzdGVyKGluZm8tPmRy aTIuZHJtX2ZkKTsKKyAgICBkcm1Ecm9wTWFzdGVyKHBSQURFT05FbnQtPmZkKTsKIH0KIAogLyog Q2FsbGVkIGF0IHRoZSBlbmQgb2YgZWFjaCBzZXJ2ZXIgZ2VuZXJhdGlvbi4gIFJlc3RvcmUgdGhl IG9yaWdpbmFsCkBAIC0yMTc3LDYgKzIxNzgsNyBAQCB2b2lkIFJBREVPTkZyZWVTY3JlZW5fS01T KEZSRUVfU0NSRUVOX0FSR1NfREVDTCkKIEJvb2wgUkFERU9OU2NyZWVuSW5pdF9LTVMoU0NSRUVO X0lOSVRfQVJHU19ERUNMKQogewogICAgIFNjcm5JbmZvUHRyICAgIHBTY3JuID0geGY4NlNjcmVl blRvU2NybihwU2NyZWVuKTsKKyAgICBSQURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVu dFByaXYocFNjcm4pOwogICAgIFJBREVPTkluZm9QdHIgIGluZm8gID0gUkFERU9OUFRSKHBTY3Ju KTsKICAgICBpbnQgICAgICAgICAgICBzdWJQaXhlbE9yZGVyID0gU3ViUGl4ZWxVbmtub3duOwog ICAgIE1lc3NhZ2VUeXBlIGZyb207CkBAIC0yMjAxLDkgKzIyMDMsOSBAQCBCb29sIFJBREVPTlNj cmVlbkluaXRfS01TKFNDUkVFTl9JTklUX0FSR1NfREVDTCkKICAgICBpZiAoaW5mby0+cjYwMF9z aGFkb3dfZmIgPT0gRkFMU0UpCiAgICAgICAgIGluZm8tPmRpcmVjdFJlbmRlcmluZ0VuYWJsZWQg PSByYWRlb25fZHJpMl9zY3JlZW5faW5pdChwU2NyZWVuKTsKIAotICAgIGluZm8tPnN1cmZfbWFu ID0gcmFkZW9uX3N1cmZhY2VfbWFuYWdlcl9uZXcoaW5mby0+ZHJpMi5kcm1fZmQpOworICAgIGlu Zm8tPnN1cmZfbWFuID0gcmFkZW9uX3N1cmZhY2VfbWFuYWdlcl9uZXcocFJBREVPTkVudC0+ZmQp OwogICAgIGlmICghaW5mby0+YnVmbWdyKQotICAgICAgICBpbmZvLT5idWZtZ3IgPSByYWRlb25f Ym9fbWFuYWdlcl9nZW1fY3RvcihpbmZvLT5kcmkyLmRybV9mZCk7CisgICAgICAgIGluZm8tPmJ1 Zm1nciA9IHJhZGVvbl9ib19tYW5hZ2VyX2dlbV9jdG9yKHBSQURFT05FbnQtPmZkKTsKICAgICBp ZiAoIWluZm8tPmJ1Zm1ncikgewogCXhmODZEcnZNc2cocFNjcm4tPnNjcm5JbmRleCwgWF9FUlJP UiwKIAkJICAgImZhaWxlZCB0byBpbml0aWFsaXNlIEdFTSBidWZmZXIgbWFuYWdlciIpOwpAQCAt MjIxMiw3ICsyMjE0LDcgQEAgQm9vbCBSQURFT05TY3JlZW5Jbml0X0tNUyhTQ1JFRU5fSU5JVF9B UkdTX0RFQ0wpCiAgICAgZHJtbW9kZV9zZXRfYnVmbWdyKHBTY3JuLCAmaW5mby0+ZHJtbW9kZSwg aW5mby0+YnVmbWdyKTsKIAogICAgIGlmICghaW5mby0+Y3NtKQotICAgICAgICBpbmZvLT5jc20g PSByYWRlb25fY3NfbWFuYWdlcl9nZW1fY3RvcihpbmZvLT5kcmkyLmRybV9mZCk7CisgICAgICAg IGluZm8tPmNzbSA9IHJhZGVvbl9jc19tYW5hZ2VyX2dlbV9jdG9yKHBSQURFT05FbnQtPmZkKTsK ICAgICBpZiAoIWluZm8tPmNzbSkgewogCXhmODZEcnZNc2cocFNjcm4tPnNjcm5JbmRleCwgWF9F UlJPUiwKIAkJICAgImZhaWxlZCB0byBpbml0aWFsaXNlIGNvbW1hbmQgc3VibWlzc2lvbiBtYW5h Z2VyIik7CmRpZmYgLS1naXQgYS9zcmMvcmFkZW9uX3ByZXNlbnQuYyBiL3NyYy9yYWRlb25fcHJl c2VudC5jCmluZGV4IDYzNWQxMDg2MS4uZTYzN2Q3ODY4IDEwMDY0NAotLS0gYS9zcmMvcmFkZW9u X3ByZXNlbnQuYworKysgYi9zcmMvcmFkZW9uX3ByZXNlbnQuYwpAQCAtMTA1LDEwICsxMDUsMTEg QEAgc3RhdGljIEJvb2wKIHJhZGVvbl9wcmVzZW50X2ZsdXNoX2RybV9ldmVudHMoU2NyZWVuUHRy IHNjcmVlbikKIHsKICAgICBTY3JuSW5mb1B0ciBzY3JuID0geGY4NlNjcmVlblRvU2NybihzY3Jl ZW4pOworICAgIFJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihzY3JuKTsK ICAgICB4Zjg2Q3J0Y0NvbmZpZ1B0ciB4Zjg2X2NvbmZpZyA9IFhGODZfQ1JUQ19DT05GSUdfUFRS KHNjcm4pOwogICAgIGRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSB4Zjg2 X2NvbmZpZy0+Y3J0Y1swXS0+ZHJpdmVyX3ByaXZhdGU7CiAgICAgZHJtbW9kZV9wdHIgZHJtbW9k ZSA9IGRybW1vZGVfY3J0Yy0+ZHJtbW9kZTsKLSAgICBzdHJ1Y3QgcG9sbGZkIHAgPSB7IC5mZCA9 IGRybW1vZGUtPmZkLCAuZXZlbnRzID0gUE9MTElOIH07CisgICAgc3RydWN0IHBvbGxmZCBwID0g eyAuZmQgPSBwUkFERU9ORW50LT5mZCwgLmV2ZW50cyA9IFBPTExJTiB9OwogICAgIGludCByOwog CiAgICAgZG8gewpAQCAtMTE4LDcgKzExOSw3IEBAIHJhZGVvbl9wcmVzZW50X2ZsdXNoX2RybV9l dmVudHMoU2NyZWVuUHRyIHNjcmVlbikKICAgICBpZiAociA8PSAwKQogCXJldHVybiAwOwogCi0g ICAgcmV0dXJuIGRybUhhbmRsZUV2ZW50KGRybW1vZGUtPmZkLCAmZHJtbW9kZS0+ZXZlbnRfY29u dGV4dCkgPj0gMDsKKyAgICByZXR1cm4gZHJtSGFuZGxlRXZlbnQocFJBREVPTkVudC0+ZmQsICZk cm1tb2RlLT5ldmVudF9jb250ZXh0KSA+PSAwOwogfQogCiAvKgpAQCAtMTU1LDcgKzE1Niw3IEBA IHJhZGVvbl9wcmVzZW50X3F1ZXVlX3ZibGFuayhSUkNydGNQdHIgY3J0YywgdWludDY0X3QgZXZl bnRfaWQsIHVpbnQ2NF90IG1zYykKICAgICB4Zjg2Q3J0Y1B0ciB4Zjg2X2NydGMgPSBjcnRjLT5k ZXZQcml2YXRlOwogICAgIFNjcmVlblB0ciBzY3JlZW4gPSBjcnRjLT5wU2NyZWVuOwogICAgIFNj cm5JbmZvUHRyIHNjcm4gPSB4Zjg2U2NyZWVuVG9TY3JuKHNjcmVlbik7Ci0gICAgUkFERU9OSW5m b1B0ciBpbmZvID0gUkFERU9OUFRSKHNjcm4pOworICAgIFJBREVPTkVudFB0ciBwUkFERU9ORW50 ID0gUkFERU9ORW50UHJpdihzY3JuKTsKICAgICBpbnQgY3J0Y19pZCA9IGRybW1vZGVfZ2V0X2Ny dGNfaWQoeGY4Nl9jcnRjKTsKICAgICBzdHJ1Y3QgcmFkZW9uX3ByZXNlbnRfdmJsYW5rX2V2ZW50 ICpldmVudDsKICAgICB1aW50cHRyX3QgZHJtX3F1ZXVlX3NlcTsKQEAgLTE4MCw3ICsxODEsNyBA QCByYWRlb25fcHJlc2VudF9xdWV1ZV92YmxhbmsoUlJDcnRjUHRyIGNydGMsIHVpbnQ2NF90IGV2 ZW50X2lkLCB1aW50NjRfdCBtc2MpCiAgICAgdmJsLnJlcXVlc3Quc2VxdWVuY2UgPSBtc2M7CiAg ICAgdmJsLnJlcXVlc3Quc2lnbmFsID0gZHJtX3F1ZXVlX3NlcTsKICAgICBmb3IgKDs7KSB7Ci0J cmV0ID0gZHJtV2FpdFZCbGFuayhpbmZvLT5kcmkyLmRybV9mZCwgJnZibCk7CisJcmV0ID0gZHJt V2FpdFZCbGFuayhwUkFERU9ORW50LT5mZCwgJnZibCk7CiAJaWYgKCFyZXQpCiAJICAgIGJyZWFr OwogCWlmIChlcnJubyAhPSBFQlVTWSB8fCAhcmFkZW9uX3ByZXNlbnRfZmx1c2hfZHJtX2V2ZW50 cyhzY3JlZW4pKSB7CkBAIC00MzUsMTEgKzQzNiwxMSBAQCByYWRlb25fcHJlc2VudF9oYXNfYXN5 bmNfZmxpcChTY3JlZW5QdHIgc2NyZWVuKQogewogI2lmZGVmIERSTV9DQVBfQVNZTkNfUEFHRV9G TElQCiAgICAgU2NybkluZm9QdHIgc2NybiA9IHhmODZTY3JlZW5Ub1Njcm4oc2NyZWVuKTsKLSAg ICBSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05QVFIoc2Nybik7CisgICAgUkFERU9ORW50UHRy IHBSQURFT05FbnQgPSBSQURFT05FbnRQcml2KHNjcm4pOwogICAgIGludCByZXQ7CiAgICAgdWlu dDY0X3QgdmFsdWU7CiAKLSAgICByZXQgPSBkcm1HZXRDYXAoaW5mby0+ZHJpMi5kcm1fZmQsIERS TV9DQVBfQVNZTkNfUEFHRV9GTElQLCAmdmFsdWUpOworICAgIHJldCA9IGRybUdldENhcChwUkFE RU9ORW50LT5mZCwgRFJNX0NBUF9BU1lOQ19QQUdFX0ZMSVAsICZ2YWx1ZSk7CiAgICAgaWYgKHJl dCA9PSAwKQogCXJldHVybiB2YWx1ZSA9PSAxOwogI2VuZGlmCi0tIAoyLjEzLjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBs aXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=