From: Paul Durrant Subject: [PATCH v7 4/6] iommu: don't domain_crash() inside iommu_map/unmap_page() Date: Wed, 12 Sep 2018 12:30:26 +0100 Message-ID: <20180912113028.19610-5-paul.durrant@citrix.com> References: <20180912113028.19610-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1g03Lw-0005kZ-J8 for xen-devel@lists.xenproject.org; Wed, 12 Sep 2018 11:30:36 +0000 In-Reply-To: <20180912113028.19610-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: Kevin Tian , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Paul Durrant , Jun Nakajima List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCByZW1vdmVzIHRoZSBpbXBsaWNpdCBkb21haW5fY3Jhc2goKSBmcm9tIGlvbW11 X21hcCgpLAp1bm1hcF9wYWdlKCkgYW5kIGlvbW11X2lvdGxiX2ZsdXNoKCkgYW5kIHR1cm5zIHRo ZW0gaW50byBzdHJhaWdodGZvcndhcmQKd3JhcHBlcnMgdGhhdCBjaGVjayB0aGUgZXhpc3RlbmNl IG9mIHRoZSByZWxldmFudCBpb21tdV9vcCBhbmQgY2FsbAp0aHJvdWdoIHRvIGl0LiBUaGlzIG1h a2VzIHRoZW0gdXNhYmxlIGJ5IFBWIElPTU1VIGNvZGUgdG8gYmUgZGVsaXZlcmVkIGluCmZ1dHVy ZSBwYXRjaGVzLgpUaGlzIHBhdGNoIGFkZHMgYSBoZWxwZXIgbWFjcm8sIGRvbXVfY3Jhc2goKSwg dGhhdCB3aWxsIG9ubHkgaW52b2tlCmRvbWFpbl9jcmFzaCgpIGlmIHRoZSBkb21haW4gaXMgbm90 IHRoZSBoYXJkd2FyZSBkb21haW4gYW5kIG1vZGlmaWVzCmNhbGxlcnMgb2YgaW9tbXVfbWFwKCks IHVubWFwX3BhZ2UoKSBhbmQgaW9tbXVfaW90bGJfZmx1c2goKSB0byB1c2UgdGhpcwpzaG91bGQg YW4gb3BlcmF0aW9uIGZhaWwuCgpOT1RFOiBUaGlzIHBhdGNoIGluY2x1ZGVzIG9uZSBiaXQgb2Yg Y2xlYW4tdXAgaW4gc2V0X2lkZW50aXR5X3AybV9lbnRyeSgpCiAgICAgIHJlcGxhY2luZyB1c2Ug b2YgcDJtLT5kb21haW4gd2l0aCB0aGUgZG9tYWluIHBvaW50ZXIgcGFzc2VkIGludG8gdGhlCiAg ICAgIGZ1bmN0aW9uLgoKU2lnbmVkLW9mZi1ieTogUGF1bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRA Y2l0cml4LmNvbT4KUmV2aWV3ZWQtYnk6IEphbiBCZXVsaWNoIDxqYmV1bGljaEBzdXNlLmNvbT4K LS0tCkNjOiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgpDYzogU3RlZmFubyBTdGFiZWxs aW5pIDxzc3RhYmVsbGluaUBrZXJuZWwub3JnPgpDYzogSnVsaWVuIEdyYWxsIDxqdWxpZW4uZ3Jh bGxAYXJtLmNvbT4KQ2M6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+ CkNjOiBJYW4gSmFja3NvbiA8aWFuLmphY2tzb25AZXUuY2l0cml4LmNvbT4KQ2M6IEtvbnJhZCBS emVzenV0ZWsgV2lsayA8a29ucmFkLndpbGtAb3JhY2xlLmNvbT4KQ2M6IFRpbSBEZWVnYW4gPHRp bUB4ZW4ub3JnPgpDYzogSnVuIE5ha2FqaW1hIDxqdW4ubmFrYWppbWFAaW50ZWwuY29tPgpDYzog S2V2aW4gVGlhbiA8a2V2aW4udGlhbkBpbnRlbC5jb20+CkNjOiBHZW9yZ2UgRHVubGFwIDxnZW9y Z2UuZHVubGFwQGV1LmNpdHJpeC5jb20+Cgp2NzoKIC0gUmUtYmFzZSBhbmQgcmUtbmFtZSBCRk4g LT4gREZOLgogLSBNb3ZlIGRvbXVfY3Jhc2goKSBvdXRzaWRlIGRvdWJsZSBsb2NrZWQgcmVnaW9u IGluIGdyYW50X3RhYmxlLmMuCiAtIEFkZGVkIEphbidzIFItYi4KCnY2OgogLSBJbnRyb2R1Y2Ug ZG9tdV9jcmFzaCgpIChpZGVhIHN1Z2dlc3RlZCBieSBLZXZpbiwgbmFtZSBzdWdnZXN0ZWQgYnkg SmFuKQogICB0byBjcmFzaCBub24taGFyZHdhcmUgZG9tYWlucy4KIC0gRHJvcHBlZCBXZWkncyBh bmQgR2VvcmdlJ3MgUi1iIGJlY2F1c2Ugb2YgY2hhbmdlLgoKdjI6CiAtIE5ldyBpbiB2Mi4KLS0t CiB4ZW4vYXJjaC9hcm0vcDJtLmMgICAgICAgICAgICAgICAgICB8ICA0ICsrKysKIHhlbi9hcmNo L3g4Ni9tbS5jICAgICAgICAgICAgICAgICAgIHwgIDMgKysrCiB4ZW4vYXJjaC94ODYvbW0vcDJt LWVwdC5jICAgICAgICAgICB8ICAzICsrKwogeGVuL2FyY2gveDg2L21tL3AybS1wdC5jICAgICAg ICAgICAgfCAgMyArKysKIHhlbi9hcmNoL3g4Ni9tbS9wMm0uYyAgICAgICAgICAgICAgIHwgMjIg KysrKysrKysrKysrKysrKysrLS0tLQogeGVuL2NvbW1vbi9ncmFudF90YWJsZS5jICAgICAgICAg ICAgfCAgNCArKysrCiB4ZW4vY29tbW9uL21lbW9yeS5jICAgICAgICAgICAgICAgICB8ICAzICsr KwogeGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvaW9tbXUuYyAgICAgfCAxMiAtLS0tLS0tLS0tLS0K IHhlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3g4Ni9pb21tdS5jIHwgIDQgKysrKwogeGVuL2luY2x1 ZGUveGVuL3NjaGVkLmggICAgICAgICAgICAgfCAgNSArKysrKwogMTAgZmlsZXMgY2hhbmdlZCwg NDcgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gv YXJtL3AybS5jIGIveGVuL2FyY2gvYXJtL3AybS5jCmluZGV4IDBkYjEyYjAxZjEuLjFjNzlmZjdh ZGUgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9wMm0uYworKysgYi94ZW4vYXJjaC9hcm0vcDJt LmMKQEAgLTk1Nyw4ICs5NTcsMTIgQEAgc3RhdGljIGludCBfX3AybV9zZXRfZW50cnkoc3RydWN0 IHAybV9kb21haW4gKnAybSwKIAogICAgIGlmICggbmVlZF9pb21tdShwMm0tPmRvbWFpbikgJiYK ICAgICAgICAgIChscGFlX2lzX3ZhbGlkKG9yaWdfcHRlKSB8fCBscGFlX2lzX3ZhbGlkKCplbnRy eSkpICkKKyAgICB7CiAgICAgICAgIHJjID0gaW9tbXVfaW90bGJfZmx1c2gocDJtLT5kb21haW4s IF9kZm4oZ2ZuX3goc2dmbikpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDFVTCA8 PCBwYWdlX29yZGVyKTsKKyAgICAgICAgaWYgKCB1bmxpa2VseShyYykgKQorICAgICAgICAgICAg ZG9tdV9jcmFzaChwMm0tPmRvbWFpbik7CisgICAgfQogICAgIGVsc2UKICAgICAgICAgcmMgPSAw OwogCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0uYyBiL3hlbi9hcmNoL3g4Ni9tbS5jCmlu ZGV4IGU1MDNkZWRlYmUuLjU3NzY0ZTg0ZmEgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS5j CisrKyBiL3hlbi9hcmNoL3g4Ni9tbS5jCkBAIC0yNzY1LDYgKzI3NjUsOSBAQCBzdGF0aWMgaW50 IF9nZXRfcGFnZV90eXBlKHN0cnVjdCBwYWdlX2luZm8gKnBhZ2UsIHVuc2lnbmVkIGxvbmcgdHlw ZSwKICAgICAgICAgICAgICAgICBpb21tdV9yZXQgPSBpb21tdV9tYXBfcGFnZShkLCBfZGZuKG1m bl94KG1mbikpLCBtZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgSU9NTVVGX3JlYWRhYmxlIHwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBJT01NVUZfd3JpdGFibGUpOworCisgICAgICAgICAgICBpZiAoIHVubGlrZWx5KGlv bW11X3JldCkgKQorICAgICAgICAgICAgICAgIGRvbXVfY3Jhc2goZCk7CiAgICAgICAgIH0KICAg ICB9CiAKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMgYi94ZW4vYXJjaC94 ODYvbW0vcDJtLWVwdC5jCmluZGV4IDlhM2E5MGU5ZTYuLmFmNzY3NGY3ZTEgMTAwNjQ0Ci0tLSBh L3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMKKysrIGIveGVuL2FyY2gveDg2L21tL3AybS1lcHQu YwpAQCAtODk1LDYgKzg5NSw5IEBAIG91dDoKICAgICAgICAgICAgICAgICAgICAgaWYgKCAhcmMg KQogICAgICAgICAgICAgICAgICAgICAgICAgcmMgPSByZXQ7CiAgICAgICAgICAgICAgICAgfQor CisgICAgICAgICAgICBpZiAoIHVubGlrZWx5KHJjKSApCisgICAgICAgICAgICAgICAgZG9tdV9j cmFzaChkKTsKICAgICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21t L3AybS1wdC5jIGIveGVuL2FyY2gveDg2L21tL3AybS1wdC5jCmluZGV4IDg4MWU5ZTg3YjguLjYw NzA0NmYzMWIgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYworKysgYi94ZW4v YXJjaC94ODYvbW0vcDJtLXB0LmMKQEAgLTcxNyw2ICs3MTcsOSBAQCBwMm1fcHRfc2V0X2VudHJ5 KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwKICAgICAgICAg ICAgICAgICAgICAgICAgIHJjID0gcmV0OwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgfQor CisgICAgICAgIGlmICggdW5saWtlbHkocmMpICkKKyAgICAgICAgICAgIGRvbXVfY3Jhc2gocDJt LT5kb21haW4pOwogICAgIH0KIAogICAgIC8qCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0v cDJtLmMgYi94ZW4vYXJjaC94ODYvbW0vcDJtLmMKaW5kZXggODAxYjYyOWI5NS4uNTM3YWRkNjVi YiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3AybS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9t bS9wMm0uYwpAQCAtNzI0LDYgKzcyNCw5IEBAIHAybV9yZW1vdmVfcGFnZShzdHJ1Y3QgcDJtX2Rv bWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbl9sLCB1bnNpZ25lZCBsb25nIG1mbiwKICAgICAg ICAgICAgICAgICBpZiAoICFyYyApCiAgICAgICAgICAgICAgICAgICAgIHJjID0gcmV0OwogICAg ICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAoIHVubGlrZWx5KHJjKSApCisgICAgICAgICAg ICAgICAgZG9tdV9jcmFzaChwMm0tPmRvbWFpbik7CiAgICAgICAgIH0KIAogICAgICAgICByZXR1 cm4gcmM7CkBAIC03ODksNiArNzkyLDcgQEAgZ3Vlc3RfcGh5c21hcF9hZGRfZW50cnkoc3RydWN0 IGRvbWFpbiAqZCwgZ2ZuX3QgZ2ZuLCBtZm5fdCBtZm4sCiAgICAgICAgICAgICAgICAgICAgICAg ICBpZiAoIGlvbW11X3VubWFwX3BhZ2UoZCwgZGZuX2FkZChkZm4sIGkpKSApCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29udGludWU7CiAKKyAgICAgICAgICAgICAgICAgICAgZG9tdV9j cmFzaChkKTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJjOwogICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgIH0KQEAgLTExNTcsMTIgKzExNjEsMTcgQEAgaW50IHNldF9pZGVudGl0 eV9wMm1fZW50cnkoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBnZm5fbCwKICAgICBz dHJ1Y3QgcDJtX2RvbWFpbiAqcDJtID0gcDJtX2dldF9ob3N0cDJtKGQpOwogICAgIGludCByZXQ7 CiAKLSAgICBpZiAoICFwYWdpbmdfbW9kZV90cmFuc2xhdGUocDJtLT5kb21haW4pICkKKyAgICBp ZiAoICFwYWdpbmdfbW9kZV90cmFuc2xhdGUoZCkgKQogICAgIHsKICAgICAgICAgaWYgKCAhbmVl ZF9pb21tdShkKSApCiAgICAgICAgICAgICByZXR1cm4gMDsKLSAgICAgICAgcmV0dXJuIGlvbW11 X21hcF9wYWdlKGQsIF9kZm4oZ2ZuX2wpLCBfbWZuKGdmbl9sKSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIElPTU1VRl9yZWFkYWJsZSB8IElPTU1VRl93cml0YWJsZSk7CisKKyAgICAg ICAgcmV0ID0gaW9tbXVfbWFwX3BhZ2UoZCwgX2RmbihnZm5fbCksIF9tZm4oZ2ZuX2wpLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBJT01NVUZfcmVhZGFibGUgfCBJT01NVUZfd3JpdGFi bGUpOworICAgICAgICBpZiAoIHVubGlrZWx5KHJldCkgKQorICAgICAgICAgICAgZG9tdV9jcmFz aChkKTsKKworICAgICAgICByZXR1cm4gcmV0OwogICAgIH0KIAogICAgIGdmbl9sb2NrKHAybSwg Z2ZuLCAwKTsKQEAgLTEyNTIsNyArMTI2MSwxMiBAQCBpbnQgY2xlYXJfaWRlbnRpdHlfcDJtX2Vu dHJ5KHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuX2wpCiAgICAgewogICAgICAg ICBpZiAoICFuZWVkX2lvbW11KGQpICkKICAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICBy ZXR1cm4gaW9tbXVfdW5tYXBfcGFnZShkLCBfZGZuKGdmbl9sKSk7CisKKyAgICAgICAgcmV0ID0g aW9tbXVfdW5tYXBfcGFnZShkLCBfZGZuKGdmbl9sKSk7CisgICAgICAgIGlmICggdW5saWtlbHko cmV0KSApCisgICAgICAgICAgICBkb211X2NyYXNoKGQpOworCisgICAgICAgIHJldHVybiByZXQ7 CiAgICAgfQogCiAgICAgZ2ZuX2xvY2socDJtLCBnZm4sIDApOwpkaWZmIC0tZ2l0IGEveGVuL2Nv bW1vbi9ncmFudF90YWJsZS5jIGIveGVuL2NvbW1vbi9ncmFudF90YWJsZS5jCmluZGV4IDJkMDFj YWQxNzYuLjBmMGI3YjFhNDkgMTAwNjQ0Ci0tLSBhL3hlbi9jb21tb24vZ3JhbnRfdGFibGUuYwor KysgYi94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMKQEAgLTExNTUsNiArMTE1NSw3IEBAIG1hcF9n cmFudF9yZWYoCiAgICAgICAgIGlmICggZXJyICkKICAgICAgICAgewogICAgICAgICAgICAgZG91 YmxlX2d0X3VubG9jayhsZ3QsIHJndCk7CisgICAgICAgICAgICBkb211X2NyYXNoKGxkKTsKICAg ICAgICAgICAgIHJjID0gR05UU1RfZ2VuZXJhbF9lcnJvcjsKICAgICAgICAgICAgIGdvdG8gdW5k b19vdXQ7CiAgICAgICAgIH0KQEAgLTE0MDYsNyArMTQwNywxMCBAQCB1bm1hcF9jb21tb24oCiAg ICAgICAgIGRvdWJsZV9ndF91bmxvY2sobGd0LCByZ3QpOwogCiAgICAgICAgIGlmICggZXJyICkK KyAgICAgICAgeworICAgICAgICAgICAgZG9tdV9jcmFzaChsZCk7CiAgICAgICAgICAgICByYyA9 IEdOVFNUX2dlbmVyYWxfZXJyb3I7CisgICAgICAgIH0KICAgICB9CiAKICAgICAvKiBJZiBqdXN0 IHVubWFwcGVkIGEgd3JpdGFibGUgbWFwcGluZywgbWFyayBhcyBkaXJ0aWVkICovCmRpZmYgLS1n aXQgYS94ZW4vY29tbW9uL21lbW9yeS5jIGIveGVuL2NvbW1vbi9tZW1vcnkuYwppbmRleCA4OWIy MTFkNmFhLi44NTYxMWRkYWU0IDEwMDY0NAotLS0gYS94ZW4vY29tbW9uL21lbW9yeS5jCisrKyBi L3hlbi9jb21tb24vbWVtb3J5LmMKQEAgLTg0MSw2ICs4NDEsOSBAQCBpbnQgeGVubWVtX2FkZF90 b19waHlzbWFwKHN0cnVjdCBkb21haW4gKmQsIHN0cnVjdCB4ZW5fYWRkX3RvX3BoeXNtYXAgKnhh dHAsCiAgICAgICAgIHJldCA9IGlvbW11X2lvdGxiX2ZsdXNoKGQsIF9kZm4oeGF0cC0+Z3BmbiAt IGRvbmUpLCBkb25lKTsKICAgICAgICAgaWYgKCB1bmxpa2VseShyZXQpICYmIHJjID49IDAgKQog ICAgICAgICAgICAgcmMgPSByZXQ7CisKKyAgICAgICAgaWYgKCB1bmxpa2VseShyYyA8IDApICkK KyAgICAgICAgICAgIGRvbXVfY3Jhc2goZCk7CiAgICAgfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBh L3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2lvbW11LmMgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3Vn aC9pb21tdS5jCmluZGV4IDE1YWU2NmEwNmMuLmExNmYxYTBjNjYgMTAwNjQ0Ci0tLSBhL3hlbi9k cml2ZXJzL3Bhc3N0aHJvdWdoL2lvbW11LmMKKysrIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gv aW9tbXUuYwpAQCAtMjcxLDkgKzI3MSw2IEBAIGludCBpb21tdV9tYXBfcGFnZShzdHJ1Y3QgZG9t YWluICpkLCBkZm5fdCBkZm4sIG1mbl90IG1mbiwKICAgICAgICAgICAgIHByaW50ayhYRU5MT0df RVJSCiAgICAgICAgICAgICAgICAgICAgImQlZDogSU9NTVUgbWFwcGluZyBkZm4gJSJQUklfZGZu IiB0byBtZm4gJSJQUklfbWZuIiBmYWlsZWQ6ICVkXG4iLAogICAgICAgICAgICAgICAgICAgIGQt PmRvbWFpbl9pZCwgZGZuX3goZGZuKSwgbWZuX3gobWZuKSwgcmMpOwotCi0gICAgICAgIGlmICgg IWlzX2hhcmR3YXJlX2RvbWFpbihkKSApCi0gICAgICAgICAgICBkb21haW5fY3Jhc2goZCk7CiAg ICAgfQogCiAgICAgcmV0dXJuIHJjOwpAQCAtMjk0LDkgKzI5MSw2IEBAIGludCBpb21tdV91bm1h cF9wYWdlKHN0cnVjdCBkb21haW4gKmQsIGRmbl90IGRmbikKICAgICAgICAgICAgIHByaW50ayhY RU5MT0dfRVJSCiAgICAgICAgICAgICAgICAgICAgImQlZDogSU9NTVUgdW5tYXBwaW5nIGRmbiAl IlBSSV9kZm4iIGZhaWxlZDogJWRcbiIsCiAgICAgICAgICAgICAgICAgICAgZC0+ZG9tYWluX2lk LCBkZm5feChkZm4pLCByYyk7Ci0KLSAgICAgICAgaWYgKCAhaXNfaGFyZHdhcmVfZG9tYWluKGQp ICkKLSAgICAgICAgICAgIGRvbWFpbl9jcmFzaChkKTsKICAgICB9CiAKICAgICByZXR1cm4gcmM7 CkBAIC0zMzQsOSArMzI4LDYgQEAgaW50IGlvbW11X2lvdGxiX2ZsdXNoKHN0cnVjdCBkb21haW4g KmQsIGRmbl90IGRmbiwgdW5zaWduZWQgaW50IHBhZ2VfY291bnQpCiAgICAgICAgICAgICBwcmlu dGsoWEVOTE9HX0VSUgogICAgICAgICAgICAgICAgICAgICJkJWQ6IElPTU1VIElPVExCIGZsdXNo IGZhaWxlZDogJWQsIGRmbiAlIlBSSV9kZm4iLCBwYWdlIGNvdW50ICV1XG4iLAogICAgICAgICAg ICAgICAgICAgIGQtPmRvbWFpbl9pZCwgcmMsIGRmbl94KGRmbiksIHBhZ2VfY291bnQpOwotCi0g ICAgICAgIGlmICggIWlzX2hhcmR3YXJlX2RvbWFpbihkKSApCi0gICAgICAgICAgICBkb21haW5f Y3Jhc2goZCk7CiAgICAgfQogCiAgICAgcmV0dXJuIHJjOwpAQCAtMzU3LDkgKzM0OCw2IEBAIGlu dCBpb21tdV9pb3RsYl9mbHVzaF9hbGwoc3RydWN0IGRvbWFpbiAqZCkKICAgICAgICAgICAgIHBy aW50ayhYRU5MT0dfRVJSCiAgICAgICAgICAgICAgICAgICAgImQlZDogSU9NTVUgSU9UTEIgZmx1 c2ggYWxsIGZhaWxlZDogJWRcbiIsCiAgICAgICAgICAgICAgICAgICAgZC0+ZG9tYWluX2lkLCBy Yyk7Ci0KLSAgICAgICAgaWYgKCAhaXNfaGFyZHdhcmVfZG9tYWluKGQpICkKLSAgICAgICAgICAg IGRvbWFpbl9jcmFzaChkKTsKICAgICB9CiAKICAgICByZXR1cm4gcmM7CmRpZmYgLS1naXQgYS94 ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC94ODYvaW9tbXUuYyBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJv dWdoL3g4Ni9pb21tdS5jCmluZGV4IDIxZTY2NzhmMTYuLjYyMGJkYzE0YzMgMTAwNjQ0Ci0tLSBh L3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3g4Ni9pb21tdS5jCisrKyBiL3hlbi9kcml2ZXJzL3Bh c3N0aHJvdWdoL3g4Ni9pb21tdS5jCkBAIC0xMDQsNyArMTA0LDExIEBAIGludCBhcmNoX2lvbW11 X3BvcHVsYXRlX3BhZ2VfdGFibGUoc3RydWN0IGRvbWFpbiAqZCkKICAgICB0aGlzX2NwdShpb21t dV9kb250X2ZsdXNoX2lvdGxiKSA9IDA7CiAKICAgICBpZiAoICFyYyApCisgICAgewogICAgICAg ICByYyA9IGlvbW11X2lvdGxiX2ZsdXNoX2FsbChkKTsKKyAgICAgICAgaWYgKCB1bmxpa2VseShy YykgKQorICAgICAgICAgICAgZG9tYWluX2NyYXNoKGQpOworICAgIH0KIAogICAgIGlmICggcmMg JiYgcmMgIT0gLUVSRVNUQVJUICkKICAgICAgICAgaW9tbXVfdGVhcmRvd24oZCk7CmRpZmYgLS1n aXQgYS94ZW4vaW5jbHVkZS94ZW4vc2NoZWQuaCBiL3hlbi9pbmNsdWRlL3hlbi9zY2hlZC5oCmlu ZGV4IDBiYTgwY2IxYTguLmYyYzU5NGQxOTcgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL3hlbi9z Y2hlZC5oCisrKyBiL3hlbi9pbmNsdWRlL3hlbi9zY2hlZC5oCkBAIC02MTYsNiArNjE2LDExIEBA IHZvaWQgX19kb21haW5fY3Jhc2goc3RydWN0IGRvbWFpbiAqZCk7CiAgICAgX19kb21haW5fY3Jh c2goZCk7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKIH0gd2hpbGUgKDApCiAKKyNkZWZpbmUgZG9tdV9jcmFzaChkKSBkbyB7ICAgICAgICAgICAg ICAgIFwKKyAgICBpZiAoICFpc19oYXJkd2FyZV9kb21haW4oZCkgKSAgICAgICAgIFwKKyAgICAg ICAgZG9tYWluX2NyYXNoKGQpOyAgICAgICAgICAgICAgICAgIFwKK30gd2hpbGUgKGZhbHNlKQor CiAvKgogICogQ2FsbGVkIGZyb20gYXNzZW1ibHkgY29kZSwgd2l0aCBhbiBvcHRpb25hbCBhZGRy ZXNzIHRvIGhlbHAgaW5kaWNhdGUgd2h5CiAgKiB0aGUgY3Jhc2ggb2NjdXJlZC4gIElmIGFkZHIg aXMgMCwgbG9vayB1cCBhZGRyZXNzIGZyb20gbGFzdCBleHRhYmxlCi0tIAoyLjExLjAKCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFp bGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhl bnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs