From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-ati 09/10] Add struct radeon_buffer Date: Thu, 5 Jul 2018 14:13:06 +0200 Message-ID: <20180705121307.7835-10-michel@daenzer.net> References: <20180705121307.7835-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180705121307.7835-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+CgpJbnNwaXJlZCBi eSBhbWRncHUsIHByZXBhcmF0aW9uIGZvciB0aGUgZm9sbG93aW5nIGNoYW5nZS4gRm9yIG5vdywg dGhpcwppcyBtb3N0bHkgYSB3cmFwcGVyIGFyb3VuZCBzdHJ1Y3QgcmFkZW9uX2JvLCBubyBmdW5j dGlvbmFsIGNoYW5nZQppbnRlbmRlZC4KClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBEw6RuemVyIDxt aWNoZWwuZGFlbnplckBhbWQuY29tPgotLS0KIHNyYy9kcm1tb2RlX2Rpc3BsYXkuYyAgICAgICAg ICAgICAgIHwgMTIzICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIHNyYy9kcm1tb2RlX2Rp c3BsYXkuaCAgICAgICAgICAgICAgIHwgICAyICstCiBzcmMvZXZlcmdyZWVuX2V4YS5jICAgICAg ICAgICAgICAgICB8ICA0MCArKysrLS0tLS0KIHNyYy9ldmVyZ3JlZW5fc3RhdGUuaCAgICAgICAg ICAgICAgIHwgICAxIC0KIHNyYy9ldmVyZ3JlZW5fdGV4dHVyZWRfdmlkZW9mdW5jcy5jIHwgICAy ICstCiBzcmMvcjYwMF9leGEuYyAgICAgICAgICAgICAgICAgICAgICB8ICA0MCArKysrLS0tLS0K IHNyYy9yNjAwX3N0YXRlLmggICAgICAgICAgICAgICAgICAgIHwgICAxIC0KIHNyYy9yNjAwX3Rl eHR1cmVkX3ZpZGVvZnVuY3MuYyAgICAgIHwgICAyICstCiBzcmMvcmFkZW9uLmggICAgICAgICAg ICAgICAgICAgICAgICB8ICAzMSArKysrLS0tCiBzcmMvcmFkZW9uX2JvX2hlbHBlci5jICAgICAg ICAgICAgICB8ICAzNCArKysrKy0tLQogc3JjL3JhZGVvbl9ib19oZWxwZXIuaCAgICAgICAgICAg ICAgfCAgMzggKysrKysrKystCiBzcmMvcmFkZW9uX2RyaTIuYyAgICAgICAgICAgICAgICAgICB8 ICAyMiArKy0tLQogc3JjL3JhZGVvbl9kcmkzLmMgICAgICAgICAgICAgICAgICAgfCAgIDQgKy0K IHNyYy9yYWRlb25fZXhhLmMgICAgICAgICAgICAgICAgICAgIHwgIDE3ICsrLS0KIHNyYy9yYWRl b25fZXhhX2Z1bmNzLmMgICAgICAgICAgICAgIHwgIDQzICsrKysrLS0tLS0KIHNyYy9yYWRlb25f ZXhhX3NoYXJlZC5jICAgICAgICAgICAgIHwgICAyICstCiBzcmMvcmFkZW9uX2V4YV9zaGFyZWQu aCAgICAgICAgICAgICB8ICAgMyArLQogc3JjL3JhZGVvbl9nbGFtb3IuYyAgICAgICAgICAgICAg ICAgfCAgMTAgKy0tCiBzcmMvcmFkZW9uX2dsYW1vcl93cmFwcGVycy5jICAgICAgICB8ICAgNiAr LQogc3JjL3JhZGVvbl9rbXMuYyAgICAgICAgICAgICAgICAgICAgfCAxMDQgKysrKysrKystLS0t LS0tLS0tLS0tLS0KIHNyYy9yYWRlb25fcHJlc2VudC5jICAgICAgICAgICAgICAgIHwgICAyICst CiBzcmMvcmFkZW9uX3RleHR1cmVkX3ZpZGVvZnVuY3MuYyAgICB8ICAyNCArKysrLS0KIDIyIGZp bGVzIGNoYW5nZWQsIDI2NyBpbnNlcnRpb25zKCspLCAyODQgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvc3JjL2RybW1vZGVfZGlzcGxheS5jIGIvc3JjL2RybW1vZGVfZGlzcGxheS5jCmluZGV4 IDNjNGQ5NGZkOS4uYzkxZjViYjIwIDEwMDY0NAotLS0gYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmMK KysrIGIvc3JjL2RybW1vZGVfZGlzcGxheS5jCkBAIC0xMTEsNyArMTExLDcgQEAgc3RhdGljIFBp eG1hcFB0ciBkcm1tb2RlX2NyZWF0ZV9ib19waXhtYXAoU2NybkluZm9QdHIgcFNjcm4sCiAJCQkJ CSAgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LAogCQkJCQkgIGludCBkZXB0aCwgaW50IGJwcCwKIAkJ CQkJICBpbnQgcGl0Y2gsCi0JCQkJCSAgc3RydWN0IHJhZGVvbl9ibyAqYm8pCisJCQkJCSAgc3Ry dWN0IHJhZGVvbl9idWZmZXIgKmJvKQogewogCVJBREVPTkluZm9QdHIgaW5mbyA9IFJBREVPTlBU UihwU2Nybik7CiAJU2NyZWVuUHRyIHBTY3JlZW4gPSBwU2Nybi0+cFNjcmVlbjsKQEAgLTM3OSw3 ICszNzksNyBAQCBjcmVhdGVfcGl4bWFwX2Zvcl9mYmNvbihkcm1tb2RlX3B0ciBkcm1tb2RlLAog CVJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihwU2Nybik7CiAJUkFERU9O SW5mb1B0ciBpbmZvID0gUkFERU9OUFRSKHBTY3JuKTsKIAlQaXhtYXBQdHIgcGl4bWFwID0gaW5m by0+ZmJjb25fcGl4bWFwOwotCXN0cnVjdCByYWRlb25fYm8gKmJvOworCXN0cnVjdCByYWRlb25f YnVmZmVyICpibzsKIAlkcm1Nb2RlRkJQdHIgZmJjb247CiAJc3RydWN0IGRybV9nZW1fZmxpbmsg Zmxpbms7CiAKQEAgLTQwMiwxMCArNDAyLDE4IEBAIGNyZWF0ZV9waXhtYXBfZm9yX2ZiY29uKGRy bW1vZGVfcHRyIGRybW1vZGUsCiAJCWdvdG8gb3V0X2ZyZWVfZmI7CiAJfQogCi0JYm8gPSByYWRl b25fYm9fb3Blbihkcm1tb2RlLT5idWZtZ3IsIGZsaW5rLm5hbWUsIDAsIDAsIDAsIDApOworCWJv ID0gY2FsbG9jKDEsIHNpemVvZihzdHJ1Y3QgcmFkZW9uX2J1ZmZlcikpOworCWlmICghYm8pIHsK KwkJeGY4NkRydk1zZyhwU2Nybi0+c2NybkluZGV4LCBYX0VSUk9SLAorCQkJICAgIkNvdWxkbid0 IGFsbG9jYXRlIEJPIGZvciBmYmNvbiBoYW5kbGVcbiIpOworCQlnb3RvIG91dF9mcmVlX2ZiOwor CX0KKwliby0+cmVmX2NvdW50ID0gMTsKKworCWJvLT5iby5yYWRlb24gPSByYWRlb25fYm9fb3Bl bihkcm1tb2RlLT5idWZtZ3IsIGZsaW5rLm5hbWUsIDAsIDAsIDAsIDApOwogCWlmIChibyA9PSBO VUxMKSB7CiAJCXhmODZEcnZNc2cocFNjcm4tPnNjcm5JbmRleCwgWF9FUlJPUiwKLQkJCSAgICJD b3VsZG4ndCBhbGxvY2F0ZSBibyBmb3IgZmJjb24gaGFuZGxlXG4iKTsKKwkJCSAgICJDb3VsZG4n dCBvcGVuIEJPIGZvciBmYmNvbiBoYW5kbGVcbiIpOwogCQlnb3RvIG91dF9mcmVlX2ZiOwogCX0K IApAQCAtNDEzLDcgKzQyMSw3IEBAIGNyZWF0ZV9waXhtYXBfZm9yX2ZiY29uKGRybW1vZGVfcHRy IGRybW1vZGUsCiAJCQkJCSAgZmJjb24tPmRlcHRoLCBmYmNvbi0+YnBwLCBmYmNvbi0+cGl0Y2gs CiAJCQkJCSAgYm8pOwogCWluZm8tPmZiY29uX3BpeG1hcCA9IHBpeG1hcDsKLQlyYWRlb25fYm9f dW5yZWYoYm8pOworCXJhZGVvbl9idWZmZXJfdW5yZWYoJmJvKTsKIG91dF9mcmVlX2ZiOgogCWRy bU1vZGVGcmVlRkIoZmJjb24pOwogCXJldHVybiBwaXhtYXA7CkBAIC00OTYsMTEgKzUwNCw3IEBA IGRybW1vZGVfY3J0Y19zY2Fub3V0X2Rlc3Ryb3koZHJtbW9kZV9wdHIgZHJtbW9kZSwKIAkJc2Nh bm91dC0+cGl4bWFwID0gTlVMTDsKIAl9CiAKLQlpZiAoc2Nhbm91dC0+Ym8pIHsKLQkJcmFkZW9u X2JvX3VubWFwKHNjYW5vdXQtPmJvKTsKLQkJcmFkZW9uX2JvX3VucmVmKHNjYW5vdXQtPmJvKTsK LQkJc2Nhbm91dC0+Ym8gPSBOVUxMOwotCX0KKwlyYWRlb25fYnVmZmVyX3VucmVmKCZzY2Fub3V0 LT5ibyk7CiB9CiAKIHZvaWQKQEAgLTkxMyw3ICs5MTcsNyBAQCBkcm1tb2RlX3NldF9tb2RlX21h am9yKHhmODZDcnRjUHRyIGNydGMsIERpc3BsYXlNb2RlUHRyIG1vZGUsCiAJCQlmYiA9IHJhZGVv bl9mYl9jcmVhdGUocFNjcm4sIHBSQURFT05FbnQtPmZkLAogCQkJCQkgICAgICBwU2Nybi0+dmly dHVhbFgsIHBTY3JuLT52aXJ0dWFsWSwKIAkJCQkJICAgICAgcFNjcm4tPmRpc3BsYXlXaWR0aCAq IGluZm8tPnBpeGVsX2J5dGVzLAotCQkJCQkgICAgICBpbmZvLT5mcm9udF9iby0+aGFuZGxlKTsK KwkJCQkJICAgICAgaW5mby0+ZnJvbnRfYnVmZmVyLT5iby5yYWRlb24tPmhhbmRsZSk7CiAJCQkv KiBQcmV2ZW50IHJlZmNudCBvZiBhZC1ob2MgRkJzIGZyb20gcmVhY2hpbmcgMiAqLwogCQkJZHJt bW9kZV9mYl9yZWZlcmVuY2UocFJBREVPTkVudC0+ZmQsICZkcm1tb2RlX2NydGMtPmZiLCBOVUxM KTsKIAkJCWRybW1vZGVfY3J0Yy0+ZmIgPSBmYjsKQEAgLTIyMzIsMTQgKzIyMzYsMTIgQEAgZHJt bW9kZV94Zjg2Y3J0Y19yZXNpemUgKFNjcm5JbmZvUHRyIHNjcm4sIGludCB3aWR0aCwgaW50IGhl aWdodCkKIHsKIAl4Zjg2Q3J0Y0NvbmZpZ1B0ciB4Zjg2X2NvbmZpZyA9IFhGODZfQ1JUQ19DT05G SUdfUFRSKHNjcm4pOwogCVJBREVPTkluZm9QdHIgaW5mbyA9IFJBREVPTlBUUihzY3JuKTsKLQlz dHJ1Y3QgcmFkZW9uX2JvICpvbGRfZnJvbnQgPSBOVUxMOworCXN0cnVjdCByYWRlb25fYnVmZmVy ICpvbGRfZnJvbnQgPSBOVUxMOwogCVNjcmVlblB0ciAgIHNjcmVlbiA9IHhmODZTY3JuVG9TY3Jl ZW4oc2Nybik7CiAJaW50CSAgICBpLCBwaXRjaCwgb2xkX3dpZHRoLCBvbGRfaGVpZ2h0LCBvbGRf cGl0Y2g7Ci0JaW50IGFsaWduZWRfaGVpZ2h0OwotCXVpbnQzMl90IHNjcmVlbl9zaXplOworCWlu dCB1c2FnZSA9IENSRUFURV9QSVhNQVBfVVNBR0VfQkFDS0lOR19QSVhNQVA7CiAJaW50IGNwcCA9 IGluZm8tPnBpeGVsX2J5dGVzOwotCXN0cnVjdCByYWRlb25fc3VyZmFjZSBzdXJmYWNlOwotCXVp bnQzMl90IHRpbGluZ19mbGFncyA9IDAsIGJhc2VfYWxpZ247CisJdWludDMyX3QgdGlsaW5nX2Zs YWdzOwogCVBpeG1hcFB0ciBwcGl4ID0gc2NyZWVuLT5HZXRTY3JlZW5QaXhtYXAoc2NyZWVuKTsK IAl2b2lkICpmYl9zaGFkb3c7CiAKQEAgLTIyNDcsNzEgKzIyNDksMzQgQEAgZHJtbW9kZV94Zjg2 Y3J0Y19yZXNpemUgKFNjcm5JbmZvUHRyIHNjcm4sIGludCB3aWR0aCwgaW50IGhlaWdodCkKIAkJ cmV0dXJuIFRSVUU7CiAKIAlpZiAoaW5mby0+YWxsb3dDb2xvclRpbGluZyAmJiAhaW5mby0+c2hh ZG93X3ByaW1hcnkpIHsKLQkJaWYgKGluZm8tPkNoaXBGYW1pbHkgPj0gQ0hJUF9GQU1JTFlfUjYw MCkgewotCQkJaWYgKGluZm8tPmFsbG93Q29sb3JUaWxpbmcyRCkgewotCQkJCXRpbGluZ19mbGFn cyB8PSBSQURFT05fVElMSU5HX01BQ1JPOwotCQkJfSBlbHNlIHsKLQkJCQl0aWxpbmdfZmxhZ3Mg fD0gUkFERU9OX1RJTElOR19NSUNSTzsKLQkJCX0KLQkJfSBlbHNlCi0JCQl0aWxpbmdfZmxhZ3Mg fD0gUkFERU9OX1RJTElOR19NQUNSTzsKLQl9Ci0KLQlwaXRjaCA9IFJBREVPTl9BTElHTih3aWR0 aCwgZHJtbW9kZV9nZXRfcGl0Y2hfYWxpZ24oc2NybiwgY3BwLCB0aWxpbmdfZmxhZ3MpKSAqIGNw cDsKLQlhbGlnbmVkX2hlaWdodCA9IFJBREVPTl9BTElHTihoZWlnaHQsIGRybW1vZGVfZ2V0X2hl aWdodF9hbGlnbihzY3JuLCB0aWxpbmdfZmxhZ3MpKTsKLQlzY3JlZW5fc2l6ZSA9IFJBREVPTl9B TElHTihwaXRjaCAqIGFsaWduZWRfaGVpZ2h0LCBSQURFT05fR1BVX1BBR0VfU0laRSk7Ci0JYmFz ZV9hbGlnbiA9IDQwOTY7Ci0KLQlpZiAoaW5mby0+c3VyZl9tYW4pIHsKLQkJaWYgKCFyYWRlb25f c3VyZmFjZV9pbml0aWFsaXplKGluZm8sICZzdXJmYWNlLCB3aWR0aCwgaGVpZ2h0LAotCQkJCQkg ICAgICAgY3BwLCB0aWxpbmdfZmxhZ3MsIDApKQotCQkJcmV0dXJuIEZBTFNFOwotCi0JCXNjcmVl bl9zaXplID0gc3VyZmFjZS5ib19zaXplOwotCQliYXNlX2FsaWduID0gc3VyZmFjZS5ib19hbGln bm1lbnQ7Ci0JCXBpdGNoID0gc3VyZmFjZS5sZXZlbFswXS5waXRjaF9ieXRlczsKLQkJdGlsaW5n X2ZsYWdzID0gMDsKLQkJc3dpdGNoIChzdXJmYWNlLmxldmVsWzBdLm1vZGUpIHsKLQkJY2FzZSBS QURFT05fU1VSRl9NT0RFXzJEOgotCQkJdGlsaW5nX2ZsYWdzIHw9IFJBREVPTl9USUxJTkdfTUFD Uk87Ci0JCQl0aWxpbmdfZmxhZ3MgfD0gc3VyZmFjZS5iYW5rdyA8PCBSQURFT05fVElMSU5HX0VH X0JBTktXX1NISUZUOwotCQkJdGlsaW5nX2ZsYWdzIHw9IHN1cmZhY2UuYmFua2ggPDwgUkFERU9O X1RJTElOR19FR19CQU5LSF9TSElGVDsKLQkJCXRpbGluZ19mbGFncyB8PSBzdXJmYWNlLm10aWxl YSA8PCBSQURFT05fVElMSU5HX0VHX01BQ1JPX1RJTEVfQVNQRUNUX1NISUZUOwotCQkJaWYgKHN1 cmZhY2UudGlsZV9zcGxpdCkKLQkJCQl0aWxpbmdfZmxhZ3MgfD0gZWdfdGlsZV9zcGxpdChzdXJm YWNlLnRpbGVfc3BsaXQpCi0JCQkJCQk8PCBSQURFT05fVElMSU5HX0VHX1RJTEVfU1BMSVRfU0hJ RlQ7Ci0JCQlicmVhazsKLQkJY2FzZSBSQURFT05fU1VSRl9NT0RFXzFEOgotCQkJdGlsaW5nX2Zs YWdzIHw9IFJBREVPTl9USUxJTkdfTUlDUk87Ci0JCQlicmVhazsKLQkJZGVmYXVsdDoKLQkJCWJy ZWFrOwotCQl9Ci0JCWlmICghaW5mby0+dXNlX2dsYW1vcikKLQkJCWluZm8tPmZyb250X3N1cmZh Y2UgPSBzdXJmYWNlOworCQlpZiAoaW5mby0+Q2hpcEZhbWlseSA8IENISVBfRkFNSUxZX1I2MDAg fHwgaW5mby0+YWxsb3dDb2xvclRpbGluZzJEKQorCQkJdXNhZ2UgfD0gUkFERU9OX0NSRUFURV9Q SVhNQVBfVElMSU5HX01BQ1JPOworCQllbHNlCisJCQl1c2FnZSB8PSBSQURFT05fQ1JFQVRFX1BJ WE1BUF9USUxJTkdfTUlDUk87CiAJfQogCi0JeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhf SU5GTywKLQkJICAgIkFsbG9jYXRlIG5ldyBmcmFtZSBidWZmZXIgJWR4JWQgc3RyaWRlICVkXG4i LAotCQkgICB3aWR0aCwgaGVpZ2h0LCBwaXRjaCAvIGNwcCk7CisJeGY4NkRydk1zZyhzY3JuLT5z Y3JuSW5kZXgsIFhfSU5GTywgIkFsbG9jYXRlIG5ldyBmcmFtZSBidWZmZXIgJWR4JWRcbiIsCisJ CSAgIHdpZHRoLCBoZWlnaHQpOwogCiAJb2xkX3dpZHRoID0gc2Nybi0+dmlydHVhbFg7CiAJb2xk X2hlaWdodCA9IHNjcm4tPnZpcnR1YWxZOwogCW9sZF9waXRjaCA9IHNjcm4tPmRpc3BsYXlXaWR0 aDsKLQlvbGRfZnJvbnQgPSBpbmZvLT5mcm9udF9ibzsKKwlvbGRfZnJvbnQgPSBpbmZvLT5mcm9u dF9idWZmZXI7CiAKIAlzY3JuLT52aXJ0dWFsWCA9IHdpZHRoOwogCXNjcm4tPnZpcnR1YWxZID0g aGVpZ2h0OwotCXNjcm4tPmRpc3BsYXlXaWR0aCA9IHBpdGNoIC8gY3BwOwogCi0JaW5mby0+ZnJv bnRfYm8gPSByYWRlb25fYm9fb3BlbihpbmZvLT5idWZtZ3IsIDAsIHNjcmVlbl9zaXplLCBiYXNl X2FsaWduLAotCQkJCQlpbmZvLT5zaGFkb3dfcHJpbWFyeSA/Ci0JCQkJCVJBREVPTl9HRU1fRE9N QUlOX0dUVCA6Ci0JCQkJCVJBREVPTl9HRU1fRE9NQUlOX1ZSQU0sCi0JCQkJCXRpbGluZ19mbGFn cyA/IFJBREVPTl9HRU1fTk9fQ1BVX0FDQ0VTUyA6IDApOwotCWlmICghaW5mby0+ZnJvbnRfYm8p CisJaW5mby0+ZnJvbnRfYnVmZmVyID0gcmFkZW9uX2FsbG9jX3BpeG1hcF9ibyhzY3JuLCBzY3Ju LT52aXJ0dWFsWCwKKwkJCQkJCSAgICBzY3JuLT52aXJ0dWFsWSwgc2Nybi0+ZGVwdGgsCisJCQkJ CQkgICAgdXNhZ2UsIHNjcm4tPmJpdHNQZXJQaXhlbCwKKwkJCQkJCSAgICAmcGl0Y2gsCisJCQkJ CQkgICAgJmluZm8tPmZyb250X3N1cmZhY2UsCisJCQkJCQkgICAgJnRpbGluZ19mbGFncyk7CisJ aWYgKCFpbmZvLT5mcm9udF9idWZmZXIpCiAJCWdvdG8gZmFpbDsKIAorCXNjcm4tPmRpc3BsYXlX aWR0aCA9IHBpdGNoIC8gY3BwOworCiAjaWYgWF9CWVRFX09SREVSID09IFhfQklHX0VORElBTgog CXN3aXRjaCAoY3BwKSB7CiAJY2FzZSA0OgpAQCAtMjMyNiw3ICsyMjkxLDcgQEAgZHJtbW9kZV94 Zjg2Y3J0Y19yZXNpemUgKFNjcm5JbmZvUHRyIHNjcm4sIGludCB3aWR0aCwgaW50IGhlaWdodCkK IAkgICAgdGlsaW5nX2ZsYWdzIHw9IFJBREVPTl9USUxJTkdfU1VSRkFDRTsKICNlbmRpZgogCWlm ICh0aWxpbmdfZmxhZ3MpCi0JICAgIHJhZGVvbl9ib19zZXRfdGlsaW5nKGluZm8tPmZyb250X2Jv LCB0aWxpbmdfZmxhZ3MsIHBpdGNoKTsKKwkgICAgcmFkZW9uX2JvX3NldF90aWxpbmcoaW5mby0+ ZnJvbnRfYnVmZmVyLT5iby5yYWRlb24sIHRpbGluZ19mbGFncywgcGl0Y2gpOwogCiAJaWYgKCFp bmZvLT5yNjAwX3NoYWRvd19mYikgewogCQlpZiAoaW5mby0+c3VyZl9tYW4gJiYgIWluZm8tPnVz ZV9nbGFtb3IpCkBAIC0yMzM0LDkgKzIyOTksOSBAQCBkcm1tb2RlX3hmODZjcnRjX3Jlc2l6ZSAo U2NybkluZm9QdHIgc2NybiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogCQlzY3JlZW4tPk1vZGlm eVBpeG1hcEhlYWRlcihwcGl4LAogCQkJCQkgICB3aWR0aCwgaGVpZ2h0LCAtMSwgLTEsIHBpdGNo LCBOVUxMKTsKIAl9IGVsc2UgewotCQlpZiAocmFkZW9uX2JvX21hcChpbmZvLT5mcm9udF9ibywg MSkpCisJCWlmIChyYWRlb25fYm9fbWFwKGluZm8tPmZyb250X2J1ZmZlci0+Ym8ucmFkZW9uLCAx KSkKIAkJCWdvdG8gZmFpbDsKLQkJZmJfc2hhZG93ID0gY2FsbG9jKDEsIHNjcmVlbl9zaXplKTsK KwkJZmJfc2hhZG93ID0gY2FsbG9jKDEsIHBpdGNoICogc2Nybi0+dmlydHVhbFkpOwogCQlpZiAo ZmJfc2hhZG93ID09IE5VTEwpCiAJCQlnb3RvIGZhaWw7CiAJCWZyZWUoaW5mby0+ZmJfc2hhZG93 KTsKQEAgLTIzNTAsMTIgKzIzMTUsMTIgQEAgZHJtbW9kZV94Zjg2Y3J0Y19yZXNpemUgKFNjcm5J bmZvUHRyIHNjcm4sIGludCB3aWR0aCwgaW50IGhlaWdodCkKIAkJcmFkZW9uX2dsYW1vcl9jcmVh dGVfc2NyZWVuX3Jlc291cmNlcyhzY3JuLT5wU2NyZWVuKTsKIAogCWlmICghaW5mby0+cjYwMF9z aGFkb3dfZmIpIHsKLQkJaWYgKCFyYWRlb25fc2V0X3BpeG1hcF9ibyhwcGl4LCBpbmZvLT5mcm9u dF9ibykpCisJCWlmICghcmFkZW9uX3NldF9waXhtYXBfYm8ocHBpeCwgaW5mby0+ZnJvbnRfYnVm ZmVyKSkKIAkJCWdvdG8gZmFpbDsKIAl9CiAKIAlyYWRlb25fcGl4bWFwX2NsZWFyKHBwaXgpOwot CXJhZGVvbl9maW5pc2goc2NybiwgaW5mby0+ZnJvbnRfYm8pOworCXJhZGVvbl9maW5pc2goc2Ny biwgaW5mby0+ZnJvbnRfYnVmZmVyKTsKIAogCWZvciAoaSA9IDA7IGkgPCB4Zjg2X2NvbmZpZy0+ bnVtX2NydGM7IGkrKykgewogCQl4Zjg2Q3J0Y1B0ciBjcnRjID0geGY4Nl9jb25maWctPmNydGNb aV07CkBAIC0yMzY3LDE2ICsyMzMyLDE0IEBAIGRybW1vZGVfeGY4NmNydGNfcmVzaXplIChTY3Ju SW5mb1B0ciBzY3JuLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAJCQkJICAgICAgIGNydGMtPnJv dGF0aW9uLCBjcnRjLT54LCBjcnRjLT55KTsKIAl9CiAKLQlpZiAob2xkX2Zyb250KQotCQlyYWRl b25fYm9fdW5yZWYob2xkX2Zyb250KTsKKwlyYWRlb25fYnVmZmVyX3VucmVmKCZvbGRfZnJvbnQp OwogCi0JcmFkZW9uX2ttc191cGRhdGVfdnJhbV9saW1pdChzY3JuLCBzY3JlZW5fc2l6ZSk7CisJ cmFkZW9uX2ttc191cGRhdGVfdnJhbV9saW1pdChzY3JuLCBwaXRjaCAqIHNjcm4tPnZpcnR1YWxZ KTsKIAlyZXR1cm4gVFJVRTsKIAogIGZhaWw6Ci0JaWYgKGluZm8tPmZyb250X2JvKQotCQlyYWRl b25fYm9fdW5yZWYoaW5mby0+ZnJvbnRfYm8pOwotCWluZm8tPmZyb250X2JvID0gb2xkX2Zyb250 OworCXJhZGVvbl9idWZmZXJfdW5yZWYoJmluZm8tPmZyb250X2J1ZmZlcik7CisJaW5mby0+ZnJv bnRfYnVmZmVyID0gb2xkX2Zyb250OwogCXNjcm4tPnZpcnR1YWxYID0gb2xkX3dpZHRoOwogCXNj cm4tPnZpcnR1YWxZID0gb2xkX2hlaWdodDsKIAlzY3JuLT5kaXNwbGF5V2lkdGggPSBvbGRfcGl0 Y2g7CmRpZmYgLS1naXQgYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmggYi9zcmMvZHJtbW9kZV9kaXNw bGF5LmgKaW5kZXggZTBiOTdlNzIxLi4yMzQ2MGZkYzAgMTAwNjQ0Ci0tLSBhL3NyYy9kcm1tb2Rl X2Rpc3BsYXkuaAorKysgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmgKQEAgLTcyLDcgKzcyLDcgQEAg c3RydWN0IGRybW1vZGVfZmIgewogfTsKIAogc3RydWN0IGRybW1vZGVfc2Nhbm91dCB7Ci0gICAg c3RydWN0IHJhZGVvbl9ibyAqYm87CisgICAgc3RydWN0IHJhZGVvbl9idWZmZXIgKmJvOwogICAg IFBpeG1hcFB0ciBwaXhtYXA7CiAgICAgaW50IHdpZHRoLCBoZWlnaHQ7CiB9OwpkaWZmIC0tZ2l0 IGEvc3JjL2V2ZXJncmVlbl9leGEuYyBiL3NyYy9ldmVyZ3JlZW5fZXhhLmMKaW5kZXggNDFlZGQz NDUzLi5kYWU4YjZhMTUgMTAwNjQ0Ci0tLSBhL3NyYy9ldmVyZ3JlZW5fZXhhLmMKKysrIGIvc3Jj L2V2ZXJncmVlbl9leGEuYwpAQCAtNzEsNyArNzEsNyBAQCBFVkVSR1JFRU5QcmVwYXJlU29saWQo UGl4bWFwUHRyIHBQaXgsIGludCBhbHUsIFBpeGVsIHBtLCBQaXhlbCBmZykKICAgICBpZiAoIVJB REVPTlZhbGlkUE0ocG0sIHBQaXgtPmRyYXdhYmxlLmJpdHNQZXJQaXhlbCkpCiAJUkFERU9OX0ZB TExCQUNLKCgiaW52YWxpZCBwbGFuZW1hc2tcbiIpKTsKIAotICAgIGRzdC5ibyA9IHJhZGVvbl9n ZXRfcGl4bWFwX2JvKHBQaXgpOworICAgIGRzdC5ibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBQ aXgpLT5iby5yYWRlb247CiAgICAgZHN0LnRpbGluZ19mbGFncyA9IHJhZGVvbl9nZXRfcGl4bWFw X3RpbGluZyhwUGl4KTsKICAgICBkc3Quc3VyZmFjZSA9IHJhZGVvbl9nZXRfcGl4bWFwX3N1cmZh Y2UocFBpeCk7CiAKQEAgLTQ2NiwxMyArNDY2LDEzIEBAIEVWRVJHUkVFTlByZXBhcmVDb3B5KFBp eG1hcFB0ciBwU3JjLCAgIFBpeG1hcFB0ciBwRHN0LAogCiAgICAgYWNjZWxfc3RhdGUtPnNhbWVf c3VyZmFjZSA9IEZBTFNFOwogCi0gICAgc3JjX29iai5ibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2Jv KHBTcmMpOwotICAgIGRzdF9vYmouYm8gPSByYWRlb25fZ2V0X3BpeG1hcF9ibyhwRHN0KTsKKyAg ICBzcmNfb2JqLmJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8ocFNyYyktPmJvLnJhZGVvbjsKKyAg ICBkc3Rfb2JqLmJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8ocERzdCktPmJvLnJhZGVvbjsKICAg ICBkc3Rfb2JqLnN1cmZhY2UgPSByYWRlb25fZ2V0X3BpeG1hcF9zdXJmYWNlKHBEc3QpOwogICAg IHNyY19vYmouc3VyZmFjZSA9IHJhZGVvbl9nZXRfcGl4bWFwX3N1cmZhY2UocFNyYyk7CiAgICAg ZHN0X29iai50aWxpbmdfZmxhZ3MgPSByYWRlb25fZ2V0X3BpeG1hcF90aWxpbmcocERzdCk7CiAg ICAgc3JjX29iai50aWxpbmdfZmxhZ3MgPSByYWRlb25fZ2V0X3BpeG1hcF90aWxpbmcocFNyYyk7 Ci0gICAgaWYgKHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBTcmMpID09IHJhZGVvbl9nZXRfcGl4bWFw X2JvKHBEc3QpKQorICAgIGlmIChzcmNfb2JqLmJvID09IGRzdF9vYmouYm8pCiAJYWNjZWxfc3Rh dGUtPnNhbWVfc3VyZmFjZSA9IFRSVUU7CiAKICAgICBzcmNfb2JqLndpZHRoID0gcFNyYy0+ZHJh d2FibGUud2lkdGg7CkBAIC0xMzAxLDcgKzEzMDEsNyBAQCBzdGF0aWMgQm9vbCBFVkVSR1JFRU5Q cmVwYXJlQ29tcG9zaXRlKGludCBvcCwgUGljdHVyZVB0ciBwU3JjUGljdHVyZSwKIAlyZXR1cm4g RkFMU0U7CiAKICAgICBpZiAocFNyYykgewotCXNyY19vYmouYm8gPSByYWRlb25fZ2V0X3BpeG1h cF9ibyhwU3JjKTsKKwlzcmNfb2JqLmJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8ocFNyYyktPmJv LnJhZGVvbjsKIAlzcmNfb2JqLnN1cmZhY2UgPSByYWRlb25fZ2V0X3BpeG1hcF9zdXJmYWNlKHBT cmMpOwogCXNyY19vYmoudGlsaW5nX2ZsYWdzID0gcmFkZW9uX2dldF9waXhtYXBfdGlsaW5nKHBT cmMpOwogCXNyY19vYmoucGl0Y2ggPSBleGFHZXRQaXhtYXBQaXRjaChwU3JjKSAvIChwU3JjLT5k cmF3YWJsZS5iaXRzUGVyUGl4ZWwgLyA4KTsKQEAgLTEzMTEsNyArMTMxMSw3IEBAIHN0YXRpYyBC b29sIEVWRVJHUkVFTlByZXBhcmVDb21wb3NpdGUoaW50IG9wLCBQaWN0dXJlUHRyIHBTcmNQaWN0 dXJlLAogCXNyY19vYmouZG9tYWluID0gUkFERU9OX0dFTV9ET01BSU5fVlJBTSB8IFJBREVPTl9H RU1fRE9NQUlOX0dUVDsKICAgICB9CiAKLSAgICBkc3Rfb2JqLmJvID0gcmFkZW9uX2dldF9waXht YXBfYm8ocERzdCk7CisgICAgZHN0X29iai5ibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBEc3Qp LT5iby5yYWRlb247CiAgICAgZHN0X29iai5zdXJmYWNlID0gcmFkZW9uX2dldF9waXhtYXBfc3Vy ZmFjZShwRHN0KTsKICAgICBkc3Rfb2JqLnRpbGluZ19mbGFncyA9IHJhZGVvbl9nZXRfcGl4bWFw X3RpbGluZyhwRHN0KTsKICAgICBkc3Rfb2JqLnBpdGNoID0gZXhhR2V0UGl4bWFwUGl0Y2gocERz dCkgLyAocERzdC0+ZHJhd2FibGUuYml0c1BlclBpeGVsIC8gOCk7CkBAIC0xMzI1LDcgKzEzMjUs NyBAQCBzdGF0aWMgQm9vbCBFVkVSR1JFRU5QcmVwYXJlQ29tcG9zaXRlKGludCBvcCwgUGljdHVy ZVB0ciBwU3JjUGljdHVyZSwKIAogICAgIGlmIChwTWFza1BpY3R1cmUpIHsKIAlpZiAocE1hc2sp IHsKLQkgICAgbWFza19vYmouYm8gPSByYWRlb25fZ2V0X3BpeG1hcF9ibyhwTWFzayk7CisJICAg IG1hc2tfb2JqLmJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8ocE1hc2spLT5iby5yYWRlb247CiAJ ICAgIG1hc2tfb2JqLnRpbGluZ19mbGFncyA9IHJhZGVvbl9nZXRfcGl4bWFwX3RpbGluZyhwTWFz ayk7CiAJICAgIG1hc2tfb2JqLnBpdGNoID0gZXhhR2V0UGl4bWFwUGl0Y2gocE1hc2spIC8gKHBN YXNrLT5kcmF3YWJsZS5iaXRzUGVyUGl4ZWwgLyA4KTsKIAkgICAgbWFza19vYmouc3VyZmFjZSA9 IHJhZGVvbl9nZXRfcGl4bWFwX3N1cmZhY2UocE1hc2spOwpAQCAtMTY3MywxNiArMTY3MywxNiBA QCBFVkVSR1JFRU5VcGxvYWRUb1NjcmVlbihQaXhtYXBQdHIgcERzdCwgaW50IHgsIGludCB5LCBp bnQgdywgaW50IGgsCiAJcmV0dXJuIEZBTFNFOwogCiAgICAgZHJpdmVyX3ByaXYgPSBleGFHZXRQ aXhtYXBEcml2ZXJQcml2YXRlKHBEc3QpOwotICAgIGlmICghZHJpdmVyX3ByaXYgfHwgIWRyaXZl cl9wcml2LT5ibykKKyAgICBpZiAoIWRyaXZlcl9wcml2IHx8ICFkcml2ZXJfcHJpdi0+Ym8tPmJv LnJhZGVvbikKIAlyZXR1cm4gRkFMU0U7CiAKICAgICAvKiBJZiB3ZSBrbm93IHRoZSBCTyB3b24n dCBiZSBidXN5IC8gaW4gVlJBTSwgZG9uJ3QgYm90aGVyIHdpdGggYSBzY3JhdGNoICovCi0gICAg Y29weV9kc3QgPSBkcml2ZXJfcHJpdi0+Ym87CisgICAgY29weV9kc3QgPSBkcml2ZXJfcHJpdi0+ Ym8tPmJvLnJhZGVvbjsKICAgICBjb3B5X3BpdGNoID0gcERzdC0+ZGV2S2luZDsKICAgICBpZiAo IShkcml2ZXJfcHJpdi0+dGlsaW5nX2ZsYWdzICYgKFJBREVPTl9USUxJTkdfTUFDUk8gfCBSQURF T05fVElMSU5HX01JQ1JPKSkpIHsKLQlpZiAoIXJhZGVvbl9ib19pc19yZWZlcmVuY2VkX2J5X2Nz KGRyaXZlcl9wcml2LT5ibywgaW5mby0+Y3MpKSB7CisJaWYgKCFyYWRlb25fYm9faXNfcmVmZXJl bmNlZF9ieV9jcyhkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbiwgaW5mby0+Y3MpKSB7CiAJICAg IGZsdXNoID0gRkFMU0U7Ci0JICAgIGlmICghcmFkZW9uX2JvX2lzX2J1c3koZHJpdmVyX3ByaXYt PmJvLCAmZHN0X2RvbWFpbikgJiYKKwkgICAgaWYgKCFyYWRlb25fYm9faXNfYnVzeShkcml2ZXJf cHJpdi0+Ym8tPmJvLnJhZGVvbiwgJmRzdF9kb21haW4pICYmCiAJCSEoZHN0X2RvbWFpbiAmIFJB REVPTl9HRU1fRE9NQUlOX1ZSQU0pKQogCQlnb3RvIGNvcHk7CiAJfQpAQCAtMTcxMSw3ICsxNzEx LDcgQEAgRVZFUkdSRUVOVXBsb2FkVG9TY3JlZW4oUGl4bWFwUHRyIHBEc3QsIGludCB4LCBpbnQg eSwgaW50IHcsIGludCBoLAogICAgIGRzdF9vYmouaGVpZ2h0ID0gcERzdC0+ZHJhd2FibGUuaGVp Z2h0OwogICAgIGRzdF9vYmouYnBwID0gYnBwOwogICAgIGRzdF9vYmouZG9tYWluID0gUkFERU9O X0dFTV9ET01BSU5fVlJBTTsKLSAgICBkc3Rfb2JqLmJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8o cERzdCk7CisgICAgZHN0X29iai5ibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBEc3QpLT5iby5y YWRlb247CiAgICAgZHN0X29iai50aWxpbmdfZmxhZ3MgPSByYWRlb25fZ2V0X3BpeG1hcF90aWxp bmcocERzdCk7CiAgICAgZHN0X29iai5zdXJmYWNlID0gcmFkZW9uX2dldF9waXhtYXBfc3VyZmFj ZShwRHN0KTsKIApAQCAtMTczOSw3ICsxNzM5LDcgQEAgY29weToKICAgICByID0gVFJVRTsKICAg ICBzaXplID0gdyAqIGJwcCAvIDg7CiAgICAgZHN0ID0gY29weV9kc3QtPnB0cjsKLSAgICBpZiAo Y29weV9kc3QgPT0gZHJpdmVyX3ByaXYtPmJvKQorICAgIGlmIChjb3B5X2RzdCA9PSBkcml2ZXJf cHJpdi0+Ym8tPmJvLnJhZGVvbikKIAlkc3QgKz0geSAqIGNvcHlfcGl0Y2ggKyB4ICogYnBwIC8g ODsKICAgICBmb3IgKGkgPSAwOyBpIDwgaDsgaSsrKSB7CiAJbWVtY3B5KGRzdCArIGkgKiBjb3B5 X3BpdGNoLCBzcmMsIHNpemUpOwpAQCAtMTc4OSwxNSArMTc4OSwxNSBAQCBFVkVSR1JFRU5Eb3du bG9hZEZyb21TY3JlZW4oUGl4bWFwUHRyIHBTcmMsIGludCB4LCBpbnQgeSwgaW50IHcsCiAJcmV0 dXJuIEZBTFNFOwogCiAgICAgZHJpdmVyX3ByaXYgPSBleGFHZXRQaXhtYXBEcml2ZXJQcml2YXRl KHBTcmMpOwotICAgIGlmICghZHJpdmVyX3ByaXYgfHwgIWRyaXZlcl9wcml2LT5ibykKKyAgICBp ZiAoIWRyaXZlcl9wcml2IHx8ICFkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbikKIAlyZXR1cm4g RkFMU0U7CiAKICAgICAvKiBJZiB3ZSBrbm93IHRoZSBCTyB3b24ndCBlbmQgdXAgaW4gVlJBTSBh bnl3YXksIGRvbid0IGJvdGhlciB3aXRoIGEgc2NyYXRjaCAqLwotICAgIGNvcHlfc3JjID0gZHJp dmVyX3ByaXYtPmJvOworICAgIGNvcHlfc3JjID0gZHJpdmVyX3ByaXYtPmJvLT5iby5yYWRlb247 CiAgICAgY29weV9waXRjaCA9IHBTcmMtPmRldktpbmQ7CiAgICAgaWYgKCEoZHJpdmVyX3ByaXYt PnRpbGluZ19mbGFncyAmIChSQURFT05fVElMSU5HX01BQ1JPIHwgUkFERU9OX1RJTElOR19NSUNS TykpKSB7Ci0JaWYgKHJhZGVvbl9ib19pc19yZWZlcmVuY2VkX2J5X2NzKGRyaXZlcl9wcml2LT5i bywgaW5mby0+Y3MpKSB7Ci0JICAgIHNyY19kb21haW4gPSByYWRlb25fYm9fZ2V0X3NyY19kb21h aW4oZHJpdmVyX3ByaXYtPmJvKTsKKwlpZiAocmFkZW9uX2JvX2lzX3JlZmVyZW5jZWRfYnlfY3Mo ZHJpdmVyX3ByaXYtPmJvLT5iby5yYWRlb24sIGluZm8tPmNzKSkgeworCSAgICBzcmNfZG9tYWlu ID0gcmFkZW9uX2JvX2dldF9zcmNfZG9tYWluKGRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9uKTsK IAkgICAgaWYgKChzcmNfZG9tYWluICYgKFJBREVPTl9HRU1fRE9NQUlOX0dUVCB8IFJBREVPTl9H RU1fRE9NQUlOX1ZSQU0pKSA9PQogCQkoUkFERU9OX0dFTV9ET01BSU5fR1RUIHwgUkFERU9OX0dF TV9ET01BSU5fVlJBTSkpCiAJCXNyY19kb21haW4gPSAwOwpAQCAtMTgwNiw3ICsxODA2LDcgQEAg RVZFUkdSRUVORG93bmxvYWRGcm9tU2NyZWVuKFBpeG1hcFB0ciBwU3JjLCBpbnQgeCwgaW50IHks IGludCB3LAogCX0KIAogCWlmICghc3JjX2RvbWFpbikKLQkgICAgcmFkZW9uX2JvX2lzX2J1c3ko ZHJpdmVyX3ByaXYtPmJvLCAmc3JjX2RvbWFpbik7CisJICAgIHJhZGVvbl9ib19pc19idXN5KGRy aXZlcl9wcml2LT5iby0+Ym8ucmFkZW9uLCAmc3JjX2RvbWFpbik7CiAKIAlpZiAoc3JjX2RvbWFp biAmIH4odWludDMyX3QpUkFERU9OX0dFTV9ET01BSU5fVlJBTSkKIAkgICAgZ290byBjb3B5OwpA QCAtMTg0MSw3ICsxODQxLDcgQEAgRVZFUkdSRUVORG93bmxvYWRGcm9tU2NyZWVuKFBpeG1hcFB0 ciBwU3JjLCBpbnQgeCwgaW50IHksIGludCB3LAogICAgIHNyY19vYmouaGVpZ2h0ID0gcFNyYy0+ ZHJhd2FibGUuaGVpZ2h0OwogICAgIHNyY19vYmouYnBwID0gYnBwOwogICAgIHNyY19vYmouZG9t YWluID0gUkFERU9OX0dFTV9ET01BSU5fVlJBTSB8IFJBREVPTl9HRU1fRE9NQUlOX0dUVDsKLSAg ICBzcmNfb2JqLmJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8ocFNyYyk7CisgICAgc3JjX29iai5i byA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBTcmMpLT5iby5yYWRlb247CiAgICAgc3JjX29iai50 aWxpbmdfZmxhZ3MgPSByYWRlb25fZ2V0X3BpeG1hcF90aWxpbmcocFNyYyk7CiAgICAgc3JjX29i ai5zdXJmYWNlID0gcmFkZW9uX2dldF9waXhtYXBfc3VyZmFjZShwU3JjKTsKIApAQCAtMTg4Myw3 ICsxODgzLDcgQEAgY29weToKICAgICB9CiAgICAgciA9IFRSVUU7CiAgICAgdyAqPSBicHAgLyA4 OwotICAgIGlmIChjb3B5X3NyYyA9PSBkcml2ZXJfcHJpdi0+Ym8pCisgICAgaWYgKGNvcHlfc3Jj ID09IGRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9uKQogCXNpemUgPSB5ICogY29weV9waXRjaCAr IHggKiBicHAgLyA4OwogICAgIGVsc2UKIAlzaXplID0gMDsKZGlmZiAtLWdpdCBhL3NyYy9ldmVy Z3JlZW5fc3RhdGUuaCBiL3NyYy9ldmVyZ3JlZW5fc3RhdGUuaAppbmRleCBlZjMzMTAwMjUuLjdl NTRlMWM3ZiAxMDA2NDQKLS0tIGEvc3JjL2V2ZXJncmVlbl9zdGF0ZS5oCisrKyBiL3NyYy9ldmVy Z3JlZW5fc3RhdGUuaApAQCAtMzQ5LDcgKzM0OSw2IEBAIGV4dGVybiB2b2lkICpSQURFT05FWEFD cmVhdGVQaXhtYXAyKFNjcmVlblB0ciBwU2NyZWVuLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsCiAJ CQkJICAgIGludCBkZXB0aCwgaW50IHVzYWdlX2hpbnQsIGludCBiaXRzUGVyUGl4ZWwsCiAJCQkJ ICAgIGludCAqbmV3X3BpdGNoKTsKIGV4dGVybiB2b2lkIFJBREVPTkVYQURlc3Ryb3lQaXhtYXAo U2NyZWVuUHRyIHBTY3JlZW4sIHZvaWQgKmRyaXZlclByaXYpOwotZXh0ZXJuIHN0cnVjdCByYWRl b25fYm8gKnJhZGVvbl9nZXRfcGl4bWFwX2JvKFBpeG1hcFB0ciBwUGl4KTsKIGV4dGVybiBCb29s IFJBREVPTkVYQVBpeG1hcElzT2Zmc2NyZWVuKFBpeG1hcFB0ciBwUGl4KTsKIGV4dGVybiBCb29s IFJBREVPTkVYQVNoYXJlUGl4bWFwQmFja2luZyhQaXhtYXBQdHIgcHBpeCwgU2NyZWVuUHRyIHNs YXZlLCB2b2lkICoqaGFuZGxlX3ApOwogZXh0ZXJuIEJvb2wgUkFERU9ORVhBU2V0U2hhcmVkUGl4 bWFwQmFja2luZyhQaXhtYXBQdHIgcHBpeCwgdm9pZCAqaGFuZGxlKTsKZGlmZiAtLWdpdCBhL3Ny Yy9ldmVyZ3JlZW5fdGV4dHVyZWRfdmlkZW9mdW5jcy5jIGIvc3JjL2V2ZXJncmVlbl90ZXh0dXJl ZF92aWRlb2Z1bmNzLmMKaW5kZXggMjA4MDVmZjQwLi41MzY3NTYwMDEgMTAwNjQ0Ci0tLSBhL3Ny Yy9ldmVyZ3JlZW5fdGV4dHVyZWRfdmlkZW9mdW5jcy5jCisrKyBiL3NyYy9ldmVyZ3JlZW5fdGV4 dHVyZWRfdmlkZW9mdW5jcy5jCkBAIC0xNDAsNyArMTQwLDcgQEAgRVZFUkdSRUVORGlzcGxheVRl eHR1cmVkVmlkZW8oU2NybkluZm9QdHIgcFNjcm4sIFJBREVPTlBvcnRQcml2UHRyIHBQcml2KQog ICAgIENMRUFSICh2c19jb25zdF9jb25mKTsKICAgICBDTEVBUiAocHNfY29uc3RfY29uZik7CiAK LSAgICBkc3Rfb2JqLmJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8ocFBpeG1hcCk7CisgICAgZHN0 X29iai5ibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBQaXhtYXApLT5iby5yYWRlb247CiAgICAg ZHN0X29iai50aWxpbmdfZmxhZ3MgPSByYWRlb25fZ2V0X3BpeG1hcF90aWxpbmcocFBpeG1hcCk7 CiAgICAgZHN0X29iai5zdXJmYWNlID0gcmFkZW9uX2dldF9waXhtYXBfc3VyZmFjZShwUGl4bWFw KTsKIApkaWZmIC0tZ2l0IGEvc3JjL3I2MDBfZXhhLmMgYi9zcmMvcjYwMF9leGEuYwppbmRleCBh MTExZGQ0NTYuLmJkODI0Yzg3NyAxMDA2NDQKLS0tIGEvc3JjL3I2MDBfZXhhLmMKKysrIGIvc3Jj L3I2MDBfZXhhLmMKQEAgLTE1MCw3ICsxNTAsNyBAQCBSNjAwUHJlcGFyZVNvbGlkKFBpeG1hcFB0 ciBwUGl4LCBpbnQgYWx1LCBQaXhlbCBwbSwgUGl4ZWwgZmcpCiAgICAgaWYgKCFSQURFT05WYWxp ZFBNKHBtLCBwUGl4LT5kcmF3YWJsZS5iaXRzUGVyUGl4ZWwpKQogCVJBREVPTl9GQUxMQkFDSygo ImludmFsaWQgcGxhbmVtYXNrXG4iKSk7CiAKLSAgICBkc3QuYm8gPSByYWRlb25fZ2V0X3BpeG1h cF9ibyhwUGl4KTsKKyAgICBkc3QuYm8gPSByYWRlb25fZ2V0X3BpeG1hcF9ibyhwUGl4KS0+Ym8u cmFkZW9uOwogICAgIGRzdC50aWxpbmdfZmxhZ3MgPSByYWRlb25fZ2V0X3BpeG1hcF90aWxpbmco cFBpeCk7CiAgICAgZHN0LnN1cmZhY2UgPSByYWRlb25fZ2V0X3BpeG1hcF9zdXJmYWNlKHBQaXgp OwogCkBAIC01MzQsMTMgKzUzNCwxMyBAQCBSNjAwUHJlcGFyZUNvcHkoUGl4bWFwUHRyIHBTcmMs ICAgUGl4bWFwUHRyIHBEc3QsCiAKICAgICBhY2NlbF9zdGF0ZS0+c2FtZV9zdXJmYWNlID0gRkFM U0U7CiAKLSAgICBzcmNfb2JqLmJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8ocFNyYyk7Ci0gICAg ZHN0X29iai5ibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBEc3QpOworICAgIHNyY19vYmouYm8g PSByYWRlb25fZ2V0X3BpeG1hcF9ibyhwU3JjKS0+Ym8ucmFkZW9uOworICAgIGRzdF9vYmouYm8g PSByYWRlb25fZ2V0X3BpeG1hcF9ibyhwRHN0KS0+Ym8ucmFkZW9uOwogICAgIGRzdF9vYmoudGls aW5nX2ZsYWdzID0gcmFkZW9uX2dldF9waXhtYXBfdGlsaW5nKHBEc3QpOwogICAgIHNyY19vYmou dGlsaW5nX2ZsYWdzID0gcmFkZW9uX2dldF9waXhtYXBfdGlsaW5nKHBTcmMpOwogICAgIHNyY19v Ymouc3VyZmFjZSA9IHJhZGVvbl9nZXRfcGl4bWFwX3N1cmZhY2UocFNyYyk7CiAgICAgZHN0X29i ai5zdXJmYWNlID0gcmFkZW9uX2dldF9waXhtYXBfc3VyZmFjZShwRHN0KTsKLSAgICBpZiAocmFk ZW9uX2dldF9waXhtYXBfYm8ocFNyYykgPT0gcmFkZW9uX2dldF9waXhtYXBfYm8ocERzdCkpCisg ICAgaWYgKHNyY19vYmouYm8gPT0gZHN0X29iai5ibykKIAlhY2NlbF9zdGF0ZS0+c2FtZV9zdXJm YWNlID0gVFJVRTsKIAogICAgIHNyY19vYmoud2lkdGggPSBwU3JjLT5kcmF3YWJsZS53aWR0aDsK QEAgLTEzNDQsNyArMTM0NCw3IEBAIHN0YXRpYyBCb29sIFI2MDBQcmVwYXJlQ29tcG9zaXRlKGlu dCBvcCwgUGljdHVyZVB0ciBwU3JjUGljdHVyZSwKIAlyZXR1cm4gRkFMU0U7CiAKICAgICBpZiAo cFNyYykgewotCXNyY19vYmouYm8gPSByYWRlb25fZ2V0X3BpeG1hcF9ibyhwU3JjKTsKKwlzcmNf b2JqLmJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8ocFNyYyktPmJvLnJhZGVvbjsKIAlzcmNfb2Jq LnRpbGluZ19mbGFncyA9IHJhZGVvbl9nZXRfcGl4bWFwX3RpbGluZyhwU3JjKTsKIAlzcmNfb2Jq LnN1cmZhY2UgPSByYWRlb25fZ2V0X3BpeG1hcF9zdXJmYWNlKHBTcmMpOwogCXNyY19vYmoucGl0 Y2ggPSBleGFHZXRQaXhtYXBQaXRjaChwU3JjKSAvIChwU3JjLT5kcmF3YWJsZS5iaXRzUGVyUGl4 ZWwgLyA4KTsKQEAgLTEzNTQsNyArMTM1NCw3IEBAIHN0YXRpYyBCb29sIFI2MDBQcmVwYXJlQ29t cG9zaXRlKGludCBvcCwgUGljdHVyZVB0ciBwU3JjUGljdHVyZSwKIAlzcmNfb2JqLmRvbWFpbiA9 IFJBREVPTl9HRU1fRE9NQUlOX1ZSQU0gfCBSQURFT05fR0VNX0RPTUFJTl9HVFQ7CiAgICAgfQog Ci0gICAgZHN0X29iai5ibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBEc3QpOworICAgIGRzdF9v YmouYm8gPSByYWRlb25fZ2V0X3BpeG1hcF9ibyhwRHN0KS0+Ym8ucmFkZW9uOwogICAgIGRzdF9v YmoudGlsaW5nX2ZsYWdzID0gcmFkZW9uX2dldF9waXhtYXBfdGlsaW5nKHBEc3QpOwogICAgIGRz dF9vYmouc3VyZmFjZSA9IHJhZGVvbl9nZXRfcGl4bWFwX3N1cmZhY2UocERzdCk7CiAgICAgZHN0 X29iai5waXRjaCA9IGV4YUdldFBpeG1hcFBpdGNoKHBEc3QpIC8gKHBEc3QtPmRyYXdhYmxlLmJp dHNQZXJQaXhlbCAvIDgpOwpAQCAtMTM2OCw3ICsxMzY4LDcgQEAgc3RhdGljIEJvb2wgUjYwMFBy ZXBhcmVDb21wb3NpdGUoaW50IG9wLCBQaWN0dXJlUHRyIHBTcmNQaWN0dXJlLAogCiAgICAgaWYg KHBNYXNrUGljdHVyZSkgewogCWlmIChwTWFzaykgewotCSAgICBtYXNrX29iai5ibyA9IHJhZGVv bl9nZXRfcGl4bWFwX2JvKHBNYXNrKTsKKwkgICAgbWFza19vYmouYm8gPSByYWRlb25fZ2V0X3Bp eG1hcF9ibyhwTWFzayktPmJvLnJhZGVvbjsKIAkgICAgbWFza19vYmoudGlsaW5nX2ZsYWdzID0g cmFkZW9uX2dldF9waXhtYXBfdGlsaW5nKHBNYXNrKTsKIAkgICAgbWFza19vYmouc3VyZmFjZSA9 IHJhZGVvbl9nZXRfcGl4bWFwX3N1cmZhY2UocE1hc2spOwogCSAgICBtYXNrX29iai5waXRjaCA9 IGV4YUdldFBpeG1hcFBpdGNoKHBNYXNrKSAvIChwTWFzay0+ZHJhd2FibGUuYml0c1BlclBpeGVs IC8gOCk7CkBAIC0xNzAwLDE2ICsxNzAwLDE2IEBAIFI2MDBVcGxvYWRUb1NjcmVlbkNTKFBpeG1h cFB0ciBwRHN0LCBpbnQgeCwgaW50IHksIGludCB3LCBpbnQgaCwKIAlyZXR1cm4gRkFMU0U7CiAK ICAgICBkcml2ZXJfcHJpdiA9IGV4YUdldFBpeG1hcERyaXZlclByaXZhdGUocERzdCk7Ci0gICAg aWYgKCFkcml2ZXJfcHJpdiB8fCAhZHJpdmVyX3ByaXYtPmJvKQorICAgIGlmICghZHJpdmVyX3By aXYgfHwgIWRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9uKQogCXJldHVybiBGQUxTRTsKIAogICAg IC8qIElmIHdlIGtub3cgdGhlIEJPIHdvbid0IGJlIGJ1c3kgLyBpbiBWUkFNLCBkb24ndCBib3Ro ZXIgd2l0aCBhIHNjcmF0Y2ggKi8KLSAgICBjb3B5X2RzdCA9IGRyaXZlcl9wcml2LT5ibzsKKyAg ICBjb3B5X2RzdCA9IGRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9uOwogICAgIGNvcHlfcGl0Y2gg PSBwRHN0LT5kZXZLaW5kOwogICAgIGlmICghKGRyaXZlcl9wcml2LT50aWxpbmdfZmxhZ3MgJiAo UkFERU9OX1RJTElOR19NQUNSTyB8IFJBREVPTl9USUxJTkdfTUlDUk8pKSkgewotCWlmICghcmFk ZW9uX2JvX2lzX3JlZmVyZW5jZWRfYnlfY3MoZHJpdmVyX3ByaXYtPmJvLCBpbmZvLT5jcykpIHsK KwlpZiAoIXJhZGVvbl9ib19pc19yZWZlcmVuY2VkX2J5X2NzKGRyaXZlcl9wcml2LT5iby0+Ym8u cmFkZW9uLCBpbmZvLT5jcykpIHsKIAkgICAgZmx1c2ggPSBGQUxTRTsKLQkgICAgaWYgKCFyYWRl b25fYm9faXNfYnVzeShkcml2ZXJfcHJpdi0+Ym8sICZkc3RfZG9tYWluKSAmJgorCSAgICBpZiAo IXJhZGVvbl9ib19pc19idXN5KGRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9uLCAmZHN0X2RvbWFp bikgJiYKIAkJIShkc3RfZG9tYWluICYgUkFERU9OX0dFTV9ET01BSU5fVlJBTSkpCiAJCWdvdG8g Y29weTsKIAl9CkBAIC0xNzQxLDcgKzE3NDEsNyBAQCBSNjAwVXBsb2FkVG9TY3JlZW5DUyhQaXht YXBQdHIgcERzdCwgaW50IHgsIGludCB5LCBpbnQgdywgaW50IGgsCiAgICAgZHN0X29iai5oZWln aHQgPSBwRHN0LT5kcmF3YWJsZS5oZWlnaHQ7CiAgICAgZHN0X29iai5icHAgPSBicHA7CiAgICAg ZHN0X29iai5kb21haW4gPSBSQURFT05fR0VNX0RPTUFJTl9WUkFNOwotICAgIGRzdF9vYmouYm8g PSByYWRlb25fZ2V0X3BpeG1hcF9ibyhwRHN0KTsKKyAgICBkc3Rfb2JqLmJvID0gcmFkZW9uX2dl dF9waXhtYXBfYm8ocERzdCktPmJvLnJhZGVvbjsKICAgICBkc3Rfb2JqLnRpbGluZ19mbGFncyA9 IHJhZGVvbl9nZXRfcGl4bWFwX3RpbGluZyhwRHN0KTsKICAgICBkc3Rfb2JqLnN1cmZhY2UgPSBy YWRlb25fZ2V0X3BpeG1hcF9zdXJmYWNlKHBEc3QpOwogCkBAIC0xNzY5LDcgKzE3NjksNyBAQCBj b3B5OgogICAgIHIgPSBUUlVFOwogICAgIHNpemUgPSB3ICogYnBwIC8gODsKICAgICBkc3QgPSBj b3B5X2RzdC0+cHRyOwotICAgIGlmIChjb3B5X2RzdCA9PSBkcml2ZXJfcHJpdi0+Ym8pCisgICAg aWYgKGNvcHlfZHN0ID09IGRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9uKQogCWRzdCArPSB5ICog Y29weV9waXRjaCArIHggKiBicHAgLyA4OwogICAgIGZvciAoaSA9IDA7IGkgPCBoOyBpKyspIHsK ICAgICAgICAgbWVtY3B5KGRzdCArIGkgKiBjb3B5X3BpdGNoLCBzcmMsIHNpemUpOwpAQCAtMTgx OSwxNSArMTgxOSwxNSBAQCBSNjAwRG93bmxvYWRGcm9tU2NyZWVuQ1MoUGl4bWFwUHRyIHBTcmMs IGludCB4LCBpbnQgeSwgaW50IHcsCiAJcmV0dXJuIEZBTFNFOwogCiAgICAgZHJpdmVyX3ByaXYg PSBleGFHZXRQaXhtYXBEcml2ZXJQcml2YXRlKHBTcmMpOwotICAgIGlmICghZHJpdmVyX3ByaXYg fHwgIWRyaXZlcl9wcml2LT5ibykKKyAgICBpZiAoIWRyaXZlcl9wcml2IHx8ICFkcml2ZXJfcHJp di0+Ym8tPmJvLnJhZGVvbikKIAlyZXR1cm4gRkFMU0U7CiAKICAgICAvKiBJZiB3ZSBrbm93IHRo ZSBCTyB3b24ndCBlbmQgdXAgaW4gVlJBTSBhbnl3YXksIGRvbid0IGJvdGhlciB3aXRoIGEgc2Ny YXRjaCAqLwotICAgIGNvcHlfc3JjID0gZHJpdmVyX3ByaXYtPmJvOworICAgIGNvcHlfc3JjID0g ZHJpdmVyX3ByaXYtPmJvLT5iby5yYWRlb247CiAgICAgY29weV9waXRjaCA9IHBTcmMtPmRldktp bmQ7CiAgICAgaWYgKCEoZHJpdmVyX3ByaXYtPnRpbGluZ19mbGFncyAmIChSQURFT05fVElMSU5H X01BQ1JPIHwgUkFERU9OX1RJTElOR19NSUNSTykpKSB7Ci0JaWYgKHJhZGVvbl9ib19pc19yZWZl cmVuY2VkX2J5X2NzKGRyaXZlcl9wcml2LT5ibywgaW5mby0+Y3MpKSB7Ci0JICAgIHNyY19kb21h aW4gPSByYWRlb25fYm9fZ2V0X3NyY19kb21haW4oZHJpdmVyX3ByaXYtPmJvKTsKKwlpZiAocmFk ZW9uX2JvX2lzX3JlZmVyZW5jZWRfYnlfY3MoZHJpdmVyX3ByaXYtPmJvLT5iby5yYWRlb24sIGlu Zm8tPmNzKSkgeworCSAgICBzcmNfZG9tYWluID0gcmFkZW9uX2JvX2dldF9zcmNfZG9tYWluKGRy aXZlcl9wcml2LT5iby0+Ym8ucmFkZW9uKTsKIAkgICAgaWYgKChzcmNfZG9tYWluICYgKFJBREVP Tl9HRU1fRE9NQUlOX0dUVCB8IFJBREVPTl9HRU1fRE9NQUlOX1ZSQU0pKSA9PQogCQkoUkFERU9O X0dFTV9ET01BSU5fR1RUIHwgUkFERU9OX0dFTV9ET01BSU5fVlJBTSkpCiAJCXNyY19kb21haW4g PSAwOwpAQCAtMTgzNiw3ICsxODM2LDcgQEAgUjYwMERvd25sb2FkRnJvbVNjcmVlbkNTKFBpeG1h cFB0ciBwU3JjLCBpbnQgeCwgaW50IHksIGludCB3LAogCX0KIAogCWlmICghc3JjX2RvbWFpbikK LQkgICAgcmFkZW9uX2JvX2lzX2J1c3koZHJpdmVyX3ByaXYtPmJvLCAmc3JjX2RvbWFpbik7CisJ ICAgIHJhZGVvbl9ib19pc19idXN5KGRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9uLCAmc3JjX2Rv bWFpbik7CiAKIAlpZiAoc3JjX2RvbWFpbiAmIH4odWludDMyX3QpUkFERU9OX0dFTV9ET01BSU5f VlJBTSkKIAkgICAgZ290byBjb3B5OwpAQCAtMTg2Nyw3ICsxODY3LDcgQEAgUjYwMERvd25sb2Fk RnJvbVNjcmVlbkNTKFBpeG1hcFB0ciBwU3JjLCBpbnQgeCwgaW50IHksIGludCB3LAogICAgIHNy Y19vYmouaGVpZ2h0ID0gcFNyYy0+ZHJhd2FibGUuaGVpZ2h0OwogICAgIHNyY19vYmouYnBwID0g YnBwOwogICAgIHNyY19vYmouZG9tYWluID0gUkFERU9OX0dFTV9ET01BSU5fVlJBTSB8IFJBREVP Tl9HRU1fRE9NQUlOX0dUVDsKLSAgICBzcmNfb2JqLmJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8o cFNyYyk7CisgICAgc3JjX29iai5ibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBTcmMpLT5iby5y YWRlb247CiAgICAgc3JjX29iai50aWxpbmdfZmxhZ3MgPSByYWRlb25fZ2V0X3BpeG1hcF90aWxp bmcocFNyYyk7CiAgICAgc3JjX29iai5zdXJmYWNlID0gcmFkZW9uX2dldF9waXhtYXBfc3VyZmFj ZShwU3JjKTsKIApAQCAtMTkwOSw3ICsxOTA5LDcgQEAgY29weToKICAgICB9CiAgICAgciA9IFRS VUU7CiAgICAgdyAqPSBicHAgLyA4OwotICAgIGlmIChjb3B5X3NyYyA9PSBkcml2ZXJfcHJpdi0+ Ym8pCisgICAgaWYgKGNvcHlfc3JjID09IGRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9uKQogCXNp emUgPSB5ICogY29weV9waXRjaCArIHggKiBicHAgLyA4OwogICAgIGVsc2UKIAlzaXplID0gMDsK ZGlmZiAtLWdpdCBhL3NyYy9yNjAwX3N0YXRlLmggYi9zcmMvcjYwMF9zdGF0ZS5oCmluZGV4IDQ4 OThlOGRlOC4uMzQzNDU5OTY3IDEwMDY0NAotLS0gYS9zcmMvcjYwMF9zdGF0ZS5oCisrKyBiL3Ny Yy9yNjAwX3N0YXRlLmgKQEAgLTMyMCw3ICszMjAsNiBAQCBleHRlcm4gdm9pZCAqUkFERU9ORVhB Q3JlYXRlUGl4bWFwMihTY3JlZW5QdHIgcFNjcmVlbiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LAog CQkJCSAgICBpbnQgZGVwdGgsIGludCB1c2FnZV9oaW50LCBpbnQgYml0c1BlclBpeGVsLAogCQkJ CSAgICBpbnQgKm5ld19waXRjaCk7CiBleHRlcm4gdm9pZCBSQURFT05FWEFEZXN0cm95UGl4bWFw KFNjcmVlblB0ciBwU2NyZWVuLCB2b2lkICpkcml2ZXJQcml2KTsKLWV4dGVybiBzdHJ1Y3QgcmFk ZW9uX2JvICpyYWRlb25fZ2V0X3BpeG1hcF9ibyhQaXhtYXBQdHIgcFBpeCk7CiBleHRlcm4gQm9v bCBSQURFT05FWEFQaXhtYXBJc09mZnNjcmVlbihQaXhtYXBQdHIgcFBpeCk7CiBleHRlcm4gQm9v bCBSQURFT05FWEFTaGFyZVBpeG1hcEJhY2tpbmcoUGl4bWFwUHRyIHBwaXgsIFNjcmVlblB0ciBz bGF2ZSwgdm9pZCAqKmhhbmRsZV9wKTsKIGV4dGVybiBCb29sIFJBREVPTkVYQVNldFNoYXJlZFBp eG1hcEJhY2tpbmcoUGl4bWFwUHRyIHBwaXgsIHZvaWQgKmhhbmRsZSk7CmRpZmYgLS1naXQgYS9z cmMvcjYwMF90ZXh0dXJlZF92aWRlb2Z1bmNzLmMgYi9zcmMvcjYwMF90ZXh0dXJlZF92aWRlb2Z1 bmNzLmMKaW5kZXggZDIwZGY3ZTJlLi5jOGE5YjE5NzggMTAwNjQ0Ci0tLSBhL3NyYy9yNjAwX3Rl eHR1cmVkX3ZpZGVvZnVuY3MuYworKysgYi9zcmMvcjYwMF90ZXh0dXJlZF92aWRlb2Z1bmNzLmMK QEAgLTE1Miw3ICsxNTIsNyBAQCBSNjAwRGlzcGxheVRleHR1cmVkVmlkZW8oU2NybkluZm9QdHIg cFNjcm4sIFJBREVPTlBvcnRQcml2UHRyIHBQcml2KQogICAgIENMRUFSICh2c19jb25mKTsKICAg ICBDTEVBUiAocHNfY29uZik7CiAKLSAgICBkc3Rfb2JqLmJvID0gcmFkZW9uX2dldF9waXhtYXBf Ym8ocFBpeG1hcCk7CisgICAgZHN0X29iai5ibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBQaXht YXApLT5iby5yYWRlb247CiAgICAgZHN0X29iai50aWxpbmdfZmxhZ3MgPSByYWRlb25fZ2V0X3Bp eG1hcF90aWxpbmcocFBpeG1hcCk7CiAgICAgZHN0X29iai5zdXJmYWNlID0gcmFkZW9uX2dldF9w aXhtYXBfc3VyZmFjZShwUGl4bWFwKTsKIApkaWZmIC0tZ2l0IGEvc3JjL3JhZGVvbi5oIGIvc3Jj L3JhZGVvbi5oCmluZGV4IDQ5OWU4OWY5Mi4uNjQ4ZmQ5OGE1IDEwMDY0NAotLS0gYS9zcmMvcmFk ZW9uLmgKKysrIGIvc3JjL3JhZGVvbi5oCkBAIC04Myw2ICs4Myw3IEBACiAjaW5jbHVkZSAicmFk ZW9uX2RyaTIuaCIKICNpbmNsdWRlICJkcm1tb2RlX2Rpc3BsYXkuaCIKICNpbmNsdWRlICJyYWRl b25fc3VyZmFjZS5oIgorI2luY2x1ZGUgInJhZGVvbl9ib19oZWxwZXIuaCIKIAogCQkJCS8qIFJl bmRlciBzdXBwb3J0ICovCiAjaWZkZWYgUkVOREVSCkBAIC0zMDAsMTQgKzMwMSwxMyBAQCByYWRl b25fZGlydHlfc3JjX2VxdWFscyhQaXhtYXBEaXJ0eVVwZGF0ZVB0ciBkaXJ0eSwgUGl4bWFwUHRy IHBpeG1hcCkKICNkZWZpbmUgQ1VSU09SX1dJRFRIX0NJSwkxMjgKICNkZWZpbmUgQ1VSU09SX0hF SUdIVF9DSUsJMTI4CiAKLQogI2lmZGVmIFVTRV9HTEFNT1IKIAogc3RydWN0IHJhZGVvbl9waXht YXAgewogCXVpbnRfZmFzdDMyX3QgZ3B1X3JlYWQ7CiAJdWludF9mYXN0MzJfdCBncHVfd3JpdGU7 CiAKLQlzdHJ1Y3QgcmFkZW9uX2JvICpibzsKKwlzdHJ1Y3QgcmFkZW9uX2J1ZmZlciAqYm87CiAJ c3RydWN0IGRybW1vZGVfZmIgKmZiOwogCiAJdWludDMyX3QgdGlsaW5nX2ZsYWdzOwpAQCAtMzMz LDcgKzMzMyw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCByYWRlb25fc2V0X3BpeG1hcF9wcml2YXRl KFBpeG1hcFB0ciBwaXhtYXAsIHN0cnVjdCByYWRlb25fcGl4CiAKIAogc3RydWN0IHJhZGVvbl9l eGFfcGl4bWFwX3ByaXYgewotICAgIHN0cnVjdCByYWRlb25fYm8gKmJvOworICAgIHN0cnVjdCBy YWRlb25fYnVmZmVyICpibzsKICAgICBzdHJ1Y3QgZHJtbW9kZV9mYiAqZmI7CiAgICAgdWludDMy X3QgdGlsaW5nX2ZsYWdzOwogICAgIHN0cnVjdCByYWRlb25fc3VyZmFjZSBzdXJmYWNlOwpAQCAt NTY3LDcgKzU2Nyw3IEBAIHR5cGVkZWYgc3RydWN0IHsKIAogICAgIHZvaWQgKCpyZWVtaXRfY3Vy cmVudDJkKShTY3JuSW5mb1B0ciBwU2NybiwgaW50IG9wKTsgLy8gZW1pdCB0aGUgY3VycmVudCAy RCBzdGF0ZSBpbnRvIHRoZSBJQiAKICAgICBzdHJ1Y3QgcmFkZW9uXzJkX3N0YXRlIHN0YXRlXzJk OwotICAgIHN0cnVjdCByYWRlb25fYm8gKmZyb250X2JvOworICAgIHN0cnVjdCByYWRlb25fYnVm ZmVyICpmcm9udF9idWZmZXI7CiAgICAgc3RydWN0IHJhZGVvbl9ib19tYW5hZ2VyICpidWZtZ3I7 CiAgICAgc3RydWN0IHJhZGVvbl9jc19tYW5hZ2VyICpjc207CiAgICAgc3RydWN0IHJhZGVvbl9j cyAqY3M7CkBAIC03MTMsNyArNzEzLDcgQEAgc3RhdGljIGlubGluZSBzdHJ1Y3QgcmFkZW9uX3N1 cmZhY2UgKnJhZGVvbl9nZXRfcGl4bWFwX3N1cmZhY2UoUGl4bWFwUHRyIHBQaXgpCiAKIHVpbnQz Ml90IHJhZGVvbl9nZXRfcGl4bWFwX3RpbGluZyhQaXhtYXBQdHIgcFBpeCk7CiAKLXN0YXRpYyBp bmxpbmUgQm9vbCByYWRlb25fc2V0X3BpeG1hcF9ibyhQaXhtYXBQdHIgcFBpeCwgc3RydWN0IHJh ZGVvbl9ibyAqYm8pCitzdGF0aWMgaW5saW5lIEJvb2wgcmFkZW9uX3NldF9waXhtYXBfYm8oUGl4 bWFwUHRyIHBQaXgsIHN0cnVjdCByYWRlb25fYnVmZmVyICpibykKIHsKICAgICBTY3JuSW5mb1B0 ciBzY3JuID0geGY4NlNjcmVlblRvU2NybihwUGl4LT5kcmF3YWJsZS5wU2NyZWVuKTsKICAgICBS QURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVudFByaXYoc2Nybik7CkBAIC03MzIsNyAr NzMyLDcgQEAgc3RhdGljIGlubGluZSBCb29sIHJhZGVvbl9zZXRfcGl4bWFwX2JvKFBpeG1hcFB0 ciBwUGl4LCBzdHJ1Y3QgcmFkZW9uX2JvICpibykKIAkJaWYgKHByaXYtPmJvID09IGJvKQogCQkg ICAgcmV0dXJuIFRSVUU7CiAKLQkJcmFkZW9uX2JvX3VucmVmKHByaXYtPmJvKTsKKwkJcmFkZW9u X2J1ZmZlcl91bnJlZigmcHJpdi0+Ym8pOwogCSAgICB9CiAKIAkgICAgZHJtbW9kZV9mYl9yZWZl cmVuY2UocFJBREVPTkVudC0+ZmQsICZwcml2LT5mYiwgTlVMTCk7CkBAIC03NTIsMTAgKzc1Miwx MCBAQCBzdGF0aWMgaW5saW5lIEJvb2wgcmFkZW9uX3NldF9waXhtYXBfYm8oUGl4bWFwUHRyIHBQ aXgsIHN0cnVjdCByYWRlb25fYm8gKmJvKQogCQkgICAgcmV0dXJuIEZBTFNFOwogCSAgICB9CiAK LQkgICAgcmFkZW9uX2JvX3JlZihibyk7CisJICAgIHJhZGVvbl9idWZmZXJfcmVmKGJvKTsKIAkg ICAgcHJpdi0+Ym8gPSBibzsKIAotCSAgICByYWRlb25fYm9fZ2V0X3RpbGluZyhibywgJnByaXYt PnRpbGluZ19mbGFncywgJnBpdGNoKTsKKwkgICAgcmFkZW9uX2JvX2dldF90aWxpbmcoYm8tPmJv LnJhZGVvbiwgJnByaXYtPnRpbGluZ19mbGFncywgJnBpdGNoKTsKIAl9CiAKIAlyYWRlb25fc2V0 X3BpeG1hcF9wcml2YXRlKHBQaXgsIHByaXYpOwpAQCAtNzY5LDE1ICs3NjksMTQgQEAgc3RhdGlj IGlubGluZSBCb29sIHJhZGVvbl9zZXRfcGl4bWFwX2JvKFBpeG1hcFB0ciBwUGl4LCBzdHJ1Y3Qg cmFkZW9uX2JvICpibykKIAlpZiAoZHJpdmVyX3ByaXYpIHsKIAkgICAgdWludDMyX3QgcGl0Y2g7 CiAKLQkgICAgaWYgKGRyaXZlcl9wcml2LT5ibykKLQkJcmFkZW9uX2JvX3VucmVmKGRyaXZlcl9w cml2LT5ibyk7Ci0KKwkgICAgcmFkZW9uX2J1ZmZlcl91bnJlZigmZHJpdmVyX3ByaXYtPmJvKTsK IAkgICAgZHJtbW9kZV9mYl9yZWZlcmVuY2UocFJBREVPTkVudC0+ZmQsICZkcml2ZXJfcHJpdi0+ ZmIsIE5VTEwpOwogCi0JICAgIHJhZGVvbl9ib19yZWYoYm8pOworCSAgICByYWRlb25fYnVmZmVy X3JlZihibyk7CiAJICAgIGRyaXZlcl9wcml2LT5ibyA9IGJvOwogCi0JICAgIHJhZGVvbl9ib19n ZXRfdGlsaW5nKGJvLCAmZHJpdmVyX3ByaXYtPnRpbGluZ19mbGFncywgJnBpdGNoKTsKKwkgICAg cmFkZW9uX2JvX2dldF90aWxpbmcoYm8tPmJvLnJhZGVvbiwgJmRyaXZlcl9wcml2LT50aWxpbmdf ZmxhZ3MsCisJCQkJICZwaXRjaCk7CiAJICAgIHJldHVybiBUUlVFOwogCX0KIApAQCAtNzg1LDcg Kzc4NCw3IEBAIHN0YXRpYyBpbmxpbmUgQm9vbCByYWRlb25fc2V0X3BpeG1hcF9ibyhQaXhtYXBQ dHIgcFBpeCwgc3RydWN0IHJhZGVvbl9ibyAqYm8pCiAgICAgfQogfQogCi1zdGF0aWMgaW5saW5l IHN0cnVjdCByYWRlb25fYm8gKnJhZGVvbl9nZXRfcGl4bWFwX2JvKFBpeG1hcFB0ciBwUGl4KQor c3RhdGljIGlubGluZSBzdHJ1Y3QgcmFkZW9uX2J1ZmZlciAqcmFkZW9uX2dldF9waXhtYXBfYm8o UGl4bWFwUHRyIHBQaXgpCiB7CiAjaWZkZWYgVVNFX0dMQU1PUgogICAgIFJBREVPTkluZm9QdHIg aW5mbyA9IFJBREVPTlBUUih4Zjg2U2NyZWVuVG9TY3JuKHBQaXgtPmRyYXdhYmxlLnBTY3JlZW4p KTsKQEAgLTEwMDQsNyArMTAwMyw3IEBAIGRvIHsJCQkJCQkJCQlcCiAjZGVmaW5lIEVNSVRfT0ZG U0VUKHJlZywgdmFsdWUsIHBQaXgsIHJkLCB3ZCkgZG8gewkJXAogICAgIGRyaXZlcl9wcml2ID0g ZXhhR2V0UGl4bWFwRHJpdmVyUHJpdmF0ZShwUGl4KTsJCVwKICAgICBPVVRfUklOR19SRUcoKHJl ZyksICh2YWx1ZSkpOwkJCQlcCi0gICAgT1VUX1JJTkdfUkVMT0MoZHJpdmVyX3ByaXYtPmJvLCAo cmQpLCAod2QpKTsJCQlcCisgICAgT1VUX1JJTkdfUkVMT0MoZHJpdmVyX3ByaXYtPmJvLT5iby5y YWRlb24sIChyZCksICh3ZCkpOwlcCiAgICAgfSB3aGlsZSgwKQogCiAjZGVmaW5lIEVNSVRfUkVB RF9PRkZTRVQocmVnLCB2YWx1ZSwgcFBpeCkgRU1JVF9PRkZTRVQocmVnLCB2YWx1ZSwgcFBpeCwg KFJBREVPTl9HRU1fRE9NQUlOX1ZSQU0gfCBSQURFT05fR0VNX0RPTUFJTl9HVFQpLCAwKQpAQCAt MTAxOCw3ICsxMDE3LDcgQEAgZG8gewkJCQkJCQkJCVwKICNkZWZpbmUgRU1JVF9DT0xPUlBJVENI KHJlZywgdmFsdWUsIHBQaXgpIGRvIHsJCQlcCiAgICAgZHJpdmVyX3ByaXYgPSBleGFHZXRQaXht YXBEcml2ZXJQcml2YXRlKHBQaXgpOwkJCVwKICAgICBPVVRfUklOR19SRUcoKHJlZyksIHZhbHVl KTsJCQkJCVwKLSAgICBPVVRfUklOR19SRUxPQyhkcml2ZXJfcHJpdi0+Ym8sIDAsIFJBREVPTl9H RU1fRE9NQUlOX1ZSQU0pOwkJXAorICAgIE9VVF9SSU5HX1JFTE9DKGRyaXZlcl9wcml2LT5iby0+ Ym8ucmFkZW9uLCAwLCBSQURFT05fR0VNX0RPTUFJTl9WUkFNKTsJXAogfSB3aGlsZSgwKQogCiBz dGF0aWMgX19pbmxpbmVfXyB2b2lkIFJBREVPTl9TWU5DKFJBREVPTkluZm9QdHIgaW5mbywgU2Ny bkluZm9QdHIgcFNjcm4pCmRpZmYgLS1naXQgYS9zcmMvcmFkZW9uX2JvX2hlbHBlci5jIGIvc3Jj L3JhZGVvbl9ib19oZWxwZXIuYwppbmRleCA3Y2ZlOTEyNjUuLjJiODM2YmJmNiAxMDA2NDQKLS0t IGEvc3JjL3JhZGVvbl9ib19oZWxwZXIuYworKysgYi9zcmMvcmFkZW9uX2JvX2hlbHBlci5jCkBA IC0xNDUsNyArMTQ1LDcgQEAgcmFkZW9uX3N1cmZhY2VfaW5pdGlhbGl6ZShSQURFT05JbmZvUHRy IGluZm8sIHN0cnVjdCByYWRlb25fc3VyZmFjZSAqc3VyZmFjZSwKIC8qIENhbGN1bGF0ZSBhcHBy b3ByaWF0ZSB0aWxpbmcgYW5kIHBpdGNoIGZvciBhIHBpeG1hcCBhbmQgYWxsb2NhdGUgYSBCTyB0 aGF0CiAgKiBjYW4gaG9sZCBpdC4KICAqLwotc3RydWN0IHJhZGVvbl9ibyoKK3N0cnVjdCByYWRl b25fYnVmZmVyICoKIHJhZGVvbl9hbGxvY19waXhtYXBfYm8oU2NybkluZm9QdHIgcFNjcm4sIGlu dCB3aWR0aCwgaW50IGhlaWdodCwgaW50IGRlcHRoLAogCQkgICAgICAgaW50IHVzYWdlX2hpbnQs IGludCBiaXRzUGVyUGl4ZWwsIGludCAqbmV3X3BpdGNoLAogCQkgICAgICAgc3RydWN0IHJhZGVv bl9zdXJmYWNlICpuZXdfc3VyZmFjZSwgdWludDMyX3QgKm5ld190aWxpbmcpCkBAIC0xNTYsNyAr MTU2LDcgQEAgcmFkZW9uX2FsbG9jX3BpeG1hcF9ibyhTY3JuSW5mb1B0ciBwU2NybiwgaW50IHdp ZHRoLCBpbnQgaGVpZ2h0LCBpbnQgZGVwdGgsCiAgICAgaW50IGNwcCA9IGJpdHNQZXJQaXhlbCAv IDg7CiAgICAgdWludDMyX3QgdGlsaW5nID0gMCwgZmxhZ3MgPSAwOwogICAgIHN0cnVjdCByYWRl b25fc3VyZmFjZSBzdXJmYWNlOwotICAgIHN0cnVjdCByYWRlb25fYm8gKmJvOworICAgIHN0cnVj dCByYWRlb25fYnVmZmVyICpibzsKICAgICBpbnQgZG9tYWluID0gUkFERU9OX0dFTV9ET01BSU5f VlJBTTsKICAgICBpZiAodXNhZ2VfaGludCkgewogCWlmIChpbmZvLT5hbGxvd0NvbG9yVGlsaW5n KSB7CkBAIC0yMjUsMTAgKzIyNSwxNSBAQCByYWRlb25fYWxsb2NfcGl4bWFwX2JvKFNjcm5JbmZv UHRyIHBTY3JuLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsIGludCBkZXB0aCwKICAgICBpZiAodGls aW5nKQogCWZsYWdzIHw9IFJBREVPTl9HRU1fTk9fQ1BVX0FDQ0VTUzsKIAotICAgIGJvID0gcmFk ZW9uX2JvX29wZW4oaW5mby0+YnVmbWdyLCAwLCBzaXplLCBiYXNlX2FsaWduLAotCQkJZG9tYWlu LCBmbGFncyk7CisgICAgYm8gPSBjYWxsb2MoMSwgc2l6ZW9mKHN0cnVjdCByYWRlb25fYnVmZmVy KSk7CisgICAgaWYgKCFibykKKwlyZXR1cm4gTlVMTDsKKworICAgIGJvLT5yZWZfY291bnQgPSAx OworICAgIGJvLT5iby5yYWRlb24gPSByYWRlb25fYm9fb3BlbihpbmZvLT5idWZtZ3IsIDAsIHNp emUsIGJhc2VfYWxpZ24sCisJCQkJICAgZG9tYWluLCBmbGFncyk7CiAKLSAgICBpZiAoYm8gJiYg dGlsaW5nICYmIHJhZGVvbl9ib19zZXRfdGlsaW5nKGJvLCB0aWxpbmcsIHBpdGNoKSA9PSAwKQor ICAgIGlmIChibyAmJiB0aWxpbmcgJiYgcmFkZW9uX2JvX3NldF90aWxpbmcoYm8tPmJvLnJhZGVv biwgdGlsaW5nLCBwaXRjaCkgPT0gMCkKIAkqbmV3X3RpbGluZyA9IHRpbGluZzsKIAogICAgICpu ZXdfcGl0Y2ggPSBwaXRjaDsKQEAgLTIzOCwxMCArMjQzLDEwIEBAIHJhZGVvbl9hbGxvY19waXht YXBfYm8oU2NybkluZm9QdHIgcFNjcm4sIGludCB3aWR0aCwgaW50IGhlaWdodCwgaW50IGRlcHRo LAogCiAvKiBGbHVzaCBhbmQgd2FpdCBmb3IgdGhlIEJPIHRvIGJlY29tZSBpZGxlICovCiB2b2lk Ci1yYWRlb25fZmluaXNoKFNjcm5JbmZvUHRyIHNjcm4sIHN0cnVjdCByYWRlb25fYm8gKmJvKQor cmFkZW9uX2ZpbmlzaChTY3JuSW5mb1B0ciBzY3JuLCBzdHJ1Y3QgcmFkZW9uX2J1ZmZlciAqYm8p CiB7CiAgICAgcmFkZW9uX2NzX2ZsdXNoX2luZGlyZWN0KHNjcm4pOwotICAgIHJhZGVvbl9ib193 YWl0KGJvKTsKKyAgICByYWRlb25fYm9fd2FpdChiby0+Ym8ucmFkZW9uKTsKIH0KIAogCkBAIC0y NjksNyArMjc0LDcgQEAgcmFkZW9uX3BpeG1hcF9jbGVhcihQaXhtYXBQdHIgcGl4bWFwKQogLyog R2V0IEdFTSBoYW5kbGUgZm9yIHRoZSBwaXhtYXAgKi8KIEJvb2wgcmFkZW9uX2dldF9waXhtYXBf aGFuZGxlKFBpeG1hcFB0ciBwaXhtYXAsIHVpbnQzMl90ICpoYW5kbGUpCiB7Ci0gICAgc3RydWN0 IHJhZGVvbl9ibyAqYm8gPSByYWRlb25fZ2V0X3BpeG1hcF9ibyhwaXhtYXApOworICAgIHN0cnVj dCByYWRlb25fYnVmZmVyICpibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2JvKHBpeG1hcCk7CiAjaWZk ZWYgVVNFX0dMQU1PUgogICAgIFNjcmVlblB0ciBzY3JlZW4gPSBwaXhtYXAtPmRyYXdhYmxlLnBT Y3JlZW47CiAgICAgU2NybkluZm9QdHIgc2NybiA9IHhmODZTY3JlZW5Ub1Njcm4oc2NyZWVuKTsK QEAgLTI3OCw3ICsyODMsNyBAQCBCb29sIHJhZGVvbl9nZXRfcGl4bWFwX2hhbmRsZShQaXhtYXBQ dHIgcGl4bWFwLCB1aW50MzJfdCAqaGFuZGxlKQogI2VuZGlmCiAKICAgICBpZiAoYm8pIHsKLQkq aGFuZGxlID0gYm8tPmhhbmRsZTsKKwkqaGFuZGxlID0gYm8tPmJvLnJhZGVvbi0+aGFuZGxlOwog CXJldHVybiBUUlVFOwogICAgIH0KIApAQCAtMzY2LDE1ICszNzEsMjAgQEAgQm9vbCByYWRlb25f c2V0X3NoYXJlZF9waXhtYXBfYmFja2luZyhQaXhtYXBQdHIgcHBpeCwgdm9pZCAqZmRfaGFuZGxl LAogewogICAgIFNjcm5JbmZvUHRyIHBTY3JuID0geGY4NlNjcmVlblRvU2NybihwcGl4LT5kcmF3 YWJsZS5wU2NyZWVuKTsKICAgICBSQURFT05JbmZvUHRyIGluZm8gPSBSQURFT05QVFIocFNjcm4p OwotICAgIHN0cnVjdCByYWRlb25fYm8gKmJvOworICAgIHN0cnVjdCByYWRlb25fYnVmZmVyICpi bzsKICAgICBpbnQgaWhhbmRsZSA9IChpbnQpKGxvbmcpZmRfaGFuZGxlOwogICAgIHVpbnQzMl90 IHNpemUgPSBwcGl4LT5kZXZLaW5kICogcHBpeC0+ZHJhd2FibGUuaGVpZ2h0OwogICAgIEJvb2wg cmV0ID0gRkFMU0U7CiAKLSAgICBibyA9IHJhZGVvbl9nZW1fYm9fb3Blbl9wcmltZShpbmZvLT5i dWZtZ3IsIGloYW5kbGUsIHNpemUpOworICAgIGJvID0gKHN0cnVjdCByYWRlb25fYnVmZmVyICop Y2FsbG9jKDEsIHNpemVvZihzdHJ1Y3QgcmFkZW9uX2J1ZmZlcikpOworICAgIGlmICghYm8pCisJ Z290byBlcnJvcjsKKworICAgIGJvLT5iby5yYWRlb24gPSByYWRlb25fZ2VtX2JvX29wZW5fcHJp bWUoaW5mby0+YnVmbWdyLCBpaGFuZGxlLCBzaXplKTsKICAgICBpZiAoIWJvKQogICAgICAgICBn b3RvIGVycm9yOwogCisgICAgYm8tPnJlZl9jb3VudCA9IDE7CiAgICAgcmV0ID0gcmFkZW9uX3Nl dF9waXhtYXBfYm8ocHBpeCwgYm8pOwogICAgIGlmICghcmV0KQogCWdvdG8gZXJyb3I7CkBAIC00 MDQsNiArNDE0LDYgQEAgQm9vbCByYWRlb25fc2V0X3NoYXJlZF9waXhtYXBfYmFja2luZyhQaXht YXBQdHIgcHBpeCwgdm9pZCAqZmRfaGFuZGxlLAogICAgIGNsb3NlKGloYW5kbGUpOwogICAgIC8q IHdlIGhhdmUgYSByZWZlcmVuY2UgZnJvbSB0aGUgYWxsb2MgYW5kIG9uZSBmcm9tIHNldCBwaXht YXAgYm8sCiAgICAgICAgZHJvcCBvbmUgKi8KLSAgICByYWRlb25fYm9fdW5yZWYoYm8pOworICAg IHJhZGVvbl9idWZmZXJfdW5yZWYoJmJvKTsKICAgICByZXR1cm4gcmV0OwogfQpkaWZmIC0tZ2l0 IGEvc3JjL3JhZGVvbl9ib19oZWxwZXIuaCBiL3NyYy9yYWRlb25fYm9faGVscGVyLmgKaW5kZXgg ZmE5OTIwMWIyLi41M2FmODdjMzcgMTAwNjQ0Ci0tLSBhL3NyYy9yYWRlb25fYm9faGVscGVyLmgK KysrIGIvc3JjL3JhZGVvbl9ib19oZWxwZXIuaApAQCAtMjMsMTMgKzIzLDIyIEBACiAjaWZuZGVm IFJBREVPTl9CT19IRUxQRVJfSAogI2RlZmluZSBSQURFT05fQk9fSEVMUEVSX0ggMQogCi1leHRl cm4gc3RydWN0IHJhZGVvbl9ibyoKKyNkZWZpbmUgUkFERU9OX0JPX0ZMQUdTX0dCTQkweDEKKwor c3RydWN0IHJhZGVvbl9idWZmZXIgeworCXVuaW9uIHsKKwkJc3RydWN0IHJhZGVvbl9ibyAqcmFk ZW9uOworCX0gYm87CisJdWludDMyX3QgcmVmX2NvdW50OworfTsKKworZXh0ZXJuIHN0cnVjdCBy YWRlb25fYnVmZmVyICoKIHJhZGVvbl9hbGxvY19waXhtYXBfYm8oU2NybkluZm9QdHIgcFNjcm4s IGludCB3aWR0aCwgaW50IGhlaWdodCwgaW50IGRlcHRoLAogCQkgICAgICAgaW50IHVzYWdlX2hp bnQsIGludCBiaXRzUGVyUGl4ZWwsIGludCAqbmV3X3BpdGNoLAogCQkgICAgICAgc3RydWN0IHJh ZGVvbl9zdXJmYWNlICpuZXdfc3VyZmFjZSwgdWludDMyX3QgKm5ld190aWxpbmcpOwogCiBleHRl cm4gdm9pZAotcmFkZW9uX2ZpbmlzaChTY3JuSW5mb1B0ciBzY3JuLCBzdHJ1Y3QgcmFkZW9uX2Jv ICpibyk7CityYWRlb25fZmluaXNoKFNjcm5JbmZvUHRyIHNjcm4sIHN0cnVjdCByYWRlb25fYnVm ZmVyICpibyk7CiAKIGV4dGVybiB2b2lkCiByYWRlb25fcGl4bWFwX2NsZWFyKFBpeG1hcFB0ciBw aXhtYXApOwpAQCAtNjAsNCArNjksMjkgQEAgc3RhdGljIGlubGluZSBQaXhtYXBQdHIgZ2V0X2Ry YXdhYmxlX3BpeG1hcChEcmF3YWJsZVB0ciBkcmF3YWJsZSkKIAlyZXR1cm4gZHJhd2FibGUtPnBT Y3JlZW4tPkdldFdpbmRvd1BpeG1hcCgoV2luZG93UHRyKWRyYXdhYmxlKTsKIH0KIAorc3RhdGlj IGlubGluZSB2b2lkCityYWRlb25fYnVmZmVyX3JlZihzdHJ1Y3QgcmFkZW9uX2J1ZmZlciAqYnVm ZmVyKQoreworICAgIGJ1ZmZlci0+cmVmX2NvdW50Kys7Cit9CisKK3N0YXRpYyBpbmxpbmUgdm9p ZAorcmFkZW9uX2J1ZmZlcl91bnJlZihzdHJ1Y3QgcmFkZW9uX2J1ZmZlciAqKmJ1ZmZlcikKK3sK KyAgICBzdHJ1Y3QgcmFkZW9uX2J1ZmZlciAqYnVmID0gKmJ1ZmZlcjsKKworICAgIGlmICghYnVm KQorCXJldHVybjsKKworICAgIGlmIChidWYtPnJlZl9jb3VudCA+IDEpIHsKKwlidWYtPnJlZl9j b3VudC0tOworCXJldHVybjsKKyAgICB9CisKKyAgICByYWRlb25fYm9fdW5tYXAoYnVmLT5iby5y YWRlb24pOworICAgIHJhZGVvbl9ib191bnJlZihidWYtPmJvLnJhZGVvbik7CisgICAgZnJlZShi dWYpOworICAgICpidWZmZXIgPSBOVUxMOworfQorCiAjZW5kaWYgLyogUkFERU9OX0JPX0hFTFBF Ul9IICovCmRpZmYgLS1naXQgYS9zcmMvcmFkZW9uX2RyaTIuYyBiL3NyYy9yYWRlb25fZHJpMi5j CmluZGV4IDZmNDY5MTI3Ni4uNTg0YTFkOWQxIDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX2RyaTIu YworKysgYi9zcmMvcmFkZW9uX2RyaTIuYwpAQCAtNzksNyArNzksNyBAQCBzdGF0aWMgRGV2UHJp dmF0ZUtleVJlYyBkcmkyX3dpbmRvd19wcml2YXRlX2tleV9yZWM7CiBzdGF0aWMgQm9vbAogcmFk ZW9uX2dldF9mbGlua19uYW1lKFJBREVPTkVudFB0ciBwUkFERU9ORW50LCBQaXhtYXBQdHIgcGl4 bWFwLCB1aW50MzJfdCAqbmFtZSkKIHsKLSAgICBzdHJ1Y3QgcmFkZW9uX2JvICpibyA9IHJhZGVv bl9nZXRfcGl4bWFwX2JvKHBpeG1hcCk7CisgICAgc3RydWN0IHJhZGVvbl9ibyAqYm8gPSByYWRl b25fZ2V0X3BpeG1hcF9ibyhwaXhtYXApLT5iby5yYWRlb247CiAgICAgc3RydWN0IGRybV9nZW1f ZmxpbmsgZmxpbms7CiAKICAgICBpZiAoYm8pCkBAIC03MTksNyArNzE5LDcgQEAgcmFkZW9uX2Ry aTJfZXhjaGFuZ2VfYnVmZmVycyhEcmF3YWJsZVB0ciBkcmF3LCBEUkkyQnVmZmVyUHRyIGZyb250 LCBEUkkyQnVmZmVyUHQKIHsKICAgICBzdHJ1Y3QgZHJpMl9idWZmZXJfcHJpdiAqZnJvbnRfcHJp diA9IGZyb250LT5kcml2ZXJQcml2YXRlOwogICAgIHN0cnVjdCBkcmkyX2J1ZmZlcl9wcml2ICpi YWNrX3ByaXYgPSBiYWNrLT5kcml2ZXJQcml2YXRlOwotICAgIHN0cnVjdCByYWRlb25fYm8gKmZy b250X2JvLCAqYmFja19ibzsKKyAgICBzdHJ1Y3QgcmFkZW9uX2J1ZmZlciAqZnJvbnRfYnVmZmVy LCAqYmFja19idWZmZXI7CiAgICAgU2NyZWVuUHRyIHNjcmVlbjsKICAgICBSQURFT05JbmZvUHRy IGluZm87CiAgICAgUmVnaW9uUmVjIHJlZ2lvbjsKQEAgLTczNywxOSArNzM3LDE5IEBAIHJhZGVv bl9kcmkyX2V4Y2hhbmdlX2J1ZmZlcnMoRHJhd2FibGVQdHIgZHJhdywgRFJJMkJ1ZmZlclB0ciBm cm9udCwgRFJJMkJ1ZmZlclB0CiAgICAgYmFjay0+bmFtZSA9IHRtcDsKIAogICAgIC8qIFN3YXAg cGl4bWFwIGJvcyAqLwotICAgIGZyb250X2JvID0gcmFkZW9uX2dldF9waXhtYXBfYm8oZnJvbnRf cHJpdi0+cGl4bWFwKTsKLSAgICBiYWNrX2JvID0gcmFkZW9uX2dldF9waXhtYXBfYm8oYmFja19w cml2LT5waXhtYXApOwotICAgIHJhZGVvbl9zZXRfcGl4bWFwX2JvKGZyb250X3ByaXYtPnBpeG1h cCwgYmFja19ibyk7Ci0gICAgcmFkZW9uX3NldF9waXhtYXBfYm8oYmFja19wcml2LT5waXhtYXAs IGZyb250X2JvKTsKKyAgICBmcm9udF9idWZmZXIgPSByYWRlb25fZ2V0X3BpeG1hcF9ibyhmcm9u dF9wcml2LT5waXhtYXApOworICAgIGJhY2tfYnVmZmVyID0gcmFkZW9uX2dldF9waXhtYXBfYm8o YmFja19wcml2LT5waXhtYXApOworICAgIHJhZGVvbl9zZXRfcGl4bWFwX2JvKGZyb250X3ByaXYt PnBpeG1hcCwgYmFja19idWZmZXIpOworICAgIHJhZGVvbl9zZXRfcGl4bWFwX2JvKGJhY2tfcHJp di0+cGl4bWFwLCBmcm9udF9idWZmZXIpOwogCiAgICAgLyogRG8gd2UgbmVlZCB0byB1cGRhdGUg dGhlIFNjcmVlbj8gKi8KICAgICBzY3JlZW4gPSBkcmF3LT5wU2NyZWVuOwogICAgIGluZm8gPSBS QURFT05QVFIoeGY4NlNjcmVlblRvU2NybihzY3JlZW4pKTsKLSAgICBpZiAoZnJvbnRfYm8gPT0g aW5mby0+ZnJvbnRfYm8pIHsKLQlyYWRlb25fYm9fcmVmKGJhY2tfYm8pOwotCXJhZGVvbl9ib191 bnJlZihpbmZvLT5mcm9udF9ibyk7Ci0JaW5mby0+ZnJvbnRfYm8gPSBiYWNrX2JvOwotCXJhZGVv bl9zZXRfcGl4bWFwX2JvKHNjcmVlbi0+R2V0U2NyZWVuUGl4bWFwKHNjcmVlbiksIGJhY2tfYm8p OworICAgIGlmIChmcm9udF9idWZmZXIgPT0gaW5mby0+ZnJvbnRfYnVmZmVyKSB7CisJcmFkZW9u X2J1ZmZlcl9yZWYoYmFja19idWZmZXIpOworCXJhZGVvbl9idWZmZXJfdW5yZWYoJmluZm8tPmZy b250X2J1ZmZlcik7CisJaW5mby0+ZnJvbnRfYnVmZmVyID0gYmFja19idWZmZXI7CisJcmFkZW9u X3NldF9waXhtYXBfYm8oc2NyZWVuLT5HZXRTY3JlZW5QaXhtYXAoc2NyZWVuKSwgYmFja19idWZm ZXIpOwogICAgIH0KIAogICAgIHJhZGVvbl9nbGFtb3JfZXhjaGFuZ2VfYnVmZmVycyhmcm9udF9w cml2LT5waXhtYXAsIGJhY2tfcHJpdi0+cGl4bWFwKTsKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25f ZHJpMy5jIGIvc3JjL3JhZGVvbl9kcmkzLmMKaW5kZXggM2U2ODlmZmQ3Li5iMTk5Yzc5MzcgMTAw NjQ0Ci0tLSBhL3NyYy9yYWRlb25fZHJpMy5jCisrKyBiL3NyYy9yYWRlb25fZHJpMy5jCkBAIC0y MTQsNyArMjE0LDcgQEAgc3RhdGljIGludCByYWRlb25fZHJpM19mZF9mcm9tX3BpeG1hcChTY3Jl ZW5QdHIgc2NyZWVuLAogCXN0cnVjdCByYWRlb25fYm8gKmJvOwogCWludCBmZDsKIAotCWJvID0g cmFkZW9uX2dldF9waXhtYXBfYm8ocGl4bWFwKTsKKwlibyA9IHJhZGVvbl9nZXRfcGl4bWFwX2Jv KHBpeG1hcCktPmJvLnJhZGVvbjsKIAlpZiAoIWJvKSB7CiAjaWZkZWYgVVNFX0dMQU1PUgogCQlT Y3JuSW5mb1B0ciBzY3JuID0geGY4NlNjcmVlblRvU2NybihzY3JlZW4pOwpAQCAtMjI1LDcgKzIy NSw3IEBAIHN0YXRpYyBpbnQgcmFkZW9uX2RyaTNfZmRfZnJvbV9waXhtYXAoU2NyZWVuUHRyIHNj cmVlbiwKICNlbmRpZgogCiAJCWV4YU1vdmVJblBpeG1hcChwaXhtYXApOwotCQlibyA9IHJhZGVv bl9nZXRfcGl4bWFwX2JvKHBpeG1hcCk7CisJCWJvID0gcmFkZW9uX2dldF9waXhtYXBfYm8ocGl4 bWFwKS0+Ym8ucmFkZW9uOwogCQlpZiAoIWJvKQogCQkJcmV0dXJuIC0xOwogCX0KZGlmZiAtLWdp dCBhL3NyYy9yYWRlb25fZXhhLmMgYi9zcmMvcmFkZW9uX2V4YS5jCmluZGV4IGVmNjBiYzBjMS4u OTBkOTJkN2I4IDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX2V4YS5jCisrKyBiL3NyYy9yYWRlb25f ZXhhLmMKQEAgLTE4NCwxMSArMTg0LDExIEBAIEJvb2wgUkFERU9OUHJlcGFyZUFjY2Vzc19DUyhQ aXhtYXBQdHIgcFBpeCwgaW50IGluZGV4KQogCXJldHVybiBGQUxTRTsKIAogICAgIC8qIGlmIHdl IGhhdmUgbW9yZSByZWZzIHRoYW4ganVzdCB0aGUgQk8gdGhlbiBmbHVzaCAqLwotICAgIGlmIChy YWRlb25fYm9faXNfcmVmZXJlbmNlZF9ieV9jcyhkcml2ZXJfcHJpdi0+Ym8sIGluZm8tPmNzKSkg eworICAgIGlmIChyYWRlb25fYm9faXNfcmVmZXJlbmNlZF9ieV9jcyhkcml2ZXJfcHJpdi0+Ym8t PmJvLnJhZGVvbiwgaW5mby0+Y3MpKSB7CiAJZmx1c2ggPSBUUlVFOwogCiAJaWYgKGNhbl9mYWls KSB7Ci0JICAgIHBvc3NpYmxlX2RvbWFpbnMgPSByYWRlb25fYm9fZ2V0X3NyY19kb21haW4oZHJp dmVyX3ByaXYtPmJvKTsKKwkgICAgcG9zc2libGVfZG9tYWlucyA9IHJhZGVvbl9ib19nZXRfc3Jj X2RvbWFpbihkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbik7CiAJICAgIGlmIChwb3NzaWJsZV9k b21haW5zID09IFJBREVPTl9HRU1fRE9NQUlOX1ZSQU0pCiAJCXJldHVybiBGQUxTRTsgLyogdXNl IERvd25sb2FkRnJvbVNjcmVlbiAqLwogCX0KQEAgLTE5Niw3ICsxOTYsNyBAQCBCb29sIFJBREVP TlByZXBhcmVBY2Nlc3NfQ1MoUGl4bWFwUHRyIHBQaXgsIGludCBpbmRleCkKIAogICAgIC8qIGlm IHRoZSBCTyBtaWdodCBlbmQgdXAgaW4gVlJBTSwgcHJlZmVyIERvd25sb2FkRnJvbVNjcmVlbiAq LwogICAgIGlmIChjYW5fZmFpbCAmJiAocG9zc2libGVfZG9tYWlucyAmIFJBREVPTl9HRU1fRE9N QUlOX1ZSQU0pKSB7Ci0JcmFkZW9uX2JvX2lzX2J1c3koZHJpdmVyX3ByaXYtPmJvLCAmY3VycmVu dF9kb21haW4pOworCXJhZGVvbl9ib19pc19idXN5KGRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9u LCAmY3VycmVudF9kb21haW4pOwogCiAJaWYgKGN1cnJlbnRfZG9tYWluICYgcG9zc2libGVfZG9t YWlucykgewogCSAgICBpZiAoY3VycmVudF9kb21haW4gPT0gUkFERU9OX0dFTV9ET01BSU5fVlJB TSkKQEAgLTIwOSwxNCArMjA5LDE0IEBAIEJvb2wgUkFERU9OUHJlcGFyZUFjY2Vzc19DUyhQaXht YXBQdHIgcFBpeCwgaW50IGluZGV4KQogICAgICAgICByYWRlb25fY3NfZmx1c2hfaW5kaXJlY3Qo cFNjcm4pOwogICAgIAogICAgIC8qIGZsdXNoIElCICovCi0gICAgcmV0ID0gcmFkZW9uX2JvX21h cChkcml2ZXJfcHJpdi0+Ym8sIDEpOworICAgIHJldCA9IHJhZGVvbl9ib19tYXAoZHJpdmVyX3By aXYtPmJvLT5iby5yYWRlb24sIDEpOwogICAgIGlmIChyZXQpIHsKICAgICAgIEZhdGFsRXJyb3Io ImZhaWxlZCB0byBtYXAgcGl4bWFwICVkXG4iLCByZXQpOwogICAgICAgcmV0dXJuIEZBTFNFOwog ICAgIH0KICAgICBkcml2ZXJfcHJpdi0+Ym9fbWFwcGVkID0gVFJVRTsKIAotICAgIHBQaXgtPmRl dlByaXZhdGUucHRyID0gZHJpdmVyX3ByaXYtPmJvLT5wdHI7CisgICAgcFBpeC0+ZGV2UHJpdmF0 ZS5wdHIgPSBkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbi0+cHRyOwogCiAgICAgcmV0dXJuIFRS VUU7CiB9CkBAIC0yMjksNyArMjI5LDcgQEAgdm9pZCBSQURFT05GaW5pc2hBY2Nlc3NfQ1MoUGl4 bWFwUHRyIHBQaXgsIGludCBpbmRleCkKICAgICBpZiAoIWRyaXZlcl9wcml2IHx8ICFkcml2ZXJf cHJpdi0+Ym9fbWFwcGVkKQogICAgICAgICByZXR1cm47CiAKLSAgICByYWRlb25fYm9fdW5tYXAo ZHJpdmVyX3ByaXYtPmJvKTsKKyAgICByYWRlb25fYm9fdW5tYXAoZHJpdmVyX3ByaXYtPmJvLT5i by5yYWRlb24pOwogICAgIGRyaXZlcl9wcml2LT5ib19tYXBwZWQgPSBGQUxTRTsKICAgICBwUGl4 LT5kZXZQcml2YXRlLnB0ciA9IE5VTEw7CiB9CkBAIC0yNzcsOCArMjc3LDcgQEAgdm9pZCBSQURF T05FWEFEZXN0cm95UGl4bWFwKFNjcmVlblB0ciBwU2NyZWVuLCB2b2lkICpkcml2ZXJQcml2KQog ICAgIGlmICghZHJpdmVyUHJpdikKICAgICAgIHJldHVybjsKIAotICAgIGlmIChkcml2ZXJfcHJp di0+Ym8pCi0JcmFkZW9uX2JvX3VucmVmKGRyaXZlcl9wcml2LT5ibyk7CisgICAgcmFkZW9uX2J1 ZmZlcl91bnJlZigmZHJpdmVyX3ByaXYtPmJvKTsKICAgICBkcm1tb2RlX2ZiX3JlZmVyZW5jZShw UkFERU9ORW50LT5mZCwgJmRyaXZlcl9wcml2LT5mYiwgTlVMTCk7CiAgICAgZnJlZShkcml2ZXJQ cml2KTsKIH0KQEAgLTI4Nyw3ICsyODYsNyBAQCBCb29sIFJBREVPTkVYQVNoYXJlUGl4bWFwQmFj a2luZyhQaXhtYXBQdHIgcHBpeCwgU2NyZWVuUHRyIHNsYXZlLCB2b2lkICoqZmRfaGFuZAogewog ICAgIHN0cnVjdCByYWRlb25fZXhhX3BpeG1hcF9wcml2ICpkcml2ZXJfcHJpdiA9IGV4YUdldFBp eG1hcERyaXZlclByaXZhdGUocHBpeCk7CiAKLSAgICBpZiAoIXJhZGVvbl9zaGFyZV9waXhtYXBf YmFja2luZyhkcml2ZXJfcHJpdi0+Ym8sIGZkX2hhbmRsZSkpCisgICAgaWYgKCFyYWRlb25fc2hh cmVfcGl4bWFwX2JhY2tpbmcoZHJpdmVyX3ByaXYtPmJvLT5iby5yYWRlb24sIGZkX2hhbmRsZSkp CiAJcmV0dXJuIEZBTFNFOwogCiAgICAgZHJpdmVyX3ByaXYtPnNoYXJlZCA9IFRSVUU7CmRpZmYg LS1naXQgYS9zcmMvcmFkZW9uX2V4YV9mdW5jcy5jIGIvc3JjL3JhZGVvbl9leGFfZnVuY3MuYwpp bmRleCBhZGQ4OTQ1OGYuLjgxOWI0MjU4MCAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbl9leGFfZnVu Y3MuYworKysgYi9zcmMvcmFkZW9uX2V4YV9mdW5jcy5jCkBAIC0xMzgsNyArMTM4LDggQEAgUkFE RU9OUHJlcGFyZVNvbGlkKFBpeG1hcFB0ciBwUGl4LCBpbnQgYWx1LCBQaXhlbCBwbSwgUGl4ZWwg ZmcpCiAgICAgcmFkZW9uX2NzX3NwYWNlX3Jlc2V0X2JvcyhpbmZvLT5jcyk7CiAKICAgICBkcml2 ZXJfcHJpdiA9IGV4YUdldFBpeG1hcERyaXZlclByaXZhdGUocFBpeCk7Ci0gICAgcmFkZW9uX2Nz X3NwYWNlX2FkZF9wZXJzaXN0ZW50X2JvKGluZm8tPmNzLCBkcml2ZXJfcHJpdi0+Ym8sIDAsIFJB REVPTl9HRU1fRE9NQUlOX1ZSQU0pOworICAgIHJhZGVvbl9jc19zcGFjZV9hZGRfcGVyc2lzdGVu dF9ibyhpbmZvLT5jcywgZHJpdmVyX3ByaXYtPmJvLT5iby5yYWRlb24sIDAsCisJCQkJICAgICAg UkFERU9OX0dFTV9ET01BSU5fVlJBTSk7CiAKICAgICByZXQgPSByYWRlb25fY3Nfc3BhY2VfY2hl Y2soaW5mby0+Y3MpOwogICAgIGlmIChyZXQpCkBAIC0xNDYsNyArMTQ3LDcgQEAgUkFERU9OUHJl cGFyZVNvbGlkKFBpeG1hcFB0ciBwUGl4LCBpbnQgYWx1LCBQaXhlbCBwbSwgUGl4ZWwgZmcpCiAK ICAgICBkcml2ZXJfcHJpdiA9IGV4YUdldFBpeG1hcERyaXZlclByaXZhdGUocFBpeCk7CiAgICAg aWYgKGRyaXZlcl9wcml2KSB7Ci0JaW5mby0+c3RhdGVfMmQuZHN0X2JvID0gZHJpdmVyX3ByaXYt PmJvOworCWluZm8tPnN0YXRlXzJkLmRzdF9ibyA9IGRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9u OwogIAlpbmZvLT5zdGF0ZV8yZC5kc3RfZG9tYWluID0gZHJpdmVyX3ByaXYtPnNoYXJlZCA/IFJB REVPTl9HRU1fRE9NQUlOX0dUVCA6IFJBREVPTl9HRU1fRE9NQUlOX1ZSQU07CiAgICAgfQogCkBA IC0yNTYsMTMgKzI1NywxNSBAQCBSQURFT05QcmVwYXJlQ29weShQaXhtYXBQdHIgcFNyYywgICBQ aXhtYXBQdHIgcERzdCwKICAgICByYWRlb25fY3Nfc3BhY2VfcmVzZXRfYm9zKGluZm8tPmNzKTsK IAogICAgIGRyaXZlcl9wcml2ID0gZXhhR2V0UGl4bWFwRHJpdmVyUHJpdmF0ZShwU3JjKTsKLSAg ICByYWRlb25fY3Nfc3BhY2VfYWRkX3BlcnNpc3RlbnRfYm8oaW5mby0+Y3MsIGRyaXZlcl9wcml2 LT5ibywgUkFERU9OX0dFTV9ET01BSU5fR1RUIHwgUkFERU9OX0dFTV9ET01BSU5fVlJBTSwgMCk7 Ci0gICAgaW5mby0+c3RhdGVfMmQuc3JjX2JvID0gZHJpdmVyX3ByaXYtPmJvOworICAgIHJhZGVv bl9jc19zcGFjZV9hZGRfcGVyc2lzdGVudF9ibyhpbmZvLT5jcywgZHJpdmVyX3ByaXYtPmJvLT5i by5yYWRlb24sCisJCQkJICAgICAgUkFERU9OX0dFTV9ET01BSU5fR1RUIHwgUkFERU9OX0dFTV9E T01BSU5fVlJBTSwgMCk7CisgICAgaW5mby0+c3RhdGVfMmQuc3JjX2JvID0gZHJpdmVyX3ByaXYt PmJvLT5iby5yYWRlb247CiAKICAgICBkcml2ZXJfcHJpdiA9IGV4YUdldFBpeG1hcERyaXZlclBy aXZhdGUocERzdCk7Ci0gICAgaW5mby0+c3RhdGVfMmQuZHN0X2JvID0gZHJpdmVyX3ByaXYtPmJv OworICAgIGluZm8tPnN0YXRlXzJkLmRzdF9ibyA9IGRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9u OwogICAgIGluZm8tPnN0YXRlXzJkLmRzdF9kb21haW4gPSBkcml2ZXJfcHJpdi0+c2hhcmVkID8g UkFERU9OX0dFTV9ET01BSU5fR1RUIDogUkFERU9OX0dFTV9ET01BSU5fVlJBTTsKLSAgICByYWRl b25fY3Nfc3BhY2VfYWRkX3BlcnNpc3RlbnRfYm8oaW5mby0+Y3MsIGRyaXZlcl9wcml2LT5ibywg MCwgaW5mby0+c3RhdGVfMmQuZHN0X2RvbWFpbik7CisgICAgcmFkZW9uX2NzX3NwYWNlX2FkZF9w ZXJzaXN0ZW50X2JvKGluZm8tPmNzLCBkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbiwgMCwKKwkJ CQkgICAgICBpbmZvLT5zdGF0ZV8yZC5kc3RfZG9tYWluKTsKIAogICAgIHJldCA9IHJhZGVvbl9j c19zcGFjZV9jaGVjayhpbmZvLT5jcyk7CiAgICAgaWYgKHJldCkKQEAgLTM4OSw3ICszOTIsNyBA QCBSQURFT05VcGxvYWRUb1NjcmVlbkNTKFBpeG1hcFB0ciBwRHN0LCBpbnQgeCwgaW50IHksIGlu dCB3LCBpbnQgaCwKIAlyZXR1cm4gRkFMU0U7CiAKICAgICBkcml2ZXJfcHJpdiA9IGV4YUdldFBp eG1hcERyaXZlclByaXZhdGUocERzdCk7Ci0gICAgaWYgKCFkcml2ZXJfcHJpdiB8fCAhZHJpdmVy X3ByaXYtPmJvKQorICAgIGlmICghZHJpdmVyX3ByaXYgfHwgIWRyaXZlcl9wcml2LT5iby0+Ym8u cmFkZW9uKQogCXJldHVybiBGQUxTRTsKIAogI2lmIFhfQllURV9PUkRFUiA9PSBYX0JJR19FTkRJ QU4KQEAgLTQwNCwxMiArNDA3LDEyIEBAIFJBREVPTlVwbG9hZFRvU2NyZWVuQ1MoUGl4bWFwUHRy IHBEc3QsIGludCB4LCBpbnQgeSwgaW50IHcsIGludCBoLAogI2VuZGlmCiAKICAgICAvKiBJZiB3 ZSBrbm93IHRoZSBCTyB3b24ndCBiZSBidXN5IC8gaW4gVlJBTSwgZG9uJ3QgYm90aGVyIHdpdGgg YSBzY3JhdGNoICovCi0gICAgY29weV9kc3QgPSBkcml2ZXJfcHJpdi0+Ym87CisgICAgY29weV9k c3QgPSBkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbjsKICAgICBjb3B5X3BpdGNoID0gcERzdC0+ ZGV2S2luZDsKICAgICBpZiAoIShkcml2ZXJfcHJpdi0+dGlsaW5nX2ZsYWdzICYgKFJBREVPTl9U SUxJTkdfTUFDUk8gfCBSQURFT05fVElMSU5HX01JQ1JPKSkpIHsKLQlpZiAoIXJhZGVvbl9ib19p c19yZWZlcmVuY2VkX2J5X2NzKGRyaXZlcl9wcml2LT5ibywgaW5mby0+Y3MpKSB7CisJaWYgKCFy YWRlb25fYm9faXNfcmVmZXJlbmNlZF9ieV9jcyhkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbiwg aW5mby0+Y3MpKSB7CiAJICAgIGZsdXNoID0gRkFMU0U7Ci0JICAgIGlmICghcmFkZW9uX2JvX2lz X2J1c3koZHJpdmVyX3ByaXYtPmJvLCAmZHN0X2RvbWFpbikgJiYKKwkgICAgaWYgKCFyYWRlb25f Ym9faXNfYnVzeShkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbiwgJmRzdF9kb21haW4pICYmCiAJ CSEoZHN0X2RvbWFpbiAmIFJBREVPTl9HRU1fRE9NQUlOX1ZSQU0pKQogCQlnb3RvIGNvcHk7CiAJ fQpAQCAtNDQ2LDcgKzQ0OSw3IEBAIGNvcHk6CiAgICAgciA9IFRSVUU7CiAgICAgc2l6ZSA9IHcg KiBicHAgLyA4OwogICAgIGRzdCA9IGNvcHlfZHN0LT5wdHI7Ci0gICAgaWYgKGNvcHlfZHN0ID09 IGRyaXZlcl9wcml2LT5ibykKKyAgICBpZiAoY29weV9kc3QgPT0gZHJpdmVyX3ByaXYtPmJvLT5i by5yYWRlb24pCiAJZHN0ICs9IHkgKiBjb3B5X3BpdGNoICsgeCAqIGJwcCAvIDg7CiAgICAgZm9y IChpID0gMDsgaSA8IGg7IGkrKykgewogICAgICAgICBSQURFT05Db3B5U3dhcChkc3QgKyBpICog Y29weV9waXRjaCwgKHVpbnQ4X3QqKXNyYywgc2l6ZSwgc3dhcCk7CkBAIC00NTgsNyArNDYxLDcg QEAgY29weToKIAlSQURFT05HZXREYXRhdHlwZUJwcChwRHN0LT5kcmF3YWJsZS5iaXRzUGVyUGl4 ZWwsICZkYXRhdHlwZSk7CiAJUkFERU9OR2V0UGl4bWFwT2Zmc2V0UGl0Y2gocERzdCwgJmRzdF9w aXRjaF9vZmZzZXQpOwogCVJBREVPTl9TV0lUQ0hfVE9fMkQoKTsKLQlSQURFT05CbGl0Q2h1bmso cFNjcm4sIHNjcmF0Y2gsIGRyaXZlcl9wcml2LT5ibywgZGF0YXR5cGUsIHNjcmF0Y2hfcGl0Y2gg PDwgMTYsCisJUkFERU9OQmxpdENodW5rKHBTY3JuLCBzY3JhdGNoLCBkcml2ZXJfcHJpdi0+Ym8t PmJvLnJhZGVvbiwgZGF0YXR5cGUsIHNjcmF0Y2hfcGl0Y2ggPDwgMTYsCiAJCQlkc3RfcGl0Y2hf b2Zmc2V0LCAwLCAwLCB4LCB5LCB3LCBoLAogCQkJUkFERU9OX0dFTV9ET01BSU5fR1RULCBSQURF T05fR0VNX0RPTUFJTl9WUkFNKTsKICAgICB9CkBAIC00OTMsNyArNDk2LDcgQEAgUkFERU9ORG93 bmxvYWRGcm9tU2NyZWVuQ1MoUGl4bWFwUHRyIHBTcmMsIGludCB4LCBpbnQgeSwgaW50IHcsCiAJ cmV0dXJuIEZBTFNFOwogCiAgICAgZHJpdmVyX3ByaXYgPSBleGFHZXRQaXhtYXBEcml2ZXJQcml2 YXRlKHBTcmMpOwotICAgIGlmICghZHJpdmVyX3ByaXYgfHwgIWRyaXZlcl9wcml2LT5ibykKKyAg ICBpZiAoIWRyaXZlcl9wcml2IHx8ICFkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbikKIAlyZXR1 cm4gRkFMU0U7CiAKICNpZiBYX0JZVEVfT1JERVIgPT0gWF9CSUdfRU5ESUFOCkBAIC01MDgsMTEg KzUxMSwxMSBAQCBSQURFT05Eb3dubG9hZEZyb21TY3JlZW5DUyhQaXhtYXBQdHIgcFNyYywgaW50 IHgsIGludCB5LCBpbnQgdywKICNlbmRpZgogCiAgICAgLyogSWYgd2Uga25vdyB0aGUgQk8gd29u J3QgZW5kIHVwIGluIFZSQU0gYW55d2F5LCBkb24ndCBib3RoZXIgd2l0aCBhIHNjcmF0Y2ggKi8K LSAgICBjb3B5X3NyYyA9IGRyaXZlcl9wcml2LT5ibzsKKyAgICBjb3B5X3NyYyA9IGRyaXZlcl9w cml2LT5iby0+Ym8ucmFkZW9uOwogICAgIGNvcHlfcGl0Y2ggPSBwU3JjLT5kZXZLaW5kOwogICAg IGlmICghKGRyaXZlcl9wcml2LT50aWxpbmdfZmxhZ3MgJiAoUkFERU9OX1RJTElOR19NQUNSTyB8 IFJBREVPTl9USUxJTkdfTUlDUk8pKSkgewotCWlmIChyYWRlb25fYm9faXNfcmVmZXJlbmNlZF9i eV9jcyhkcml2ZXJfcHJpdi0+Ym8sIGluZm8tPmNzKSkgewotCSAgICBzcmNfZG9tYWluID0gcmFk ZW9uX2JvX2dldF9zcmNfZG9tYWluKGRyaXZlcl9wcml2LT5ibyk7CisJaWYgKHJhZGVvbl9ib19p c19yZWZlcmVuY2VkX2J5X2NzKGRyaXZlcl9wcml2LT5iby0+Ym8ucmFkZW9uLCBpbmZvLT5jcykp IHsKKwkgICAgc3JjX2RvbWFpbiA9IHJhZGVvbl9ib19nZXRfc3JjX2RvbWFpbihkcml2ZXJfcHJp di0+Ym8tPmJvLnJhZGVvbik7CiAJICAgIGlmICgoc3JjX2RvbWFpbiAmIChSQURFT05fR0VNX0RP TUFJTl9HVFQgfCBSQURFT05fR0VNX0RPTUFJTl9WUkFNKSkgPT0KIAkJKFJBREVPTl9HRU1fRE9N QUlOX0dUVCB8IFJBREVPTl9HRU1fRE9NQUlOX1ZSQU0pKQogCQlzcmNfZG9tYWluID0gMDsKQEAg LTUyMSw3ICs1MjQsNyBAQCBSQURFT05Eb3dubG9hZEZyb21TY3JlZW5DUyhQaXhtYXBQdHIgcFNy YywgaW50IHgsIGludCB5LCBpbnQgdywKIAl9CiAKIAlpZiAoIXNyY19kb21haW4pCi0JICAgIHJh ZGVvbl9ib19pc19idXN5KGRyaXZlcl9wcml2LT5ibywgJnNyY19kb21haW4pOworCSAgICByYWRl b25fYm9faXNfYnVzeShkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbiwgJnNyY19kb21haW4pOwog CiAJaWYgKHNyY19kb21haW4gJiB+KHVpbnQzMl90KVJBREVPTl9HRU1fRE9NQUlOX1ZSQU0pCiAJ ICAgIGdvdG8gY29weTsKQEAgLTU0MSw4ICs1NDQsOCBAQCBSQURFT05Eb3dubG9hZEZyb21TY3Jl ZW5DUyhQaXhtYXBQdHIgcFNyYywgaW50IHgsIGludCB5LCBpbnQgdywKICAgICBSQURFT05HZXRE YXRhdHlwZUJwcChwU3JjLT5kcmF3YWJsZS5iaXRzUGVyUGl4ZWwsICZkYXRhdHlwZSk7CiAgICAg UkFERU9OR2V0UGl4bWFwT2Zmc2V0UGl0Y2gocFNyYywgJnNyY19waXRjaF9vZmZzZXQpOwogICAg IFJBREVPTl9TV0lUQ0hfVE9fMkQoKTsKLSAgICBSQURFT05CbGl0Q2h1bmsocFNjcm4sIGRyaXZl cl9wcml2LT5ibywgc2NyYXRjaCwgZGF0YXR5cGUsIHNyY19waXRjaF9vZmZzZXQsCi0gICAgICAg ICAgICAgICAgICAgIHNjcmF0Y2hfcGl0Y2ggPDwgMTYsIHgsIHksIDAsIDAsIHcsIGgsCisgICAg UkFERU9OQmxpdENodW5rKHBTY3JuLCBkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbiwgc2NyYXRj aCwgZGF0YXR5cGUsCisJCSAgICBzcmNfcGl0Y2hfb2Zmc2V0LCBzY3JhdGNoX3BpdGNoIDw8IDE2 LCB4LCB5LCAwLCAwLCB3LCBoLAogICAgICAgICAgICAgICAgICAgICBSQURFT05fR0VNX0RPTUFJ Tl9WUkFNIHwgUkFERU9OX0dFTV9ET01BSU5fR1RULAogICAgICAgICAgICAgICAgICAgICBSQURF T05fR0VNX0RPTUFJTl9HVFQpOwogICAgIGNvcHlfc3JjID0gc2NyYXRjaDsKQEAgLTU2MSw3ICs1 NjQsNyBAQCBjb3B5OgogICAgIH0KICAgICByID0gVFJVRTsKICAgICB3ICo9IGJwcCAvIDg7Ci0g ICAgaWYgKGNvcHlfc3JjID09IGRyaXZlcl9wcml2LT5ibykKKyAgICBpZiAoY29weV9zcmMgPT0g ZHJpdmVyX3ByaXYtPmJvLT5iby5yYWRlb24pCiAJc2l6ZSA9IHkgKiBjb3B5X3BpdGNoICsgeCAq IGJwcCAvIDg7CiAgICAgZWxzZQogCXNpemUgPSAwOwpkaWZmIC0tZ2l0IGEvc3JjL3JhZGVvbl9l eGFfc2hhcmVkLmMgYi9zcmMvcmFkZW9uX2V4YV9zaGFyZWQuYwppbmRleCBjY2ExYzY3ZWEuLjk0 MjM4YTVhOSAxMDA2NDQKLS0tIGEvc3JjL3JhZGVvbl9leGFfc2hhcmVkLmMKKysrIGIvc3JjL3Jh ZGVvbl9leGFfc2hhcmVkLmMKQEAgLTEyOSw3ICsxMjksNyBAQCBQaXhtYXBQdHIgUkFERU9OU29s aWRQaXhtYXAoU2NyZWVuUHRyIHBTY3JlZW4sIHVpbnQzMl90IHNvbGlkKQogICAgIHN0cnVjdCBy YWRlb25fYm8gKmJvOwogICAgIGV4YU1vdmVJblBpeG1hcChwUGl4KTsKIAotICAgIGJvID0gcmFk ZW9uX2dldF9waXhtYXBfYm8ocFBpeCk7CisgICAgYm8gPSByYWRlb25fZ2V0X3BpeG1hcF9ibyhw UGl4KS0+Ym8ucmFkZW9uOwogCiAgICAgaWYgKHJhZGVvbl9ib19tYXAoYm8sIDEpKSB7CiAJcFNj cmVlbi0+RGVzdHJveVBpeG1hcChwUGl4KTsKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fZXhhX3No YXJlZC5oIGIvc3JjL3JhZGVvbl9leGFfc2hhcmVkLmgKaW5kZXggM2RmN2ZhMjA3Li5mZTI4YzIz MDIgMTAwNjQ0Ci0tLSBhL3NyYy9yYWRlb25fZXhhX3NoYXJlZC5oCisrKyBiL3NyYy9yYWRlb25f ZXhhX3NoYXJlZC5oCkBAIC02Niw3ICs2Niw4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCByYWRlb25f YWRkX3BpeG1hcChzdHJ1Y3QgcmFkZW9uX2NzICpjcywgUGl4bWFwUHRyIHBQaXgsIGludCByCiB7 CiAgICAgc3RydWN0IHJhZGVvbl9leGFfcGl4bWFwX3ByaXYgKmRyaXZlcl9wcml2ID0gZXhhR2V0 UGl4bWFwRHJpdmVyUHJpdmF0ZShwUGl4KTsKIAotICAgIHJhZGVvbl9jc19zcGFjZV9hZGRfcGVy c2lzdGVudF9ibyhjcywgZHJpdmVyX3ByaXYtPmJvLCByZWFkX2RvbWFpbnMsIHdyaXRlX2RvbWFp bik7CisgICAgcmFkZW9uX2NzX3NwYWNlX2FkZF9wZXJzaXN0ZW50X2JvKGNzLCBkcml2ZXJfcHJp di0+Ym8tPmJvLnJhZGVvbiwKKwkJCQkgICAgICByZWFkX2RvbWFpbnMsIHdyaXRlX2RvbWFpbik7 CiB9CiAKIGV4dGVybiB2b2lkIHJhZGVvbl9pYl9kaXNjYXJkKFNjcm5JbmZvUHRyIHBTY3JuKTsK ZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fZ2xhbW9yLmMgYi9zcmMvcmFkZW9uX2dsYW1vci5jCmlu ZGV4IDZjZmY3MmUxZi4uYzFkOTYxNjA0IDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX2dsYW1vci5j CisrKyBiL3NyYy9yYWRlb25fZ2xhbW9yLmMKQEAgLTYyLDcgKzYyLDcgQEAgcmFkZW9uX2dsYW1v cl9jcmVhdGVfc2NyZWVuX3Jlc291cmNlcyhTY3JlZW5QdHIgc2NyZWVuKQogI2VuZGlmCiAKIAlp ZiAoIWdsYW1vcl9lZ2xfY3JlYXRlX3RleHR1cmVkX3NjcmVlbihzY3JlZW4sCi0JCQkJCSAgICAg ICBpbmZvLT5mcm9udF9iby0+aGFuZGxlLAorCQkJCQkgICAgICAgaW5mby0+ZnJvbnRfYnVmZmVy LT5iby5yYWRlb24tPmhhbmRsZSwKIAkJCQkJICAgICAgIHNjcm4tPmRpc3BsYXlXaWR0aCAqCiAJ CQkJCSAgICAgICBpbmZvLT5waXhlbF9ieXRlcykpCiAJCXJldHVybiBGQUxTRTsKQEAgLTE2Niw3 ICsxNjYsNyBAQCByYWRlb25fZ2xhbW9yX3ByZV9pbml0KFNjcm5JbmZvUHRyIHNjcm4pCiBCb29s CiByYWRlb25fZ2xhbW9yX2NyZWF0ZV90ZXh0dXJlZF9waXhtYXAoUGl4bWFwUHRyIHBpeG1hcCwg c3RydWN0IHJhZGVvbl9waXhtYXAgKnByaXYpCiB7Ci0JcmV0dXJuIGdsYW1vcl9lZ2xfY3JlYXRl X3RleHR1cmVkX3BpeG1hcChwaXhtYXAsIHByaXYtPmJvLT5oYW5kbGUsCisJcmV0dXJuIGdsYW1v cl9lZ2xfY3JlYXRlX3RleHR1cmVkX3BpeG1hcChwaXhtYXAsIHByaXYtPmJvLT5iby5yYWRlb24t PmhhbmRsZSwKIAkJCQkJCSBwaXhtYXAtPmRldktpbmQpOwogfQogCkBAIC0xODAsMTAgKzE4MCwx MCBAQCBzdGF0aWMgQm9vbCByYWRlb25fZ2xhbW9yX2Rlc3Ryb3lfcGl4bWFwKFBpeG1hcFB0ciBw aXhtYXApCiAKIAlpZiAocGl4bWFwLT5yZWZjbnQgPT0gMSkgewogCQlpZiAocGl4bWFwLT5kZXZQ cml2YXRlLnB0cikgewotCQkJc3RydWN0IHJhZGVvbl9ibyAqYm8gPSByYWRlb25fZ2V0X3BpeG1h cF9ibyhwaXhtYXApOworCQkJc3RydWN0IHJhZGVvbl9idWZmZXIgKmJvID0gcmFkZW9uX2dldF9w aXhtYXBfYm8ocGl4bWFwKTsKIAogCQkJaWYgKGJvKQotCQkJCXJhZGVvbl9ib191bm1hcChibyk7 CisJCQkJcmFkZW9uX2JvX3VubWFwKGJvLT5iby5yYWRlb24pOwogCQl9CiAKICNpZmRlZiBIQVZF X0dMQU1PUl9FR0xfREVTVFJPWV9URVhUVVJFRF9QSVhNQVAKQEAgLTI4OSw3ICsyODksNyBAQCBm YWxsYmFja19nbGFtb3I6CiAJICogYWZ0ZXJ3YXJkcy4KIAkgKi8KIAluZXdfcGl4bWFwID0gZ2xh bW9yX2NyZWF0ZV9waXhtYXAoc2NyZWVuLCB3LCBoLAlkZXB0aCwgdXNhZ2UpOwotCXJhZGVvbl9i b191bnJlZihwcml2LT5ibyk7CisJcmFkZW9uX2J1ZmZlcl91bnJlZigmcHJpdi0+Ym8pOwogZmFs bGJhY2tfcHJpdjoKIAlmcmVlKHByaXYpOwogZmFsbGJhY2tfcGl4bWFwOgpkaWZmIC0tZ2l0IGEv c3JjL3JhZGVvbl9nbGFtb3Jfd3JhcHBlcnMuYyBiL3NyYy9yYWRlb25fZ2xhbW9yX3dyYXBwZXJz LmMKaW5kZXggOTQ3MDBhN2I5Li43OWQ5OGNjNzcgMTAwNjQ0Ci0tLSBhL3NyYy9yYWRlb25fZ2xh bW9yX3dyYXBwZXJzLmMKKysrIGIvc3JjL3JhZGVvbl9nbGFtb3Jfd3JhcHBlcnMuYwpAQCAtNTUs NyArNTUsNyBAQCByYWRlb25fZ2xhbW9yX3ByZXBhcmVfYWNjZXNzX2NwdShTY3JuSW5mb1B0ciBz Y3JuLCBSQURFT05JbmZvUHRyIGluZm8sCiAJCQkJIFBpeG1hcFB0ciBwaXhtYXAsIHN0cnVjdCBy YWRlb25fcGl4bWFwICpwcml2LAogCQkJCSBCb29sIG5lZWRfc3luYykKIHsKLQlzdHJ1Y3QgcmFk ZW9uX2JvICpibyA9IHByaXYtPmJvOworCXN0cnVjdCByYWRlb25fYnVmZmVyICpibyA9IHByaXYt PmJvOwogCWludCByZXQ7CiAKIAlpZiAoIXBpeG1hcC0+ZGV2UHJpdmF0ZS5wdHIpIHsKQEAgLTY1 LDcgKzY1LDcgQEAgcmFkZW9uX2dsYW1vcl9wcmVwYXJlX2FjY2Vzc19jcHUoU2NybkluZm9QdHIg c2NybiwgUkFERU9OSW5mb1B0ciBpbmZvLAogCQkJaW5mby0+Z3B1X2ZsdXNoZWQrKzsKIAkJfQog Ci0JCXJldCA9IHJhZGVvbl9ib19tYXAoYm8sIDEpOworCQlyZXQgPSByYWRlb25fYm9fbWFwKGJv LT5iby5yYWRlb24sIDEpOwogCQlpZiAocmV0KSB7CiAJCQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5J bmRleCwgWF9XQVJOSU5HLAogCQkJCSAgICIlczogYm8gbWFwICh0aWxpbmdfZmxhZ3MgJWQpIGZh aWxlZDogJXNcbiIsCkBAIC03NSw3ICs3NSw3IEBAIHJhZGVvbl9nbGFtb3JfcHJlcGFyZV9hY2Nl c3NfY3B1KFNjcm5JbmZvUHRyIHNjcm4sIFJBREVPTkluZm9QdHIgaW5mbywKIAkJCXJldHVybiBG QUxTRTsKIAkJfQogCi0JCXBpeG1hcC0+ZGV2UHJpdmF0ZS5wdHIgPSBiby0+cHRyOworCQlwaXht YXAtPmRldlByaXZhdGUucHRyID0gYm8tPmJvLnJhZGVvbi0+cHRyOwogCX0gZWxzZSBpZiAobmVl ZF9zeW5jKQogCQlyYWRlb25fZmluaXNoKHNjcm4sIGJvKTsKIApkaWZmIC0tZ2l0IGEvc3JjL3Jh ZGVvbl9rbXMuYyBiL3NyYy9yYWRlb25fa21zLmMKaW5kZXggZDRiNTllODFiLi5kM2VlZWJlYTgg MTAwNjQ0Ci0tLSBhL3NyYy9yYWRlb25fa21zLmMKKysrIGIvc3JjL3JhZGVvbl9rbXMuYwpAQCAt MjU0LDcgKzI1NCw3IEBAIHJhZGVvblNoYWRvd1dpbmRvdyhTY3JlZW5QdHIgc2NyZWVuLCBDQVJE MzIgcm93LCBDQVJEMzIgb2Zmc2V0LCBpbnQgbW9kZSwKICAgICBzdHJpZGUgPSAocFNjcm4tPmRp c3BsYXlXaWR0aCAqIHBTY3JuLT5iaXRzUGVyUGl4ZWwpIC8gODsKICAgICAqc2l6ZSA9IHN0cmlk ZTsKIAotICAgIHJldHVybiAoKHVpbnQ4X3QgKilpbmZvLT5mcm9udF9iby0+cHRyICsgcm93ICog c3RyaWRlICsgb2Zmc2V0KTsKKyAgICByZXR1cm4gKCh1aW50OF90ICopaW5mby0+ZnJvbnRfYnVm ZmVyLT5iby5yYWRlb24tPnB0ciArIHJvdyAqIHN0cmlkZSArIG9mZnNldCk7CiB9CiAKIHN0YXRp YyB2b2lkCkBAIC0zNTksOSArMzU5LDkgQEAgc3RhdGljIEJvb2wgUkFERU9OQ3JlYXRlU2NyZWVu UmVzb3VyY2VzX0tNUyhTY3JlZW5QdHIgcFNjcmVlbikKICAgICB9CiAKICAgICBpZiAoaW5mby0+ ZHJpMi5lbmFibGVkIHx8IGluZm8tPnVzZV9nbGFtb3IpIHsKLQlpZiAoaW5mby0+ZnJvbnRfYm8p IHsKKwlpZiAoaW5mby0+ZnJvbnRfYnVmZmVyKSB7CiAJICAgIFBpeG1hcFB0ciBwUGl4ID0gcFNj cmVlbi0+R2V0U2NyZWVuUGl4bWFwKHBTY3JlZW4pOwotCSAgICBpZiAoIXJhZGVvbl9zZXRfcGl4 bWFwX2JvKHBQaXgsIGluZm8tPmZyb250X2JvKSkKKwkgICAgaWYgKCFyYWRlb25fc2V0X3BpeG1h cF9ibyhwUGl4LCBpbmZvLT5mcm9udF9idWZmZXIpKQogCQlyZXR1cm4gRkFMU0U7CiAKIAkgICAg aWYgKGluZm8tPnN1cmZfbWFuICYmICFpbmZvLT51c2VfZ2xhbW9yKQpAQCAtMTY4MSw3ICsxNjgx LDcgQEAgdm9pZCBSQURFT05XaW5kb3dFeHBvc3VyZXNfb25lc2hvdChXaW5kb3dQdHIgcFdpbiwg UmVnaW9uUHRyIHBSZWdpb24KICAgICBwU2NyZWVuLT5XaW5kb3dFeHBvc3VyZXMocFdpbiwgcFJl Z2lvbik7CiAjZW5kaWYKIAotICAgIHJhZGVvbl9maW5pc2gocFNjcm4sIGluZm8tPmZyb250X2Jv KTsKKyAgICByYWRlb25fZmluaXNoKHBTY3JuLCBpbmZvLT5mcm9udF9idWZmZXIpOwogICAgIGRy bW1vZGVfc2V0X2Rlc2lyZWRfbW9kZXMocFNjcm4sICZpbmZvLT5kcm1tb2RlLCBUUlVFKTsKIH0K IApAQCAtMjI2OSw3ICsyMjY5LDcgQEAgQm9vbCBSQURFT05TY3JlZW5Jbml0X0tNUyhTY3JlZW5Q dHIgcFNjcmVlbiwgaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCXhmODZEcnZNc2cocFNjcm4tPnNj cm5JbmRleCwgWF9FUlJPUiwgInJhZGVvbl9zZXR1cF9rZXJuZWxfbWVtIGZhaWxlZFxuIik7CiAJ cmV0dXJuIEZBTFNFOwogICAgIH0KLSAgICBmcm9udF9wdHIgPSBpbmZvLT5mcm9udF9iby0+cHRy OworICAgIGZyb250X3B0ciA9IGluZm8tPmZyb250X2J1ZmZlci0+Ym8ucmFkZW9uLT5wdHI7CiAK ICAgICBpZiAoaW5mby0+cjYwMF9zaGFkb3dfZmIpIHsKIAlpbmZvLT5mYl9zaGFkb3cgPSBjYWxs b2MoMSwKQEAgLTI0NzgsMTUgKzI0NzgsMTcgQEAgQm9vbCBSQURFT05FbnRlclZUX0tNUyhTY3Ju SW5mb1B0ciBwU2NybikKICAgICBpZiAoaW5mby0+cjYwMF9zaGFkb3dfZmIpIHsKIAlpbnQgYmFz ZV9hbGlnbiA9IGRybW1vZGVfZ2V0X2Jhc2VfYWxpZ24ocFNjcm4sIGluZm8tPnBpeGVsX2J5dGVz LCAwKTsKIAlzdHJ1Y3QgcmFkZW9uX2JvICpmcm9udF9ibyA9IHJhZGVvbl9ib19vcGVuKGluZm8t PmJ1Zm1nciwgMCwKLQkJCQkJCSAgICBpbmZvLT5mcm9udF9iby0+c2l6ZSwKKwkJCQkJCSAgICBw U2Nybi0+ZGlzcGxheVdpZHRoICoKKwkJCQkJCSAgICBpbmZvLT5waXhlbF9ieXRlcyAqCisJCQkJ CQkgICAgcFNjcm4tPnZpcnR1YWxZLAogCQkJCQkJICAgIGJhc2VfYWxpZ24sCiAJCQkJCQkgICAg UkFERU9OX0dFTV9ET01BSU5fVlJBTSwgMCk7CiAKIAlpZiAoZnJvbnRfYm8pIHsKIAkgICAgaWYg KHJhZGVvbl9ib19tYXAoZnJvbnRfYm8sIDEpID09IDApIHsKIAkJbWVtc2V0KGZyb250X2JvLT5w dHIsIDAsIGZyb250X2JvLT5zaXplKTsKLQkJcmFkZW9uX2JvX3VucmVmKGluZm8tPmZyb250X2Jv KTsKLQkJaW5mby0+ZnJvbnRfYm8gPSBmcm9udF9ibzsKKwkJcmFkZW9uX2JvX3VucmVmKGluZm8t PmZyb250X2J1ZmZlci0+Ym8ucmFkZW9uKTsKKwkJaW5mby0+ZnJvbnRfYnVmZmVyLT5iby5yYWRl b24gPSBmcm9udF9ibzsKIAkgICAgfSBlbHNlIHsKIAkJcmFkZW9uX2JvX3VucmVmKGZyb250X2Jv KTsKIAkJZnJvbnRfYm8gPSBOVUxMOwpAQCAtMjYzMyw3ICsyNjM1LDggQEAgdm9pZCBSQURFT05M ZWF2ZVZUX0tNUyhTY3JuSW5mb1B0ciBwU2NybikKIAogCXBpeG1hcF91bnJlZl9mYihwU2NyZWVu LT5HZXRTY3JlZW5QaXhtYXAocFNjcmVlbiksIE5vbmUsIHBSQURFT05FbnQpOwogICAgIH0gZWxz ZSB7Ci0JbWVtc2V0KGluZm8tPmZyb250X2JvLT5wdHIsIDAsIGluZm8tPmZyb250X2JvLT5zaXpl KTsKKwltZW1zZXQoaW5mby0+ZnJvbnRfYnVmZmVyLT5iby5yYWRlb24tPnB0ciwgMCwKKwkgICAg ICAgcFNjcm4tPmRpc3BsYXlXaWR0aCAqIGluZm8tPnBpeGVsX2J5dGVzICogcFNjcm4tPnZpcnR1 YWxZKTsKICAgICB9CiAKICAgICBUaW1lclNldChOVUxMLCAwLCAxMDAwLCBjbGVhbnVwX2JsYWNr X2ZiLCBwU2NyZWVuKTsKQEAgLTI2NzEsMTAgKzI2NzQsOCBAQCBzdGF0aWMgQm9vbCByYWRlb25f c2V0dXBfa2VybmVsX21lbShTY3JlZW5QdHIgcFNjcmVlbikKICAgICBSQURFT05JbmZvUHRyIGlu Zm8gPSBSQURFT05QVFIocFNjcm4pOwogICAgIHhmODZDcnRjQ29uZmlnUHRyICAgeGY4Nl9jb25m aWcgPSBYRjg2X0NSVENfQ09ORklHX1BUUihwU2Nybik7CiAgICAgaW50IGNwcCA9IGluZm8tPnBp eGVsX2J5dGVzOwotICAgIHVpbnQzMl90IHNjcmVlbl9zaXplOwotICAgIGludCBwaXRjaCwgYmFz ZV9hbGlnbjsKKyAgICBpbnQgcGl0Y2g7CiAgICAgdWludDMyX3QgdGlsaW5nX2ZsYWdzID0gMDsK LSAgICBzdHJ1Y3QgcmFkZW9uX3N1cmZhY2Ugc3VyZmFjZTsKIAogICAgIGlmIChpbmZvLT5hY2Nl bF9zdGF0ZS0+ZXhhICE9IE5VTEwpIHsKIAl4Zjg2RHJ2TXNnKHBTY3JlZW4tPm15TnVtLCBYX0VS Uk9SLCAiTWVtb3J5IG1hcCBhbHJlYWR5IGluaXRpYWxpemVkXG4iKTsKQEAgLTI2ODgsNTAgKzI2 ODksNiBAQCBzdGF0aWMgQm9vbCByYWRlb25fc2V0dXBfa2VybmVsX21lbShTY3JlZW5QdHIgcFNj cmVlbikKIAl9CiAgICAgfQogCi0gICAgaWYgKGluZm8tPmFsbG93Q29sb3JUaWxpbmcgJiYgIWlu Zm8tPnNoYWRvd19wcmltYXJ5KSB7Ci0JaWYgKGluZm8tPkNoaXBGYW1pbHkgPj0gQ0hJUF9GQU1J TFlfUjYwMCkgewotCQlpZiAoaW5mby0+YWxsb3dDb2xvclRpbGluZzJEKSB7Ci0JCQl0aWxpbmdf ZmxhZ3MgfD0gUkFERU9OX1RJTElOR19NQUNSTzsKLQkJfSBlbHNlIHsKLQkJCXRpbGluZ19mbGFn cyB8PSBSQURFT05fVElMSU5HX01JQ1JPOwotCQl9Ci0JfSBlbHNlCi0JICAgIHRpbGluZ19mbGFn cyB8PSBSQURFT05fVElMSU5HX01BQ1JPOwotICAgIH0KLSAgICBwaXRjaCA9IFJBREVPTl9BTElH TihwU2Nybi0+dmlydHVhbFgsIGRybW1vZGVfZ2V0X3BpdGNoX2FsaWduKHBTY3JuLCBjcHAsIHRp bGluZ19mbGFncykpICogY3BwOwotICAgIHNjcmVlbl9zaXplID0gUkFERU9OX0FMSUdOKHBTY3Ju LT52aXJ0dWFsWSwgZHJtbW9kZV9nZXRfaGVpZ2h0X2FsaWduKHBTY3JuLCB0aWxpbmdfZmxhZ3Mp KSAqIHBpdGNoOwotICAgIGJhc2VfYWxpZ24gPSBkcm1tb2RlX2dldF9iYXNlX2FsaWduKHBTY3Ju LCBjcHAsIHRpbGluZ19mbGFncyk7Ci0JaWYgKGluZm8tPnN1cmZfbWFuKSB7Ci0JCWlmICghcmFk ZW9uX3N1cmZhY2VfaW5pdGlhbGl6ZShpbmZvLCAmc3VyZmFjZSwgcFNjcm4tPnZpcnR1YWxYLAot CQkJCQkgICAgICAgcFNjcm4tPnZpcnR1YWxZLCBjcHAsCi0JCQkJCSAgICAgICB0aWxpbmdfZmxh Z3MsIDApKSB7Ci0JCQl4Zjg2RHJ2TXNnKHBTY3JlZW4tPm15TnVtLCBYX0VSUk9SLAotCQkJCSAg ICJyYWRlb25fc3VyZmFjZV9pbml0aWFsaXplIGZhaWxlZFxuIik7Ci0JCQlyZXR1cm4gRkFMU0U7 Ci0JCX0KLQkJcGl0Y2ggPSBzdXJmYWNlLmxldmVsWzBdLnBpdGNoX2J5dGVzOwotCQlzY3JlZW5f c2l6ZSA9IHN1cmZhY2UuYm9fc2l6ZTsKLQkJYmFzZV9hbGlnbiA9IHN1cmZhY2UuYm9fYWxpZ25t ZW50OwotCQl0aWxpbmdfZmxhZ3MgPSAwOwotCQlzd2l0Y2ggKHN1cmZhY2UubGV2ZWxbMF0ubW9k ZSkgewotCQljYXNlIFJBREVPTl9TVVJGX01PREVfMkQ6Ci0JCQl0aWxpbmdfZmxhZ3MgfD0gUkFE RU9OX1RJTElOR19NQUNSTzsKLQkJCXRpbGluZ19mbGFncyB8PSBzdXJmYWNlLmJhbmt3IDw8IFJB REVPTl9USUxJTkdfRUdfQkFOS1dfU0hJRlQ7Ci0JCQl0aWxpbmdfZmxhZ3MgfD0gc3VyZmFjZS5i YW5raCA8PCBSQURFT05fVElMSU5HX0VHX0JBTktIX1NISUZUOwotCQkJdGlsaW5nX2ZsYWdzIHw9 IHN1cmZhY2UubXRpbGVhIDw8IFJBREVPTl9USUxJTkdfRUdfTUFDUk9fVElMRV9BU1BFQ1RfU0hJ RlQ7Ci0JCQlpZiAoc3VyZmFjZS50aWxlX3NwbGl0KQotCQkJCXRpbGluZ19mbGFncyB8PSBlZ190 aWxlX3NwbGl0KHN1cmZhY2UudGlsZV9zcGxpdCkKLQkJCQkJCTw8IFJBREVPTl9USUxJTkdfRUdf VElMRV9TUExJVF9TSElGVDsKLQkJCWJyZWFrOwotCQljYXNlIFJBREVPTl9TVVJGX01PREVfMUQ6 Ci0JCQl0aWxpbmdfZmxhZ3MgfD0gUkFERU9OX1RJTElOR19NSUNSTzsKLQkJCWJyZWFrOwotCQlk ZWZhdWx0OgotCQkJYnJlYWs7Ci0JCX0KLQkJaWYgKCFpbmZvLT51c2VfZ2xhbW9yKQotCQkgICAg aW5mby0+ZnJvbnRfc3VyZmFjZSA9IHN1cmZhY2U7Ci0JfQogICAgIHsKIAlpbnQgY3Vyc29yX3Np emU7CiAJaW50IGM7CkBAIC0yNzU4LDE3ICsyNzE1LDI3IEBAIHN0YXRpYyBCb29sIHJhZGVvbl9z ZXR1cF9rZXJuZWxfbWVtKFNjcmVlblB0ciBwU2NyZWVuKQogICAgICAgICB9CiAgICAgfQogCi0g ICAgc2NyZWVuX3NpemUgPSBSQURFT05fQUxJR04oc2NyZWVuX3NpemUsIFJBREVPTl9HUFVfUEFH RV9TSVpFKTsKKyAgICBpZiAoaW5mby0+ZnJvbnRfYnVmZmVyID09IE5VTEwpIHsKKwlpbnQgdXNh Z2UgPSBDUkVBVEVfUElYTUFQX1VTQUdFX0JBQ0tJTkdfUElYTUFQOworCisJaWYgKGluZm8tPmFs bG93Q29sb3JUaWxpbmcgJiYgIWluZm8tPnNoYWRvd19wcmltYXJ5KSB7CisJICAgIGlmIChpbmZv LT5DaGlwRmFtaWx5IDwgQ0hJUF9GQU1JTFlfUjYwMCB8fCBpbmZvLT5hbGxvd0NvbG9yVGlsaW5n MkQpCisJCXVzYWdlIHw9IFJBREVPTl9DUkVBVEVfUElYTUFQX1RJTElOR19NQUNSTzsKKwkgICAg ZWxzZQorCQl1c2FnZSB8PSBSQURFT05fQ1JFQVRFX1BJWE1BUF9USUxJTkdfTUlDUk87CisJfQor CisgICAgICAgIGluZm8tPmZyb250X2J1ZmZlciA9IHJhZGVvbl9hbGxvY19waXhtYXBfYm8ocFNj cm4sIHBTY3JuLT52aXJ0dWFsWCwKKwkJCQkJCSAgICBwU2Nybi0+dmlydHVhbFksCisJCQkJCQkg ICAgcFNjcm4tPmRlcHRoLAorCQkJCQkJICAgIHVzYWdlLAorCQkJCQkJICAgIHBTY3JuLT5iaXRz UGVyUGl4ZWwsCisJCQkJCQkgICAgJnBpdGNoLAorCQkJCQkJICAgICZpbmZvLT5mcm9udF9zdXJm YWNlLAorCQkJCQkJICAgICZ0aWxpbmdfZmxhZ3MpOwogCi0gICAgaWYgKGluZm8tPmZyb250X2Jv ID09IE5VTEwpIHsKLSAgICAgICAgaW5mby0+ZnJvbnRfYm8gPSByYWRlb25fYm9fb3BlbihpbmZv LT5idWZtZ3IsIDAsIHNjcmVlbl9zaXplLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGJhc2VfYWxpZ24sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaW5mby0+c2hhZG93X3ByaW1hcnkgPwotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFJBREVPTl9HRU1fRE9NQUlOX0dUVCA6Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgUkFERU9OX0dFTV9ET01BSU5fVlJBTSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aWxpbmdfZmxhZ3MgPyBSQURFT05fR0VNX05P X0NQVV9BQ0NFU1MgOiAwKTsKICAgICAgICAgaWYgKGluZm8tPnI2MDBfc2hhZG93X2ZiID09IFRS VUUpIHsKLSAgICAgICAgICAgIGlmIChyYWRlb25fYm9fbWFwKGluZm8tPmZyb250X2JvLCAxKSkg eworICAgICAgICAgICAgaWYgKHJhZGVvbl9ib19tYXAoaW5mby0+ZnJvbnRfYnVmZmVyLT5iby5y YWRlb24sIDEpKSB7CiAgICAgICAgICAgICAgICAgRXJyb3JGKCJGYWlsZWQgdG8gbWFwIGN1cnNv ciBidWZmZXIgbWVtb3J5XG4iKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMjc4Niwx MyArMjc1MywxNCBAQCBzdGF0aWMgQm9vbCByYWRlb25fc2V0dXBfa2VybmVsX21lbShTY3JlZW5Q dHIgcFNjcmVlbikKIAkgICAgdGlsaW5nX2ZsYWdzIHw9IFJBREVPTl9USUxJTkdfU1VSRkFDRTsK ICNlbmRpZgogCWlmICh0aWxpbmdfZmxhZ3MpCi0gICAgICAgICAgICByYWRlb25fYm9fc2V0X3Rp bGluZyhpbmZvLT5mcm9udF9ibywgdGlsaW5nX2ZsYWdzLCBwaXRjaCk7CisgICAgICAgICAgICBy YWRlb25fYm9fc2V0X3RpbGluZyhpbmZvLT5mcm9udF9idWZmZXItPmJvLnJhZGVvbiwgdGlsaW5n X2ZsYWdzLCBwaXRjaCk7CiAgICAgfQogCiAgICAgcFNjcm4tPmRpc3BsYXlXaWR0aCA9IHBpdGNo IC8gY3BwOwogCi0gICAgeGY4NkRydk1zZyhwU2Nybi0+c2NybkluZGV4LCBYX0lORk8sICJGcm9u dCBidWZmZXIgc2l6ZTogJWRLXG4iLCBpbmZvLT5mcm9udF9iby0+c2l6ZS8xMDI0KTsKLSAgICBy YWRlb25fa21zX3VwZGF0ZV92cmFtX2xpbWl0KHBTY3JuLCBzY3JlZW5fc2l6ZSk7CisgICAgeGY4 NkRydk1zZyhwU2Nybi0+c2NybkluZGV4LCBYX0lORk8sICJGcm9udCBidWZmZXIgc2l6ZTogJWRL XG4iLAorCSAgICAgICBwaXRjaCAqIHBTY3JuLT52aXJ0dWFsWSAvIDEwMjQpOworICAgIHJhZGVv bl9rbXNfdXBkYXRlX3ZyYW1fbGltaXQocFNjcm4sIHBpdGNoICogcFNjcm4tPnZpcnR1YWxZKTsK ICAgICByZXR1cm4gVFJVRTsKIH0KIApkaWZmIC0tZ2l0IGEvc3JjL3JhZGVvbl9wcmVzZW50LmMg Yi9zcmMvcmFkZW9uX3ByZXNlbnQuYwppbmRleCA2NjgwNWQ3ZGYuLjI5ODJkNzI4NiAxMDA2NDQK LS0tIGEvc3JjL3JhZGVvbl9wcmVzZW50LmMKKysrIGIvc3JjL3JhZGVvbl9wcmVzZW50LmMKQEAg LTQyMiw3ICs0MjIsNyBAQCByYWRlb25fcHJlc2VudF91bmZsaXAoU2NyZWVuUHRyIHNjcmVlbiwg dWludDY0X3QgZXZlbnRfaWQpCiAJcmV0dXJuOwogCiBtb2Rlc2V0OgotICAgIHJhZGVvbl9maW5p c2goc2NybiwgaW5mby0+ZnJvbnRfYm8pOworICAgIHJhZGVvbl9maW5pc2goc2NybiwgaW5mby0+ ZnJvbnRfYnVmZmVyKTsKICAgICBmb3IgKGkgPSAwOyBpIDwgY29uZmlnLT5udW1fY3J0YzsgaSsr KSB7CiAJeGY4NkNydGNQdHIgY3J0YyA9IGNvbmZpZy0+Y3J0Y1tpXTsKIAlkcm1tb2RlX2NydGNf cHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0gY3J0Yy0+ZHJpdmVyX3ByaXZhdGU7CmRpZmYgLS1n aXQgYS9zcmMvcmFkZW9uX3RleHR1cmVkX3ZpZGVvZnVuY3MuYyBiL3NyYy9yYWRlb25fdGV4dHVy ZWRfdmlkZW9mdW5jcy5jCmluZGV4IDY1M2RlNDRkZS4uMDk1OWIxMTlhIDEwMDY0NAotLS0gYS9z cmMvcmFkZW9uX3RleHR1cmVkX3ZpZGVvZnVuY3MuYworKysgYi9zcmMvcmFkZW9uX3RleHR1cmVk X3ZpZGVvZnVuY3MuYwpAQCAtNjMsMTAgKzYzLDEyIEBAIFJBREVPTlByZXBhcmVUZXh0dXJlZFZp ZGVvKFNjcm5JbmZvUHRyIHBTY3JuLCBSQURFT05Qb3J0UHJpdlB0ciBwUHJpdikKICAgICByYWRl b25fY3Nfc3BhY2VfYWRkX3BlcnNpc3RlbnRfYm8oaW5mby0+Y3MsIHNyY19ibywgUkFERU9OX0dF TV9ET01BSU5fR1RUIHwgUkFERU9OX0dFTV9ET01BSU5fVlJBTSwgMCk7CiAKICAgICBpZiAocFBy aXYtPmJpY3ViaWNfZW5hYmxlZCkKLQlyYWRlb25fY3Nfc3BhY2VfYWRkX3BlcnNpc3RlbnRfYm8o aW5mby0+Y3MsIGluZm8tPmJpY3ViaWNfYm8sIFJBREVPTl9HRU1fRE9NQUlOX0dUVCB8IFJBREVP Tl9HRU1fRE9NQUlOX1ZSQU0sIDApOworCXJhZGVvbl9jc19zcGFjZV9hZGRfcGVyc2lzdGVudF9i byhpbmZvLT5jcywgaW5mby0+YmljdWJpY19ibywKKwkJCQkJICBSQURFT05fR0VNX0RPTUFJTl9H VFQgfCBSQURFT05fR0VNX0RPTUFJTl9WUkFNLCAwKTsKIAogICAgIGRyaXZlcl9wcml2ID0gZXhh R2V0UGl4bWFwRHJpdmVyUHJpdmF0ZShwUGl4bWFwKTsKLSAgICByYWRlb25fY3Nfc3BhY2VfYWRk X3BlcnNpc3RlbnRfYm8oaW5mby0+Y3MsIGRyaXZlcl9wcml2LT5ibywgMCwgUkFERU9OX0dFTV9E T01BSU5fVlJBTSk7CisgICAgcmFkZW9uX2NzX3NwYWNlX2FkZF9wZXJzaXN0ZW50X2JvKGluZm8t PmNzLCBkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbiwgMCwKKwkJCQkgICAgICBSQURFT05fR0VN X0RPTUFJTl9WUkFNKTsKIAogICAgIHJldCA9IHJhZGVvbl9jc19zcGFjZV9jaGVjayhpbmZvLT5j cyk7CiAgICAgaWYgKHJldCkgewpAQCAtNDMzLDEwICs0MzUsMTIgQEAgUjIwMFByZXBhcmVUZXh0 dXJlZFZpZGVvKFNjcm5JbmZvUHRyIHBTY3JuLCBSQURFT05Qb3J0UHJpdlB0ciBwUHJpdikKICAg ICByYWRlb25fY3Nfc3BhY2VfYWRkX3BlcnNpc3RlbnRfYm8oaW5mby0+Y3MsIHNyY19ibywgUkFE RU9OX0dFTV9ET01BSU5fR1RUIHwgUkFERU9OX0dFTV9ET01BSU5fVlJBTSwgMCk7CiAKICAgICBp ZiAocFByaXYtPmJpY3ViaWNfZW5hYmxlZCkKLQlyYWRlb25fY3Nfc3BhY2VfYWRkX3BlcnNpc3Rl bnRfYm8oaW5mby0+Y3MsIGluZm8tPmJpY3ViaWNfYm8sIFJBREVPTl9HRU1fRE9NQUlOX0dUVCB8 IFJBREVPTl9HRU1fRE9NQUlOX1ZSQU0sIDApOworCXJhZGVvbl9jc19zcGFjZV9hZGRfcGVyc2lz dGVudF9ibyhpbmZvLT5jcywgaW5mby0+YmljdWJpY19ibywKKwkJCQkJICBSQURFT05fR0VNX0RP TUFJTl9HVFQgfCBSQURFT05fR0VNX0RPTUFJTl9WUkFNLCAwKTsKIAogICAgIGRyaXZlcl9wcml2 ID0gZXhhR2V0UGl4bWFwRHJpdmVyUHJpdmF0ZShwUGl4bWFwKTsKLSAgICByYWRlb25fY3Nfc3Bh Y2VfYWRkX3BlcnNpc3RlbnRfYm8oaW5mby0+Y3MsIGRyaXZlcl9wcml2LT5ibywgMCwgUkFERU9O X0dFTV9ET01BSU5fVlJBTSk7CisgICAgcmFkZW9uX2NzX3NwYWNlX2FkZF9wZXJzaXN0ZW50X2Jv KGluZm8tPmNzLCBkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbiwgMCwKKwkJCQkgICAgICBSQURF T05fR0VNX0RPTUFJTl9WUkFNKTsKIAogICAgIHJldCA9IHJhZGVvbl9jc19zcGFjZV9jaGVjayhp bmZvLT5jcyk7CiAgICAgaWYgKHJldCkgewpAQCAtOTU4LDEwICs5NjIsMTIgQEAgUjMwMFByZXBh cmVUZXh0dXJlZFZpZGVvKFNjcm5JbmZvUHRyIHBTY3JuLCBSQURFT05Qb3J0UHJpdlB0ciBwUHJp dikKICAgICByYWRlb25fY3Nfc3BhY2VfYWRkX3BlcnNpc3RlbnRfYm8oaW5mby0+Y3MsIHNyY19i bywgUkFERU9OX0dFTV9ET01BSU5fR1RUIHwgUkFERU9OX0dFTV9ET01BSU5fVlJBTSwgMCk7CiAK ICAgICBpZiAocFByaXYtPmJpY3ViaWNfZW5hYmxlZCkKLQlyYWRlb25fY3Nfc3BhY2VfYWRkX3Bl cnNpc3RlbnRfYm8oaW5mby0+Y3MsIGluZm8tPmJpY3ViaWNfYm8sIFJBREVPTl9HRU1fRE9NQUlO X0dUVCB8IFJBREVPTl9HRU1fRE9NQUlOX1ZSQU0sIDApOworCXJhZGVvbl9jc19zcGFjZV9hZGRf cGVyc2lzdGVudF9ibyhpbmZvLT5jcywgaW5mby0+YmljdWJpY19ibywKKwkJCQkJICBSQURFT05f R0VNX0RPTUFJTl9HVFQgfCBSQURFT05fR0VNX0RPTUFJTl9WUkFNLCAwKTsKIAogICAgIGRyaXZl cl9wcml2ID0gZXhhR2V0UGl4bWFwRHJpdmVyUHJpdmF0ZShwUGl4bWFwKTsKLSAgICByYWRlb25f Y3Nfc3BhY2VfYWRkX3BlcnNpc3RlbnRfYm8oaW5mby0+Y3MsIGRyaXZlcl9wcml2LT5ibywgMCwg UkFERU9OX0dFTV9ET01BSU5fVlJBTSk7CisgICAgcmFkZW9uX2NzX3NwYWNlX2FkZF9wZXJzaXN0 ZW50X2JvKGluZm8tPmNzLCBkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbiwgMCwKKwkJCQkgICAg ICBSQURFT05fR0VNX0RPTUFJTl9WUkFNKTsKIAogICAgIHJldCA9IHJhZGVvbl9jc19zcGFjZV9j aGVjayhpbmZvLT5jcyk7CiAgICAgaWYgKHJldCkgewpAQCAtMjM3NiwxMCArMjM4MiwxMiBAQCBS NTAwUHJlcGFyZVRleHR1cmVkVmlkZW8oU2NybkluZm9QdHIgcFNjcm4sIFJBREVPTlBvcnRQcml2 UHRyIHBQcml2KQogICAgIHJhZGVvbl9jc19zcGFjZV9hZGRfcGVyc2lzdGVudF9ibyhpbmZvLT5j cywgc3JjX2JvLCBSQURFT05fR0VNX0RPTUFJTl9HVFQgfCBSQURFT05fR0VNX0RPTUFJTl9WUkFN LCAwKTsKIAogICAgIGlmIChwUHJpdi0+YmljdWJpY19lbmFibGVkKQotCXJhZGVvbl9jc19zcGFj ZV9hZGRfcGVyc2lzdGVudF9ibyhpbmZvLT5jcywgaW5mby0+YmljdWJpY19ibywgUkFERU9OX0dF TV9ET01BSU5fR1RUIHwgUkFERU9OX0dFTV9ET01BSU5fVlJBTSwgMCk7CisJcmFkZW9uX2NzX3Nw YWNlX2FkZF9wZXJzaXN0ZW50X2JvKGluZm8tPmNzLCBpbmZvLT5iaWN1YmljX2JvLAorCQkJCQkg IFJBREVPTl9HRU1fRE9NQUlOX0dUVCB8IFJBREVPTl9HRU1fRE9NQUlOX1ZSQU0sIDApOwogICAg IAogICAgIGRyaXZlcl9wcml2ID0gZXhhR2V0UGl4bWFwRHJpdmVyUHJpdmF0ZShwUGl4bWFwKTsK LSAgICByYWRlb25fY3Nfc3BhY2VfYWRkX3BlcnNpc3RlbnRfYm8oaW5mby0+Y3MsIGRyaXZlcl9w cml2LT5ibywgMCwgUkFERU9OX0dFTV9ET01BSU5fVlJBTSk7CisgICAgcmFkZW9uX2NzX3NwYWNl X2FkZF9wZXJzaXN0ZW50X2JvKGluZm8tPmNzLCBkcml2ZXJfcHJpdi0+Ym8tPmJvLnJhZGVvbiwg MCwKKwkJCQkgICAgICBSQURFT05fR0VNX0RPTUFJTl9WUkFNKTsKIAogICAgIHJldCA9IHJhZGVv bl9jc19zcGFjZV9jaGVjayhpbmZvLT5jcyk7CiAgICAgaWYgKHJldCkgewotLSAKMi4xOC4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1h aWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK