From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-ati 2/2] Use reference counting for tracking KMS framebuffer lifetimes Date: Tue, 2 May 2017 16:40:34 +0900 Message-ID: <20170502074034.17211-2-michel@daenzer.net> References: <20170502074034.17211-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170502074034.17211-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpSZWZlcmVuY2Vz IGFyZSBoZWxkIGJ5IHRoZSBwaXhtYXBzIGNvcnJlc3BvbmRpbmcgdG8gdGhlIEZCcyAoc28KdGhl IHNhbWUgS01TIEZCIGNhbiBiZSByZXVzZWQgYXMgbG9uZyBhcyB0aGUgcGl4bWFwIGV4aXN0cykg YW5kIGJ5IHRoZQpDUlRDcyBzY2FubmluZyBvdXQgZnJvbSB0aGVtIChzbyBhIEtNUyBGQiBpcyBv bmx5IGRlc3Ryb3llZCBvbmNlIGl0J3MKbm90IGJlaW5nIHNjYW5uZWQgb3V0IGFueW1vcmUsIHBy ZXZlbnRpbmcgaW50ZXJtaXR0ZW50IGJsYWNrIHNjcmVlbnMgYW5kCndvcnNlIGlzc3VlcyBkdWUg dG8gYSBDUlRDIHR1cm5pbmcgb2ZmIHdoZW4gaXQgc2hvdWxkIGJlIG9uKS4KClNpZ25lZC1vZmYt Ynk6IE1pY2hlbCBEw6RuemVyIDxtaWNoZWwuZGFlbnplckBhbWQuY29tPgotLS0KIHNyYy9kcm1t b2RlX2Rpc3BsYXkuYyAgfCAxNTAgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogc3JjL2RybW1vZGVfZGlzcGxheS5oICB8ICA0MSArKysrKysrKysrKyst LQogc3JjL3JhZGVvbi5oICAgICAgICAgICB8ICA3MyArKysrKysrKysrKysrKysrKysrKysrKysK IHNyYy9yYWRlb25fYm9faGVscGVyLmggfCAgIDMgLQogc3JjL3JhZGVvbl9leGEuYyAgICAgICB8 ICAgMiArCiBzcmMvcmFkZW9uX2ttcy5jICAgICAgIHwgIDY0ICsrKysrKysrKysrKysrKysrKy0t LQogc3JjL3JhZGVvbl9wcmVzZW50LmMgICB8ICAgOCAtLS0KIDcgZmlsZXMgY2hhbmdlZCwgMjI4 IGluc2VydGlvbnMoKyksIDExMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZHJtbW9k ZV9kaXNwbGF5LmMgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKaW5kZXggYTkyY2Y3ODVmLi5iOWJh ZWVjYWUgMTAwNjQ0Ci0tLSBhL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYworKysgYi9zcmMvZHJtbW9k ZV9kaXNwbGF5LmMKQEAgLTM3NSw2ICszNzUsNyBAQCBkcm1tb2RlX2NydGNfZHBtcyh4Zjg2Q3J0 Y1B0ciBjcnRjLCBpbnQgbW9kZSkKIAogCQlkcm1Nb2RlU2V0Q3J0Yyhkcm1tb2RlLT5mZCwgZHJt bW9kZV9jcnRjLT5tb2RlX2NydGMtPmNydGNfaWQsCiAJCQkgICAgICAgMCwgMCwgMCwgTlVMTCwg MCwgTlVMTCk7CisJCWRybW1vZGVfZmJfcmVmZXJlbmNlKGRybW1vZGUtPmZkLCAmZHJtbW9kZV9j cnRjLT5mYiwgTlVMTCk7CiAJfSBlbHNlIGlmIChkcm1tb2RlX2NydGMtPmRwbXNfbW9kZSAhPSBE UE1TTW9kZU9uKQogCQljcnRjLT5mdW5jcy0+c2V0X21vZGVfbWFqb3IoY3J0YywgJmNydGMtPm1v ZGUsIGNydGMtPnJvdGF0aW9uLAogCQkJCQkgICAgY3J0Yy0+eCwgY3J0Yy0+eSk7CkBAIC00NDcs OCArNDQ4LDkgQEAgdm9pZCBkcm1tb2RlX2NvcHlfZmIoU2NybkluZm9QdHIgcFNjcm4sIGRybW1v ZGVfcHRyIGRybW1vZGUpCiB7CiAJeGY4NkNydGNDb25maWdQdHIgICB4Zjg2X2NvbmZpZyA9IFhG ODZfQ1JUQ19DT05GSUdfUFRSKHBTY3JuKTsKIAlSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05Q VFIocFNjcm4pOwotCVBpeG1hcFB0ciBzcmMsIGRzdDsKIAlTY3JlZW5QdHIgcFNjcmVlbiA9IHBT Y3JuLT5wU2NyZWVuOworCVBpeG1hcFB0ciBzcmMsIGRzdCA9IHBTY3JlZW4tPkdldFNjcmVlblBp eG1hcChwU2NyZWVuKTsKKwlzdHJ1Y3QgZHJtbW9kZV9mYiAqZmIgPSByYWRlb25fcGl4bWFwX2dl dF9mYihkc3QpOwogCWludCBmYmNvbl9pZCA9IDA7CiAJQm9vbCBmb3JjZTsKIAlHQ1B0ciBnYzsK QEAgLTQ2NCw3ICs0NjYsNyBAQCB2b2lkIGRybW1vZGVfY29weV9mYihTY3JuSW5mb1B0ciBwU2Ny biwgZHJtbW9kZV9wdHIgZHJtbW9kZSkKIAlpZiAoIWZiY29uX2lkKQogCQlyZXR1cm47CiAKLQlp ZiAoZmJjb25faWQgPT0gZHJtbW9kZS0+ZmJfaWQpIHsKKwlpZiAoZmJjb25faWQgPT0gZmItPmhh bmRsZSkgewogCQkvKiBpbiBzb21lIHJhcmUgY2FzZSB0aGVyZSBtaWdodCBiZSBubyBmYmNvbiBh bmQgd2UgbWlnaHQgYWxyZWFkeQogCQkgKiBiZSB0aGUgb25lIHdpdGggdGhlIGN1cnJlbnQgZmIg dG8gYXZvaWQgYSBmYWxzZSBkZWFkbGNrIGluCiAJCSAqIGtlcm5lbCB0dG0gY29kZSBqdXN0IGRv IG5vdGhpbmcgYXMgYW55d2F5IHRoZXJlIGlzIG5vdGhpbmcKQEAgLTQ3Nyw4ICs0NzksNiBAQCB2 b2lkIGRybW1vZGVfY29weV9mYihTY3JuSW5mb1B0ciBwU2NybiwgZHJtbW9kZV9wdHIgZHJtbW9k ZSkKIAlpZiAoIXNyYykKIAkJcmV0dXJuOwogCi0JZHN0ID0gcFNjcmVlbi0+R2V0U2NyZWVuUGl4 bWFwKHBTY3JlZW4pOwotCiAJZ2MgPSBHZXRTY3JhdGNoR0MocFNjcm4tPmRlcHRoLCBwU2NyZWVu KTsKIAlWYWxpZGF0ZUdDKCZkc3QtPmRyYXdhYmxlLCBnYyk7CiAKQEAgLTUwNSw4ICs1MDUsNiBA QCBkcm1tb2RlX2NydGNfc2Nhbm91dF9kZXN0cm95KGRybW1vZGVfcHRyIGRybW1vZGUsCiAJfQog CiAJaWYgKHNjYW5vdXQtPmJvKSB7Ci0JCWRybU1vZGVSbUZCKGRybW1vZGUtPmZkLCBzY2Fub3V0 LT5mYl9pZCk7Ci0JCXNjYW5vdXQtPmZiX2lkID0gMDsKIAkJcmFkZW9uX2JvX3VubWFwKHNjYW5v dXQtPmJvKTsKIAkJcmFkZW9uX2JvX3VucmVmKHNjYW5vdXQtPmJvKTsKIAkJc2Nhbm91dC0+Ym8g PSBOVUxMOwpAQCAtNTcxLDE1ICs1NjksOSBAQCBkcm1tb2RlX2NydGNfc2Nhbm91dF9jcmVhdGUo eGY4NkNydGNQdHIgY3J0Yywgc3RydWN0IGRybW1vZGVfc2Nhbm91dCAqc2Nhbm91dCwKIAlzY2Fu b3V0LT5ibyA9IHJhZGVvbl9hbGxvY19waXhtYXBfYm8ocFNjcm4sIHdpZHRoLCBoZWlnaHQsIHBT Y3JuLT5kZXB0aCwKIAkJCQkJICAgICB0aWxpbmcsIHBTY3JuLT5iaXRzUGVyUGl4ZWwsCiAJCQkJ CSAgICAgJnBpdGNoLCAmc3VyZmFjZSwgJnRpbGluZyk7Ci0JaWYgKHNjYW5vdXQtPmJvID09IE5V TEwpCi0JCWdvdG8gZXJyb3I7Ci0KLQlpZiAoZHJtTW9kZUFkZEZCKGRybW1vZGUtPmZkLCB3aWR0 aCwgaGVpZ2h0LCBwU2Nybi0+ZGVwdGgsCi0JCQkgICBwU2Nybi0+Yml0c1BlclBpeGVsLCBwaXRj aCwKLQkJCSAgIHNjYW5vdXQtPmJvLT5oYW5kbGUsCi0JCQkgICAmc2Nhbm91dC0+ZmJfaWQpICE9 IDApIHsKLQkJRXJyb3JGKCJmYWlsZWQgdG8gYWRkIHNjYW5vdXQgZmJcbiIpOwotCQlnb3RvIGVy cm9yOworCWlmICghc2Nhbm91dC0+Ym8pIHsKKwkJRXJyb3JGKCJmYWlsZWQgdG8gY3JlYXRlIENS VEMgc2Nhbm91dCBCT1xuIik7CisJCXJldHVybiBOVUxMOwogCX0KIAogCXNjYW5vdXQtPnBpeG1h cCA9IGRybW1vZGVfY3JlYXRlX2JvX3BpeG1hcChwU2NybiwKQEAgLTU4NywxMyArNTc5LDE3IEBA IGRybW1vZGVfY3J0Y19zY2Fub3V0X2NyZWF0ZSh4Zjg2Q3J0Y1B0ciBjcnRjLCBzdHJ1Y3QgZHJt bW9kZV9zY2Fub3V0ICpzY2Fub3V0LAogCQkJCQkJIHBTY3JuLT5kZXB0aCwKIAkJCQkJCSBwU2Ny bi0+Yml0c1BlclBpeGVsLAogCQkJCQkJIHBpdGNoLCBzY2Fub3V0LT5ibywgTlVMTCk7Ci0JaWYg KHNjYW5vdXQtPnBpeG1hcCkgeworCWlmICghc2Nhbm91dC0+cGl4bWFwKSB7CisJCUVycm9yRigi ZmFpbGVkIHRvIGNyZWF0ZSBDUlRDIHNjYW5vdXQgcGl4bWFwXG4iKTsKKwkJZ290byBlcnJvcjsK Kwl9CisKKwlpZiAocmFkZW9uX3BpeG1hcF9nZXRfZmIoc2Nhbm91dC0+cGl4bWFwKSkgewogCQlz Y2Fub3V0LT53aWR0aCA9IHdpZHRoOwogCQlzY2Fub3V0LT5oZWlnaHQgPSBoZWlnaHQ7CiAJfSBl bHNlIHsKLQkJeGY4NkRydk1zZyhwU2Nybi0+c2NybkluZGV4LCBYX0VSUk9SLAotCQkJICAgIkNv dWxkbid0IGFsbG9jYXRlIHNjYW5vdXQgcGl4bWFwIGZvciBDUlRDXG4iKTsKLWVycm9yOgorCQlF cnJvckYoImZhaWxlZCB0byBjcmVhdGUgQ1JUQyBzY2Fub3V0IEZCXG4iKTsKK2Vycm9yOgkJCiAJ CWRybW1vZGVfY3J0Y19zY2Fub3V0X2Rlc3Ryb3koZHJtbW9kZSwgc2Nhbm91dCk7CiAJfQogCkBA IC03MDYsOCArNzAyLDggQEAgZHJtbW9kZV9oYW5kbGVfdHJhbnNmb3JtKHhmODZDcnRjUHRyIGNy dGMpCiAKIHN0YXRpYyB2b2lkCiBkcm1tb2RlX2NydGNfcHJpbWVfc2Nhbm91dF91cGRhdGUoeGY4 NkNydGNQdHIgY3J0YywgRGlzcGxheU1vZGVQdHIgbW9kZSwKLQkJCQkgIHVuc2lnbmVkIHNjYW5v dXRfaWQsIGludCAqZmJfaWQsIGludCAqeCwKLQkJCQkgIGludCAqeSkKKwkJCQkgIHVuc2lnbmVk IHNjYW5vdXRfaWQsIHN0cnVjdCBkcm1tb2RlX2ZiICoqZmIsCisJCQkJICBpbnQgKngsIGludCAq eSkKIHsKIAlTY3JuSW5mb1B0ciBzY3JuID0gY3J0Yy0+c2NybjsKIAlTY3JlZW5QdHIgc2NyZWVu ID0gc2Nybi0+cFNjcmVlbjsKQEAgLTc1OSw3ICs3NTUsNyBAQCBkcm1tb2RlX2NydGNfcHJpbWVf c2Nhbm91dF91cGRhdGUoeGY4NkNydGNQdHIgY3J0YywgRGlzcGxheU1vZGVQdHIgbW9kZSwKIAkJ fQogCX0KIAotCSpmYl9pZCA9IGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtzY2Fub3V0X2lkXS5mYl9p ZDsKKwkqZmIgPSByYWRlb25fcGl4bWFwX2dldF9mYihkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nh bm91dF9pZF0ucGl4bWFwKTsKIAkqeCA9ICp5ID0gMDsKIAlkcm1tb2RlX2NydGMtPnNjYW5vdXRf aWQgPSBzY2Fub3V0X2lkOwogfQpAQCAtNzY4LDcgKzc2NCw4IEBAIGRybW1vZGVfY3J0Y19wcmlt ZV9zY2Fub3V0X3VwZGF0ZSh4Zjg2Q3J0Y1B0ciBjcnRjLCBEaXNwbGF5TW9kZVB0ciBtb2RlLAog CiBzdGF0aWMgdm9pZAogZHJtbW9kZV9jcnRjX3NjYW5vdXRfdXBkYXRlKHhmODZDcnRjUHRyIGNy dGMsIERpc3BsYXlNb2RlUHRyIG1vZGUsCi0JCQkgICAgdW5zaWduZWQgc2Nhbm91dF9pZCwgaW50 ICpmYl9pZCwgaW50ICp4LCBpbnQgKnkpCisJCQkgICAgdW5zaWduZWQgc2Nhbm91dF9pZCwgc3Ry dWN0IGRybW1vZGVfZmIgKipmYiwgaW50ICp4LAorCQkJICAgIGludCAqeSkKIHsKIAlTY3JuSW5m b1B0ciBzY3JuID0gY3J0Yy0+c2NybjsKIAlTY3JlZW5QdHIgc2NyZWVuID0gc2Nybi0+cFNjcmVl bjsKQEAgLTgwNCw3ICs4MDEsNyBAQCBkcm1tb2RlX2NydGNfc2Nhbm91dF91cGRhdGUoeGY4NkNy dGNQdHIgY3J0YywgRGlzcGxheU1vZGVQdHIgbW9kZSwKIAkJYm94LT54MiA9IG1heChib3gtPngy LCBzY3JuLT52aXJ0dWFsWCk7CiAJCWJveC0+eTIgPSBtYXgoYm94LT55Miwgc2Nybi0+dmlydHVh bFkpOwogCi0JCSpmYl9pZCA9IGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtzY2Fub3V0X2lkXS5mYl9p ZDsKKwkJKmZiID0gcmFkZW9uX3BpeG1hcF9nZXRfZmIoZHJtbW9kZV9jcnRjLT5zY2Fub3V0W3Nj YW5vdXRfaWRdLnBpeG1hcCk7CiAJCSp4ID0gKnkgPSAwOwogCiAJCXJhZGVvbl9zY2Fub3V0X2Rv X3VwZGF0ZShjcnRjLCBzY2Fub3V0X2lkKTsKQEAgLTgzMCw3ICs4MjcsNyBAQCBkcm1tb2RlX3Nl dF9tb2RlX21ham9yKHhmODZDcnRjUHRyIGNydGMsIERpc3BsYXlNb2RlUHRyIG1vZGUsCiAJaW50 IG91dHB1dF9jb3VudCA9IDA7CiAJQm9vbCByZXQgPSBGQUxTRTsKIAlpbnQgaTsKLQlpbnQgZmJf aWQ7CisJc3RydWN0IGRybW1vZGVfZmIgKmZiID0gTlVMTDsKIAlkcm1Nb2RlTW9kZUluZm8ga21v ZGU7CiAKIAkvKiBUaGUgcm9vdCB3aW5kb3cgY29udGVudHMgbWF5IGJlIHVuZGVmaW5lZCBiZWZv cmUgdGhlIFdpbmRvd0V4cG9zdXJlcwpAQCAtODc4LDE1ICs4NzUsMTQgQEAgZHJtbW9kZV9zZXRf bW9kZV9tYWpvcih4Zjg2Q3J0Y1B0ciBjcnRjLCBEaXNwbGF5TW9kZVB0ciBtb2RlLAogCiAJCWRy bW1vZGVfQ29udmVydFRvS01vZGUoY3J0Yy0+c2NybiwgJmttb2RlLCBtb2RlKTsKIAotCQlmYl9p ZCA9IGRybW1vZGUtPmZiX2lkOwogI2lmZGVmIFJBREVPTl9QSVhNQVBfU0hBUklORwogCQlpZiAo Y3J0Yy0+cmFuZHJfY3J0YyAmJiBjcnRjLT5yYW5kcl9jcnRjLT5zY2Fub3V0X3BpeG1hcCkgewog CQkJZHJtbW9kZV9jcnRjX3ByaW1lX3NjYW5vdXRfdXBkYXRlKGNydGMsIG1vZGUsIHNjYW5vdXRf aWQsCi0JCQkJCQkJICAmZmJfaWQsICZ4LCAmeSk7CisJCQkJCQkJICAmZmIsICZ4LCAmeSk7CiAJ CX0gZWxzZQogI2VuZGlmCi0JCWlmIChkcm1tb2RlX2NydGMtPnJvdGF0ZS5mYl9pZCkgewotCQkJ ZmJfaWQgPSBkcm1tb2RlX2NydGMtPnJvdGF0ZS5mYl9pZDsKKwkJaWYgKGRybW1vZGVfY3J0Yy0+ cm90YXRlLnBpeG1hcCkgeworCQkJZmIgPSByYWRlb25fcGl4bWFwX2dldF9mYihkcm1tb2RlX2Ny dGMtPnJvdGF0ZS5waXhtYXApOwogCQkJeCA9IHkgPSAwOwogCiAJCX0gZWxzZSBpZiAoIXJhZGVv bl9pc19ncHVfc2NyZWVuKHBTY3JlZW4pICYmCkBAIC04OTYsMjIgKzg5MiwyNCBAQCBkcm1tb2Rl X3NldF9tb2RlX21ham9yKHhmODZDcnRjUHRyIGNydGMsIERpc3BsYXlNb2RlUHRyIG1vZGUsCiAj ZW5kaWYKIAkJCSAgICBpbmZvLT5zaGFkb3dfcHJpbWFyeSkpIHsKIAkJCWRybW1vZGVfY3J0Y19z Y2Fub3V0X3VwZGF0ZShjcnRjLCBtb2RlLCBzY2Fub3V0X2lkLAotCQkJCQkJICAgICZmYl9pZCwg JngsICZ5KTsKKwkJCQkJCSAgICAmZmIsICZ4LCAmeSk7CiAJCX0KIAotCQlpZiAoZmJfaWQgPT0g MCkgewotCQkJaWYgKGRybU1vZGVBZGRGQihkcm1tb2RlLT5mZCwKLQkJCQkJIHBTY3JuLT52aXJ0 dWFsWCwKLQkJCQkJIHBTY3JuLT52aXJ0dWFsWSwKLQkJCQkJIHBTY3JuLT5kZXB0aCwgcFNjcm4t PmJpdHNQZXJQaXhlbCwKLQkJCQkJIHBTY3JuLT5kaXNwbGF5V2lkdGggKiBpbmZvLT5waXhlbF9i eXRlcywKLQkJCQkJIGluZm8tPmZyb250X2JvLT5oYW5kbGUsCi0JCQkJCSAmZHJtbW9kZS0+ZmJf aWQpIDwgMCkgewotCQkJCUVycm9yRigiZmFpbGVkIHRvIGFkZCBmYlxuIik7Ci0JCQkJZ290byBk b25lOwotCQkJfQotCi0JCQlmYl9pZCA9IGRybW1vZGUtPmZiX2lkOworCQlpZiAoIWZiKQorCQkJ ZmIgPSByYWRlb25fcGl4bWFwX2dldF9mYihwU2NyZWVuLT5HZXRXaW5kb3dQaXhtYXAocFNjcmVl bi0+cm9vdCkpOworCQlpZiAoIWZiKSB7CisJCQlmYiA9IHJhZGVvbl9mYl9jcmVhdGUoZHJtbW9k ZS0+ZmQsIHBTY3JuLT52aXJ0dWFsWCwKKwkJCQkJICAgICAgcFNjcm4tPnZpcnR1YWxZLCBwU2Ny bi0+ZGVwdGgsCisJCQkJCSAgICAgIHBTY3JuLT5iaXRzUGVyUGl4ZWwsCisJCQkJCSAgICAgIHBT Y3JuLT5kaXNwbGF5V2lkdGggKiBpbmZvLT5waXhlbF9ieXRlcywKKwkJCQkJICAgICAgaW5mby0+ ZnJvbnRfYm8tPmhhbmRsZSk7CisJCQkvKiBQcmV2ZW50IHJlZmNudCBvZiBhZC1ob2MgRkJzIGZy b20gcmVhY2hpbmcgMiAqLworCQkJZHJtbW9kZV9mYl9yZWZlcmVuY2UoZHJtbW9kZS0+ZmQsICZk cm1tb2RlX2NydGMtPmZiLCBOVUxMKTsKKwkJCWRybW1vZGVfY3J0Yy0+ZmIgPSBmYjsKKwkJfQor CQlpZiAoIWZiKSB7CisJCQlFcnJvckYoImZhaWxlZCB0byBhZGQgRkIgZm9yIG1vZGVzZXRcbiIp OworCQkJZ290byBkb25lOwogCQl9CiAKIAkJLyogV2FpdCBmb3IgYW55IHBlbmRpbmcgZmxpcCB0 byBmaW5pc2ggKi8KQEAgLTkyMSwxMyArOTE5LDE1IEBAIGRybW1vZGVfc2V0X21vZGVfbWFqb3Io eGY4NkNydGNQdHIgY3J0YywgRGlzcGxheU1vZGVQdHIgbW9kZSwKIAogCQlpZiAoZHJtTW9kZVNl dENydGMoZHJtbW9kZS0+ZmQsCiAJCQkJICAgZHJtbW9kZV9jcnRjLT5tb2RlX2NydGMtPmNydGNf aWQsCi0JCQkJICAgZmJfaWQsIHgsIHksIG91dHB1dF9pZHMsCisJCQkJICAgZmItPmhhbmRsZSwg eCwgeSwgb3V0cHV0X2lkcywKIAkJCQkgICBvdXRwdXRfY291bnQsICZrbW9kZSkgIT0gMCkgewog CQkJeGY4NkRydk1zZyhjcnRjLT5zY3JuLT5zY3JuSW5kZXgsIFhfRVJST1IsCiAJCQkJICAgImZh aWxlZCB0byBzZXQgbW9kZTogJXNcbiIsIHN0cmVycm9yKGVycm5vKSk7CiAJCQlnb3RvIGRvbmU7 Ci0JCX0gZWxzZQorCQl9IGVsc2UgewogCQkJcmV0ID0gVFJVRTsKKwkJCWRybW1vZGVfZmJfcmVm ZXJlbmNlKGRybW1vZGUtPmZkLCAmZHJtbW9kZV9jcnRjLT5mYiwgZmIpOworCQl9CiAKIAkJaWYg KHBTY3JlZW4pCiAJCQl4Zjg2Q3J0Y1NldFNjcmVlblN1YnBpeGVsT3JkZXIocFNjcmVlbik7CkBA IC05NzIsNyArOTcyLDkgQEAgZG9uZToKIAl9IGVsc2UgewogCQljcnRjLT5hY3RpdmUgPSBUUlVF OwogCi0JCWlmIChmYl9pZCAhPSBkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9pZF0uZmJf aWQpCisJCWlmIChkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9pZF0ucGl4bWFwICYmCisJ CSAgICBmYiAhPSByYWRlb25fcGl4bWFwX2dldF9mYihkcm1tb2RlX2NydGMtPgorCQkJCQkgICAg ICAgc2Nhbm91dFtzY2Fub3V0X2lkXS5waXhtYXApKQogCQkJZHJtbW9kZV9jcnRjX3NjYW5vdXRf ZnJlZShkcm1tb2RlX2NydGMpOwogCQllbHNlIGlmICghZHJtbW9kZV9jcnRjLT50ZWFyX2ZyZWUp IHsKIAkJCWRybW1vZGVfY3J0Y19zY2Fub3V0X2Rlc3Ryb3koZHJtbW9kZSwKQEAgLTIxMDcsMTMg KzIxMDksOSBAQCBzdGF0aWMgQm9vbAogZHJtbW9kZV94Zjg2Y3J0Y19yZXNpemUgKFNjcm5JbmZv UHRyIHNjcm4sIGludCB3aWR0aCwgaW50IGhlaWdodCkKIHsKIAl4Zjg2Q3J0Y0NvbmZpZ1B0ciB4 Zjg2X2NvbmZpZyA9IFhGODZfQ1JUQ19DT05GSUdfUFRSKHNjcm4pOwotCWRybW1vZGVfY3J0Y19w cml2YXRlX3B0cgotCQkgICAgZHJtbW9kZV9jcnRjID0geGY4Nl9jb25maWctPmNydGNbMF0tPmRy aXZlcl9wcml2YXRlOwotCWRybW1vZGVfcHRyIGRybW1vZGUgPSBkcm1tb2RlX2NydGMtPmRybW1v ZGU7CiAJUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHNjcm4pOwogCXN0cnVjdCByYWRl b25fYm8gKm9sZF9mcm9udCA9IE5VTEw7CiAJU2NyZWVuUHRyICAgc2NyZWVuID0geGY4NlNjcm5U b1NjcmVlbihzY3JuKTsKLQl1aW50MzJfdCAgICBvbGRfZmJfaWQ7CiAJaW50CSAgICBpLCBwaXRj aCwgb2xkX3dpZHRoLCBvbGRfaGVpZ2h0LCBvbGRfcGl0Y2g7CiAJaW50IGFsaWduZWRfaGVpZ2h0 OwogCXVpbnQzMl90IHNjcmVlbl9zaXplOwpAQCAtMjIxMyw4ICsyMjExLDYgQEAgZHJtbW9kZV94 Zjg2Y3J0Y19yZXNpemUgKFNjcm5JbmZvUHRyIHNjcm4sIGludCB3aWR0aCwgaW50IGhlaWdodCkK IAlvbGRfd2lkdGggPSBzY3JuLT52aXJ0dWFsWDsKIAlvbGRfaGVpZ2h0ID0gc2Nybi0+dmlydHVh bFk7CiAJb2xkX3BpdGNoID0gc2Nybi0+ZGlzcGxheVdpZHRoOwotCW9sZF9mYl9pZCA9IGRybW1v ZGUtPmZiX2lkOwotCWRybW1vZGUtPmZiX2lkID0gMDsKIAlvbGRfZnJvbnQgPSBpbmZvLT5mcm9u dF9ibzsKIAogCXNjcm4tPnZpcnR1YWxYID0gd2lkdGg7CkBAIC0yMjk2LDggKzIyOTIsNiBAQCBk cm1tb2RlX3hmODZjcnRjX3Jlc2l6ZSAoU2NybkluZm9QdHIgc2NybiwgaW50IHdpZHRoLCBpbnQg aGVpZ2h0KQogCQkJCSAgICAgICBjcnRjLT5yb3RhdGlvbiwgY3J0Yy0+eCwgY3J0Yy0+eSk7CiAJ fQogCi0JaWYgKG9sZF9mYl9pZCkKLQkJZHJtTW9kZVJtRkIoZHJtbW9kZS0+ZmQsIG9sZF9mYl9p ZCk7CiAJaWYgKG9sZF9mcm9udCkKIAkJcmFkZW9uX2JvX3VucmVmKG9sZF9mcm9udCk7CiAKQEAg LTIzMTEsNyArMjMwNSw2IEBAIGRybW1vZGVfeGY4NmNydGNfcmVzaXplIChTY3JuSW5mb1B0ciBz Y3JuLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAJc2Nybi0+dmlydHVhbFggPSBvbGRfd2lkdGg7 CiAJc2Nybi0+dmlydHVhbFkgPSBvbGRfaGVpZ2h0OwogCXNjcm4tPmRpc3BsYXlXaWR0aCA9IG9s ZF9waXRjaDsKLQlkcm1tb2RlLT5mYl9pZCA9IG9sZF9mYl9pZDsKIAogCXJldHVybiBGQUxTRTsK IH0KQEAgLTIzMjUsNyArMjMxOCw3IEBAIGRybW1vZGVfY2xlYXJfcGVuZGluZ19mbGlwKHhmODZD cnRjUHRyIGNydGMpCiB7CiAJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YyA9 IGNydGMtPmRyaXZlcl9wcml2YXRlOwogCi0JZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcgPSBG QUxTRTsKKwlkcm1tb2RlX2NydGMtPmZsaXBfcGVuZGluZyA9IE5VTEw7CiAKIAlpZiAoIWNydGMt PmVuYWJsZWQgfHwKIAkgICAgKGRybW1vZGVfY3J0Yy0+cGVuZGluZ19kcG1zX21vZGUgIT0gRFBN U01vZGVPbiAmJgpAQCAtMjM2OSw3ICsyMzYyLDcgQEAgZHJtbW9kZV9mbGlwX2Fib3J0KHhmODZD cnRjUHRyIGNydGMsIHZvaWQgKmV2ZW50X2RhdGEpCiBzdGF0aWMgdm9pZAogZHJtbW9kZV9mbGlw X2hhbmRsZXIoeGY4NkNydGNQdHIgY3J0YywgdWludDMyX3QgZnJhbWUsIHVpbnQ2NF90IHVzZWMs IHZvaWQgKmV2ZW50X2RhdGEpCiB7Ci0JUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKGNy dGMtPnNjcm4pOworCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjcnRj LT5kcml2ZXJfcHJpdmF0ZTsKIAlkcm1tb2RlX2ZsaXBkYXRhX3B0ciBmbGlwZGF0YSA9IGV2ZW50 X2RhdGE7CiAKIAkvKiBJcyB0aGlzIHRoZSBldmVudCB3aG9zZSBpbmZvIHNoYWxsIGJlIGRlbGl2 ZXJlZCB0byBoaWdoZXIgbGV2ZWw/ICovCkBAIC0yMzg5LDEyICsyMzgyLDExIEBAIGRybW1vZGVf ZmxpcF9oYW5kbGVyKHhmODZDcnRjUHRyIGNydGMsIHVpbnQzMl90IGZyYW1lLCB1aW50NjRfdCB1 c2VjLCB2b2lkICpldmVuCiAJCWVsc2UKIAkJCWZsaXBkYXRhLT5oYW5kbGVyKGNydGMsIGZyYW1l LCB1c2VjLCBmbGlwZGF0YS0+ZXZlbnRfZGF0YSk7CiAKLQkJLyogUmVsZWFzZSBmcmFtZWJ1ZmZl ciAqLwotCQlkcm1Nb2RlUm1GQihpbmZvLT5kcm1tb2RlLmZkLCBmbGlwZGF0YS0+b2xkX2ZiX2lk KTsKLQogCQlmcmVlKGZsaXBkYXRhKTsKIAl9CiAKKwlkcm1tb2RlX2ZiX3JlZmVyZW5jZShkcm1t b2RlX2NydGMtPmRybW1vZGUtPmZkLCAmZHJtbW9kZV9jcnRjLT5mYiwKKwkJCSAgICAgZHJtbW9k ZV9jcnRjLT5mbGlwX3BlbmRpbmcpOwogCWRybW1vZGVfY2xlYXJfcGVuZGluZ19mbGlwKGNydGMp OwogfQogCkBAIC0yNjUxLDYgKzI2NDMsOCBAQCBCb29sIGRybW1vZGVfc2V0X2Rlc2lyZWRfbW9k ZXMoU2NybkluZm9QdHIgcFNjcm4sIGRybW1vZGVfcHRyIGRybW1vZGUsCiAJCQkJZHJtTW9kZVNl dENydGMoZHJtbW9kZS0+ZmQsCiAJCQkJCSAgICAgICBkcm1tb2RlX2NydGMtPm1vZGVfY3J0Yy0+ Y3J0Y19pZCwKIAkJCQkJICAgICAgIDAsIDAsIDAsIE5VTEwsIDAsIE5VTEwpOworCQkJCWRybW1v ZGVfZmJfcmVmZXJlbmNlKGRybW1vZGUtPmZkLAorCQkJCQkJICAgICAmZHJtbW9kZV9jcnRjLT5m YiwgTlVMTCk7CiAJCQl9CiAJCQljb250aW51ZTsKIAkJfQpAQCAtMjkxMSwxNCArMjkwNSwxMiBA QCBCb29sIHJhZGVvbl9kb19wYWdlZmxpcChTY3JuSW5mb1B0ciBzY3JuLCBDbGllbnRQdHIgY2xp ZW50LAogCXhmODZDcnRjQ29uZmlnUHRyIGNvbmZpZyA9IFhGODZfQ1JUQ19DT05GSUdfUFRSKHNj cm4pOwogCXhmODZDcnRjUHRyIGNydGMgPSBOVUxMOwogCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0 ciBkcm1tb2RlX2NydGMgPSBjb25maWctPmNydGNbMF0tPmRyaXZlcl9wcml2YXRlOwotCWRybW1v ZGVfcHRyIGRybW1vZGUgPSBkcm1tb2RlX2NydGMtPmRybW1vZGU7Ci0JdW5zaWduZWQgaW50IHBp dGNoOwogCWludCBpOwogCXVpbnQzMl90IHRpbGluZ19mbGFncyA9IDA7CiAJdWludDMyX3QgZmxp cF9mbGFncyA9IGZsaXBfc3luYyA9PSBGTElQX0FTWU5DID8gRFJNX01PREVfUEFHRV9GTElQX0FT WU5DIDogMDsKIAlkcm1tb2RlX2ZsaXBkYXRhX3B0ciBmbGlwZGF0YTsKIAl1aW50cHRyX3QgZHJt X3F1ZXVlX3NlcSA9IDA7Ci0JdWludDMyX3QgaGFuZGxlOworCXN0cnVjdCBkcm1tb2RlX2ZiICpm YjsKIAogCWlmIChpbmZvLT5hbGxvd0NvbG9yVGlsaW5nKSB7CiAJCWlmIChpbmZvLT5DaGlwRmFt aWx5ID49IENISVBfRkFNSUxZX1I2MDApCkBAIC0yOTI3LDEyICsyOTE5LDYgQEAgQm9vbCByYWRl b25fZG9fcGFnZWZsaXAoU2NybkluZm9QdHIgc2NybiwgQ2xpZW50UHRyIGNsaWVudCwKIAkJCXRp bGluZ19mbGFncyB8PSBSQURFT05fVElMSU5HX01BQ1JPOwogCX0KIAotCXBpdGNoID0gUkFERU9O X0FMSUdOKHNjcm4tPmRpc3BsYXlXaWR0aCwgZHJtbW9kZV9nZXRfcGl0Y2hfYWxpZ24oc2Nybiwg aW5mby0+cGl4ZWxfYnl0ZXMsIHRpbGluZ19mbGFncykpICoKLQkJaW5mby0+cGl4ZWxfYnl0ZXM7 Ci0JaWYgKGluZm8tPkNoaXBGYW1pbHkgPj0gQ0hJUF9GQU1JTFlfUjYwMCAmJiBpbmZvLT5zdXJm X21hbikgewotCQlwaXRjaCA9IGluZm8tPmZyb250X3N1cmZhY2UubGV2ZWxbMF0ucGl0Y2hfYnl0 ZXM7Ci0JfQotCiAgICAgICAgIGZsaXBkYXRhID0gY2FsbG9jKDEsIHNpemVvZihkcm1tb2RlX2Zs aXBkYXRhX3JlYykpOwogICAgICAgICBpZiAoIWZsaXBkYXRhKSB7CiAgICAgICAgICAgICAgeGY4 NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfV0FSTklORywKQEAgLTI5NDAsMTcgKzI5MjYsMTEg QEAgQm9vbCByYWRlb25fZG9fcGFnZWZsaXAoU2NybkluZm9QdHIgc2NybiwgQ2xpZW50UHRyIGNs aWVudCwKICAgICAgICAgICAgICBnb3RvIGVycm9yOwogICAgICAgICB9CiAKLQlpZiAoIXJhZGVv bl9nZXRfcGl4bWFwX2hhbmRsZShwaXhtYXAsICZoYW5kbGUpKQotCQlnb3RvIGVycm9yOwotCi0J LyoKLQkgKiBDcmVhdGUgYSBuZXcgaGFuZGxlIGZvciB0aGUgYmFjayBidWZmZXIKLQkgKi8KLQlm bGlwZGF0YS0+b2xkX2ZiX2lkID0gZHJtbW9kZS0+ZmJfaWQ7Ci0JaWYgKGRybU1vZGVBZGRGQihk cm1tb2RlLT5mZCwgc2Nybi0+dmlydHVhbFgsIHNjcm4tPnZpcnR1YWxZLAotCQkJIHNjcm4tPmRl cHRoLCBzY3JuLT5iaXRzUGVyUGl4ZWwsIHBpdGNoLAotCQkJIGhhbmRsZSwgJmRybW1vZGUtPmZi X2lkKSkKKwlmYiA9IHJhZGVvbl9waXhtYXBfZ2V0X2ZiKHBpeG1hcCk7CisJaWYgKCFmYikgewor CQlFcnJvckYoIkZhaWxlZCB0byBnZXQgRkIgZm9yIGZsaXBcbiIpOwogCQlnb3RvIGVycm9yOwor CX0KIAogCS8qCiAJICogUXVldWUgZmxpcHMgb24gYWxsIGVuYWJsZWQgQ1JUQ3MKQEAgLTI5OTQs NyArMjk3NCw3IEBAIEJvb2wgcmFkZW9uX2RvX3BhZ2VmbGlwKFNjcm5JbmZvUHRyIHNjcm4sIENs aWVudFB0ciBjbGllbnQsCiAJCWlmIChkcm1tb2RlX2NydGMtPmh3X2lkID09IHJlZl9jcnRjX2h3 X2lkKSB7CiAJCQlpZiAoZHJtbW9kZV9wYWdlX2ZsaXBfdGFyZ2V0X2Fic29sdXRlKHBSQURFT05F bnQsCiAJCQkJCQkJICAgICAgZHJtbW9kZV9jcnRjLAotCQkJCQkJCSAgICAgIGRybW1vZGUtPmZi X2lkLAorCQkJCQkJCSAgICAgIGZiLT5oYW5kbGUsCiAJCQkJCQkJICAgICAgZmxpcF9mbGFncywK IAkJCQkJCQkgICAgICBkcm1fcXVldWVfc2VxLAogCQkJCQkJCSAgICAgIHRhcmdldF9tc2MpICE9 IDApCkBAIC0zMDAyLDEzICsyOTgyLDEzIEBAIEJvb2wgcmFkZW9uX2RvX3BhZ2VmbGlwKFNjcm5J bmZvUHRyIHNjcm4sIENsaWVudFB0ciBjbGllbnQsCiAJCX0gZWxzZSB7CiAJCQlpZiAoZHJtbW9k ZV9wYWdlX2ZsaXBfdGFyZ2V0X3JlbGF0aXZlKHBSQURFT05FbnQsCiAJCQkJCQkJICAgICAgZHJt bW9kZV9jcnRjLAotCQkJCQkJCSAgICAgIGRybW1vZGUtPmZiX2lkLAorCQkJCQkJCSAgICAgIGZi LT5oYW5kbGUsCiAJCQkJCQkJICAgICAgZmxpcF9mbGFncywKIAkJCQkJCQkgICAgICBkcm1fcXVl dWVfc2VxLCAwKSAhPSAwKQogCQkJCWdvdG8gZmxpcF9lcnJvcjsKIAkJfQogCi0JCWRybW1vZGVf Y3J0Yy0+ZmxpcF9wZW5kaW5nID0gVFJVRTsKKwkJZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcg PSBmYjsKIAkJZHJtX3F1ZXVlX3NlcSA9IDA7CiAJfQogCkBAIC0zMDIwLDEyICszMDAwLDYgQEAg ZmxpcF9lcnJvcjoKIAkJICAgc3RyZXJyb3IoZXJybm8pKTsKIAogZXJyb3I6Ci0JaWYgKGZsaXBk YXRhICYmIGZsaXBkYXRhLT5mbGlwX2NvdW50IDw9IDEgJiYKLQkgICAgZHJtbW9kZS0+ZmJfaWQg IT0gZmxpcGRhdGEtPm9sZF9mYl9pZCkgewotCQlkcm1Nb2RlUm1GQihkcm1tb2RlLT5mZCwgZHJt bW9kZS0+ZmJfaWQpOwotCQlkcm1tb2RlLT5mYl9pZCA9IGZsaXBkYXRhLT5vbGRfZmJfaWQ7Ci0J fQotCiAJaWYgKGRybV9xdWV1ZV9zZXEpCiAJCXJhZGVvbl9kcm1fYWJvcnRfZW50cnkoZHJtX3F1 ZXVlX3NlcSk7CiAJZWxzZSBpZiAoY3J0YykKZGlmZiAtLWdpdCBhL3NyYy9kcm1tb2RlX2Rpc3Bs YXkuaCBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuaAppbmRleCBlZmNhMzMxY2IuLjdiNTkyZGJkMCAx MDA2NDQKLS0tIGEvc3JjL2RybW1vZGVfZGlzcGxheS5oCisrKyBiL3NyYy9kcm1tb2RlX2Rpc3Bs YXkuaApAQCAtNDEsNyArNDEsNiBAQAogCiB0eXBlZGVmIHN0cnVjdCB7CiAgIGludCBmZDsKLSAg dW5zaWduZWQgZmJfaWQ7CiAgIGRybU1vZGVGQlB0ciBtb2RlX2ZiOwogICBpbnQgY3BwOwogICBz dHJ1Y3QgcmFkZW9uX2JvX21hbmFnZXIgKmJ1Zm1ncjsKQEAgLTYwLDcgKzU5LDYgQEAgdHlwZWRl ZiBzdHJ1Y3QgewogfSBkcm1tb2RlX3JlYywgKmRybW1vZGVfcHRyOwogCiB0eXBlZGVmIHN0cnVj dCB7Ci0gIHVuc2lnbmVkIG9sZF9mYl9pZDsKICAgaW50IGZsaXBfY291bnQ7CiAgIHZvaWQgKmV2 ZW50X2RhdGE7CiAgIHVuc2lnbmVkIGludCBmZV9mcmFtZTsKQEAgLTcwLDEwICs2OCwxNCBAQCB0 eXBlZGVmIHN0cnVjdCB7CiAgIHJhZGVvbl9kcm1fYWJvcnRfcHJvYyBhYm9ydDsKIH0gZHJtbW9k ZV9mbGlwZGF0YV9yZWMsICpkcm1tb2RlX2ZsaXBkYXRhX3B0cjsKIAorc3RydWN0IGRybW1vZGVf ZmIgeworCWludCByZWZjbnQ7CisJdWludDMyX3QgaGFuZGxlOworfTsKKwogc3RydWN0IGRybW1v ZGVfc2Nhbm91dCB7CiAgICAgc3RydWN0IHJhZGVvbl9ibyAqYm87CiAgICAgUGl4bWFwUHRyIHBp eG1hcDsKLSAgICB1bnNpZ25lZCBmYl9pZDsKICAgICBpbnQgd2lkdGgsIGhlaWdodDsKIH07CiAK QEAgLTEwMiw4ICsxMDQsMTAgQEAgdHlwZWRlZiBzdHJ1Y3QgewogICAgICAqIG1vZGVzZXQpCiAg ICAgICovCiAgICAgQm9vbCBuZWVkX21vZGVzZXQ7Ci0gICAgLyogQSBmbGlwIGlzIHBlbmRpbmcg Zm9yIHRoaXMgQ1JUQyAqLwotICAgIEJvb2wgZmxpcF9wZW5kaW5nOworICAgIC8qIEEgZmxpcCB0 byB0aGlzIEZCIGlzIHBlbmRpbmcgZm9yIHRoaXMgQ1JUQyAqLworICAgIHN0cnVjdCBkcm1tb2Rl X2ZiICpmbGlwX3BlbmRpbmc7CisgICAgLyogVGhlIEZCIGN1cnJlbnRseSBiZWluZyBzY2FubmVk IG91dCBieSB0aGlzIENSVEMsIGlmIGFueSAqLworICAgIHN0cnVjdCBkcm1tb2RlX2ZiICpmYjsK IH0gZHJtbW9kZV9jcnRjX3ByaXZhdGVfcmVjLCAqZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyOwog CiB0eXBlZGVmIHN0cnVjdCB7CkBAIC0xMzUsNiArMTM5LDMzIEBAIGVudW0gZHJtbW9kZV9mbGlw X3N5bmMgewogfTsKIAogCitzdGF0aWMgaW5saW5lIHZvaWQKK2RybW1vZGVfZmJfcmVmZXJlbmNl KGludCBkcm1fZmQsIHN0cnVjdCBkcm1tb2RlX2ZiICoqb2xkLCBzdHJ1Y3QgZHJtbW9kZV9mYiAq bmV3KQoreworCWlmIChuZXcpIHsKKwkJaWYgKG5ldy0+cmVmY250IDw9IDApIHsKKwkJCUVycm9y RigiTmV3IEZCJ3MgcmVmY250IHdhcyAlZCBpbiAlc1xuIiwKKwkJCSAgICAgICBuZXctPnJlZmNu dCwgX19mdW5jX18pOworCQl9CisJCW5ldy0+cmVmY250Kys7CisJfQorCisJaWYgKCpvbGQpIHsK KwkJaWYgKCgqb2xkKS0+cmVmY250IDw9IDApIHsKKwkJCUVycm9yRigiT2xkIEZCJ3MgcmVmY250 IHdhcyAlZCBpbiAlc1xuIiwKKwkJCSAgICAgICAoKm9sZCktPnJlZmNudCwgX19mdW5jX18pOwor CQl9IGVsc2UgeworCQkJaWYgKC0tKCpvbGQpLT5yZWZjbnQgPT0gMCkgeworCQkJCWRybU1vZGVS bUZCKGRybV9mZCwgKCpvbGQpLT5oYW5kbGUpOworCQkJCWZyZWUoKm9sZCk7CisJCQl9CisJCX0K Kwl9CisKKwkqb2xkID0gbmV3OworfQorCisKIGV4dGVybiBpbnQgZHJtbW9kZV9wYWdlX2ZsaXBf dGFyZ2V0X2Fic29sdXRlKFJBREVPTkVudFB0ciBwUkFERU9ORW50LAogCQkJCQkgICAgIGRybW1v ZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMsCiAJCQkJCSAgICAgaW50IGZiX2lkLCB1 aW50MzJfdCBmbGFncywKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb24uaCBiL3NyYy9yYWRlb24uaApp bmRleCAyY2IxODhlMWYuLmZlYmU1ODBiNiAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbi5oCisrKyBi L3NyYy9yYWRlb24uaApAQCAtMjg4LDYgKzI4OCw3IEBAIHN0cnVjdCByYWRlb25fcGl4bWFwIHsK IAl1aW50X2Zhc3QzMl90IGdwdV93cml0ZTsKIAogCXN0cnVjdCByYWRlb25fYm8gKmJvOworCXN0 cnVjdCBkcm1tb2RlX2ZiICpmYjsKIAogCXVpbnQzMl90IHRpbGluZ19mbGFnczsKIApAQCAtMzEz LDYgKzMxNCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCByYWRlb25fc2V0X3BpeG1hcF9wcml2YXRl KFBpeG1hcFB0ciBwaXhtYXAsIHN0cnVjdCByYWRlb25fcGl4CiAKIHN0cnVjdCByYWRlb25fZXhh X3BpeG1hcF9wcml2IHsKICAgICBzdHJ1Y3QgcmFkZW9uX2JvICpibzsKKyAgICBzdHJ1Y3QgZHJt bW9kZV9mYiAqZmI7CiAgICAgdWludDMyX3QgdGlsaW5nX2ZsYWdzOwogICAgIHN0cnVjdCByYWRl b25fc3VyZmFjZSBzdXJmYWNlOwogICAgIEJvb2wgYm9fbWFwcGVkOwpAQCAtNjA5LDYgKzYxMSw5 IEBAIGV4dGVybiB2b2lkICBSQURFT05Db3B5U3dhcCh1aW50OF90ICpkc3QsIHVpbnQ4X3QgKnNy YywgdW5zaWduZWQgaW50IHNpemUsIGludCBzCiBleHRlcm4gdm9pZCBSQURFT05Jbml0M0RFbmdp bmUoU2NybkluZm9QdHIgcFNjcm4pOwogZXh0ZXJuIGludCByYWRlb25fY3Nfc3BhY2VfcmVtYWlu aW5nKFNjcm5JbmZvUHRyIHBTY3JuKTsKIAorLyogcmFkZW9uX2JvX2hlbHBlci5jICovCitleHRl cm4gQm9vbCByYWRlb25fZ2V0X3BpeG1hcF9oYW5kbGUoUGl4bWFwUHRyIHBpeG1hcCwgdWludDMy X3QgKmhhbmRsZSk7CisKIC8qIHJhZGVvbl9jb21tb25mdW5jcy5jICovCiBleHRlcm4gdm9pZCBS QURFT05XYWl0Rm9yVkxpbmUoU2NybkluZm9QdHIgcFNjcm4sIFBpeG1hcFB0ciBwUGl4LAogCQkJ ICAgICAgIHhmODZDcnRjUHRyIGNydGMsIGludCBzdGFydCwgaW50IHN0b3ApOwpAQCAtNzA2LDYg KzcxMSw4IEBAIHN0YXRpYyBpbmxpbmUgQm9vbCByYWRlb25fc2V0X3BpeG1hcF9ibyhQaXhtYXBQ dHIgcFBpeCwgc3RydWN0IHJhZGVvbl9ibyAqYm8pCiAJCXJhZGVvbl9ib191bnJlZihwcml2LT5i byk7CiAJICAgIH0KIAorCSAgICBkcm1tb2RlX2ZiX3JlZmVyZW5jZShpbmZvLT5kcm1tb2RlLmZk LCAmcHJpdi0+ZmIsIE5VTEwpOworCiAJICAgIGlmICghYm8pIHsKIAkJZnJlZShwcml2KTsKIAkJ cHJpdiA9IE5VTEw7CkBAIC03OTAsNiArNzk3LDcyIEBAIHN0YXRpYyBpbmxpbmUgQm9vbCByYWRl b25fZ2V0X3BpeG1hcF9zaGFyZWQoUGl4bWFwUHRyIHBQaXgpCiAgICAgcmV0dXJuIEZBTFNFOwog fQogCitzdGF0aWMgaW5saW5lIHN0cnVjdCBkcm1tb2RlX2ZiKgorcmFkZW9uX2ZiX2NyZWF0ZShp bnQgZHJtX2ZkLCB1aW50MzJfdCB3aWR0aCwgdWludDMyX3QgaGVpZ2h0LCB1aW50OF90IGRlcHRo LAorCQkgdWludDhfdCBicHAsIHVpbnQzMl90IHBpdGNoLCB1aW50MzJfdCBoYW5kbGUpCit7Cisg ICAgc3RydWN0IGRybW1vZGVfZmIgKmZiICA9IG1hbGxvYyhzaXplb2YoKmZiKSk7CisKKyAgICBp ZiAoIWZiKQorCXJldHVybiBOVUxMOworCisgICAgZmItPnJlZmNudCA9IDE7CisgICAgaWYgKGRy bU1vZGVBZGRGQihkcm1fZmQsIHdpZHRoLCBoZWlnaHQsIGRlcHRoLCBicHAsIHBpdGNoLCBoYW5k bGUsCisJCSAgICAgJmZiLT5oYW5kbGUpID09IDApCisJcmV0dXJuIGZiOworCisgICAgZnJlZShm Yik7CisgICAgcmV0dXJuIE5VTEw7Cit9CisKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGRybW1vZGVf ZmIqCityYWRlb25fcGl4bWFwX2NyZWF0ZV9mYihpbnQgZHJtX2ZkLCBQaXhtYXBQdHIgcGl4KQor eworICAgIHVpbnQzMl90IGhhbmRsZTsKKworICAgIGlmICghcmFkZW9uX2dldF9waXhtYXBfaGFu ZGxlKHBpeCwgJmhhbmRsZSkpCisJcmV0dXJuIE5VTEw7CisKKyAgICByZXR1cm4gcmFkZW9uX2Zi X2NyZWF0ZShkcm1fZmQsIHBpeC0+ZHJhd2FibGUud2lkdGgsIHBpeC0+ZHJhd2FibGUuaGVpZ2h0 LAorCQkJICAgIHBpeC0+ZHJhd2FibGUuZGVwdGgsIHBpeC0+ZHJhd2FibGUuYml0c1BlclBpeGVs LAorCQkJICAgIHBpeC0+ZGV2S2luZCwgaGFuZGxlKTsKK30KKworc3RhdGljIGlubGluZSBzdHJ1 Y3QgZHJtbW9kZV9mYioKK3JhZGVvbl9waXhtYXBfZ2V0X2ZiKFBpeG1hcFB0ciBwaXgpCit7Cisg ICAgUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHhmODZTY3JlZW5Ub1Njcm4ocGl4LT5k cmF3YWJsZS5wU2NyZWVuKSk7CisKKyNpZmRlZiBVU0VfR0xBTU9SCisgICAgaWYgKGluZm8tPnVz ZV9nbGFtb3IpIHsKKwlzdHJ1Y3QgcmFkZW9uX3BpeG1hcCAqcHJpdiA9IHJhZGVvbl9nZXRfcGl4 bWFwX3ByaXZhdGUocGl4KTsKKworCWlmICghcHJpdikKKwkgICAgcmV0dXJuIE5VTEw7CisKKwlp ZiAoIXByaXYtPmZiKQorCSAgICBwcml2LT5mYiA9IHJhZGVvbl9waXhtYXBfY3JlYXRlX2ZiKGlu Zm8tPmRybW1vZGUuZmQsIHBpeCk7CisKKwlyZXR1cm4gcHJpdi0+ZmI7CisgICAgfSBlbHNlCisj ZW5kaWYKKyAgICBpZiAoaW5mby0+YWNjZWxPbikKKyAgICB7CisJc3RydWN0IHJhZGVvbl9leGFf cGl4bWFwX3ByaXYgKmRyaXZlcl9wcml2ID0KKwkgICAgZXhhR2V0UGl4bWFwRHJpdmVyUHJpdmF0 ZShwaXgpOworCisJaWYgKCFkcml2ZXJfcHJpdikKKwkgICAgcmV0dXJuIE5VTEw7CisKKwlpZiAo IWRyaXZlcl9wcml2LT5mYikKKwkgICAgZHJpdmVyX3ByaXYtPmZiID0gcmFkZW9uX3BpeG1hcF9j cmVhdGVfZmIoaW5mby0+ZHJtbW9kZS5mZCwgcGl4KTsKKworCXJldHVybiBkcml2ZXJfcHJpdi0+ ZmI7CisgICAgfQorCisgICAgcmV0dXJuIE5VTEw7Cit9CisKICNkZWZpbmUgQ1BfUEFDS0VUMChy ZWcsIG4pCQkJCQkJXAogCShSQURFT05fQ1BfUEFDS0VUMCB8ICgobikgPDwgMTYpIHwgKChyZWcp ID4+IDIpKQogI2RlZmluZSBDUF9QQUNLRVQxKHJlZzAsIHJlZzEpCQkJCQkJXApkaWZmIC0tZ2l0 IGEvc3JjL3JhZGVvbl9ib19oZWxwZXIuaCBiL3NyYy9yYWRlb25fYm9faGVscGVyLmgKaW5kZXgg ZjFhZWQ1NTE2Li43NzEzNDI1MDIgMTAwNjQ0Ci0tLSBhL3NyYy9yYWRlb25fYm9faGVscGVyLmgK KysrIGIvc3JjL3JhZGVvbl9ib19oZWxwZXIuaApAQCAtMjgsOSArMjgsNiBAQCByYWRlb25fYWxs b2NfcGl4bWFwX2JvKFNjcm5JbmZvUHRyIHBTY3JuLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsIGlu dCBkZXB0aCwKIAkJICAgICAgIGludCB1c2FnZV9oaW50LCBpbnQgYml0c1BlclBpeGVsLCBpbnQg Km5ld19waXRjaCwKIAkJICAgICAgIHN0cnVjdCByYWRlb25fc3VyZmFjZSAqbmV3X3N1cmZhY2Us IHVpbnQzMl90ICpuZXdfdGlsaW5nKTsKIAotZXh0ZXJuIEJvb2wKLXJhZGVvbl9nZXRfcGl4bWFw X2hhbmRsZShQaXhtYXBQdHIgcGl4bWFwLCB1aW50MzJfdCAqaGFuZGxlKTsKLQogZXh0ZXJuIHVp bnQzMl90CiByYWRlb25fZ2V0X3BpeG1hcF90aWxpbmdfZmxhZ3MoUGl4bWFwUHRyIHBQaXgpOwog CmRpZmYgLS1naXQgYS9zcmMvcmFkZW9uX2V4YS5jIGIvc3JjL3JhZGVvbl9leGEuYwppbmRleCAx ZTQ1N2E4YmIuLmQ4ZGQ3ZmRjZSAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbl9leGEuYworKysgYi9z cmMvcmFkZW9uX2V4YS5jCkBAIC0zMDAsNiArMzAwLDcgQEAgdm9pZCAqUkFERU9ORVhBQ3JlYXRl UGl4bWFwMihTY3JlZW5QdHIgcFNjcmVlbiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LAogCiB2b2lk IFJBREVPTkVYQURlc3Ryb3lQaXhtYXAoU2NyZWVuUHRyIHBTY3JlZW4sIHZvaWQgKmRyaXZlclBy aXYpCiB7CisgICAgUkFERU9OSW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHhmODZTY3JlZW5Ub1Nj cm4ocFNjcmVlbikpOwogICAgIHN0cnVjdCByYWRlb25fZXhhX3BpeG1hcF9wcml2ICpkcml2ZXJf cHJpdiA9IGRyaXZlclByaXY7CiAKICAgICBpZiAoIWRyaXZlclByaXYpCkBAIC0zMDcsNiArMzA4 LDcgQEAgdm9pZCBSQURFT05FWEFEZXN0cm95UGl4bWFwKFNjcmVlblB0ciBwU2NyZWVuLCB2b2lk ICpkcml2ZXJQcml2KQogCiAgICAgaWYgKGRyaXZlcl9wcml2LT5ibykKIAlyYWRlb25fYm9fdW5y ZWYoZHJpdmVyX3ByaXYtPmJvKTsKKyAgICBkcm1tb2RlX2ZiX3JlZmVyZW5jZShpbmZvLT5kcm1t b2RlLmZkLCAmZHJpdmVyX3ByaXYtPmZiLCBOVUxMKTsKICAgICBmcmVlKGRyaXZlclByaXYpOwog fQogCmRpZmYgLS1naXQgYS9zcmMvcmFkZW9uX2ttcy5jIGIvc3JjL3JhZGVvbl9rbXMuYwppbmRl eCBiMzQyN2M0NjIuLjJiNDEwZWIzZCAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbl9rbXMuYworKysg Yi9zcmMvcmFkZW9uX2ttcy5jCkBAIC03NzIsNiArNzcyLDE3IEBAIHJhZGVvbl9wcmltZV9zY2Fu b3V0X2ZsaXBfYWJvcnQoeGY4NkNydGNQdHIgY3J0Yywgdm9pZCAqZXZlbnRfZGF0YSkKIH0KIAog c3RhdGljIHZvaWQKK3JhZGVvbl9wcmltZV9zY2Fub3V0X2ZsaXBfaGFuZGxlcih4Zjg2Q3J0Y1B0 ciBjcnRjLCB1aW50MzJfdCBtc2MsIHVpbnQ2NF90IHVzZWMsCisJCQkJICB2b2lkICpldmVudF9k YXRhKQoreworICAgIGRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBldmVu dF9kYXRhOworCisgICAgZHJtbW9kZV9mYl9yZWZlcmVuY2UoZHJtbW9kZV9jcnRjLT5kcm1tb2Rl LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsCisJCQkgZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcp OworICAgIHJhZGVvbl9wcmltZV9zY2Fub3V0X2ZsaXBfYWJvcnQoY3J0YywgZXZlbnRfZGF0YSk7 Cit9CisKK3N0YXRpYyB2b2lkCiByYWRlb25fcHJpbWVfc2Nhbm91dF9mbGlwKFBpeG1hcERpcnR5 VXBkYXRlUHRyIGVudCkKIHsKICAgICBTY3JlZW5QdHIgc2NyZWVuID0gZW50LT5zbGF2ZV9kc3Qt PmRyYXdhYmxlLnBTY3JlZW47CkBAIC03OTgsNyArODA5LDggQEAgcmFkZW9uX3ByaW1lX3NjYW5v dXRfZmxpcChQaXhtYXBEaXJ0eVVwZGF0ZVB0ciBlbnQpCiAgICAgZHJtX3F1ZXVlX3NlcSA9IHJh ZGVvbl9kcm1fcXVldWVfYWxsb2MoY3J0YywKIAkJCQkJICAgUkFERU9OX0RSTV9RVUVVRV9DTElF TlRfREVGQVVMVCwKIAkJCQkJICAgUkFERU9OX0RSTV9RVUVVRV9JRF9ERUZBVUxULAotCQkJCQkg ICBkcm1tb2RlX2NydGMsIE5VTEwsCisJCQkJCSAgIGRybW1vZGVfY3J0YywKKwkJCQkJICAgcmFk ZW9uX3ByaW1lX3NjYW5vdXRfZmxpcF9oYW5kbGVyLAogCQkJCQkgICByYWRlb25fcHJpbWVfc2Nh bm91dF9mbGlwX2Fib3J0KTsKICAgICBpZiAoZHJtX3F1ZXVlX3NlcSA9PSBSQURFT05fRFJNX1FV RVVFX0VSUk9SKSB7CiAJeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfV0FSTklORywKQEAg LTgwNiw4ICs4MTgsMTcgQEAgcmFkZW9uX3ByaW1lX3NjYW5vdXRfZmxpcChQaXhtYXBEaXJ0eVVw ZGF0ZVB0ciBlbnQpCiAJcmV0dXJuOwogICAgIH0KIAorICAgIGRybW1vZGVfY3J0Yy0+ZmxpcF9w ZW5kaW5nID0KKwlyYWRlb25fcGl4bWFwX2dldF9mYihkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nh bm91dF9pZF0ucGl4bWFwKTsKKyAgICBpZiAoIWRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nKSB7 CisJeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfV0FSTklORywKKwkJICAgIkZhaWxlZCB0 byBnZXQgRkIgZm9yIFBSSU1FIGZsaXAuXG4iKTsKKwlyYWRlb25fZHJtX2Fib3J0X2VudHJ5KGRy bV9xdWV1ZV9zZXEpOworCXJldHVybjsKKyAgICB9CisKICAgICBpZiAoZHJtbW9kZV9wYWdlX2Zs aXBfdGFyZ2V0X3JlbGF0aXZlKHBSQURFT05FbnQsIGRybW1vZGVfY3J0YywKLQkJCQkJICBkcm1t b2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9pZF0uZmJfaWQsCisJCQkJCSAgZHJtbW9kZV9jcnRj LT5mbGlwX3BlbmRpbmctPmhhbmRsZSwKIAkJCQkJICAwLCBkcm1fcXVldWVfc2VxLCAwKSAhPSAw KSB7CiAJeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfV0FSTklORywgImZsaXAgcXVldWUg ZmFpbGVkIGluICVzOiAlc1xuIiwKIAkJICAgX19mdW5jX18sIHN0cmVycm9yKGVycm5vKSk7CkBA IC04MTcsNyArODM4LDYgQEAgcmFkZW9uX3ByaW1lX3NjYW5vdXRfZmxpcChQaXhtYXBEaXJ0eVVw ZGF0ZVB0ciBlbnQpCiAKICAgICBkcm1tb2RlX2NydGMtPnNjYW5vdXRfaWQgPSBzY2Fub3V0X2lk OwogICAgIGRybW1vZGVfY3J0Yy0+c2Nhbm91dF91cGRhdGVfcGVuZGluZyA9IFRSVUU7Ci0gICAg ZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcgPSBUUlVFOwogfQogCiBzdGF0aWMgdm9pZApAQCAt MTA1MywxMCArMTA3MywxNCBAQCByYWRlb25fc2Nhbm91dF91cGRhdGUoeGY4NkNydGNQdHIgeGY4 Nl9jcnRjKQogc3RhdGljIHZvaWQKIHJhZGVvbl9zY2Fub3V0X2ZsaXBfYWJvcnQoeGY4NkNydGNQ dHIgY3J0Yywgdm9pZCAqZXZlbnRfZGF0YSkKIHsKLSAgICBkcm1tb2RlX2NydGNfcHJpdmF0ZV9w dHIgZHJtbW9kZV9jcnRjID0gZXZlbnRfZGF0YTsKKyAgICByYWRlb25fcHJpbWVfc2Nhbm91dF9m bGlwX2Fib3J0KGNydGMsIGV2ZW50X2RhdGEpOworfQogCi0gICAgZHJtbW9kZV9jcnRjLT5zY2Fu b3V0X3VwZGF0ZV9wZW5kaW5nID0gRkFMU0U7Ci0gICAgZHJtbW9kZV9jbGVhcl9wZW5kaW5nX2Zs aXAoY3J0Yyk7CitzdGF0aWMgdm9pZAorcmFkZW9uX3NjYW5vdXRfZmxpcF9oYW5kbGVyKHhmODZD cnRjUHRyIGNydGMsIHVpbnQzMl90IG1zYywgdWludDY0X3QgdXNlYywKKwkJCSAgICB2b2lkICpl dmVudF9kYXRhKQoreworICAgIHJhZGVvbl9wcmltZV9zY2Fub3V0X2ZsaXBfaGFuZGxlcihjcnRj LCBtc2MsIHVzZWMsIGV2ZW50X2RhdGEpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtMTA4MCw3ICsx MTA0LDggQEAgcmFkZW9uX3NjYW5vdXRfZmxpcChTY3JlZW5QdHIgcFNjcmVlbiwgUkFERU9OSW5m b1B0ciBpbmZvLAogICAgIGRybV9xdWV1ZV9zZXEgPSByYWRlb25fZHJtX3F1ZXVlX2FsbG9jKHhm ODZfY3J0YywKIAkJCQkJICAgUkFERU9OX0RSTV9RVUVVRV9DTElFTlRfREVGQVVMVCwKIAkJCQkJ ICAgUkFERU9OX0RSTV9RVUVVRV9JRF9ERUZBVUxULAotCQkJCQkgICBkcm1tb2RlX2NydGMsIE5V TEwsCisJCQkJCSAgIGRybW1vZGVfY3J0YywKKwkJCQkJICAgcmFkZW9uX3NjYW5vdXRfZmxpcF9o YW5kbGVyLAogCQkJCQkgICByYWRlb25fc2Nhbm91dF9mbGlwX2Fib3J0KTsKICAgICBpZiAoZHJt X3F1ZXVlX3NlcSA9PSBSQURFT05fRFJNX1FVRVVFX0VSUk9SKSB7CiAJeGY4NkRydk1zZyhzY3Ju LT5zY3JuSW5kZXgsIFhfV0FSTklORywKQEAgLTEwODgsOCArMTExMywxNyBAQCByYWRlb25fc2Nh bm91dF9mbGlwKFNjcmVlblB0ciBwU2NyZWVuLCBSQURFT05JbmZvUHRyIGluZm8sCiAJcmV0dXJu OwogICAgIH0KIAorICAgIGRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nID0KKwlyYWRlb25fcGl4 bWFwX2dldF9mYihkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9pZF0ucGl4bWFwKTsKKyAg ICBpZiAoIWRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nKSB7CisJeGY4NkRydk1zZyhzY3JuLT5z Y3JuSW5kZXgsIFhfV0FSTklORywKKwkJICAgIkZhaWxlZCB0byBnZXQgRkIgZm9yIHNjYW5vdXQg ZmxpcC5cbiIpOworCXJhZGVvbl9kcm1fYWJvcnRfZW50cnkoZHJtX3F1ZXVlX3NlcSk7CisJcmV0 dXJuOworICAgIH0KKwogICAgIGlmIChkcm1tb2RlX3BhZ2VfZmxpcF90YXJnZXRfcmVsYXRpdmUo cFJBREVPTkVudCwgZHJtbW9kZV9jcnRjLAotCQkJCQkgIGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtz Y2Fub3V0X2lkXS5mYl9pZCwKKwkJCQkJICBkcm1tb2RlX2NydGMtPmZsaXBfcGVuZGluZy0+aGFu ZGxlLAogCQkJCQkgIDAsIGRybV9xdWV1ZV9zZXEsIDApICE9IDApIHsKIAl4Zjg2RHJ2TXNnKHNj cm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLCAiZmxpcCBxdWV1ZSBmYWlsZWQgaW4gJXM6ICVzXG4i LAogCQkgICBfX2Z1bmNfXywgc3RyZXJyb3IoZXJybm8pKTsKQEAgLTEwOTksNyArMTEzMyw2IEBA IHJhZGVvbl9zY2Fub3V0X2ZsaXAoU2NyZWVuUHRyIHBTY3JlZW4sIFJBREVPTkluZm9QdHIgaW5m bywKIAogICAgIGRybW1vZGVfY3J0Yy0+c2Nhbm91dF9pZCA9IHNjYW5vdXRfaWQ7CiAgICAgZHJt bW9kZV9jcnRjLT5zY2Fub3V0X3VwZGF0ZV9wZW5kaW5nID0gVFJVRTsKLSAgICBkcm1tb2RlX2Ny dGMtPmZsaXBfcGVuZGluZyA9IFRSVUU7CiB9CiAKIHN0YXRpYyB2b2lkIFJBREVPTkJsb2NrSGFu ZGxlcl9LTVMoQkxPQ0tIQU5ETEVSX0FSR1NfREVDTCkKQEAgLTExMTQsNiArMTE0NywxOSBAQCBz dGF0aWMgdm9pZCBSQURFT05CbG9ja0hhbmRsZXJfS01TKEJMT0NLSEFORExFUl9BUkdTX0RFQ0wp CiAgICAgKCpwU2NyZWVuLT5CbG9ja0hhbmRsZXIpIChCTE9DS0hBTkRMRVJfQVJHUyk7CiAgICAg cFNjcmVlbi0+QmxvY2tIYW5kbGVyID0gUkFERU9OQmxvY2tIYW5kbGVyX0tNUzsKIAorICAgIGlm ICghcFNjcm4tPnZ0U2VtYSkgeworCXJhZGVvbl9jc19mbHVzaF9pbmRpcmVjdChwU2Nybik7CisK Kwlmb3IgKGMgPSAwOyBjIDwgeGY4Nl9jb25maWctPm51bV9jcnRjOyBjKyspIHsKKwkgICAgZHJt bW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YyA9CisJCXhmODZfY29uZmlnLT5jcnRj W2NdLT5kcml2ZXJfcHJpdmF0ZTsKKworCSAgICBkcm1tb2RlX2ZiX3JlZmVyZW5jZShpbmZvLT5k cm1tb2RlLmZkLCAmZHJtbW9kZV9jcnRjLT5mYiwgTlVMTCk7CisJfQorCisJcmV0dXJuOworICAg IH0KKwogICAgIGlmICghcmFkZW9uX2lzX2dwdV9zY3JlZW4ocFNjcmVlbikpCiAgICAgewogCWZv ciAoYyA9IDA7IGMgPCB4Zjg2X2NvbmZpZy0+bnVtX2NydGM7IGMrKykgewpkaWZmIC0tZ2l0IGEv c3JjL3JhZGVvbl9wcmVzZW50LmMgYi9zcmMvcmFkZW9uX3ByZXNlbnQuYwppbmRleCA5MDYzMmQw ZWMuLjYzNWQxMDg2MSAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbl9wcmVzZW50LmMKKysrIGIvc3Jj L3JhZGVvbl9wcmVzZW50LmMKQEAgLTM3Myw3ICszNzMsNiBAQCByYWRlb25fcHJlc2VudF91bmZs aXAoU2NyZWVuUHRyIHNjcmVlbiwgdWludDY0X3QgZXZlbnRfaWQpCiAgICAgZW51bSBkcm1tb2Rl X2ZsaXBfc3luYyBmbGlwX3N5bmMgPQogCShyYWRlb25fcHJlc2VudF9zY3JlZW5faW5mby5jYXBh YmlsaXRpZXMgJiBQcmVzZW50Q2FwYWJpbGl0eUFzeW5jKSA/CiAJRkxJUF9BU1lOQyA6IEZMSVBf VlNZTkM7Ci0gICAgaW50IG9sZF9mYl9pZDsKICAgICBpbnQgaTsKIAogICAgIHJhZGVvbl9jc19m bHVzaF9pbmRpcmVjdChzY3JuKTsKQEAgLTM5NiwxMiArMzk1LDYgQEAgcmFkZW9uX3ByZXNlbnRf dW5mbGlwKFNjcmVlblB0ciBzY3JlZW4sIHVpbnQ2NF90IGV2ZW50X2lkKQogCXJldHVybjsKIAog bW9kZXNldDoKLSAgICAvKiBpbmZvLT5kcm1tb2RlLmZiX2lkIHN0aWxsIHBvaW50cyB0byB0aGUg RkIgZm9yIHRoZSBsYXN0IGZsaXBwZWQgQk8uCi0gICAgICogQ2xlYXIgaXQsIGRybW1vZGVfc2V0 X21vZGVfbWFqb3Igd2lsbCByZS1jcmVhdGUgaXQKLSAgICAgKi8KLSAgICBvbGRfZmJfaWQgPSBp bmZvLT5kcm1tb2RlLmZiX2lkOwotICAgIGluZm8tPmRybW1vZGUuZmJfaWQgPSAwOwotCiAgICAg cmFkZW9uX2JvX3dhaXQoaW5mby0+ZnJvbnRfYm8pOwogICAgIGZvciAoaSA9IDA7IGkgPCBjb25m aWctPm51bV9jcnRjOyBpKyspIHsKIAl4Zjg2Q3J0Y1B0ciBjcnRjID0gY29uZmlnLT5jcnRjW2ld OwpAQCAtNDE3LDcgKzQxMCw2IEBAIG1vZGVzZXQ6CiAJICAgIGRybW1vZGVfY3J0Yy0+bmVlZF9t b2Rlc2V0ID0gVFJVRTsKICAgICB9CiAKLSAgICBkcm1Nb2RlUm1GQihpbmZvLT5kcm1tb2RlLmZk LCBvbGRfZmJfaWQpOwogICAgIHByZXNlbnRfZXZlbnRfbm90aWZ5KGV2ZW50X2lkLCAwLCAwKTsK IAogICAgIGluZm8tPmRybW1vZGUucHJlc2VudF9mbGlwcGluZyA9IEZBTFNFOwotLSAKMi4xMS4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4 IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK