From: Paul Durrant Subject: [PATCH v2 01/13] grant_table: use term 'mfn' for machine frame numbers... Date: Sat, 7 Jul 2018 12:05:14 +0100 Message-ID: <20180707110526.35822-2-paul.durrant@citrix.com> References: <20180707110526.35822-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fbl1y-00024T-Bg for xen-devel@lists.xenproject.org; Sat, 07 Jul 2018 11:05:34 +0000 In-Reply-To: <20180707110526.35822-1-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Paul Durrant , Jan Beulich List-Id: xen-devel@lists.xenproject.org Li4ucmF0aGVyIHRoYW4gbW9yZSBhbWJpZ3VvdXMgdGVybSAnZnJhbWUnLgoKVGhlcmUgYXJlIG1h bnkgcGxhY2VzIGluIHRoZSBncmFudCB0YWJsZSBjb2RlIHRoYXQgdXNlIGEgdmFyaWFibGUgb3IK ZmllbGQgbmFtZSAnLipmcmFtZScgdG8gcmVmZXIgdG8gYSBxdWFudGl0eSB0aGF0IGlzIHN0cmlj dGx5IGFuIE1GTiwgYW5kCmV2ZW4gaGFzIHR5cGUgbWZuX3QuClRoaXMgcGF0Y2ggaXMgYSBwdXJl bHkgY29zbWV0aWMgcGF0Y2ggdGhhdCBzdWJzdGl0dXRlcyAnZnJhbWUnIHdpdGggJ21mbicKaW4g dGhvc2UgcGxhY2VzIHRvIG1ha2UgdGhlIHB1cnBvc2Ugb2YgdGhlIHZhcmlhYmxlIG9yIGZpZWxk IG5hbWUgbW9yZQpvYnZpb3VzLgoKU2lnbmVkLW9mZi1ieTogUGF1bCBEdXJyYW50IDxwYXVsLmR1 cnJhbnRAY2l0cml4LmNvbT4KLS0tCkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgpDYzogR2VvcmdlIER1bmxhcCA8R2VvcmdlLkR1bmxhcEBldS5jaXRyaXguY29t PgpDYzogSWFuIEphY2tzb24gPGlhbi5qYWNrc29uQGV1LmNpdHJpeC5jb20+CkNjOiBKYW4gQmV1 bGljaCA8amJldWxpY2hAc3VzZS5jb20+CkNjOiBKdWxpZW4gR3JhbGwgPGp1bGllbi5ncmFsbEBh cm0uY29tPgpDYzogS29ucmFkIFJ6ZXN6dXRlayBXaWxrIDxrb25yYWQud2lsa0BvcmFjbGUuY29t PgpDYzogU3RlZmFubyBTdGFiZWxsaW5pIDxzc3RhYmVsbGluaUBrZXJuZWwub3JnPgpDYzogVGlt IERlZWdhbiA8dGltQHhlbi5vcmc+CkNjOiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgoK djI6CiAtIE5ldyBpbiB2Mi4KLS0tCiB4ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMgfCAxNDIgKysr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCA3MiBpbnNlcnRpb25zKCspLCA3MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4v Y29tbW9uL2dyYW50X3RhYmxlLmMgYi94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMKaW5kZXggNTFl MWY1Y2E0Yy4uZDI2MTBlMzIwYyAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9ncmFudF90YWJsZS5j CisrKyBiL3hlbi9jb21tb24vZ3JhbnRfdGFibGUuYwpAQCAtMTY3LDcgKzE2Nyw3IEBAIHN0cnVj dCBnbnR0YWJfdW5tYXBfY29tbW9uIHsKIAogICAgIC8qIFNoYXJlZCBzdGF0ZSBiZXRlZW4gKl91 bm1hcCBhbmQgKl91bm1hcF9jb21wbGV0ZSAqLwogICAgIHVpbnQxNl90IGRvbmU7Ci0gICAgbWZu X3QgZnJhbWU7CisgICAgbWZuX3QgbWZuOwogICAgIHN0cnVjdCBkb21haW4gKnJkOwogICAgIGdy YW50X3JlZl90IHJlZjsKIH07CkBAIC0yNjYsNyArMjY2LDcgQEAgc3RydWN0IGFjdGl2ZV9ncmFu dF9lbnRyeSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdyYW50LiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKi8KICAgICBncmFudF9yZWZfdCAgIHRyYW5zX2dyZWY7 CiAgICAgc3RydWN0IGRvbWFpbiAqdHJhbnNfZG9tYWluOwotICAgIG1mbl90ICAgICAgICAgZnJh bWU7ICAvKiBGcmFtZSBiZWluZyBncmFudGVkLiAgICAgICAgICAgICAgICAgICAgICovCisgICAg bWZuX3QgICAgICAgICBtZm47ICAgIC8qIE1hY2hpbmUgZnJhbWUgYmVpbmcgZ3JhbnRlZC4gICAg ICAgICAgICAgKi8KICNpZm5kZWYgTkRFQlVHCiAgICAgZ2ZuX3QgICAgICAgICBnZm47ICAgIC8q IEd1ZXN0J3MgaWRlYSBvZiB0aGUgZnJhbWUgYmVpbmcgZ3JhbnRlZC4gKi8KICNlbmRpZgpAQCAt MzcwLDE1ICszNzAsMTUgQEAgc3RhdGljIGlubGluZSB1bnNpZ25lZCBpbnQgZ3JhbnRfdG9fc3Rh dHVzX2ZyYW1lcyh1bnNpZ25lZCBpbnQgZ3JhbnRfZnJhbWVzKQogLyogQ2hlY2sgaWYgdGhlIHBh Z2UgaGFzIGJlZW4gcGFnZWQgb3V0LCBvciBuZWVkcyB1bnNoYXJpbmcuCiAgICBJZiByYyA9PSBH TlRTVF9va2F5LCAqcGFnZSBjb250YWlucyB0aGUgcGFnZSBzdHJ1Y3Qgd2l0aCBhIHJlZiB0YWtl bi4KICAgIENhbGxlciBtdXN0IGRvIHB1dF9wYWdlKCpwYWdlKS4KLSAgIElmIGFueSBlcnJvciwg KnBhZ2UgPSBOVUxMLCAqZnJhbWUgPSBJTlZBTElEX01GTiwgbm8gcmVmIHRha2VuLiAqLwotc3Rh dGljIGludCBnZXRfcGFnZWRfZnJhbWUodW5zaWduZWQgbG9uZyBnZm4sIG1mbl90ICpmcmFtZSwK KyAgIElmIGFueSBlcnJvciwgKnBhZ2UgPSBOVUxMLCAqbWZuID0gSU5WQUxJRF9NRk4sIG5vIHJl ZiB0YWtlbi4gKi8KK3N0YXRpYyBpbnQgZ2V0X3BhZ2VkX2ZyYW1lKHVuc2lnbmVkIGxvbmcgZ2Zu LCBtZm5fdCAqbWZuLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RydWN0IHBhZ2VfaW5m byAqKnBhZ2UsIGJvb2wgcmVhZG9ubHksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1 Y3QgZG9tYWluICpyZCkKIHsKICAgICBpbnQgcmMgPSBHTlRTVF9va2F5OwogICAgIHAybV90eXBl X3QgcDJtdDsKIAotICAgICpmcmFtZSA9IElOVkFMSURfTUZOOworICAgICptZm4gPSBJTlZBTElE X01GTjsKICAgICAqcGFnZSA9IGdldF9wYWdlX2Zyb21fZ2ZuKHJkLCBnZm4sICZwMm10LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVhZG9ubHkgPyBQMk1fQUxMT0MgOiBQMk1fVU5T SEFSRSk7CiAgICAgaWYgKCAhKnBhZ2UgKQpAQCAtNDA1LDcgKzQwNSw3IEBAIHN0YXRpYyBpbnQg Z2V0X3BhZ2VkX2ZyYW1lKHVuc2lnbmVkIGxvbmcgZ2ZuLCBtZm5fdCAqZnJhbWUsCiAgICAgICAg IHJldHVybiBHTlRTVF9iYWRfcGFnZTsKICAgICB9CiAKLSAgICAqZnJhbWUgPSBwYWdlX3RvX21m bigqcGFnZSk7CisgICAgKm1mbiA9IHBhZ2VfdG9fbWZuKCpwYWdlKTsKIAogICAgIHJldHVybiBy YzsKIH0KQEAgLTg0Myw3ICs4NDMsNyBAQCBzdGF0aWMgc3RydWN0IGFjdGl2ZV9ncmFudF9lbnRy eSAqZ3JhbnRfbWFwX2V4aXN0cyhjb25zdCBzdHJ1Y3QgZG9tYWluICpsZCwKICAgICAgICAgc3Ry dWN0IGFjdGl2ZV9ncmFudF9lbnRyeSAqYWN0ID0gYWN0aXZlX2VudHJ5X2FjcXVpcmUocmd0LCBy ZWYpOwogCiAgICAgICAgIGlmICggYWN0LT5waW4gJiYgYWN0LT5kb21pZCA9PSBsZC0+ZG9tYWlu X2lkICYmCi0gICAgICAgICAgICAgbWZuX2VxKGFjdC0+ZnJhbWUsIG1mbikgKQorICAgICAgICAg ICAgIG1mbl9lcShhY3QtPm1mbiwgbWZuKSApCiAgICAgICAgICAgICByZXR1cm4gYWN0OwogICAg ICAgICBhY3RpdmVfZW50cnlfcmVsZWFzZShhY3QpOwogICAgIH0KQEAgLTg4NSw3ICs4ODUsNyBA QCBzdGF0aWMgdW5zaWduZWQgaW50IG1hcGtpbmQoCiAgICAgICAgIGlmICggIShtYXAtPmZsYWdz ICYgKEdOVE1BUF9kZXZpY2VfbWFwfEdOVE1BUF9ob3N0X21hcCkpIHx8CiAgICAgICAgICAgICAg bWFwLT5kb21pZCAhPSByZC0+ZG9tYWluX2lkICkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAg ICAgICBpZiAoIG1mbl9lcShfYWN0aXZlX2VudHJ5KHJkLT5ncmFudF90YWJsZSwgbWFwLT5yZWYp LmZyYW1lLCBtZm4pICkKKyAgICAgICAgaWYgKCBtZm5fZXEoX2FjdGl2ZV9lbnRyeShyZC0+Z3Jh bnRfdGFibGUsIG1hcC0+cmVmKS5tZm4sIG1mbikgKQogICAgICAgICAgICAga2luZCB8PSBtYXAt PmZsYWdzICYgR05UTUFQX3JlYWRvbmx5ID8KICAgICAgICAgICAgICAgICAgICAgTUFQS0lORF9S RUFEIDogTUFQS0lORF9XUklURTsKICAgICB9CkBAIC05MDgsNyArOTA4LDcgQEAgbWFwX2dyYW50 X3JlZigKICAgICBzdHJ1Y3QgZ3JhbnRfdGFibGUgKmxndCwgKnJndDsKICAgICBzdHJ1Y3QgdmNw dSAgICpsZWQ7CiAgICAgZ3JhbnRfaGFuZGxlX3QgaGFuZGxlOwotICAgIG1mbl90IGZyYW1lOwor ICAgIG1mbl90IG1mbjsKICAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwZyA9IE5VTEw7CiAgICAgaW50 ICAgICAgICAgICAgcmMgPSBHTlRTVF9va2F5OwogICAgIHUzMiAgICAgICAgICAgIG9sZF9waW47 CkBAIC0xMDAxLDEzICsxMDAxLDEzIEBAIG1hcF9ncmFudF9yZWYoCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHNoYXJlZF9lbnRyeV92MShyZ3QsIG9wLT5yZWYpLmZyYW1lIDoKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2hhcmVkX2VudHJ5X3YyKHJndCwgb3AtPnJl ZikuZnVsbF9wYWdlLmZyYW1lOwogCi0gICAgICAgICAgICByYyA9IGdldF9wYWdlZF9mcmFtZShn Zm4sICZmcmFtZSwgJnBnLAorICAgICAgICAgICAgcmMgPSBnZXRfcGFnZWRfZnJhbWUoZ2ZuLCAm bWZuLCAmcGcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcC0+ZmxhZ3MgJiBH TlRNQVBfcmVhZG9ubHksIHJkKTsKICAgICAgICAgICAgIGlmICggcmMgIT0gR05UU1Rfb2theSAp CiAgICAgICAgICAgICAgICAgZ290byB1bmxvY2tfb3V0X2NsZWFyOwogICAgICAgICAgICAgYWN0 X3NldF9nZm4oYWN0LCBfZ2ZuKGdmbikpOwogICAgICAgICAgICAgYWN0LT5kb21pZCA9IGxkLT5k b21haW5faWQ7Ci0gICAgICAgICAgICBhY3QtPmZyYW1lID0gZnJhbWU7CisgICAgICAgICAgICBh Y3QtPm1mbiA9IG1mbjsKICAgICAgICAgICAgIGFjdC0+c3RhcnQgPSAwOwogICAgICAgICAgICAg YWN0LT5sZW5ndGggPSBQQUdFX1NJWkU7CiAgICAgICAgICAgICBhY3QtPmlzX3N1Yl9wYWdlID0g ZmFsc2U7CkBAIC0xMDI0LDcgKzEwMjQsNyBAQCBtYXBfZ3JhbnRfcmVmKAogICAgICAgICBhY3Qt PnBpbiArPSAob3AtPmZsYWdzICYgR05UTUFQX3JlYWRvbmx5KSA/CiAgICAgICAgICAgICBHTlRQ SU5faHN0cl9pbmMgOiBHTlRQSU5faHN0d19pbmM7CiAKLSAgICBmcmFtZSA9IGFjdC0+ZnJhbWU7 CisgICAgbWZuID0gYWN0LT5tZm47CiAgICAgYWN0X3BpbiA9IGFjdC0+cGluOwogCiAgICAgY2Fj aGVfZmxhZ3MgPSAoc2hhaC0+ZmxhZ3MgJiAoR1RGX1BBVCB8IEdURl9QV1QgfCBHVEZfUENEKSAp OwpAQCAtMTAzNSw3ICsxMDM1LDcgQEAgbWFwX2dyYW50X3JlZigKICAgICAvKiBwZyBtYXkgYmUg c2V0LCB3aXRoIGEgcmVmY291bnQgaW5jbHVkZWQsIGZyb20gZ2V0X3BhZ2VkX2ZyYW1lKCkuICov CiAgICAgaWYgKCAhcGcgKQogICAgIHsKLSAgICAgICAgcGcgPSBtZm5fdmFsaWQoZnJhbWUpID8g bWZuX3RvX3BhZ2UoZnJhbWUpIDogTlVMTDsKKyAgICAgICAgcGcgPSBtZm5fdmFsaWQobWZuKSA/ IG1mbl90b19wYWdlKG1mbikgOiBOVUxMOwogICAgICAgICBpZiAoIHBnICkKICAgICAgICAgICAg IG93bmVyID0gcGFnZV9nZXRfb3duZXJfYW5kX3JlZmVyZW5jZShwZyk7CiAgICAgfQpAQCAtMTA2 MSwxOCArMTA2MSwxOCBAQCBtYXBfZ3JhbnRfcmVmKAogICAgICAgICAgICAgZ290byB1bmRvX291 dDsKICAgICAgICAgfQogCi0gICAgICAgIGlmICggIWlvbWVtX2FjY2Vzc19wZXJtaXR0ZWQocmQs IG1mbl94KGZyYW1lKSwgbWZuX3goZnJhbWUpKSApCisgICAgICAgIGlmICggIWlvbWVtX2FjY2Vz c19wZXJtaXR0ZWQocmQsIG1mbl94KG1mbiksIG1mbl94KG1mbikpICkKICAgICAgICAgewogICAg ICAgICAgICAgZ2RwcmludGsoWEVOTE9HX1dBUk5JTkcsCiAgICAgICAgICAgICAgICAgICAgICAi SW9tZW0gbWFwcGluZyBub3QgcGVybWl0dGVkICUjIlBSSV9tZm4iIChkb21haW4gJWQpXG4iLAot ICAgICAgICAgICAgICAgICAgICAgbWZuX3goZnJhbWUpLCByZC0+ZG9tYWluX2lkKTsKKyAgICAg ICAgICAgICAgICAgICAgIG1mbl94KG1mbiksIHJkLT5kb21haW5faWQpOwogICAgICAgICAgICAg cmMgPSBHTlRTVF9nZW5lcmFsX2Vycm9yOwogICAgICAgICAgICAgZ290byB1bmRvX291dDsKICAg ICAgICAgfQogCiAgICAgICAgIGlmICggb3AtPmZsYWdzICYgR05UTUFQX2hvc3RfbWFwICkKICAg ICAgICAgewotICAgICAgICAgICAgcmMgPSBjcmVhdGVfZ3JhbnRfaG9zdF9tYXBwaW5nKG9wLT5o b3N0X2FkZHIsIGZyYW1lLCBvcC0+ZmxhZ3MsCisgICAgICAgICAgICByYyA9IGNyZWF0ZV9ncmFu dF9ob3N0X21hcHBpbmcob3AtPmhvc3RfYWRkciwgbWZuLCBvcC0+ZmxhZ3MsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FjaGVfZmxhZ3MpOwogICAgICAgICAg ICAgaWYgKCByYyAhPSBHTlRTVF9va2F5ICkKICAgICAgICAgICAgICAgICBnb3RvIHVuZG9fb3V0 OwpAQCAtMTExMiw3ICsxMTEyLDcgQEAgbWFwX2dyYW50X3JlZigKICAgICAgICAgICAgICAgICB0 eXBlY250Kys7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHJjID0gY3JlYXRlX2dyYW50 X2hvc3RfbWFwcGluZyhvcC0+aG9zdF9hZGRyLCBmcmFtZSwgb3AtPmZsYWdzLCAwKTsKKyAgICAg ICAgICAgIHJjID0gY3JlYXRlX2dyYW50X2hvc3RfbWFwcGluZyhvcC0+aG9zdF9hZGRyLCBtZm4s IG9wLT5mbGFncywgMCk7CiAgICAgICAgICAgICBpZiAoIHJjICE9IEdOVFNUX29rYXkgKQogICAg ICAgICAgICAgICAgIGdvdG8gdW5kb19vdXQ7CiAKQEAgLTExMjQsNyArMTEyNCw3IEBAIG1hcF9n cmFudF9yZWYoCiAgICAgY291bGRfbm90X3BpbjoKICAgICAgICAgaWYgKCAhcmQtPmlzX2R5aW5n ICkKICAgICAgICAgICAgIGdkcHJpbnRrKFhFTkxPR19XQVJOSU5HLCAiQ291bGQgbm90IHBpbiBn cmFudCBmcmFtZSAlIyJQUklfbWZuIlxuIiwKLSAgICAgICAgICAgICAgICAgICAgIG1mbl94KGZy YW1lKSk7CisgICAgICAgICAgICAgICAgICAgICBtZm5feChtZm4pKTsKICAgICAgICAgcmMgPSBH TlRTVF9nZW5lcmFsX2Vycm9yOwogICAgICAgICBnb3RvIHVuZG9fb3V0OwogICAgIH0KQEAgLTEx MzksMTggKzExMzksMTggQEAgbWFwX2dyYW50X3JlZigKIAogICAgICAgICAvKiBXZSdyZSBub3Qg dHJhbnNsYXRlZCwgc28gd2Uga25vdyB0aGF0IGdtZm5zIGFuZCBtZm5zIGFyZQogICAgICAgICAg ICB0aGUgc2FtZSB0aGluZ3MsIHNvIHRoZSBJT01NVSBlbnRyeSBpcyBhbHdheXMgMS10by0xLiAq LwotICAgICAgICBraW5kID0gbWFwa2luZChsZ3QsIHJkLCBmcmFtZSk7CisgICAgICAgIGtpbmQg PSBtYXBraW5kKGxndCwgcmQsIG1mbik7CiAgICAgICAgIGlmICggKGFjdF9waW4gJiAoR05UUElO X2hzdHdfbWFza3xHTlRQSU5fZGV2d19tYXNrKSkgJiYKICAgICAgICAgICAgICAhKG9sZF9waW4g JiAoR05UUElOX2hzdHdfbWFza3xHTlRQSU5fZGV2d19tYXNrKSkgKQogICAgICAgICB7CiAgICAg ICAgICAgICBpZiAoICEoa2luZCAmIE1BUEtJTkRfV1JJVEUpICkKLSAgICAgICAgICAgICAgICBl cnIgPSBpb21tdV9tYXBfcGFnZShsZCwgbWZuX3goZnJhbWUpLCBtZm5feChmcmFtZSksCisgICAg ICAgICAgICAgICAgZXJyID0gaW9tbXVfbWFwX3BhZ2UobGQsIG1mbl94KG1mbiksIG1mbl94KG1m biksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSU9NTVVGX3JlYWRhYmxl fElPTU1VRl93cml0YWJsZSk7CiAgICAgICAgIH0KICAgICAgICAgZWxzZSBpZiAoIGFjdF9waW4g JiYgIW9sZF9waW4gKQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoICFraW5kICkKLSAgICAg ICAgICAgICAgICBlcnIgPSBpb21tdV9tYXBfcGFnZShsZCwgbWZuX3goZnJhbWUpLCBtZm5feChm cmFtZSksCisgICAgICAgICAgICAgICAgZXJyID0gaW9tbXVfbWFwX3BhZ2UobGQsIG1mbl94KG1m biksIG1mbl94KG1mbiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSU9N TVVGX3JlYWRhYmxlKTsKICAgICAgICAgfQogICAgICAgICBpZiAoIGVyciApCkBAIC0xMTgwLDcg KzExODAsNyBAQCBtYXBfZ3JhbnRfcmVmKAogICAgIGlmICggbmVlZF9pb21tdSApCiAgICAgICAg IGRvdWJsZV9ndF91bmxvY2sobGd0LCByZ3QpOwogCi0gICAgb3AtPmRldl9idXNfYWRkciA9IG1m bl90b19tYWRkcihmcmFtZSk7CisgICAgb3AtPmRldl9idXNfYWRkciA9IG1mbl90b19tYWRkciht Zm4pOwogICAgIG9wLT5oYW5kbGUgICAgICAgPSBoYW5kbGU7CiAgICAgb3AtPnN0YXR1cyAgICAg ICA9IEdOVFNUX29rYXk7CiAKQEAgLTExOTAsNyArMTE5MCw3IEBAIG1hcF9ncmFudF9yZWYoCiAg dW5kb19vdXQ6CiAgICAgaWYgKCBob3N0X21hcF9jcmVhdGVkICkKICAgICB7Ci0gICAgICAgIHJl cGxhY2VfZ3JhbnRfaG9zdF9tYXBwaW5nKG9wLT5ob3N0X2FkZHIsIGZyYW1lLCAwLCBvcC0+Zmxh Z3MpOworICAgICAgICByZXBsYWNlX2dyYW50X2hvc3RfbWFwcGluZyhvcC0+aG9zdF9hZGRyLCBt Zm4sIDAsIG9wLT5mbGFncyk7CiAgICAgICAgIGdudHRhYl9mbHVzaF90bGIobGQpOwogICAgIH0K IApAQCAtMTM2NSwxOCArMTM2NSwxOCBAQCB1bm1hcF9jb21tb24oCiAgICAgICAgIGdvdG8gYWN0 X3JlbGVhc2Vfb3V0OwogICAgIH0KIAotICAgIG9wLT5mcmFtZSA9IGFjdC0+ZnJhbWU7CisgICAg b3AtPm1mbiA9IGFjdC0+bWZuOwogCiAgICAgaWYgKCBvcC0+ZGV2X2J1c19hZGRyICYmCi0gICAg ICAgICB1bmxpa2VseShvcC0+ZGV2X2J1c19hZGRyICE9IG1mbl90b19tYWRkcihhY3QtPmZyYW1l KSkgKQorICAgICAgICAgdW5saWtlbHkob3AtPmRldl9idXNfYWRkciAhPSBtZm5fdG9fbWFkZHIo YWN0LT5tZm4pKSApCiAgICAgICAgIFBJTl9GQUlMKGFjdF9yZWxlYXNlX291dCwgR05UU1RfZ2Vu ZXJhbF9lcnJvciwKICAgICAgICAgICAgICAgICAgIkJ1cyBhZGRyZXNzIGRvZXNuJ3QgbWF0Y2gg Z250cmVmICglIlBSSXg2NCIgIT0gJSJQUklwYWRkciIpXG4iLAotICAgICAgICAgICAgICAgICBv cC0+ZGV2X2J1c19hZGRyLCBtZm5fdG9fbWFkZHIoYWN0LT5mcmFtZSkpOworICAgICAgICAgICAg ICAgICBvcC0+ZGV2X2J1c19hZGRyLCBtZm5fdG9fbWFkZHIoYWN0LT5tZm4pKTsKIAogICAgIGlm ICggb3AtPmhvc3RfYWRkciAmJiAoZmxhZ3MgJiBHTlRNQVBfaG9zdF9tYXApICkKICAgICB7CiAg ICAgICAgIGlmICggKHJjID0gcmVwbGFjZV9ncmFudF9ob3N0X21hcHBpbmcob3AtPmhvc3RfYWRk ciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcC0+ZnJh bWUsIG9wLT5uZXdfYWRkciwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBvcC0+bWZuLCBvcC0+bmV3X2FkZHIsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZmxhZ3MpKSA8IDAgKQogICAgICAgICAgICAgZ290byBhY3Rf cmVsZWFzZV9vdXQ7CiAKQEAgLTE0MTEsMTIgKzE0MTEsMTIgQEAgdW5tYXBfY29tbW9uKAogCiAg ICAgICAgIGRvdWJsZV9ndF9sb2NrKGxndCwgcmd0KTsKIAotICAgICAgICBraW5kID0gbWFwa2lu ZChsZ3QsIHJkLCBvcC0+ZnJhbWUpOworICAgICAgICBraW5kID0gbWFwa2luZChsZ3QsIHJkLCBv cC0+bWZuKTsKICAgICAgICAgaWYgKCAha2luZCApCi0gICAgICAgICAgICBlcnIgPSBpb21tdV91 bm1hcF9wYWdlKGxkLCBtZm5feChvcC0+ZnJhbWUpKTsKKyAgICAgICAgICAgIGVyciA9IGlvbW11 X3VubWFwX3BhZ2UobGQsIG1mbl94KG9wLT5tZm4pKTsKICAgICAgICAgZWxzZSBpZiAoICEoa2lu ZCAmIE1BUEtJTkRfV1JJVEUpICkKLSAgICAgICAgICAgIGVyciA9IGlvbW11X21hcF9wYWdlKGxk LCBtZm5feChvcC0+ZnJhbWUpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWZu X3gob3AtPmZyYW1lKSwgSU9NTVVGX3JlYWRhYmxlKTsKKyAgICAgICAgICAgIGVyciA9IGlvbW11 X21hcF9wYWdlKGxkLCBtZm5feChvcC0+bWZuKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1mbl94KG9wLT5tZm4pLCBJT01NVUZfcmVhZGFibGUpOwogCiAgICAgICAgIGRvdWJs ZV9ndF91bmxvY2sobGd0LCByZ3QpOwogCkBAIC0xNDI2LDcgKzE0MjYsNyBAQCB1bm1hcF9jb21t b24oCiAKICAgICAvKiBJZiBqdXN0IHVubWFwcGVkIGEgd3JpdGFibGUgbWFwcGluZywgbWFyayBh cyBkaXJ0aWVkICovCiAgICAgaWYgKCByYyA9PSBHTlRTVF9va2F5ICYmICEoZmxhZ3MgJiBHTlRN QVBfcmVhZG9ubHkpICkKLSAgICAgICAgIGdudHRhYl9tYXJrX2RpcnR5KHJkLCBvcC0+ZnJhbWUp OworICAgICAgICAgZ250dGFiX21hcmtfZGlydHkocmQsIG9wLT5tZm4pOwogCiAgICAgb3AtPnN0 YXR1cyA9IHJjOwogICAgIHJjdV91bmxvY2tfZG9tYWluKHJkKTsKQEAgLTE0NjMsMTEgKzE0NjMs MTEgQEAgdW5tYXBfY29tbW9uX2NvbXBsZXRlKHN0cnVjdCBnbnR0YWJfdW5tYXBfY29tbW9uICpv cCkKICAgICBlbHNlCiAgICAgICAgIHN0YXR1cyA9ICZzdGF0dXNfZW50cnkocmd0LCBvcC0+cmVm KTsKIAotICAgIHBnID0gbWZuX3RvX3BhZ2Uob3AtPmZyYW1lKTsKKyAgICBwZyA9IG1mbl90b19w YWdlKG9wLT5tZm4pOwogCiAgICAgaWYgKCBvcC0+ZG9uZSAmIEdOVE1BUF9kZXZpY2VfbWFwICkK ICAgICB7Ci0gICAgICAgIGlmICggIWlzX2lvbWVtX3BhZ2UoYWN0LT5mcmFtZSkgKQorICAgICAg ICBpZiAoICFpc19pb21lbV9wYWdlKGFjdC0+bWZuKSApCiAgICAgICAgIHsKICAgICAgICAgICAg IGlmICggb3AtPmRvbmUgJiBHTlRNQVBfcmVhZG9ubHkgKQogICAgICAgICAgICAgICAgIHB1dF9w YWdlKHBnKTsKQEAgLTE0ODQsNyArMTQ4NCw3IEBAIHVubWFwX2NvbW1vbl9jb21wbGV0ZShzdHJ1 Y3QgZ250dGFiX3VubWFwX2NvbW1vbiAqb3ApCiAKICAgICBpZiAoIG9wLT5kb25lICYgR05UTUFQ X2hvc3RfbWFwICkKICAgICB7Ci0gICAgICAgIGlmICggIWlzX2lvbWVtX3BhZ2Uob3AtPmZyYW1l KSApCisgICAgICAgIGlmICggIWlzX2lvbWVtX3BhZ2Uob3AtPm1mbikgKQogICAgICAgICB7CiAg ICAgICAgICAgICBpZiAoIGdudHRhYl9ob3N0X21hcHBpbmdfZ2V0X3BhZ2VfdHlwZShvcC0+ZG9u ZSAmIEdOVE1BUF9yZWFkb25seSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGxkLCByZCkgKQpAQCAtMTUyNSw3ICsxNTI1LDcgQEAgdW5tYXBfZ3Jh bnRfcmVmKAogICAgIGNvbW1vbi0+ZG9uZSA9IDA7CiAgICAgY29tbW9uLT5uZXdfYWRkciA9IDA7 CiAgICAgY29tbW9uLT5yZCA9IE5VTEw7Ci0gICAgY29tbW9uLT5mcmFtZSA9IElOVkFMSURfTUZO OworICAgIGNvbW1vbi0+bWZuID0gSU5WQUxJRF9NRk47CiAKICAgICB1bm1hcF9jb21tb24oY29t bW9uKTsKICAgICBvcC0+c3RhdHVzID0gY29tbW9uLT5zdGF0dXM7CkBAIC0xNTkxLDcgKzE1OTEs NyBAQCB1bm1hcF9hbmRfcmVwbGFjZSgKICAgICBjb21tb24tPmRvbmUgPSAwOwogICAgIGNvbW1v bi0+ZGV2X2J1c19hZGRyID0gMDsKICAgICBjb21tb24tPnJkID0gTlVMTDsKLSAgICBjb21tb24t PmZyYW1lID0gSU5WQUxJRF9NRk47CisgICAgY29tbW9uLT5tZm4gPSBJTlZBTElEX01GTjsKIAog ICAgIHVubWFwX2NvbW1vbihjb21tb24pOwogICAgIG9wLT5zdGF0dXMgPSBjb21tb24tPnN0YXR1 czsKQEAgLTIzMjAsNyArMjMyMCw3IEBAIHJlbGVhc2VfZ3JhbnRfZm9yX2NvcHkoCiAgICAgc3Ry dWN0IGdyYW50X3RhYmxlICpyZ3QgPSByZC0+Z3JhbnRfdGFibGU7CiAgICAgZ3JhbnRfZW50cnlf aGVhZGVyX3QgKnNoYTsKICAgICBzdHJ1Y3QgYWN0aXZlX2dyYW50X2VudHJ5ICphY3Q7Ci0gICAg bWZuX3Qgcl9mcmFtZTsKKyAgICBtZm5fdCBtZm47CiAgICAgdWludDE2X3QgKnN0YXR1czsKICAg ICBncmFudF9yZWZfdCB0cmFuc19ncmVmOwogICAgIHN0cnVjdCBkb21haW4gKnRkOwpAQCAtMjMy OSw3ICsyMzI5LDcgQEAgcmVsZWFzZV9ncmFudF9mb3JfY29weSgKIAogICAgIGFjdCA9IGFjdGl2 ZV9lbnRyeV9hY3F1aXJlKHJndCwgZ3JlZik7CiAgICAgc2hhID0gc2hhcmVkX2VudHJ5X2hlYWRl cihyZ3QsIGdyZWYpOwotICAgIHJfZnJhbWUgPSBhY3QtPmZyYW1lOworICAgIG1mbiA9IGFjdC0+ bWZuOwogCiAgICAgaWYgKCByZ3QtPmd0X3ZlcnNpb24gPT0gMSApCiAgICAgewpAQCAtMjM1MCw3 ICsyMzUwLDcgQEAgcmVsZWFzZV9ncmFudF9mb3JfY29weSgKICAgICB9CiAgICAgZWxzZQogICAg IHsKLSAgICAgICAgZ250dGFiX21hcmtfZGlydHkocmQsIHJfZnJhbWUpOworICAgICAgICBnbnR0 YWJfbWFya19kaXJ0eShyZCwgbWZuKTsKIAogICAgICAgICBhY3QtPnBpbiAtPSBHTlRQSU5faHN0 d19pbmM7CiAgICAgICAgIGlmICggIShhY3QtPnBpbiAmIChHTlRQSU5fZGV2d19tYXNrfEdOVFBJ Tl9oc3R3X21hc2spKSApCkBAIC0yMzkwLDE1ICsyMzkwLDE3IEBAIHN0YXRpYyB2b2lkIGZpeHVw X3N0YXR1c19mb3JfY29weV9waW4oY29uc3Qgc3RydWN0IGFjdGl2ZV9ncmFudF9lbnRyeSAqYWN0 LAogICAgICAgICBnbnR0YWJfY2xlYXJfZmxhZyhfR1RGX3JlYWRpbmcsIHN0YXR1cyk7CiB9CiAK LS8qIEdyYWIgYSBmcmFtZSBudW1iZXIgZnJvbSBhIGdyYW50IGVudHJ5IGFuZCB1cGRhdGUgdGhl IGZsYWdzIGFuZCBwaW4KLSAgIGNvdW50IGFzIGFwcHJvcHJpYXRlLiBJZiByYyA9PSBHTlRTVF9v a2F5LCBub3RlIHRoYXQgdGhpcyAqZG9lcyoKLSAgIHRha2Ugb25lIHJlZiBjb3VudCBvbiB0aGUg dGFyZ2V0IHBhZ2UsIHN0b3JlZCBpbiAqcGFnZS4KLSAgIElmIHRoZXJlIGlzIGFueSBlcnJvciwg KnBhZ2UgPSBOVUxMLCBubyByZWYgdGFrZW4uICovCisvKgorICogR3JhYiBhIG1hY2hpbmUgZnJh bWUgbnVtYmVyIGZyb20gYSBncmFudCBlbnRyeSBhbmQgdXBkYXRlIHRoZSBmbGFncworICogYW5k IHBpbiBjb3VudCBhcyBhcHByb3ByaWF0ZS4gSWYgcmMgPT0gR05UU1Rfb2theSwgbm90ZSB0aGF0 IHRoaXMgKmRvZXMqCisgKiB0YWtlIG9uZSByZWYgY291bnQgb24gdGhlIHRhcmdldCBwYWdlLCBz dG9yZWQgaW4gKnBhZ2UuCisgKiBJZiB0aGVyZSBpcyBhbnkgZXJyb3IsICpwYWdlID0gTlVMTCwg bm8gcmVmIHRha2VuLgorICovCiBzdGF0aWMgaW50CiBhY3F1aXJlX2dyYW50X2Zvcl9jb3B5KAog ICAgIHN0cnVjdCBkb21haW4gKnJkLCBncmFudF9yZWZfdCBncmVmLCBkb21pZF90IGxkb20sIGJv b2wgcmVhZG9ubHksCi0gICAgbWZuX3QgKmZyYW1lLCBzdHJ1Y3QgcGFnZV9pbmZvICoqcGFnZSwK LSAgICB1aW50MTZfdCAqcGFnZV9vZmYsIHVpbnQxNl90ICpsZW5ndGgsIGJvb2wgYWxsb3dfdHJh bnNpdGl2ZSkKKyAgICBtZm5fdCAqbWZuLCBzdHJ1Y3QgcGFnZV9pbmZvICoqcGFnZSwgdWludDE2 X3QgKnBhZ2Vfb2ZmLAorICAgIHVpbnQxNl90ICpsZW5ndGgsIGJvb2wgYWxsb3dfdHJhbnNpdGl2 ZSkKIHsKICAgICBzdHJ1Y3QgZ3JhbnRfdGFibGUgKnJndCA9IHJkLT5ncmFudF90YWJsZTsKICAg ICBncmFudF9lbnRyeV92Ml90ICpzaGEyOwpAQCAtMjQwOSw3ICsyNDExLDcgQEAgYWNxdWlyZV9n cmFudF9mb3JfY29weSgKICAgICBkb21pZF90IHRyYW5zX2RvbWlkOwogICAgIGdyYW50X3JlZl90 IHRyYW5zX2dyZWY7CiAgICAgc3RydWN0IGRvbWFpbiAqdGQ7Ci0gICAgbWZuX3QgZ3JhbnRfZnJh bWU7CisgICAgbWZuX3QgZ3JhbnRfbWZuOwogICAgIHVpbnQxNl90IHRyYW5zX3BhZ2Vfb2ZmOwog ICAgIHVpbnQxNl90IHRyYW5zX2xlbmd0aDsKICAgICBib29sIGlzX3N1Yl9wYWdlOwpAQCAtMjQ4 Nyw3ICsyNDg5LDcgQEAgYWNxdWlyZV9ncmFudF9mb3JfY29weSgKICAgICAgICAgZ3JhbnRfcmVh ZF91bmxvY2socmd0KTsKIAogICAgICAgICByYyA9IGFjcXVpcmVfZ3JhbnRfZm9yX2NvcHkodGQs IHRyYW5zX2dyZWYsIHJkLT5kb21haW5faWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZWFkb25seSwgJmdyYW50X2ZyYW1lLCBwYWdlLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgcmVhZG9ubHksICZncmFudF9tZm4sIHBhZ2UsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAmdHJhbnNfcGFnZV9vZmYsICZ0cmFuc19sZW5ndGgs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmYWxzZSk7CiAKQEAgLTI1MTEs NyArMjUxMyw3IEBAIGFjcXVpcmVfZ3JhbnRfZm9yX2NvcHkoCiAgICAgICAgIGlmICggcmd0LT5n dF92ZXJzaW9uICE9IDIgfHwKICAgICAgICAgICAgICBhY3QtPnBpbiAhPSBvbGRfcGluIHx8CiAg ICAgICAgICAgICAgKG9sZF9waW4gJiYgKGFjdC0+ZG9taWQgIT0gbGRvbSB8fAotICAgICAgICAg ICAgICAgICAgICAgICAgICAhbWZuX2VxKGFjdC0+ZnJhbWUsIGdyYW50X2ZyYW1lKSB8fAorICAg ICAgICAgICAgICAgICAgICAgICAgICAhbWZuX2VxKGFjdC0+bWZuLCBncmFudF9tZm4pIHx8CiAg ICAgICAgICAgICAgICAgICAgICAgICAgIGFjdC0+c3RhcnQgIT0gdHJhbnNfcGFnZV9vZmYgfHwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0LT5sZW5ndGggIT0gdHJhbnNfbGVuZ3RoIHx8 CiAgICAgICAgICAgICAgICAgICAgICAgICAgIGFjdC0+dHJhbnNfZG9tYWluICE9IHRkIHx8CkBA IC0yNTM1LDcgKzI1MzcsNyBAQCBhY3F1aXJlX2dyYW50X2Zvcl9jb3B5KAogICAgICAgICAgICAg YWN0LT5sZW5ndGggPSB0cmFuc19sZW5ndGg7CiAgICAgICAgICAgICBhY3QtPnRyYW5zX2RvbWFp biA9IHRkOwogICAgICAgICAgICAgYWN0LT50cmFuc19ncmVmID0gdHJhbnNfZ3JlZjsKLSAgICAg ICAgICAgIGFjdC0+ZnJhbWUgPSBncmFudF9mcmFtZTsKKyAgICAgICAgICAgIGFjdC0+bWZuID0g Z3JhbnRfbWZuOwogICAgICAgICAgICAgYWN0X3NldF9nZm4oYWN0LCBJTlZBTElEX0dGTik7CiAg ICAgICAgICAgICAvKgogICAgICAgICAgICAgICogVGhlIGFjdHVhbCByZW1vdGUgcmVtb3RlIGdy YW50IG1heSBvciBtYXkgbm90IGJlIGEgc3ViLXBhZ2UsCkBAIC0yNTU5LDcgKzI1NjEsNyBAQCBh Y3F1aXJlX2dyYW50X2Zvcl9jb3B5KAogICAgICAgICB7CiAgICAgICAgICAgICB1bnNpZ25lZCBs b25nIGdmbiA9IHNoYXJlZF9lbnRyeV92MShyZ3QsIGdyZWYpLmZyYW1lOwogCi0gICAgICAgICAg ICByYyA9IGdldF9wYWdlZF9mcmFtZShnZm4sICZncmFudF9mcmFtZSwgcGFnZSwgcmVhZG9ubHks IHJkKTsKKyAgICAgICAgICAgIHJjID0gZ2V0X3BhZ2VkX2ZyYW1lKGdmbiwgJmdyYW50X21mbiwg cGFnZSwgcmVhZG9ubHksIHJkKTsKICAgICAgICAgICAgIGlmICggcmMgIT0gR05UU1Rfb2theSAp CiAgICAgICAgICAgICAgICAgZ290byB1bmxvY2tfb3V0X2NsZWFyOwogICAgICAgICAgICAgYWN0 X3NldF9nZm4oYWN0LCBfZ2ZuKGdmbikpOwpAQCAtMjU2OSw3ICsyNTcxLDcgQEAgYWNxdWlyZV9n cmFudF9mb3JfY29weSgKICAgICAgICAgfQogICAgICAgICBlbHNlIGlmICggIShzaGEyLT5oZHIu ZmxhZ3MgJiBHVEZfc3ViX3BhZ2UpICkKICAgICAgICAgewotICAgICAgICAgICAgcmMgPSBnZXRf cGFnZWRfZnJhbWUoc2hhMi0+ZnVsbF9wYWdlLmZyYW1lLCAmZ3JhbnRfZnJhbWUsIHBhZ2UsCisg ICAgICAgICAgICByYyA9IGdldF9wYWdlZF9mcmFtZShzaGEyLT5mdWxsX3BhZ2UuZnJhbWUsICZn cmFudF9tZm4sIHBhZ2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWFkb25s eSwgcmQpOwogICAgICAgICAgICAgaWYgKCByYyAhPSBHTlRTVF9va2F5ICkKICAgICAgICAgICAg ICAgICBnb3RvIHVubG9ja19vdXRfY2xlYXI7CkBAIC0yNTgwLDcgKzI1ODIsNyBAQCBhY3F1aXJl X2dyYW50X2Zvcl9jb3B5KAogICAgICAgICB9CiAgICAgICAgIGVsc2UKICAgICAgICAgewotICAg ICAgICAgICAgcmMgPSBnZXRfcGFnZWRfZnJhbWUoc2hhMi0+c3ViX3BhZ2UuZnJhbWUsICZncmFu dF9mcmFtZSwgcGFnZSwKKyAgICAgICAgICAgIHJjID0gZ2V0X3BhZ2VkX2ZyYW1lKHNoYTItPnN1 Yl9wYWdlLmZyYW1lLCAmZ3JhbnRfbWZuLCBwYWdlLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcmVhZG9ubHksIHJkKTsKICAgICAgICAgICAgIGlmICggcmMgIT0gR05UU1Rfb2th eSApCiAgICAgICAgICAgICAgICAgZ290byB1bmxvY2tfb3V0X2NsZWFyOwpAQCAtMjU5OCwxMyAr MjYwMCwxMyBAQCBhY3F1aXJlX2dyYW50X2Zvcl9jb3B5KAogICAgICAgICAgICAgYWN0LT5sZW5n dGggPSB0cmFuc19sZW5ndGg7CiAgICAgICAgICAgICBhY3QtPnRyYW5zX2RvbWFpbiA9IHRkOwog ICAgICAgICAgICAgYWN0LT50cmFuc19ncmVmID0gdHJhbnNfZ3JlZjsKLSAgICAgICAgICAgIGFj dC0+ZnJhbWUgPSBncmFudF9mcmFtZTsKKyAgICAgICAgICAgIGFjdC0+bWZuID0gZ3JhbnRfbWZu OwogICAgICAgICB9CiAgICAgfQogICAgIGVsc2UKICAgICB7Ci0gICAgICAgIEFTU0VSVChtZm5f dmFsaWQoYWN0LT5mcmFtZSkpOwotICAgICAgICAqcGFnZSA9IG1mbl90b19wYWdlKGFjdC0+ZnJh bWUpOworICAgICAgICBBU1NFUlQobWZuX3ZhbGlkKGFjdC0+bWZuKSk7CisgICAgICAgICpwYWdl ID0gbWZuX3RvX3BhZ2UoYWN0LT5tZm4pOwogICAgICAgICB0ZCA9IHBhZ2VfZ2V0X293bmVyX2Fu ZF9yZWZlcmVuY2UoKnBhZ2UpOwogICAgICAgICAvKgogICAgICAgICAgKiBhY3QtPnBpbiBiZWlu ZyBub24temVybyBzaG91bGQgZ3VhcmFudGVlIHRoZSBwYWdlIHRvIGhhdmUgYQpAQCAtMjYyOCw3 ICsyNjMwLDcgQEAgYWNxdWlyZV9ncmFudF9mb3JfY29weSgKIAogICAgICpwYWdlX29mZiA9IGFj dC0+c3RhcnQ7CiAgICAgKmxlbmd0aCA9IGFjdC0+bGVuZ3RoOwotICAgICpmcmFtZSA9IGFjdC0+ ZnJhbWU7CisgICAgKm1mbiA9IGFjdC0+bWZuOwogCiAgICAgYWN0aXZlX2VudHJ5X3JlbGVhc2Uo YWN0KTsKICAgICBncmFudF9yZWFkX3VubG9jayhyZ3QpOwpAQCAtMjY1OCw3ICsyNjYwLDcgQEAg c3RydWN0IGdudHRhYl9jb3B5X2J1ZiB7CiAKICAgICAvKiBNYXBwZWQgZXRjLiAqLwogICAgIHN0 cnVjdCBkb21haW4gKmRvbWFpbjsKLSAgICBtZm5fdCBmcmFtZTsKKyAgICBtZm5fdCBtZm47CiAg ICAgc3RydWN0IHBhZ2VfaW5mbyAqcGFnZTsKICAgICB2b2lkICp2aXJ0OwogICAgIGJvb2xfdCBy ZWFkX29ubHk7CkBAIC0yNzY0LDcgKzI3NjYsNyBAQCBzdGF0aWMgaW50IGdudHRhYl9jb3B5X2Ns YWltX2J1Zihjb25zdCBzdHJ1Y3QgZ250dGFiX2NvcHkgKm9wLAogICAgICAgICByYyA9IGFjcXVp cmVfZ3JhbnRfZm9yX2NvcHkoYnVmLT5kb21haW4sIHB0ci0+dS5yZWYsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjdXJyZW50LT5kb21haW4tPmRvbWFpbl9pZCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1Zi0+cmVhZF9vbmx5LAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJmJ1Zi0+ZnJhbWUsICZidWYtPnBhZ2UsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmYnVmLT5tZm4sICZidWYtPnBhZ2UsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmYnVmLT5wdHIub2Zmc2V0LCAmYnVm LT5sZW4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHRfdHJhbnNpdGl2 ZV9ncmFudHMpOwogICAgICAgICBpZiAoIHJjICE9IEdOVFNUX29rYXkgKQpAQCAtMjc3NCw3ICsy Nzc2LDcgQEAgc3RhdGljIGludCBnbnR0YWJfY29weV9jbGFpbV9idWYoY29uc3Qgc3RydWN0IGdu dHRhYl9jb3B5ICpvcCwKICAgICB9CiAgICAgZWxzZQogICAgIHsKLSAgICAgICAgcmMgPSBnZXRf cGFnZWRfZnJhbWUocHRyLT51LmdtZm4sICZidWYtPmZyYW1lLCAmYnVmLT5wYWdlLAorICAgICAg ICByYyA9IGdldF9wYWdlZF9mcmFtZShwdHItPnUuZ21mbiwgJmJ1Zi0+bWZuLCAmYnVmLT5wYWdl LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBidWYtPnJlYWRfb25seSwgYnVmLT5kb21h aW4pOwogICAgICAgICBpZiAoIHJjICE9IEdOVFNUX29rYXkgKQogICAgICAgICAgICAgUElOX0ZB SUwob3V0LCByYywKQEAgLTI3OTIsMTQgKzI3OTQsMTQgQEAgc3RhdGljIGludCBnbnR0YWJfY29w eV9jbGFpbV9idWYoY29uc3Qgc3RydWN0IGdudHRhYl9jb3B5ICpvcCwKICAgICAgICAgICAgIGlm ICggIWJ1Zi0+ZG9tYWluLT5pc19keWluZyApCiAgICAgICAgICAgICAgICAgZ2RwcmludGsoWEVO TE9HX1dBUk5JTkcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBnZXQgd3Jp dGFibGUgZnJhbWUgJSMiUFJJX21mbiJcbiIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgbWZu X3goYnVmLT5mcmFtZSkpOworICAgICAgICAgICAgICAgICAgICAgICAgIG1mbl94KGJ1Zi0+bWZu KSk7CiAgICAgICAgICAgICByYyA9IEdOVFNUX2dlbmVyYWxfZXJyb3I7CiAgICAgICAgICAgICBn b3RvIG91dDsKICAgICAgICAgfQogICAgICAgICBidWYtPmhhdmVfdHlwZSA9IDE7CiAgICAgfQog Ci0gICAgYnVmLT52aXJ0ID0gbWFwX2RvbWFpbl9wYWdlKGJ1Zi0+ZnJhbWUpOworICAgIGJ1Zi0+ dmlydCA9IG1hcF9kb21haW5fcGFnZShidWYtPm1mbik7CiAgICAgcmMgPSBHTlRTVF9va2F5Owog CiAgb3V0OgpAQCAtMjg0Myw3ICsyODQ1LDcgQEAgc3RhdGljIGludCBnbnR0YWJfY29weV9idWYo Y29uc3Qgc3RydWN0IGdudHRhYl9jb3B5ICpvcCwKIAogICAgIG1lbWNweShkZXN0LT52aXJ0ICsg b3AtPmRlc3Qub2Zmc2V0LCBzcmMtPnZpcnQgKyBvcC0+c291cmNlLm9mZnNldCwKICAgICAgICAg ICAgb3AtPmxlbik7Ci0gICAgZ250dGFiX21hcmtfZGlydHkoZGVzdC0+ZG9tYWluLCBkZXN0LT5m cmFtZSk7CisgICAgZ250dGFiX21hcmtfZGlydHkoZGVzdC0+ZG9tYWluLCBkZXN0LT5tZm4pOwog ICAgIHJjID0gR05UU1Rfb2theTsKICBvdXQ6CiAgICAgcmV0dXJuIHJjOwpAQCAtMzY2MSw3ICsz NjYzLDcgQEAgZ250dGFiX3JlbGVhc2VfbWFwcGluZ3MoCiAgICAgICAgIGVsc2UKICAgICAgICAg ICAgIHN0YXR1cyA9ICZzdGF0dXNfZW50cnkocmd0LCByZWYpOwogCi0gICAgICAgIHBnID0gbWZu X3RvX3BhZ2UoYWN0LT5mcmFtZSk7CisgICAgICAgIHBnID0gbWZuX3RvX3BhZ2UoYWN0LT5tZm4p OwogCiAgICAgICAgIGlmICggbWFwLT5mbGFncyAmIEdOVE1BUF9yZWFkb25seSApCiAgICAgICAg IHsKQEAgLTM2NjksNyArMzY3MSw3IEBAIGdudHRhYl9yZWxlYXNlX21hcHBpbmdzKAogICAgICAg ICAgICAgewogICAgICAgICAgICAgICAgIEJVR19PTighKGFjdC0+cGluICYgR05UUElOX2RldnJf bWFzaykpOwogICAgICAgICAgICAgICAgIGFjdC0+cGluIC09IEdOVFBJTl9kZXZyX2luYzsKLSAg ICAgICAgICAgICAgICBpZiAoICFpc19pb21lbV9wYWdlKGFjdC0+ZnJhbWUpICkKKyAgICAgICAg ICAgICAgICBpZiAoICFpc19pb21lbV9wYWdlKGFjdC0+bWZuKSApCiAgICAgICAgICAgICAgICAg ICAgIHB1dF9wYWdlKHBnKTsKICAgICAgICAgICAgIH0KIApAQCAtMzY3OCw3ICszNjgwLDcgQEAg Z250dGFiX3JlbGVhc2VfbWFwcGluZ3MoCiAgICAgICAgICAgICAgICAgQlVHX09OKCEoYWN0LT5w aW4gJiBHTlRQSU5faHN0cl9tYXNrKSk7CiAgICAgICAgICAgICAgICAgYWN0LT5waW4gLT0gR05U UElOX2hzdHJfaW5jOwogICAgICAgICAgICAgICAgIGlmICggZ250dGFiX3JlbGVhc2VfaG9zdF9t YXBwaW5ncyhkKSAmJgotICAgICAgICAgICAgICAgICAgICAgIWlzX2lvbWVtX3BhZ2UoYWN0LT5m cmFtZSkgKQorICAgICAgICAgICAgICAgICAgICAgIWlzX2lvbWVtX3BhZ2UoYWN0LT5tZm4pICkK ICAgICAgICAgICAgICAgICAgICAgcHV0X3BhZ2UocGcpOwogICAgICAgICAgICAgfQogICAgICAg ICB9CkBAIC0zNjg4LDcgKzM2OTAsNyBAQCBnbnR0YWJfcmVsZWFzZV9tYXBwaW5ncygKICAgICAg ICAgICAgIHsKICAgICAgICAgICAgICAgICBCVUdfT04oIShhY3QtPnBpbiAmIEdOVFBJTl9kZXZ3 X21hc2spKTsKICAgICAgICAgICAgICAgICBhY3QtPnBpbiAtPSBHTlRQSU5fZGV2d19pbmM7Ci0g ICAgICAgICAgICAgICAgaWYgKCAhaXNfaW9tZW1fcGFnZShhY3QtPmZyYW1lKSApCisgICAgICAg ICAgICAgICAgaWYgKCAhaXNfaW9tZW1fcGFnZShhY3QtPm1mbikgKQogICAgICAgICAgICAgICAg ICAgICBwdXRfcGFnZV9hbmRfdHlwZShwZyk7CiAgICAgICAgICAgICB9CiAKQEAgLTM2OTcsNyAr MzY5OSw3IEBAIGdudHRhYl9yZWxlYXNlX21hcHBpbmdzKAogICAgICAgICAgICAgICAgIEJVR19P TighKGFjdC0+cGluICYgR05UUElOX2hzdHdfbWFzaykpOwogICAgICAgICAgICAgICAgIGFjdC0+ cGluIC09IEdOVFBJTl9oc3R3X2luYzsKICAgICAgICAgICAgICAgICBpZiAoIGdudHRhYl9yZWxl YXNlX2hvc3RfbWFwcGluZ3MoZCkgJiYKLSAgICAgICAgICAgICAgICAgICAgICFpc19pb21lbV9w YWdlKGFjdC0+ZnJhbWUpICkKKyAgICAgICAgICAgICAgICAgICAgICFpc19pb21lbV9wYWdlKGFj dC0+bWZuKSApCiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICBpZiAoIGdu dHRhYl9ob3N0X21hcHBpbmdfZ2V0X3BhZ2VfdHlwZSgobWFwLT5mbGFncyAmCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTlRNQVBf cmVhZG9ubHkpLApAQCAtMzc1NCw3ICszNzU2LDcgQEAgdm9pZCBncmFudF90YWJsZV93YXJuX2Fj dGl2ZV9ncmFudHMoc3RydWN0IGRvbWFpbiAqZCkKICNpZm5kZWYgTkRFQlVHCiAgICAgICAgICAg ICAgICAgICAgZ2ZuX3goYWN0LT5nZm4pLAogI2VuZGlmCi0gICAgICAgICAgICAgICAgICAgbWZu X3goYWN0LT5mcmFtZSkpOworICAgICAgICAgICAgICAgICAgIG1mbl94KGFjdC0+bWZuKSk7CiAg ICAgICAgIGFjdGl2ZV9lbnRyeV9yZWxlYXNlKGFjdCk7CiAgICAgfQogCkBAIC0zOTYzLDcgKzM5 NjUsNyBAQCBzdGF0aWMgdm9pZCBnbnR0YWJfdXNhZ2VfcHJpbnQoc3RydWN0IGRvbWFpbiAqcmQp CiAKICAgICAgICAgLyogICAgICBbMHhYWFhdICBkZGRkZCAweFhYWFhYIDB4WFhYWFhYWFggICAg ICBkZGRkZCAweFhYWFhYWCAweFhYICovCiAgICAgICAgIHByaW50aygiWzB4JTAzeF0gICU1ZCAw eCUiUFJJX21mbiIgMHglMDh4ICAgICAgJTVkIDB4JTA2IlBSSXg2NCIgMHglMDJ4XG4iLAotICAg ICAgICAgICAgICAgcmVmLCBhY3QtPmRvbWlkLCBtZm5feChhY3QtPmZyYW1lKSwgYWN0LT5waW4s CisgICAgICAgICAgICAgICByZWYsIGFjdC0+ZG9taWQsIG1mbl94KGFjdC0+bWZuKSwgYWN0LT5w aW4sCiAgICAgICAgICAgICAgICBzaGEtPmRvbWlkLCBmcmFtZSwgc3RhdHVzKTsKICAgICAgICAg YWN0aXZlX2VudHJ5X3JlbGVhc2UoYWN0KTsKICAgICB9Ci0tIAoyLjExLjAKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBs aXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2pl Y3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs