From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu] Use reference counting for tracking KMS framebuffer lifetimes Date: Mon, 29 May 2017 17:07:48 +0900 Message-ID: <20170529080748.13654-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+CgpSZWZlcmVuY2Vz IGFyZSBoZWxkIGJ5IHRoZSBwaXhtYXBzIGNvcnJlc3BvbmRpbmcgdG8gdGhlIEZCcyAoc28KdGhl IHNhbWUgS01TIEZCIGNhbiBiZSByZXVzZWQgYXMgbG9uZyBhcyB0aGUgcGl4bWFwIGV4aXN0cykg YW5kIGJ5IHRoZQpDUlRDcyBzY2FubmluZyBvdXQgZnJvbSB0aGVtIChzbyBhIEtNUyBGQiBpcyBv bmx5IGRlc3Ryb3llZCBvbmNlIGl0J3MKbm90IGJlaW5nIHNjYW5uZWQgb3V0IGFueW1vcmUsIHBy ZXZlbnRpbmcgaW50ZXJtaXR0ZW50IGJsYWNrIHNjcmVlbnMgYW5kCndvcnNlIGlzc3VlcyBkdWUg dG8gYSBDUlRDIHR1cm5pbmcgb2ZmIHdoZW4gaXQgc2hvdWxkIGJlIG9uKS4KCnYyOgoqIE9ubHkg aW5jcmVhc2UgcmVmZXJlbmNlIGNvdW50IGluIGRybW1vZGVfZmJfcmVmZXJlbmNlIGlmIGl0IHdh cyBzYW5lCiAgYmVmb3JlCiogTWFrZSBkcm1tb2RlX2ZiX3JlZmVyZW5jZSdzIGluZGVudGF0aW9u IG1hdGNoIHRoZSByZXN0IG9mCiAgZHJtbW9kZV9kaXNwbGF5LmgKCihQb3J0ZWQgZnJvbSByYWRl b24gY29tbWl0IDU1ZTUxM2I5NzhiMmFmYzUyYjdjYWZjNWJmY2IwZDFkYzc4ZDc1ZjYpCgpTaWdu ZWQtb2ZmLWJ5OiBNaWNoZWwgRMOkbnplciA8bWljaGVsLmRhZW56ZXJAYW1kLmNvbT4KLS0tCiBz cmMvYW1kZ3B1X2ttcy5jICAgICAgfCAgNzAgKysrKysrKysrKysrKysrKysrKy0tLQogc3JjL2Ft ZGdwdV9waXhtYXAuaCAgIHwgIDU4ICsrKysrKysrKysrKysrKysrKysKIHNyYy9hbWRncHVfcHJl c2VudC5jICB8ICAgOSAtLS0KIHNyYy9kcm1tb2RlX2Rpc3BsYXkuYyB8IDE1NyArKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogc3JjL2RybW1vZGVfZGlz cGxheS5oIHwgIDQyICsrKysrKysrKysrKy0tCiA1IGZpbGVzIGNoYW5nZWQsIDIxOSBpbnNlcnRp b25zKCspLCAxMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2FtZGdwdV9rbXMuYyBi L3NyYy9hbWRncHVfa21zLmMKaW5kZXggYTQxOGNmOWQzLi42OWQ2MTk0M2QgMTAwNjQ0Ci0tLSBh L3NyYy9hbWRncHVfa21zLmMKKysrIGIvc3JjL2FtZGdwdV9rbXMuYwpAQCAtNjc1LDYgKzY3NSwx OCBAQCBhbWRncHVfcHJpbWVfc2Nhbm91dF9mbGlwX2Fib3J0KHhmODZDcnRjUHRyIGNydGMsIHZv aWQgKmV2ZW50X2RhdGEpCiB9CiAKIHN0YXRpYyB2b2lkCithbWRncHVfcHJpbWVfc2Nhbm91dF9m bGlwX2hhbmRsZXIoeGY4NkNydGNQdHIgY3J0YywgdWludDMyX3QgbXNjLCB1aW50NjRfdCB1c2Vj LAorCQkJCSAgdm9pZCAqZXZlbnRfZGF0YSkKK3sKKwlBTURHUFVFbnRQdHIgcEFNREdQVUVudCA9 IEFNREdQVUVudFByaXYoY3J0Yy0+c2Nybik7CisJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRy bW1vZGVfY3J0YyA9IGV2ZW50X2RhdGE7CisKKwlkcm1tb2RlX2ZiX3JlZmVyZW5jZShwQU1ER1BV RW50LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsCisJCQkgICAgIGRybW1vZGVfY3J0Yy0+ZmxpcF9w ZW5kaW5nKTsKKwlhbWRncHVfcHJpbWVfc2Nhbm91dF9mbGlwX2Fib3J0KGNydGMsIGV2ZW50X2Rh dGEpOworfQorCitzdGF0aWMgdm9pZAogYW1kZ3B1X3ByaW1lX3NjYW5vdXRfZmxpcChQaXhtYXBE aXJ0eVVwZGF0ZVB0ciBlbnQpCiB7CiAJU2NyZWVuUHRyIHNjcmVlbiA9IGVudC0+c2xhdmVfZHN0 LT5kcmF3YWJsZS5wU2NyZWVuOwpAQCAtNzAxLDcgKzcxMyw4IEBAIGFtZGdwdV9wcmltZV9zY2Fu b3V0X2ZsaXAoUGl4bWFwRGlydHlVcGRhdGVQdHIgZW50KQogCWRybV9xdWV1ZV9zZXEgPSBhbWRn cHVfZHJtX3F1ZXVlX2FsbG9jKGNydGMsCiAJCQkJCSAgICAgICBBTURHUFVfRFJNX1FVRVVFX0NM SUVOVF9ERUZBVUxULAogCQkJCQkgICAgICAgQU1ER1BVX0RSTV9RVUVVRV9JRF9ERUZBVUxULAot CQkJCQkgICAgICAgZHJtbW9kZV9jcnRjLCBOVUxMLAorCQkJCQkgICAgICAgZHJtbW9kZV9jcnRj LAorCQkJCQkgICAgICAgYW1kZ3B1X3ByaW1lX3NjYW5vdXRfZmxpcF9oYW5kbGVyLAogCQkJCQkg ICAgICAgYW1kZ3B1X3ByaW1lX3NjYW5vdXRfZmxpcF9hYm9ydCk7CiAJaWYgKGRybV9xdWV1ZV9z ZXEgPT0gQU1ER1BVX0RSTV9RVUVVRV9FUlJPUikgewogCQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5J bmRleCwgWF9XQVJOSU5HLApAQCAtNzA5LDggKzcyMiwxNyBAQCBhbWRncHVfcHJpbWVfc2Nhbm91 dF9mbGlwKFBpeG1hcERpcnR5VXBkYXRlUHRyIGVudCkKIAkJcmV0dXJuOwogCX0KIAorCWRybW1v ZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nID0KKwkJYW1kZ3B1X3BpeG1hcF9nZXRfZmIoZHJtbW9kZV9j cnRjLT5zY2Fub3V0W3NjYW5vdXRfaWRdLnBpeG1hcCk7CisJaWYgKCFkcm1tb2RlX2NydGMtPmZs aXBfcGVuZGluZykgeworCQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLAor CQkJICAgIkZhaWxlZCB0byBnZXQgRkIgZm9yIFBSSU1FIGZsaXAuXG4iKTsKKwkJYW1kZ3B1X2Ry bV9hYm9ydF9lbnRyeShkcm1fcXVldWVfc2VxKTsKKwkJcmV0dXJuOworCX0KKwogCWlmIChkcm1t b2RlX3BhZ2VfZmxpcF90YXJnZXRfcmVsYXRpdmUocEFNREdQVUVudCwgZHJtbW9kZV9jcnRjLAot CQkJCQkgICAgICBkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9pZF0uZmJfaWQsCisJCQkJ CSAgICAgIGRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nLT5oYW5kbGUsCiAJCQkJCSAgICAgIDAs IGRybV9xdWV1ZV9zZXEsIDApICE9IDApIHsKIAkJeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgs IFhfV0FSTklORywgImZsaXAgcXVldWUgZmFpbGVkIGluICVzOiAlc1xuIiwKIAkJCSAgIF9fZnVu Y19fLCBzdHJlcnJvcihlcnJubykpOwpAQCAtNzIwLDcgKzc0Miw2IEBAIGFtZGdwdV9wcmltZV9z Y2Fub3V0X2ZsaXAoUGl4bWFwRGlydHlVcGRhdGVQdHIgZW50KQogCiAJZHJtbW9kZV9jcnRjLT5z Y2Fub3V0X2lkID0gc2Nhbm91dF9pZDsKIAlkcm1tb2RlX2NydGMtPnNjYW5vdXRfdXBkYXRlX3Bl bmRpbmcgPSBUUlVFOwotCWRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nID0gVFJVRTsKIH0KIAog c3RhdGljIHZvaWQKQEAgLTk1MCwxMCArOTcxLDE0IEBAIGFtZGdwdV9zY2Fub3V0X3VwZGF0ZSh4 Zjg2Q3J0Y1B0ciB4Zjg2X2NydGMpCiBzdGF0aWMgdm9pZAogYW1kZ3B1X3NjYW5vdXRfZmxpcF9h Ym9ydCh4Zjg2Q3J0Y1B0ciBjcnRjLCB2b2lkICpldmVudF9kYXRhKQogewotCWRybW1vZGVfY3J0 Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBldmVudF9kYXRhOworCWFtZGdwdV9wcmltZV9z Y2Fub3V0X2ZsaXBfYWJvcnQoY3J0YywgZXZlbnRfZGF0YSk7Cit9CiAKLQlkcm1tb2RlX2NydGMt PnNjYW5vdXRfdXBkYXRlX3BlbmRpbmcgPSBGQUxTRTsKLQlkcm1tb2RlX2NsZWFyX3BlbmRpbmdf ZmxpcChjcnRjKTsKK3N0YXRpYyB2b2lkCithbWRncHVfc2Nhbm91dF9mbGlwX2hhbmRsZXIoeGY4 NkNydGNQdHIgY3J0YywgdWludDMyX3QgbXNjLCB1aW50NjRfdCB1c2VjLAorCQkJICAgIHZvaWQg KmV2ZW50X2RhdGEpCit7CisJYW1kZ3B1X3ByaW1lX3NjYW5vdXRfZmxpcF9oYW5kbGVyKGNydGMs IG1zYywgdXNlYywgZXZlbnRfZGF0YSk7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC05NzcsNyArMTAw Miw4IEBAIGFtZGdwdV9zY2Fub3V0X2ZsaXAoU2NyZWVuUHRyIHBTY3JlZW4sIEFNREdQVUluZm9Q dHIgaW5mbywKIAlkcm1fcXVldWVfc2VxID0gYW1kZ3B1X2RybV9xdWV1ZV9hbGxvYyh4Zjg2X2Ny dGMsCiAJCQkJCSAgICAgICBBTURHUFVfRFJNX1FVRVVFX0NMSUVOVF9ERUZBVUxULAogCQkJCQkg ICAgICAgQU1ER1BVX0RSTV9RVUVVRV9JRF9ERUZBVUxULAotCQkJCQkgICAgICAgZHJtbW9kZV9j cnRjLCBOVUxMLAorCQkJCQkgICAgICAgZHJtbW9kZV9jcnRjLAorCQkJCQkgICAgICAgYW1kZ3B1 X3NjYW5vdXRfZmxpcF9oYW5kbGVyLAogCQkJCQkgICAgICAgYW1kZ3B1X3NjYW5vdXRfZmxpcF9h Ym9ydCk7CiAJaWYgKGRybV9xdWV1ZV9zZXEgPT0gQU1ER1BVX0RSTV9RVUVVRV9FUlJPUikgewog CQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLApAQCAtOTg1LDggKzEwMTEs MTcgQEAgYW1kZ3B1X3NjYW5vdXRfZmxpcChTY3JlZW5QdHIgcFNjcmVlbiwgQU1ER1BVSW5mb1B0 ciBpbmZvLAogCQlyZXR1cm47CiAJfQogCisJZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcgPQor CQlhbWRncHVfcGl4bWFwX2dldF9mYihkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9pZF0u cGl4bWFwKTsKKwlpZiAoIWRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nKSB7CisJCXhmODZEcnZN c2coc2Nybi0+c2NybkluZGV4LCBYX1dBUk5JTkcsCisJCQkgICAiRmFpbGVkIHRvIGdldCBGQiBm b3Igc2Nhbm91dCBmbGlwLlxuIik7CisJCWFtZGdwdV9kcm1fYWJvcnRfZW50cnkoZHJtX3F1ZXVl X3NlcSk7CisJCXJldHVybjsKKwl9CisKIAlpZiAoZHJtbW9kZV9wYWdlX2ZsaXBfdGFyZ2V0X3Jl bGF0aXZlKHBBTURHUFVFbnQsIGRybW1vZGVfY3J0YywKLQkJCQkJICAgICAgZHJtbW9kZV9jcnRj LT5zY2Fub3V0W3NjYW5vdXRfaWRdLmZiX2lkLAorCQkJCQkgICAgICBkcm1tb2RlX2NydGMtPmZs aXBfcGVuZGluZy0+aGFuZGxlLAogCQkJCQkgICAgICAwLCBkcm1fcXVldWVfc2VxLCAwKSAhPSAw KSB7CiAJCXhmODZEcnZNc2coc2Nybi0+c2NybkluZGV4LCBYX1dBUk5JTkcsICJmbGlwIHF1ZXVl IGZhaWxlZCBpbiAlczogJXNcbiIsCiAJCQkgICBfX2Z1bmNfXywgc3RyZXJyb3IoZXJybm8pKTsK QEAgLTk5NiwxMyArMTAzMSwxMyBAQCBhbWRncHVfc2Nhbm91dF9mbGlwKFNjcmVlblB0ciBwU2Ny ZWVuLCBBTURHUFVJbmZvUHRyIGluZm8sCiAKIAlkcm1tb2RlX2NydGMtPnNjYW5vdXRfaWQgPSBz Y2Fub3V0X2lkOwogCWRybW1vZGVfY3J0Yy0+c2Nhbm91dF91cGRhdGVfcGVuZGluZyA9IFRSVUU7 Ci0JZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcgPSBUUlVFOwogfQogCiBzdGF0aWMgdm9pZCBB TURHUFVCbG9ja0hhbmRsZXJfS01TKEJMT0NLSEFORExFUl9BUkdTX0RFQ0wpCiB7CiAJU0NSRUVO X1BUUihhcmcpOwogCVNjcm5JbmZvUHRyIHBTY3JuID0geGY4NlNjcmVlblRvU2NybihwU2NyZWVu KTsKKwlBTURHUFVFbnRQdHIgcEFNREdQVUVudCA9IEFNREdQVUVudFByaXYocFNjcm4pOwogCUFN REdQVUluZm9QdHIgaW5mbyA9IEFNREdQVVBUUihwU2Nybik7CiAJeGY4NkNydGNDb25maWdQdHIg eGY4Nl9jb25maWcgPSBYRjg2X0NSVENfQ09ORklHX1BUUihwU2Nybik7CiAJaW50IGM7CkBAIC0x MDExLDYgKzEwNDYsMjMgQEAgc3RhdGljIHZvaWQgQU1ER1BVQmxvY2tIYW5kbGVyX0tNUyhCTE9D S0hBTkRMRVJfQVJHU19ERUNMKQogCSgqcFNjcmVlbi0+QmxvY2tIYW5kbGVyKSAoQkxPQ0tIQU5E TEVSX0FSR1MpOwogCXBTY3JlZW4tPkJsb2NrSGFuZGxlciA9IEFNREdQVUJsb2NrSGFuZGxlcl9L TVM7CiAKKwlpZiAoIXBTY3JuLT52dFNlbWEpIHsKKyNpZiBYT1JHX1ZFUlNJT05fQ1VSUkVOVCA8 IFhPUkdfVkVSU0lPTl9OVU1FUklDKDEsMTksMCwwLDApCisJCWlmIChpbmZvLT51c2VfZ2xhbW9y KQorCQkJYW1kZ3B1X2dsYW1vcl9mbHVzaChwU2Nybik7CisjZW5kaWYKKworCQlmb3IgKGMgPSAw OyBjIDwgeGY4Nl9jb25maWctPm51bV9jcnRjOyBjKyspIHsKKwkJCWRybW1vZGVfY3J0Y19wcml2 YXRlX3B0ciBkcm1tb2RlX2NydGMgPQorCQkJCXhmODZfY29uZmlnLT5jcnRjW2NdLT5kcml2ZXJf cHJpdmF0ZTsKKworCQkJZHJtbW9kZV9mYl9yZWZlcmVuY2UocEFNREdQVUVudC0+ZmQsICZkcm1t b2RlX2NydGMtPmZiLAorCQkJCQkgICAgIE5VTEwpOworCQl9CisKKwkJcmV0dXJuOworCX0KKwog CWlmICghYW1kZ3B1X2lzX2dwdV9zY3JlZW4ocFNjcmVlbikpCiAJewogCQlmb3IgKGMgPSAwOyBj IDwgeGY4Nl9jb25maWctPm51bV9jcnRjOyBjKyspIHsKZGlmZiAtLWdpdCBhL3NyYy9hbWRncHVf cGl4bWFwLmggYi9zcmMvYW1kZ3B1X3BpeG1hcC5oCmluZGV4IGE4ZGUyNmE5My4uMDBmYjViZjA1 IDEwMDY0NAotLS0gYS9zcmMvYW1kZ3B1X3BpeG1hcC5oCisrKyBiL3NyYy9hbWRncHVfcGl4bWFw LmgKQEAgLTM1LDYgKzM1LDcgQEAgc3RydWN0IGFtZGdwdV9waXhtYXAgewogCXVpbnQ2NF90IHRp bGluZ19pbmZvOwogCiAJc3RydWN0IGFtZGdwdV9idWZmZXIgKmJvOworCXN0cnVjdCBkcm1tb2Rl X2ZiICpmYjsKIAogCS8qIEdFTSBoYW5kbGUgZm9yIHBpeG1hcHMgc2hhcmVkIHZpYSBEUkkyLzMg Ki8KIAlCb29sIGhhbmRsZV92YWxpZDsKQEAgLTU2LDYgKzU3LDggQEAgc3RhdGljIGlubGluZSB2 b2lkIGFtZGdwdV9zZXRfcGl4bWFwX3ByaXZhdGUoUGl4bWFwUHRyIHBpeG1hcCwKIAogc3RhdGlj IGlubGluZSBCb29sIGFtZGdwdV9zZXRfcGl4bWFwX2JvKFBpeG1hcFB0ciBwUGl4LCBzdHJ1Y3Qg YW1kZ3B1X2J1ZmZlciAqYm8pCiB7CisJU2NybkluZm9QdHIgc2NybiA9IHhmODZTY3JlZW5Ub1Nj cm4ocFBpeC0+ZHJhd2FibGUucFNjcmVlbik7CisJQU1ER1BVRW50UHRyIHBBTURHUFVFbnQgPSBB TURHUFVFbnRQcml2KHNjcm4pOwogCXN0cnVjdCBhbWRncHVfcGl4bWFwICpwcml2OwogCiAJcHJp diA9IGFtZGdwdV9nZXRfcGl4bWFwX3ByaXZhdGUocFBpeCk7CkBAIC03MSw2ICs3NCw4IEBAIHN0 YXRpYyBpbmxpbmUgQm9vbCBhbWRncHVfc2V0X3BpeG1hcF9ibyhQaXhtYXBQdHIgcFBpeCwgc3Ry dWN0IGFtZGdwdV9idWZmZXIgKmJvCiAJCQlwcml2LT5oYW5kbGVfdmFsaWQgPSBGQUxTRTsKIAkJ fQogCisJCWRybW1vZGVfZmJfcmVmZXJlbmNlKHBBTURHUFVFbnQtPmZkLCAmcHJpdi0+ZmIsIE5V TEwpOworCiAJCWlmICghYm8pIHsKIAkJCWZyZWUocHJpdik7CiAJCQlwcml2ID0gTlVMTDsKQEAg LTk4LDYgKzEwMyw1OSBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBhbWRncHVfYnVmZmVyICphbWRn cHVfZ2V0X3BpeG1hcF9ibyhQaXhtYXBQdHIgcFBpeCkKIAlyZXR1cm4gcHJpdiA/IHByaXYtPmJv IDogTlVMTDsKIH0KIAorc3RhdGljIGlubGluZSBzdHJ1Y3QgZHJtbW9kZV9mYioKK2FtZGdwdV9m Yl9jcmVhdGUoaW50IGRybV9mZCwgdWludDMyX3Qgd2lkdGgsIHVpbnQzMl90IGhlaWdodCwgdWlu dDhfdCBkZXB0aCwKKwkJIHVpbnQ4X3QgYnBwLCB1aW50MzJfdCBwaXRjaCwgdWludDMyX3QgaGFu ZGxlKQoreworCXN0cnVjdCBkcm1tb2RlX2ZiICpmYiAgPSBtYWxsb2Moc2l6ZW9mKCpmYikpOwor CisJaWYgKCFmYikKKwkJcmV0dXJuIE5VTEw7CisKKwlmYi0+cmVmY250ID0gMTsKKwlpZiAoZHJt TW9kZUFkZEZCKGRybV9mZCwgd2lkdGgsIGhlaWdodCwgZGVwdGgsIGJwcCwgcGl0Y2gsIGhhbmRs ZSwKKwkJCSAmZmItPmhhbmRsZSkgPT0gMCkKKwkJcmV0dXJuIGZiOworCisJZnJlZShmYik7CisJ cmV0dXJuIE5VTEw7Cit9CisKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGRybW1vZGVfZmIqCithbWRn cHVfcGl4bWFwX2NyZWF0ZV9mYihpbnQgZHJtX2ZkLCBQaXhtYXBQdHIgcGl4KQoreworCXVpbnQz Ml90IGhhbmRsZTsKKworCWlmICghYW1kZ3B1X3BpeG1hcF9nZXRfaGFuZGxlKHBpeCwgJmhhbmRs ZSkpCisJCXJldHVybiBOVUxMOworCisJcmV0dXJuIGFtZGdwdV9mYl9jcmVhdGUoZHJtX2ZkLCBw aXgtPmRyYXdhYmxlLndpZHRoLCBwaXgtPmRyYXdhYmxlLmhlaWdodCwKKwkJCQlwaXgtPmRyYXdh YmxlLmRlcHRoLCBwaXgtPmRyYXdhYmxlLmJpdHNQZXJQaXhlbCwKKwkJCQlwaXgtPmRldktpbmQs IGhhbmRsZSk7Cit9CisKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGRybW1vZGVfZmIqCithbWRncHVf cGl4bWFwX2dldF9mYihQaXhtYXBQdHIgcGl4KQoreworCVNjcm5JbmZvUHRyIHNjcm4gPSB4Zjg2 U2NyZWVuVG9TY3JuKHBpeC0+ZHJhd2FibGUucFNjcmVlbik7CisJQU1ER1BVRW50UHRyIHBBTURH UFVFbnQgPSBBTURHUFVFbnRQcml2KHNjcm4pOworCUFNREdQVUluZm9QdHIgaW5mbyA9IEFNREdQ VVBUUihzY3JuKTsKKworCWlmIChpbmZvLT51c2VfZ2xhbW9yKSB7CisJCXN0cnVjdCBhbWRncHVf cGl4bWFwICpwcml2ID0gYW1kZ3B1X2dldF9waXhtYXBfcHJpdmF0ZShwaXgpOworCisJCWlmICgh cHJpdikKKwkJCXJldHVybiBOVUxMOworCisJCWlmICghcHJpdi0+ZmIpCisJCQlwcml2LT5mYiA9 IGFtZGdwdV9waXhtYXBfY3JlYXRlX2ZiKHBBTURHUFVFbnQtPmZkLCBwaXgpOworCisJCXJldHVy biBwcml2LT5mYjsKKwl9CisKKwlyZXR1cm4gTlVMTDsKK30KKwogZW51bSB7CiAJQU1ER1BVX0NS RUFURV9QSVhNQVBfRFJJMiAgICA9IDB4MDgwMDAwMDAsCiAJQU1ER1BVX0NSRUFURV9QSVhNQVBf TElORUFSICA9IDB4MDQwMDAwMDAsCmRpZmYgLS1naXQgYS9zcmMvYW1kZ3B1X3ByZXNlbnQuYyBi L3NyYy9hbWRncHVfcHJlc2VudC5jCmluZGV4IDNjNGJjNTI1OS4uODZiMDk1Y2QxIDEwMDY0NAot LS0gYS9zcmMvYW1kZ3B1X3ByZXNlbnQuYworKysgYi9zcmMvYW1kZ3B1X3ByZXNlbnQuYwpAQCAt MzUwLDcgKzM1MCw2IEBAIHN0YXRpYyB2b2lkCiBhbWRncHVfcHJlc2VudF91bmZsaXAoU2NyZWVu UHRyIHNjcmVlbiwgdWludDY0X3QgZXZlbnRfaWQpCiB7CiAJU2NybkluZm9QdHIgc2NybiA9IHhm ODZTY3JlZW5Ub1Njcm4oc2NyZWVuKTsKLQlBTURHUFVFbnRQdHIgcEFNREdQVUVudCA9IEFNREdQ VUVudFByaXYoc2Nybik7CiAJQU1ER1BVSW5mb1B0ciBpbmZvID0gQU1ER1BVUFRSKHNjcm4pOwog CXhmODZDcnRjQ29uZmlnUHRyIGNvbmZpZyA9IFhGODZfQ1JUQ19DT05GSUdfUFRSKHNjcm4pOwog CXN0cnVjdCBhbWRncHVfcHJlc2VudF92YmxhbmtfZXZlbnQgKmV2ZW50OwpAQCAtMzU4LDcgKzM1 Nyw2IEBAIGFtZGdwdV9wcmVzZW50X3VuZmxpcChTY3JlZW5QdHIgc2NyZWVuLCB1aW50NjRfdCBl dmVudF9pZCkKIAllbnVtIGRybW1vZGVfZmxpcF9zeW5jIGZsaXBfc3luYyA9CiAJCShhbWRncHVf cHJlc2VudF9zY3JlZW5faW5mby5jYXBhYmlsaXRpZXMgJiBQcmVzZW50Q2FwYWJpbGl0eUFzeW5j KSA/CiAJCUZMSVBfQVNZTkMgOiBGTElQX1ZTWU5DOwotCWludCBvbGRfZmJfaWQ7CiAJaW50IGk7 CiAKIAlpZiAoIWFtZGdwdV9wcmVzZW50X2NoZWNrX3VuZmxpcChzY3JuKSkKQEAgLTM4MCwxMiAr Mzc4LDYgQEAgYW1kZ3B1X3ByZXNlbnRfdW5mbGlwKFNjcmVlblB0ciBzY3JlZW4sIHVpbnQ2NF90 IGV2ZW50X2lkKQogCQlyZXR1cm47CiAKIG1vZGVzZXQ6Ci0JLyogaW5mby0+ZHJtbW9kZS5mYl9p ZCBzdGlsbCBwb2ludHMgdG8gdGhlIEZCIGZvciB0aGUgbGFzdCBmbGlwcGVkIEJPLgotCSAqIENs ZWFyIGl0LCBkcm1tb2RlX3NldF9tb2RlX21ham9yIHdpbGwgcmUtY3JlYXRlIGl0Ci0JICovCi0J b2xkX2ZiX2lkID0gaW5mby0+ZHJtbW9kZS5mYl9pZDsKLQlpbmZvLT5kcm1tb2RlLmZiX2lkID0g MDsKLQogCWFtZGdwdV9nbGFtb3JfZmluaXNoKHNjcm4pOwogCWZvciAoaSA9IDA7IGkgPCBjb25m aWctPm51bV9jcnRjOyBpKyspIHsKIAkJeGY4NkNydGNQdHIgY3J0YyA9IGNvbmZpZy0+Y3J0Y1tp XTsKQEAgLTQwMSw3ICszOTMsNiBAQCBtb2Rlc2V0OgogCQkJZHJtbW9kZV9jcnRjLT5uZWVkX21v ZGVzZXQgPSBUUlVFOwogCX0KIAotCWRybU1vZGVSbUZCKHBBTURHUFVFbnQtPmZkLCBvbGRfZmJf aWQpOwogCXByZXNlbnRfZXZlbnRfbm90aWZ5KGV2ZW50X2lkLCAwLCAwKTsKIAlpbmZvLT5kcm1t b2RlLnByZXNlbnRfZmxpcHBpbmcgPSBGQUxTRTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9kcm1tb2Rl X2Rpc3BsYXkuYyBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYwppbmRleCBhZGQ4Mjg3YTAuLmY0YmVh MGNlMiAxMDA2NDQKLS0tIGEvc3JjL2RybW1vZGVfZGlzcGxheS5jCisrKyBiL3NyYy9kcm1tb2Rl X2Rpc3BsYXkuYwpAQCAtMzIyLDYgKzMyMiw3IEBAIGRybW1vZGVfY3J0Y19kcG1zKHhmODZDcnRj UHRyIGNydGMsIGludCBtb2RlKQogCiAJCWRybU1vZGVTZXRDcnRjKHBBTURHUFVFbnQtPmZkLCBk cm1tb2RlX2NydGMtPm1vZGVfY3J0Yy0+Y3J0Y19pZCwKIAkJCSAgICAgICAwLCAwLCAwLCBOVUxM LCAwLCBOVUxMKTsKKwkJZHJtbW9kZV9mYl9yZWZlcmVuY2UocEFNREdQVUVudC0+ZmQsICZkcm1t b2RlX2NydGMtPmZiLCBOVUxMKTsKIAl9IGVsc2UgaWYgKGRybW1vZGVfY3J0Yy0+ZHBtc19tb2Rl ICE9IERQTVNNb2RlT24pCiAJCWNydGMtPmZ1bmNzLT5zZXRfbW9kZV9tYWpvcihjcnRjLCAmY3J0 Yy0+bW9kZSwgY3J0Yy0+cm90YXRpb24sCiAJCQkJCSAgICBjcnRjLT54LCBjcnRjLT55KTsKQEAg LTM5MCw4ICszOTEsOSBAQCB2b2lkIGRybW1vZGVfY29weV9mYihTY3JuSW5mb1B0ciBwU2Nybiwg ZHJtbW9kZV9wdHIgZHJtbW9kZSkKIHsKIAl4Zjg2Q3J0Y0NvbmZpZ1B0ciAgIHhmODZfY29uZmln ID0gWEY4Nl9DUlRDX0NPTkZJR19QVFIocFNjcm4pOwogCUFNREdQVUluZm9QdHIgaW5mbyA9IEFN REdQVVBUUihwU2Nybik7Ci0JUGl4bWFwUHRyIHNyYywgZHN0OwogCVNjcmVlblB0ciBwU2NyZWVu ID0gcFNjcm4tPnBTY3JlZW47CisJUGl4bWFwUHRyIHNyYywgZHN0ID0gcFNjcmVlbi0+R2V0U2Ny ZWVuUGl4bWFwKHBTY3JlZW4pOworCXN0cnVjdCBkcm1tb2RlX2ZiICpmYiA9IGFtZGdwdV9waXht YXBfZ2V0X2ZiKGRzdCk7CiAJaW50IGZiY29uX2lkID0gMDsKIAlHQ1B0ciBnYzsKIAlpbnQgaTsK QEAgLTQwNiw3ICs0MDgsNyBAQCB2b2lkIGRybW1vZGVfY29weV9mYihTY3JuSW5mb1B0ciBwU2Ny biwgZHJtbW9kZV9wdHIgZHJtbW9kZSkKIAlpZiAoIWZiY29uX2lkKQogCQlyZXR1cm47CiAKLQlp ZiAoZmJjb25faWQgPT0gZHJtbW9kZS0+ZmJfaWQpIHsKKwlpZiAoZmJjb25faWQgPT0gZmItPmhh bmRsZSkgewogCQkvKiBpbiBzb21lIHJhcmUgY2FzZSB0aGVyZSBtaWdodCBiZSBubyBmYmNvbiBh bmQgd2UgbWlnaHQgYWxyZWFkeQogCQkgKiBiZSB0aGUgb25lIHdpdGggdGhlIGN1cnJlbnQgZmIg dG8gYXZvaWQgYSBmYWxzZSBkZWFkbGNrIGluCiAJCSAqIGtlcm5lbCB0dG0gY29kZSBqdXN0IGRv IG5vdGhpbmcgYXMgYW55d2F5IHRoZXJlIGlzIG5vdGhpbmcKQEAgLTQxOSw4ICs0MjEsNiBAQCB2 b2lkIGRybW1vZGVfY29weV9mYihTY3JuSW5mb1B0ciBwU2NybiwgZHJtbW9kZV9wdHIgZHJtbW9k ZSkKIAlpZiAoIXNyYykKIAkJcmV0dXJuOwogCi0JZHN0ID0gcFNjcmVlbi0+R2V0U2NyZWVuUGl4 bWFwKHBTY3JlZW4pOwotCiAJZ2MgPSBHZXRTY3JhdGNoR0MocFNjcm4tPmRlcHRoLCBwU2NyZWVu KTsKIAlWYWxpZGF0ZUdDKCZkc3QtPmRyYXdhYmxlLCBnYyk7CiAKQEAgLTQ0OSwxMCArNDQ5LDYg QEAgZHJtbW9kZV9jcnRjX3NjYW5vdXRfZGVzdHJveShkcm1tb2RlX3B0ciBkcm1tb2RlLAogCX0K IAogCWlmIChzY2Fub3V0LT5ibykgewotCQlBTURHUFVFbnRQdHIgcEFNREdQVUVudCA9IEFNREdQ VUVudFByaXYoZHJtbW9kZS0+c2Nybik7Ci0KLQkJZHJtTW9kZVJtRkIocEFNREdQVUVudC0+ZmQs IHNjYW5vdXQtPmZiX2lkKTsKLQkJc2Nhbm91dC0+ZmJfaWQgPSAwOwogCQlhbWRncHVfYm9fdW5y ZWYoJnNjYW5vdXQtPmJvKTsKIAkJc2Nhbm91dC0+Ym8gPSBOVUxMOwogCX0KQEAgLTQ5NywxMCAr NDkzLDggQEAgZHJtbW9kZV9jcnRjX3NjYW5vdXRfY3JlYXRlKHhmODZDcnRjUHRyIGNydGMsIHN0 cnVjdCBkcm1tb2RlX3NjYW5vdXQgKnNjYW5vdXQsCiAJCQkgICAgaW50IHdpZHRoLCBpbnQgaGVp Z2h0KQogewogCVNjcm5JbmZvUHRyIHBTY3JuID0gY3J0Yy0+c2NybjsKLQlBTURHUFVFbnRQdHIg cEFNREdQVUVudCA9IEFNREdQVUVudFByaXYocFNjcm4pOwogCWRybW1vZGVfY3J0Y19wcml2YXRl X3B0ciBkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKIAlkcm1tb2RlX3B0ciBk cm1tb2RlID0gZHJtbW9kZV9jcnRjLT5kcm1tb2RlOwotCXVuaW9uIGdibV9ib19oYW5kbGUgYm9f aGFuZGxlOwogCWludCBwaXRjaDsKIAogCWlmIChzY2Fub3V0LT5waXhtYXApIHsKQEAgLTUxNiwx NSArNTEwLDcgQEAgZHJtbW9kZV9jcnRjX3NjYW5vdXRfY3JlYXRlKHhmODZDcnRjUHRyIGNydGMs IHN0cnVjdCBkcm1tb2RlX3NjYW5vdXQgKnNjYW5vdXQsCiAJaWYgKCFzY2Fub3V0LT5ibykgewog CQl4Zjg2RHJ2TXNnKHBTY3JuLT5zY3JuSW5kZXgsIFhfRVJST1IsCiAJCQkgICAiRmFpbGVkIHRv IGFsbG9jYXRlIHNjYW5vdXQgYnVmZmVyIG1lbW9yeVxuIik7Ci0JCWdvdG8gZXJyb3I7Ci0JfQot Ci0JYm9faGFuZGxlID0gZ2JtX2JvX2dldF9oYW5kbGUoc2Nhbm91dC0+Ym8tPmJvLmdibSk7Ci0J aWYgKGRybU1vZGVBZGRGQihwQU1ER1BVRW50LT5mZCwgd2lkdGgsIGhlaWdodCwgcFNjcm4tPmRl cHRoLAotCQkJIHBTY3JuLT5iaXRzUGVyUGl4ZWwsIHBpdGNoLAotCQkJIGJvX2hhbmRsZS51MzIs ICZzY2Fub3V0LT5mYl9pZCkgIT0gMCkgewotCQlFcnJvckYoImZhaWxlZCB0byBhZGQgc2Nhbm91 dCBmYlxuIik7Ci0JCWdvdG8gZXJyb3I7CisJCXJldHVybiBOVUxMOwogCX0KIAogCXNjYW5vdXQt PnBpeG1hcCA9IGRybW1vZGVfY3JlYXRlX2JvX3BpeG1hcChwU2NybiwKQEAgLTUzMiwxMyArNTE4 LDE3IEBAIGRybW1vZGVfY3J0Y19zY2Fub3V0X2NyZWF0ZSh4Zjg2Q3J0Y1B0ciBjcnRjLCBzdHJ1 Y3QgZHJtbW9kZV9zY2Fub3V0ICpzY2Fub3V0LAogCQkJCQkJIHBTY3JuLT5kZXB0aCwKIAkJCQkJ CSBwU2Nybi0+Yml0c1BlclBpeGVsLAogCQkJCQkJIHBpdGNoLCBzY2Fub3V0LT5ibyk7Ci0JaWYg KHNjYW5vdXQtPnBpeG1hcCkgeworCWlmICghc2Nhbm91dC0+cGl4bWFwKSB7CisJCUVycm9yRigi ZmFpbGVkIHRvIGNyZWF0ZSBDUlRDIHNjYW5vdXQgcGl4bWFwXG4iKTsKKwkJZ290byBlcnJvcjsK Kwl9CisKKwlpZiAoYW1kZ3B1X3BpeG1hcF9nZXRfZmIoc2Nhbm91dC0+cGl4bWFwKSkgewogCQlz Y2Fub3V0LT53aWR0aCA9IHdpZHRoOwogCQlzY2Fub3V0LT5oZWlnaHQgPSBoZWlnaHQ7CiAJfSBl bHNlIHsKLQkJeGY4NkRydk1zZyhwU2Nybi0+c2NybkluZGV4LCBYX0VSUk9SLAotCQkJICAgIkNv dWxkbid0IGFsbG9jYXRlIHNjYW5vdXQgcGl4bWFwIGZvciBDUlRDXG4iKTsKLWVycm9yOgorCQlF cnJvckYoImZhaWxlZCB0byBjcmVhdGUgQ1JUQyBzY2Fub3V0IEZCXG4iKTsKK2Vycm9yOgkJCiAJ CWRybW1vZGVfY3J0Y19zY2Fub3V0X2Rlc3Ryb3koZHJtbW9kZSwgc2Nhbm91dCk7CiAJfQogCkBA IC02NTEsOCArNjQxLDggQEAgZHJtbW9kZV9oYW5kbGVfdHJhbnNmb3JtKHhmODZDcnRjUHRyIGNy dGMpCiAKIHN0YXRpYyB2b2lkCiBkcm1tb2RlX2NydGNfcHJpbWVfc2Nhbm91dF91cGRhdGUoeGY4 NkNydGNQdHIgY3J0YywgRGlzcGxheU1vZGVQdHIgbW9kZSwKLQkJCQkgIHVuc2lnbmVkIHNjYW5v dXRfaWQsIGludCAqZmJfaWQsIGludCAqeCwKLQkJCQkgIGludCAqeSkKKwkJCQkgIHVuc2lnbmVk IHNjYW5vdXRfaWQsIHN0cnVjdCBkcm1tb2RlX2ZiICoqZmIsCisJCQkJICBpbnQgKngsIGludCAq eSkKIHsKIAlTY3JuSW5mb1B0ciBzY3JuID0gY3J0Yy0+c2NybjsKIAlTY3JlZW5QdHIgc2NyZWVu ID0gc2Nybi0+cFNjcmVlbjsKQEAgLTcwMSw3ICs2OTEsNyBAQCBkcm1tb2RlX2NydGNfcHJpbWVf c2Nhbm91dF91cGRhdGUoeGY4NkNydGNQdHIgY3J0YywgRGlzcGxheU1vZGVQdHIgbW9kZSwKIAkJ fQogCX0KIAotCSpmYl9pZCA9IGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtzY2Fub3V0X2lkXS5mYl9p ZDsKKwkqZmIgPSBhbWRncHVfcGl4bWFwX2dldF9mYihkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nh bm91dF9pZF0ucGl4bWFwKTsKIAkqeCA9ICp5ID0gMDsKIAlkcm1tb2RlX2NydGMtPnNjYW5vdXRf aWQgPSBzY2Fub3V0X2lkOwogfQpAQCAtNzEwLDcgKzcwMCw4IEBAIGRybW1vZGVfY3J0Y19wcmlt ZV9zY2Fub3V0X3VwZGF0ZSh4Zjg2Q3J0Y1B0ciBjcnRjLCBEaXNwbGF5TW9kZVB0ciBtb2RlLAog CiBzdGF0aWMgdm9pZAogZHJtbW9kZV9jcnRjX3NjYW5vdXRfdXBkYXRlKHhmODZDcnRjUHRyIGNy dGMsIERpc3BsYXlNb2RlUHRyIG1vZGUsCi0JCQkgICAgdW5zaWduZWQgc2Nhbm91dF9pZCwgaW50 ICpmYl9pZCwgaW50ICp4LCBpbnQgKnkpCisJCQkgICAgdW5zaWduZWQgc2Nhbm91dF9pZCwgc3Ry dWN0IGRybW1vZGVfZmIgKipmYiwgaW50ICp4LAorCQkJICAgIGludCAqeSkKIHsKIAlTY3JuSW5m b1B0ciBzY3JuID0gY3J0Yy0+c2NybjsKIAlTY3JlZW5QdHIgc2NyZWVuID0gc2Nybi0+cFNjcmVl bjsKQEAgLTc0Niw3ICs3MzcsNyBAQCBkcm1tb2RlX2NydGNfc2Nhbm91dF91cGRhdGUoeGY4NkNy dGNQdHIgY3J0YywgRGlzcGxheU1vZGVQdHIgbW9kZSwKIAkJYm94LT54MiA9IG1heChib3gtPngy LCBzY3JuLT52aXJ0dWFsWCk7CiAJCWJveC0+eTIgPSBtYXgoYm94LT55Miwgc2Nybi0+dmlydHVh bFkpOwogCi0JCSpmYl9pZCA9IGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtzY2Fub3V0X2lkXS5mYl9p ZDsKKwkJKmZiID0gYW1kZ3B1X3BpeG1hcF9nZXRfZmIoZHJtbW9kZV9jcnRjLT5zY2Fub3V0W3Nj YW5vdXRfaWRdLnBpeG1hcCk7CiAJCSp4ID0gKnkgPSAwOwogCiAJCWFtZGdwdV9zY2Fub3V0X2Rv X3VwZGF0ZShjcnRjLCBzY2Fub3V0X2lkKTsKQEAgLTc4NCw5ICs3NzUsOCBAQCBkcm1tb2RlX3Nl dF9tb2RlX21ham9yKHhmODZDcnRjUHRyIGNydGMsIERpc3BsYXlNb2RlUHRyIG1vZGUsCiAJaW50 IG91dHB1dF9jb3VudCA9IDA7CiAJQm9vbCByZXQgPSBGQUxTRTsKIAlpbnQgaTsKLQlpbnQgZmJf aWQ7CisJc3RydWN0IGRybW1vZGVfZmIgKmZiID0gTlVMTDsKIAlkcm1Nb2RlTW9kZUluZm8ga21v ZGU7Ci0JdWludDMyX3QgYm9faGFuZGxlOwogCiAJLyogVGhlIHJvb3Qgd2luZG93IGNvbnRlbnRz IG1heSBiZSB1bmRlZmluZWQgYmVmb3JlIHRoZSBXaW5kb3dFeHBvc3VyZXMKIAkgKiBob29rIGlz IGNhbGxlZCBmb3IgaXQsIHNvIGJhaWwgaWYgd2UgZ2V0IGhlcmUgYmVmb3JlIHRoYXQKQEAgLTgz NCwxNSArODI0LDE0IEBAIGRybW1vZGVfc2V0X21vZGVfbWFqb3IoeGY4NkNydGNQdHIgY3J0Yywg RGlzcGxheU1vZGVQdHIgbW9kZSwKIAogCQlkcm1tb2RlX0NvbnZlcnRUb0tNb2RlKGNydGMtPnNj cm4sICZrbW9kZSwgbW9kZSk7CiAKLQkJZmJfaWQgPSBkcm1tb2RlLT5mYl9pZDsKICNpZmRlZiBB TURHUFVfUElYTUFQX1NIQVJJTkcKIAkJaWYgKGRybW1vZGVfY3J0Yy0+cHJpbWVfc2Nhbm91dF9w aXhtYXApIHsKIAkJCWRybW1vZGVfY3J0Y19wcmltZV9zY2Fub3V0X3VwZGF0ZShjcnRjLCBtb2Rl LCBzY2Fub3V0X2lkLAotCQkJCQkJCSAgJmZiX2lkLCAmeCwgJnkpOworCQkJCQkJCSAgJmZiLCAm eCwgJnkpOwogCQl9IGVsc2UKICNlbmRpZgotCQlpZiAoZHJtbW9kZV9jcnRjLT5yb3RhdGUuZmJf aWQpIHsKLQkJCWZiX2lkID0gZHJtbW9kZV9jcnRjLT5yb3RhdGUuZmJfaWQ7CisJCWlmIChkcm1t b2RlX2NydGMtPnJvdGF0ZS5waXhtYXApIHsKKwkJCWZiID0gYW1kZ3B1X3BpeG1hcF9nZXRfZmIo ZHJtbW9kZV9jcnRjLT5yb3RhdGUucGl4bWFwKTsKIAkJCXggPSB5ID0gMDsKIAogCQl9IGVsc2Ug aWYgKCFhbWRncHVfaXNfZ3B1X3NjcmVlbihwU2NyZWVuKSAmJgpAQCAtODUyLDI2ICs4NDEsMjcg QEAgZHJtbW9kZV9zZXRfbW9kZV9tYWpvcih4Zjg2Q3J0Y1B0ciBjcnRjLCBEaXNwbGF5TW9kZVB0 ciBtb2RlLAogI2VuZGlmCiAJCQkgICAgaW5mby0+c2hhZG93X3ByaW1hcnkpKSB7CiAJCQlkcm1t b2RlX2NydGNfc2Nhbm91dF91cGRhdGUoY3J0YywgbW9kZSwgc2Nhbm91dF9pZCwKLQkJCQkJCSAg ICAmZmJfaWQsICZ4LCAmeSk7CisJCQkJCQkgICAgJmZiLCAmeCwgJnkpOwogCQl9CiAKLQkJaWYg KGZiX2lkID09IDApIHsKLQkJCWlmICghYW1kZ3B1X2JvX2dldF9oYW5kbGUoaW5mby0+ZnJvbnRf YnVmZmVyLCAmYm9faGFuZGxlKSkgewotCQkJCUVycm9yRigiZmFpbGVkIHRvIGdldCBCTyBoYW5k bGUgZm9yIEZCXG4iKTsKLQkJCQlnb3RvIGRvbmU7Ci0JCQl9Ci0KLQkJCWlmIChkcm1Nb2RlQWRk RkIocEFNREdQVUVudC0+ZmQsCi0JCQkJICAgcFNjcm4tPnZpcnR1YWxYLAotCQkJCSAgIHBTY3Ju LT52aXJ0dWFsWSwKLQkJCQkgICBwU2Nybi0+ZGVwdGgsIHBTY3JuLT5iaXRzUGVyUGl4ZWwsCi0J CQkJICAgcFNjcm4tPmRpc3BsYXlXaWR0aCAqIGluZm8tPnBpeGVsX2J5dGVzLAotCQkJCSAgIGJv X2hhbmRsZSwgJmRybW1vZGUtPmZiX2lkKSA8IDApIHsKLQkJCQlFcnJvckYoImZhaWxlZCB0byBh ZGQgZmJcbiIpOwotCQkJCWdvdG8gZG9uZTsKLQkJCX0KLQotCQkJZmJfaWQgPSBkcm1tb2RlLT5m Yl9pZDsKKwkJaWYgKCFmYikKKwkJCWZiID0gYW1kZ3B1X3BpeG1hcF9nZXRfZmIocFNjcmVlbi0+ R2V0V2luZG93UGl4bWFwKHBTY3JlZW4tPnJvb3QpKTsKKwkJaWYgKCFmYikgeworCQkJdW5pb24g Z2JtX2JvX2hhbmRsZSBib19oYW5kbGU7CisKKwkJCWJvX2hhbmRsZSA9IGdibV9ib19nZXRfaGFu ZGxlKGluZm8tPmZyb250X2J1ZmZlci0+Ym8uZ2JtKTsKKwkJCWZiID0gYW1kZ3B1X2ZiX2NyZWF0 ZShwQU1ER1BVRW50LT5mZCwgcFNjcm4tPnZpcnR1YWxYLAorCQkJCQkgICAgICBwU2Nybi0+dmly dHVhbFksIHBTY3JuLT5kZXB0aCwKKwkJCQkJICAgICAgcFNjcm4tPmJpdHNQZXJQaXhlbCwKKwkJ CQkJICAgICAgcFNjcm4tPmRpc3BsYXlXaWR0aCAqIGluZm8tPnBpeGVsX2J5dGVzLAorCQkJCQkg ICAgICBib19oYW5kbGUudTMyKTsKKwkJCS8qIFByZXZlbnQgcmVmY250IG9mIGFkLWhvYyBGQnMg ZnJvbSByZWFjaGluZyAyICovCisJCQlkcm1tb2RlX2ZiX3JlZmVyZW5jZShwQU1ER1BVRW50LT5m ZCwgJmRybW1vZGVfY3J0Yy0+ZmIsIE5VTEwpOworCQkJZHJtbW9kZV9jcnRjLT5mYiA9IGZiOwor CQl9CisJCWlmICghZmIpIHsKKwkJCUVycm9yRigiZmFpbGVkIHRvIGFkZCBGQiBmb3IgbW9kZXNl dFxuIik7CisJCQlnb3RvIGRvbmU7CiAJCX0KIAogCQkvKiBXYWl0IGZvciBhbnkgcGVuZGluZyBm bGlwIHRvIGZpbmlzaCAqLwpAQCAtODgxLDEzICs4NzEsMTUgQEAgZHJtbW9kZV9zZXRfbW9kZV9t YWpvcih4Zjg2Q3J0Y1B0ciBjcnRjLCBEaXNwbGF5TW9kZVB0ciBtb2RlLAogCiAJCWlmIChkcm1N b2RlU2V0Q3J0YyhwQU1ER1BVRW50LT5mZCwKIAkJCQkgICBkcm1tb2RlX2NydGMtPm1vZGVfY3J0 Yy0+Y3J0Y19pZCwKLQkJCQkgICBmYl9pZCwgeCwgeSwgb3V0cHV0X2lkcywKKwkJCQkgICBmYi0+ aGFuZGxlLCB4LCB5LCBvdXRwdXRfaWRzLAogCQkJCSAgIG91dHB1dF9jb3VudCwgJmttb2RlKSAh PSAwKSB7CiAJCQl4Zjg2RHJ2TXNnKGNydGMtPnNjcm4tPnNjcm5JbmRleCwgWF9FUlJPUiwKIAkJ CQkgICAiZmFpbGVkIHRvIHNldCBtb2RlOiAlc1xuIiwgc3RyZXJyb3IoZXJybm8pKTsKIAkJCWdv dG8gZG9uZTsKLQkJfSBlbHNlCisJCX0gZWxzZSB7CiAJCQlyZXQgPSBUUlVFOworCQkJZHJtbW9k ZV9mYl9yZWZlcmVuY2UocEFNREdQVUVudC0+ZmQsICZkcm1tb2RlX2NydGMtPmZiLCBmYik7CisJ CX0KIAogCQlpZiAocFNjcmVlbikKIAkJCXhmODZDcnRjU2V0U2NyZWVuU3VicGl4ZWxPcmRlcihw U2NyZWVuKTsKQEAgLTkzMyw3ICs5MjUsOSBAQCBkb25lOgogCX0gZWxzZSB7CiAJCWNydGMtPmFj dGl2ZSA9IFRSVUU7CiAKLQkJaWYgKGZiX2lkICE9IGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtzY2Fu b3V0X2lkXS5mYl9pZCkKKwkJaWYgKGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtzY2Fub3V0X2lkXS5w aXhtYXAgJiYKKwkJICAgIGZiICE9IGFtZGdwdV9waXhtYXBfZ2V0X2ZiKGRybW1vZGVfY3J0Yy0+ CisJCQkJCSAgICAgICBzY2Fub3V0W3NjYW5vdXRfaWRdLnBpeG1hcCkpCiAJCQlkcm1tb2RlX2Ny dGNfc2Nhbm91dF9mcmVlKGRybW1vZGVfY3J0Yyk7CiAJCWVsc2UgaWYgKCFkcm1tb2RlX2NydGMt PnRlYXJfZnJlZSkgewogCQkJZHJtbW9kZV9jcnRjX3NjYW5vdXRfZGVzdHJveShkcm1tb2RlLApA QCAtMjA3OSwxNCArMjA3Myw5IEBAIGludCBkcm1tb2RlX2dldF9waXRjaF9hbGlnbihTY3JuSW5m b1B0ciBzY3JuLCBpbnQgYnBlKQogc3RhdGljIEJvb2wgZHJtbW9kZV94Zjg2Y3J0Y19yZXNpemUo U2NybkluZm9QdHIgc2NybiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogewogCXhmODZDcnRjQ29u ZmlnUHRyIHhmODZfY29uZmlnID0gWEY4Nl9DUlRDX0NPTkZJR19QVFIoc2Nybik7Ci0JZHJtbW9k ZV9jcnRjX3ByaXZhdGVfcHRyCi0JICAgIGRybW1vZGVfY3J0YyA9IHhmODZfY29uZmlnLT5jcnRj WzBdLT5kcml2ZXJfcHJpdmF0ZTsKLQlkcm1tb2RlX3B0ciBkcm1tb2RlID0gZHJtbW9kZV9jcnRj LT5kcm1tb2RlOwogCUFNREdQVUluZm9QdHIgaW5mbyA9IEFNREdQVVBUUihzY3JuKTsKLQlBTURH UFVFbnRQdHIgcEFNREdQVUVudCA9IEFNREdQVUVudFByaXYoc2Nybik7CiAJc3RydWN0IGFtZGdw dV9idWZmZXIgKm9sZF9mcm9udCA9IE5VTEw7CiAJU2NyZWVuUHRyIHNjcmVlbiA9IHhmODZTY3Ju VG9TY3JlZW4oc2Nybik7Ci0JdWludDMyX3Qgb2xkX2ZiX2lkOwogCWludCBpLCBwaXRjaCwgb2xk X3dpZHRoLCBvbGRfaGVpZ2h0LCBvbGRfcGl0Y2g7CiAJaW50IGNwcCA9IGluZm8tPnBpeGVsX2J5 dGVzOwogCVBpeG1hcFB0ciBwcGl4ID0gc2NyZWVuLT5HZXRTY3JlZW5QaXhtYXAoc2NyZWVuKTsK QEAgLTIxMDksOCArMjA5OCw2IEBAIHN0YXRpYyBCb29sIGRybW1vZGVfeGY4NmNydGNfcmVzaXpl KFNjcm5JbmZvUHRyIHNjcm4sIGludCB3aWR0aCwgaW50IGhlaWdodCkKIAlvbGRfd2lkdGggPSBz Y3JuLT52aXJ0dWFsWDsKIAlvbGRfaGVpZ2h0ID0gc2Nybi0+dmlydHVhbFk7CiAJb2xkX3BpdGNo ID0gc2Nybi0+ZGlzcGxheVdpZHRoOwotCW9sZF9mYl9pZCA9IGRybW1vZGUtPmZiX2lkOwotCWRy bW1vZGUtPmZiX2lkID0gMDsKIAlvbGRfZnJvbnQgPSBpbmZvLT5mcm9udF9idWZmZXI7CiAKIAlz Y3JuLT52aXJ0dWFsWCA9IHdpZHRoOwpAQCAtMjE4Miw4ICsyMTY5LDYgQEAgc3RhdGljIEJvb2wg ZHJtbW9kZV94Zjg2Y3J0Y19yZXNpemUoU2NybkluZm9QdHIgc2NybiwgaW50IHdpZHRoLCBpbnQg aGVpZ2h0KQogCQkJCSAgICAgICBjcnRjLT5yb3RhdGlvbiwgY3J0Yy0+eCwgY3J0Yy0+eSk7CiAJ fQogCi0JaWYgKG9sZF9mYl9pZCkKLQkJZHJtTW9kZVJtRkIocEFNREdQVUVudC0+ZmQsIG9sZF9m Yl9pZCk7CiAJaWYgKG9sZF9mcm9udCkgewogCQlhbWRncHVfYm9fdW5yZWYoJm9sZF9mcm9udCk7 CiAJfQpAQCAtMjE5OCw3ICsyMTgzLDYgQEAgZmFpbDoKIAlzY3JuLT52aXJ0dWFsWCA9IG9sZF93 aWR0aDsKIAlzY3JuLT52aXJ0dWFsWSA9IG9sZF9oZWlnaHQ7CiAJc2Nybi0+ZGlzcGxheVdpZHRo ID0gb2xkX3BpdGNoOwotCWRybW1vZGUtPmZiX2lkID0gb2xkX2ZiX2lkOwogCiAJcmV0dXJuIEZB TFNFOwogfQpAQCAtMjIxMiw3ICsyMTk2LDcgQEAgZHJtbW9kZV9jbGVhcl9wZW5kaW5nX2ZsaXAo eGY4NkNydGNQdHIgY3J0YykKIHsKIAlkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9j cnRjID0gY3J0Yy0+ZHJpdmVyX3ByaXZhdGU7CiAKLQlkcm1tb2RlX2NydGMtPmZsaXBfcGVuZGlu ZyA9IEZBTFNFOworCWRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nID0gTlVMTDsKIAogCWlmICgh Y3J0Yy0+ZW5hYmxlZCB8fAogCSAgICAoZHJtbW9kZV9jcnRjLT5wZW5kaW5nX2RwbXNfbW9kZSAh PSBEUE1TTW9kZU9uICYmCkBAIC0yMjU3LDYgKzIyNDEsNyBAQCBzdGF0aWMgdm9pZAogZHJtbW9k ZV9mbGlwX2hhbmRsZXIoeGY4NkNydGNQdHIgY3J0YywgdWludDMyX3QgZnJhbWUsIHVpbnQ2NF90 IHVzZWMsIHZvaWQgKmV2ZW50X2RhdGEpCiB7CiAJQU1ER1BVRW50UHRyIHBBTURHUFVFbnQgPSBB TURHUFVFbnRQcml2KGNydGMtPnNjcm4pOworCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1t b2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKIAlkcm1tb2RlX2ZsaXBkYXRhX3B0ciBm bGlwZGF0YSA9IGV2ZW50X2RhdGE7CiAKIAkvKiBJcyB0aGlzIHRoZSBldmVudCB3aG9zZSBpbmZv IHNoYWxsIGJlIGRlbGl2ZXJlZCB0byBoaWdoZXIgbGV2ZWw/ICovCkBAIC0yMjc2LDEyICsyMjYx LDExIEBAIGRybW1vZGVfZmxpcF9oYW5kbGVyKHhmODZDcnRjUHRyIGNydGMsIHVpbnQzMl90IGZy YW1lLCB1aW50NjRfdCB1c2VjLCB2b2lkICpldmVuCiAJCWVsc2UKIAkJCWZsaXBkYXRhLT5oYW5k bGVyKGNydGMsIGZyYW1lLCB1c2VjLCBmbGlwZGF0YS0+ZXZlbnRfZGF0YSk7CiAKLQkJLyogUmVs ZWFzZSBmcmFtZWJ1ZmZlciAqLwotCQlkcm1Nb2RlUm1GQihwQU1ER1BVRW50LT5mZCwgZmxpcGRh dGEtPm9sZF9mYl9pZCk7Ci0KIAkJZnJlZShmbGlwZGF0YSk7CiAJfQogCisJZHJtbW9kZV9mYl9y ZWZlcmVuY2UocEFNREdQVUVudC0+ZmQsICZkcm1tb2RlX2NydGMtPmZiLAorCQkJICAgICBkcm1t b2RlX2NydGMtPmZsaXBfcGVuZGluZyk7CiAJZHJtbW9kZV9jbGVhcl9wZW5kaW5nX2ZsaXAoY3J0 Yyk7CiB9CiAKQEAgLTI1MTQsNiArMjQ5OCw4IEBAIEJvb2wgZHJtbW9kZV9zZXRfZGVzaXJlZF9t b2RlcyhTY3JuSW5mb1B0ciBwU2NybiwgZHJtbW9kZV9wdHIgZHJtbW9kZSwKIAkJCQlkcm1Nb2Rl U2V0Q3J0YyhwQU1ER1BVRW50LT5mZCwKIAkJCQkJICAgICAgIGRybW1vZGVfY3J0Yy0+bW9kZV9j cnRjLT5jcnRjX2lkLAogCQkJCQkgICAgICAgMCwgMCwgMCwgTlVMTCwgMCwgTlVMTCk7CisJCQkJ ZHJtbW9kZV9mYl9yZWZlcmVuY2UocEFNREdQVUVudC0+ZmQsCisJCQkJCQkgICAgICZkcm1tb2Rl X2NydGMtPmZiLCBOVUxMKTsKIAkJCX0KIAkJCWNvbnRpbnVlOwogCQl9CkBAIC0yNzczLDE4ICsy NzU5LDExIEBAIEJvb2wgYW1kZ3B1X2RvX3BhZ2VmbGlwKFNjcm5JbmZvUHRyIHNjcm4sIENsaWVu dFB0ciBjbGllbnQsCiAJeGY4NkNydGNDb25maWdQdHIgY29uZmlnID0gWEY4Nl9DUlRDX0NPTkZJ R19QVFIoc2Nybik7CiAJeGY4NkNydGNQdHIgY3J0YyA9IE5VTEw7CiAJZHJtbW9kZV9jcnRjX3By aXZhdGVfcHRyIGRybW1vZGVfY3J0YyA9IGNvbmZpZy0+Y3J0Y1swXS0+ZHJpdmVyX3ByaXZhdGU7 Ci0JZHJtbW9kZV9wdHIgZHJtbW9kZSA9IGRybW1vZGVfY3J0Yy0+ZHJtbW9kZTsKIAlpbnQgaTsK IAl1aW50MzJfdCBmbGlwX2ZsYWdzID0gZmxpcF9zeW5jID09IEZMSVBfQVNZTkMgPyBEUk1fTU9E RV9QQUdFX0ZMSVBfQVNZTkMgOiAwOwogCWRybW1vZGVfZmxpcGRhdGFfcHRyIGZsaXBkYXRhOwog CXVpbnRwdHJfdCBkcm1fcXVldWVfc2VxID0gMDsKLQl1aW50MzJfdCBuZXdfZnJvbnRfaGFuZGxl OwotCi0JaWYgKCFhbWRncHVfcGl4bWFwX2dldF9oYW5kbGUobmV3X2Zyb250LCAmbmV3X2Zyb250 X2hhbmRsZSkpIHsKLQkJeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfV0FSTklORywKLQkJ CSAgICJmbGlwIHF1ZXVlOiBkYXRhIGFsbG9jIGZhaWxlZC5cbiIpOwotCQlyZXR1cm4gRkFMU0U7 Ci0JfQorCXN0cnVjdCBkcm1tb2RlX2ZiICpmYjsKIAogCWZsaXBkYXRhID0gY2FsbG9jKDEsIHNp emVvZihkcm1tb2RlX2ZsaXBkYXRhX3JlYykpOwogCWlmICghZmxpcGRhdGEpIHsKQEAgLTI3OTMs MTUgKzI3NzIsMTEgQEAgQm9vbCBhbWRncHVfZG9fcGFnZWZsaXAoU2NybkluZm9QdHIgc2Nybiwg Q2xpZW50UHRyIGNsaWVudCwKIAkJZ290byBlcnJvcjsKIAl9CiAKLQkvKgotCSAqIENyZWF0ZSBh IG5ldyBoYW5kbGUgZm9yIHRoZSBiYWNrIGJ1ZmZlcgotCSAqLwotCWZsaXBkYXRhLT5vbGRfZmJf aWQgPSBkcm1tb2RlLT5mYl9pZDsKLQlpZiAoZHJtTW9kZUFkZEZCKHBBTURHUFVFbnQtPmZkLCBu ZXdfZnJvbnQtPmRyYXdhYmxlLndpZHRoLAotCQkJIG5ld19mcm9udC0+ZHJhd2FibGUuaGVpZ2h0 LCBzY3JuLT5kZXB0aCwKLQkJCSBzY3JuLT5iaXRzUGVyUGl4ZWwsIG5ld19mcm9udC0+ZGV2S2lu ZCwKLQkJCSBuZXdfZnJvbnRfaGFuZGxlLCAmZHJtbW9kZS0+ZmJfaWQpKQorCWZiID0gYW1kZ3B1 X3BpeG1hcF9nZXRfZmIobmV3X2Zyb250KTsKKwlpZiAoIWZiKSB7CisJCUVycm9yRigiRmFpbGVk IHRvIGdldCBGQiBmb3IgZmxpcFxuIik7CiAJCWdvdG8gZXJyb3I7CisJfQogCiAJLyoKIAkgKiBR dWV1ZSBmbGlwcyBvbiBhbGwgZW5hYmxlZCBDUlRDcwpAQCAtMjg0NSw3ICsyODIwLDcgQEAgQm9v bCBhbWRncHVfZG9fcGFnZWZsaXAoU2NybkluZm9QdHIgc2NybiwgQ2xpZW50UHRyIGNsaWVudCwK IAkJaWYgKGRybW1vZGVfY3J0Yy0+aHdfaWQgPT0gcmVmX2NydGNfaHdfaWQpIHsKIAkJCWlmIChk cm1tb2RlX3BhZ2VfZmxpcF90YXJnZXRfYWJzb2x1dGUocEFNREdQVUVudCwKIAkJCQkJCQkgICAg ICBkcm1tb2RlX2NydGMsCi0JCQkJCQkJICAgICAgZHJtbW9kZS0+ZmJfaWQsCisJCQkJCQkJICAg ICAgZmItPmhhbmRsZSwKIAkJCQkJCQkgICAgICBmbGlwX2ZsYWdzLAogCQkJCQkJCSAgICAgIGRy bV9xdWV1ZV9zZXEsCiAJCQkJCQkJICAgICAgdGFyZ2V0X21zYykgIT0gMCkKQEAgLTI4NTMsMTMg KzI4MjgsMTMgQEAgQm9vbCBhbWRncHVfZG9fcGFnZWZsaXAoU2NybkluZm9QdHIgc2NybiwgQ2xp ZW50UHRyIGNsaWVudCwKIAkJfSBlbHNlIHsKIAkJCWlmIChkcm1tb2RlX3BhZ2VfZmxpcF90YXJn ZXRfcmVsYXRpdmUocEFNREdQVUVudCwKIAkJCQkJCQkgICAgICBkcm1tb2RlX2NydGMsCi0JCQkJ CQkJICAgICAgZHJtbW9kZS0+ZmJfaWQsCisJCQkJCQkJICAgICAgZmItPmhhbmRsZSwKIAkJCQkJ CQkgICAgICBmbGlwX2ZsYWdzLAogCQkJCQkJCSAgICAgIGRybV9xdWV1ZV9zZXEsIDApICE9IDAp CiAJCQkJZ290byBmbGlwX2Vycm9yOwogCQl9CiAKLQkJZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRp bmcgPSBUUlVFOworCQlkcm1tb2RlX2NydGMtPmZsaXBfcGVuZGluZyA9IGZiOwogCQlkcm1fcXVl dWVfc2VxID0gMDsKIAl9CiAKQEAgLTI4NzEsMTIgKzI4NDYsNiBAQCBmbGlwX2Vycm9yOgogCQkg ICBzdHJlcnJvcihlcnJubykpOwogCiBlcnJvcjoKLQlpZiAoZmxpcGRhdGEgJiYgZmxpcGRhdGEt PmZsaXBfY291bnQgPD0gMSAmJgotCSAgICBkcm1tb2RlLT5mYl9pZCAhPSBmbGlwZGF0YS0+b2xk X2ZiX2lkKSB7Ci0JCWRybU1vZGVSbUZCKHBBTURHUFVFbnQtPmZkLCBkcm1tb2RlLT5mYl9pZCk7 Ci0JCWRybW1vZGUtPmZiX2lkID0gZmxpcGRhdGEtPm9sZF9mYl9pZDsKLQl9Ci0KIAlpZiAoZHJt X3F1ZXVlX3NlcSkKIAkJYW1kZ3B1X2RybV9hYm9ydF9lbnRyeShkcm1fcXVldWVfc2VxKTsKIAll bHNlIGlmIChjcnRjKQpkaWZmIC0tZ2l0IGEvc3JjL2RybW1vZGVfZGlzcGxheS5oIGIvc3JjL2Ry bW1vZGVfZGlzcGxheS5oCmluZGV4IDZhNTdmZDIzYi4uYjY0YTkzOGNkIDEwMDY0NAotLS0gYS9z cmMvZHJtbW9kZV9kaXNwbGF5LmgKKysrIGIvc3JjL2RybW1vZGVfZGlzcGxheS5oCkBAIC0zNyw3 ICszNyw2IEBACiAjaW5jbHVkZSAiYW1kZ3B1LmgiCiAKIHR5cGVkZWYgc3RydWN0IHsKLQl1bnNp Z25lZCBmYl9pZDsKIAlTY3JuSW5mb1B0ciBzY3JuOwogI2lmZGVmIEhBVkVfTElCVURFVgogCXN0 cnVjdCB1ZGV2X21vbml0b3IgKnVldmVudF9tb25pdG9yOwpAQCAtNTMsNyArNTIsNiBAQCB0eXBl ZGVmIHN0cnVjdCB7CiB9IGRybW1vZGVfcmVjLCAqZHJtbW9kZV9wdHI7CiAKIHR5cGVkZWYgc3Ry dWN0IHsKLQl1bnNpZ25lZCBvbGRfZmJfaWQ7CiAJaW50IGZsaXBfY291bnQ7CiAJdm9pZCAqZXZl bnRfZGF0YTsKIAl1bnNpZ25lZCBpbnQgZmVfZnJhbWU7CkBAIC02MywxMCArNjEsMTQgQEAgdHlw ZWRlZiBzdHJ1Y3QgewogCWFtZGdwdV9kcm1fYWJvcnRfcHJvYyBhYm9ydDsKIH0gZHJtbW9kZV9m bGlwZGF0YV9yZWMsICpkcm1tb2RlX2ZsaXBkYXRhX3B0cjsKIAorc3RydWN0IGRybW1vZGVfZmIg eworCWludCByZWZjbnQ7CisJdWludDMyX3QgaGFuZGxlOworfTsKKwogc3RydWN0IGRybW1vZGVf c2Nhbm91dCB7CiAJc3RydWN0IGFtZGdwdV9idWZmZXIgKmJvOwogCVBpeG1hcFB0ciBwaXhtYXA7 Ci0JdW5zaWduZWQgZmJfaWQ7CiAJaW50IHdpZHRoLCBoZWlnaHQ7CiB9OwogCkBAIC05Niw4ICs5 OCwxMCBAQCB0eXBlZGVmIHN0cnVjdCB7CiAKIAkvKiBNb2Rlc2V0IG5lZWRlZCBmb3IgRFBNUyBv biAqLwogCUJvb2wgbmVlZF9tb2Rlc2V0OwotCS8qIEEgZmxpcCBpcyBwZW5kaW5nIGZvciB0aGlz IENSVEMgKi8KLQlCb29sIGZsaXBfcGVuZGluZzsKKwkvKiBBIGZsaXAgdG8gdGhpcyBGQiBpcyBw ZW5kaW5nIGZvciB0aGlzIENSVEMgKi8KKwlzdHJ1Y3QgZHJtbW9kZV9mYiAqZmxpcF9wZW5kaW5n OworCS8qIFRoZSBGQiBjdXJyZW50bHkgYmVpbmcgc2Nhbm5lZCBvdXQgYnkgdGhpcyBDUlRDLCBp ZiBhbnkgKi8KKwlzdHJ1Y3QgZHJtbW9kZV9mYiAqZmI7CiB9IGRybW1vZGVfY3J0Y19wcml2YXRl X3JlYywgKmRybW1vZGVfY3J0Y19wcml2YXRlX3B0cjsKIAogdHlwZWRlZiBzdHJ1Y3QgewpAQCAt MTI4LDYgKzEzMiwzNCBAQCBlbnVtIGRybW1vZGVfZmxpcF9zeW5jIHsKIH07CiAKIAorc3RhdGlj IGlubGluZSB2b2lkCitkcm1tb2RlX2ZiX3JlZmVyZW5jZShpbnQgZHJtX2ZkLCBzdHJ1Y3QgZHJt bW9kZV9mYiAqKm9sZCwgc3RydWN0IGRybW1vZGVfZmIgKm5ldykKK3sKKwlpZiAobmV3KSB7CisJ CWlmIChuZXctPnJlZmNudCA8PSAwKSB7CisJCQlFcnJvckYoIk5ldyBGQidzIHJlZmNudCB3YXMg JWQgaW4gJXNcbiIsIG5ldy0+cmVmY250LAorCQkJICAgICAgIF9fZnVuY19fKTsKKwkJfSBlbHNl IHsKKwkJCW5ldy0+cmVmY250Kys7CisJCX0KKwl9CisKKwlpZiAoKm9sZCkgeworCQlpZiAoKCpv bGQpLT5yZWZjbnQgPD0gMCkgeworCQkJRXJyb3JGKCJPbGQgRkIncyByZWZjbnQgd2FzICVkIGlu ICVzXG4iLAorCQkJICAgICAgICgqb2xkKS0+cmVmY250LCBfX2Z1bmNfXyk7CisJCX0gZWxzZSB7 CisJCQlpZiAoLS0oKm9sZCktPnJlZmNudCA9PSAwKSB7CisJCQkJZHJtTW9kZVJtRkIoZHJtX2Zk LCAoKm9sZCktPmhhbmRsZSk7CisJCQkJZnJlZSgqb2xkKTsKKwkJCX0KKwkJfQorCX0KKworCSpv bGQgPSBuZXc7Cit9CisKKwogZXh0ZXJuIGludCBkcm1tb2RlX3BhZ2VfZmxpcF90YXJnZXRfYWJz b2x1dGUoQU1ER1BVRW50UHRyIHBBTURHUFVFbnQsCiAJCQkJCSAgICAgZHJtbW9kZV9jcnRjX3By aXZhdGVfcHRyIGRybW1vZGVfY3J0YywKIAkJCQkJICAgICBpbnQgZmJfaWQsIHVpbnQzMl90IGZs YWdzLAotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK