From: Paul Durrant Subject: [PATCH v14 3/9] iommu: push use of type-safe DFN and MFN into iommu_ops Date: Thu, 4 Oct 2018 11:45:41 +0100 Message-ID: <20181004104547.32316-4-paul.durrant@citrix.com> References: <20181004104547.32316-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 1g818k-0002JS-Ev for xen-devel@lists.xenproject.org; Thu, 04 Oct 2018 10:45:54 +0000 In-Reply-To: <20181004104547.32316-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: Andrew Cooper , Paul Durrant , George Dunlap List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCBtb2RpZmllcyB0aGUgbWV0aG9kcyBpbiBzdHJ1Y3QgaW9tbXVfb3BzIHRvIHVz ZSB0eXBlLXNhZmUgREZOCmFuZCBNRk4uIFRoaXMgZm9sbG93cyBvbiBmcm9tIHRoZSBwcmlvciBw YXRjaCB0aGF0IG1vZGlmaWVkIHRoZSBmdW5jdGlvbnMKZXhwb3J0ZWQgaW4geGVuL2lvbW11Lmgu CgpTaWduZWQtb2ZmLWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgpS ZXZpZXdlZC1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KUmV2aWV3ZWQtYnk6IEtl dmluIFRpYW4gPGtldmluLnRpYW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogUm9nZXIgUGF1IE1v bm5lIDxyb2dlci5wYXVAY2l0cml4LmNvbT4KQWNrZWQtYnk6IEphbiBCZXVsaWNoIDxqYmV1bGlj aEBzdXNlLmNvbT4KQWNrZWQtYnk6IFN1cmF2ZWUgU3V0aGlrdWxwYW5pdCA8c3VyYXZlZS5zdXRo aWt1bHBhbml0QGFtZC5jb20+Ci0tLQpDYzogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNA Y2l0cml4LmNvbT4KQ2M6IEdlb3JnZSBEdW5sYXAgPGdlb3JnZS5kdW5sYXBAY2l0cml4LmNvbT4K CnYxNDoKIC0gUmUtYmFzZS4KCnY5OgogLSBSZS1iYXNlLgoKdjc6CiAtIFJlLWJhc2UgYW5kIHJl LW5hbWUgQkZOIC0+IERGTi4KIC0gQWRkZWQgSmFuJ3MgQS1iIHNpbmNlIHJlLW5hbWluZyB3YXMg cHVyZWx5IG1lY2hhbmljYWwuCgp2NjoKIC0gUmUtYmFzZS4KCnYzOgogLSBSZW1vdmUgc29tZSB1 c2Ugb2YgaW50ZXJtZWRpYXRlICdmcmFtZScgdmFyaWFibGVzLgoKdjI6CiAtIEFkZHJlc3NlZCBj b21tZW50cyBmcm9tIEphbi4KIC0gRXh0ZW5kIHVzZSBvZiBpbnRlcm1lZGlhdGUgJ2ZyYW1lJyB2 YXJpYWJsZSB0byBhdm9pZCBkaXJlY3RseQogICBlbmNhcHN1bGF0aW5nIGdmbiB2YWx1ZXMgYXMg YmZucyAobm93IGRmbnMpIG9yIHZpY2UgdmVyc2EuCi0tLQogeGVuL2RyaXZlcnMvcGFzc3Rocm91 Z2gvYW1kL2lvbW11X21hcC5jICAgICAgIHwgNDYgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t CiB4ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9hcm0vc21tdS5jICAgICAgICAgICAgfCAxNiArKysr Ky0tLS0tCiB4ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9pb21tdS5jICAgICAgICAgICAgICAgfCAg OSArKystLS0KIHhlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC9pb21tdS5jICAgICAgICAgICB8 IDI2ICsrKysrKystLS0tLS0tLQogeGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gveDg2L2lvbW11LmMg ICAgICAgICAgIHwgIDIgKy0KIHhlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3N2bS9hbWQtaW9tbXUt cHJvdG8uaCB8ICA4ICsrLS0tCiB4ZW4vaW5jbHVkZS94ZW4vaW9tbXUuaCAgICAgICAgICAgICAg ICAgICAgICAgfCAxMyArKysrKy0tLQogNyBmaWxlcyBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCsp LCA1NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9h bWQvaW9tbXVfbWFwLmMgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9hbWQvaW9tbXVfbWFwLmMK aW5kZXggNjFhZGU3MTg1MC4uYzg5YzU0ZmRiNiAxMDA2NDQKLS0tIGEveGVuL2RyaXZlcnMvcGFz c3Rocm91Z2gvYW1kL2lvbW11X21hcC5jCisrKyBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2Ft ZC9pb21tdV9tYXAuYwpAQCAtNjMxLDcgKzYzMSw3IEBAIHN0YXRpYyBpbnQgdXBkYXRlX3BhZ2lu Z19tb2RlKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZGZuKQogICAgIHJldHVybiAw OwogfQogCi1pbnQgYW1kX2lvbW11X21hcF9wYWdlKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVk IGxvbmcgZGZuLCB1bnNpZ25lZCBsb25nIG1mbiwKK2ludCBhbWRfaW9tbXVfbWFwX3BhZ2Uoc3Ry dWN0IGRvbWFpbiAqZCwgZGZuX3QgZGZuLCBtZm5fdCBtZm4sCiAgICAgICAgICAgICAgICAgICAg ICAgIHVuc2lnbmVkIGludCBmbGFncykKIHsKICAgICBib29sX3QgbmVlZF9mbHVzaCA9IDA7CkBA IC02NTEsNyArNjUxLDggQEAgaW50IGFtZF9pb21tdV9tYXBfcGFnZShzdHJ1Y3QgZG9tYWluICpk LCB1bnNpZ25lZCBsb25nIGRmbiwgdW5zaWduZWQgbG9uZyBtZm4sCiAgICAgaWYgKCByYyApCiAg ICAgewogICAgICAgICBzcGluX3VubG9jaygmaGQtPmFyY2gubWFwcGluZ19sb2NrKTsKLSAgICAg ICAgQU1EX0lPTU1VX0RFQlVHKCJSb290IHRhYmxlIGFsbG9jIGZhaWxlZCwgZGZuID0gJWx4XG4i LCBkZm4pOworICAgICAgICBBTURfSU9NTVVfREVCVUcoIlJvb3QgdGFibGUgYWxsb2MgZmFpbGVk LCBkZm4gPSAlIlBSSV9kZm4iXG4iLAorICAgICAgICAgICAgICAgICAgICAgICAgZGZuX3goZGZu KSk7CiAgICAgICAgIGRvbWFpbl9jcmFzaChkKTsKICAgICAgICAgcmV0dXJuIHJjOwogICAgIH0K QEAgLTY2MCwyNSArNjYxLDI3IEBAIGludCBhbWRfaW9tbXVfbWFwX3BhZ2Uoc3RydWN0IGRvbWFp biAqZCwgdW5zaWduZWQgbG9uZyBkZm4sIHVuc2lnbmVkIGxvbmcgbWZuLAogICAgICAqIHdlIG1p Z2h0IG5lZWQgYSBkZWVwZXIgcGFnZSB0YWJsZSBmb3Igd2lkZXIgZGZuIG5vdyAqLwogICAgIGlm ICggaXNfaHZtX2RvbWFpbihkKSApCiAgICAgewotICAgICAgICBpZiAoIHVwZGF0ZV9wYWdpbmdf bW9kZShkLCBkZm4pICkKKyAgICAgICAgaWYgKCB1cGRhdGVfcGFnaW5nX21vZGUoZCwgZGZuX3go ZGZuKSkgKQogICAgICAgICB7CiAgICAgICAgICAgICBzcGluX3VubG9jaygmaGQtPmFyY2gubWFw cGluZ19sb2NrKTsKLSAgICAgICAgICAgIEFNRF9JT01NVV9ERUJVRygiVXBkYXRlIHBhZ2UgbW9k ZSBmYWlsZWQgZGZuID0gJWx4XG4iLCBkZm4pOworICAgICAgICAgICAgQU1EX0lPTU1VX0RFQlVH KCJVcGRhdGUgcGFnZSBtb2RlIGZhaWxlZCBkZm4gPSAlIlBSSV9kZm4iXG4iLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGRmbl94KGRmbikpOwogICAgICAgICAgICAgZG9tYWluX2NyYXNo KGQpOwogICAgICAgICAgICAgcmV0dXJuIC1FRkFVTFQ7CiAgICAgICAgIH0KICAgICB9CiAKLSAg ICBpZiAoIGlvbW11X3BkZV9mcm9tX2RmbihkLCBkZm4sIHB0X21mbikgfHwgKHB0X21mblsxXSA9 PSAwKSApCisgICAgaWYgKCBpb21tdV9wZGVfZnJvbV9kZm4oZCwgZGZuX3goZGZuKSwgcHRfbWZu KSB8fCAocHRfbWZuWzFdID09IDApICkKICAgICB7CiAgICAgICAgIHNwaW5fdW5sb2NrKCZoZC0+ YXJjaC5tYXBwaW5nX2xvY2spOwotICAgICAgICBBTURfSU9NTVVfREVCVUcoIkludmFsaWQgSU8g cGFnZXRhYmxlIGVudHJ5IGRmbiA9ICVseFxuIiwgZGZuKTsKKyAgICAgICAgQU1EX0lPTU1VX0RF QlVHKCJJbnZhbGlkIElPIHBhZ2V0YWJsZSBlbnRyeSBkZm4gPSAlIlBSSV9kZm4iXG4iLAorICAg ICAgICAgICAgICAgICAgICAgICAgZGZuX3goZGZuKSk7CiAgICAgICAgIGRvbWFpbl9jcmFzaChk KTsKICAgICAgICAgcmV0dXJuIC1FRkFVTFQ7CiAgICAgfQogCiAgICAgLyogSW5zdGFsbCA0ayBt YXBwaW5nIGZpcnN0ICovCi0gICAgbmVlZF9mbHVzaCA9IHNldF9pb21tdV9wdGVfcHJlc2VudChw dF9tZm5bMV0sIGRmbiwgbWZuLAorICAgIG5lZWRfZmx1c2ggPSBzZXRfaW9tbXVfcHRlX3ByZXNl bnQocHRfbWZuWzFdLCBkZm5feChkZm4pLCBtZm5feChtZm4pLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgSU9NTVVfUEFHSU5HX01PREVfTEVWRUxfMSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICEhKGZsYWdzICYgSU9NTVVGX3dyaXRhYmxl KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICEhKGZsYWdzICYgSU9N TVVGX3JlYWRhYmxlKSk7CkBAIC02OTAsNyArNjkzLDcgQEAgaW50IGFtZF9pb21tdV9tYXBfcGFn ZShzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIGRmbiwgdW5zaWduZWQgbG9uZyBtZm4s CiAgICAgLyogNEsgbWFwcGluZyBmb3IgUFYgZ3Vlc3RzIG5ldmVyIGNoYW5nZXMsIAogICAgICAq IG5vIG5lZWQgdG8gZmx1c2ggaWYgd2UgdHJ1c3Qgbm9uLXByZXNlbnQgYml0cyAqLwogICAgIGlm ICggaXNfaHZtX2RvbWFpbihkKSApCi0gICAgICAgIGFtZF9pb21tdV9mbHVzaF9wYWdlcyhkLCBk Zm4sIDApOworICAgICAgICBhbWRfaW9tbXVfZmx1c2hfcGFnZXMoZCwgZGZuX3goZGZuKSwgMCk7 CiAKICAgICBmb3IgKCBtZXJnZV9sZXZlbCA9IElPTU1VX1BBR0lOR19NT0RFX0xFVkVMXzI7CiAg ICAgICAgICAgbWVyZ2VfbGV2ZWwgPD0gaGQtPmFyY2gucGFnaW5nX21vZGU7IG1lcmdlX2xldmVs KysgKQpAQCAtNjk4LDE1ICs3MDEsMTYgQEAgaW50IGFtZF9pb21tdV9tYXBfcGFnZShzdHJ1Y3Qg ZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIGRmbiwgdW5zaWduZWQgbG9uZyBtZm4sCiAgICAgICAg IGlmICggcHRfbWZuW21lcmdlX2xldmVsXSA9PSAwICkKICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICBpZiAoICFpb21tdV91cGRhdGVfcGRlX2NvdW50KGQsIHB0X21mblttZXJnZV9sZXZlbF0s Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGZuLCBtZm4sIG1lcmdlX2xl dmVsKSApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGZuX3goZGZuKSwg bWZuX3gobWZuKSwgbWVyZ2VfbGV2ZWwpICkKICAgICAgICAgICAgIGJyZWFrOwogCi0gICAgICAg IGlmICggaW9tbXVfbWVyZ2VfcGFnZXMoZCwgcHRfbWZuW21lcmdlX2xldmVsXSwgZGZuLAorICAg ICAgICBpZiAoIGlvbW11X21lcmdlX3BhZ2VzKGQsIHB0X21mblttZXJnZV9sZXZlbF0sIGRmbl94 KGRmbiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxhZ3MsIG1lcmdlX2xldmVs KSApCiAgICAgICAgIHsKICAgICAgICAgICAgIHNwaW5fdW5sb2NrKCZoZC0+YXJjaC5tYXBwaW5n X2xvY2spOwogICAgICAgICAgICAgQU1EX0lPTU1VX0RFQlVHKCJNZXJnZSBpb21tdSBwYWdlIGZh aWxlZCBhdCBsZXZlbCAlZCwgIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICJkZm4gPSAl bHggbWZuID0gJWx4XG4iLCBtZXJnZV9sZXZlbCwgZGZuLCBtZm4pOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJkZm4gPSAlIlBSSV9kZm4iIG1mbiA9ICUiUFJJX21mbiJcbiIsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbWVyZ2VfbGV2ZWwsIGRmbl94KGRmbiksIG1mbl94KG1m bikpOwogICAgICAgICAgICAgZG9tYWluX2NyYXNoKGQpOwogICAgICAgICAgICAgcmV0dXJuIC1F RkFVTFQ7CiAgICAgICAgIH0KQEAgLTcyMCw3ICs3MjQsNyBAQCBvdXQ6CiAgICAgcmV0dXJuIDA7 CiB9CiAKLWludCBhbWRfaW9tbXVfdW5tYXBfcGFnZShzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25l ZCBsb25nIGRmbikKK2ludCBhbWRfaW9tbXVfdW5tYXBfcGFnZShzdHJ1Y3QgZG9tYWluICpkLCBk Zm5fdCBkZm4pCiB7CiAgICAgdW5zaWduZWQgbG9uZyBwdF9tZm5bN107CiAgICAgc3RydWN0IGRv bWFpbl9pb21tdSAqaGQgPSBkb21faW9tbXUoZCk7CkBAIC03NDIsMzEgKzc0NiwzMyBAQCBpbnQg YW1kX2lvbW11X3VubWFwX3BhZ2Uoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBkZm4p CiAgICAgICogd2UgbWlnaHQgbmVlZCBhIGRlZXBlciBwYWdlIHRhYmxlIGZvciBsYWdlciBkZm4g bm93ICovCiAgICAgaWYgKCBpc19odm1fZG9tYWluKGQpICkKICAgICB7Ci0gICAgICAgIGludCBy YyA9IHVwZGF0ZV9wYWdpbmdfbW9kZShkLCBkZm4pOworICAgICAgICBpbnQgcmMgPSB1cGRhdGVf cGFnaW5nX21vZGUoZCwgZGZuX3goZGZuKSk7CiAKICAgICAgICAgaWYgKCByYyApCiAgICAgICAg IHsKICAgICAgICAgICAgIHNwaW5fdW5sb2NrKCZoZC0+YXJjaC5tYXBwaW5nX2xvY2spOwotICAg ICAgICAgICAgQU1EX0lPTU1VX0RFQlVHKCJVcGRhdGUgcGFnZSBtb2RlIGZhaWxlZCBkZm4gPSAl bHhcbiIsIGRmbik7CisgICAgICAgICAgICBBTURfSU9NTVVfREVCVUcoIlVwZGF0ZSBwYWdlIG1v ZGUgZmFpbGVkIGRmbiA9ICUiUFJJX2RmbiJcbiIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGZuX3goZGZuKSk7CiAgICAgICAgICAgICBpZiAoIHJjICE9IC1FQUREUk5PVEFWQUlMICkK ICAgICAgICAgICAgICAgICBkb21haW5fY3Jhc2goZCk7CiAgICAgICAgICAgICByZXR1cm4gcmM7 CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoIGlvbW11X3BkZV9mcm9tX2RmbihkLCBkZm4s IHB0X21mbikgfHwgKHB0X21mblsxXSA9PSAwKSApCisgICAgaWYgKCBpb21tdV9wZGVfZnJvbV9k Zm4oZCwgZGZuX3goZGZuKSwgcHRfbWZuKSB8fCAocHRfbWZuWzFdID09IDApICkKICAgICB7CiAg ICAgICAgIHNwaW5fdW5sb2NrKCZoZC0+YXJjaC5tYXBwaW5nX2xvY2spOwotICAgICAgICBBTURf SU9NTVVfREVCVUcoIkludmFsaWQgSU8gcGFnZXRhYmxlIGVudHJ5IGRmbiA9ICVseFxuIiwgZGZu KTsKKyAgICAgICAgQU1EX0lPTU1VX0RFQlVHKCJJbnZhbGlkIElPIHBhZ2V0YWJsZSBlbnRyeSBk Zm4gPSAlIlBSSV9kZm4iXG4iLAorICAgICAgICAgICAgICAgICAgICAgICAgZGZuX3goZGZuKSk7 CiAgICAgICAgIGRvbWFpbl9jcmFzaChkKTsKICAgICAgICAgcmV0dXJuIC1FRkFVTFQ7CiAgICAg fQogCiAgICAgLyogbWFyayBQVEUgYXMgJ3BhZ2Ugbm90IHByZXNlbnQnICovCi0gICAgY2xlYXJf aW9tbXVfcHRlX3ByZXNlbnQocHRfbWZuWzFdLCBkZm4pOworICAgIGNsZWFyX2lvbW11X3B0ZV9w cmVzZW50KHB0X21mblsxXSwgZGZuX3goZGZuKSk7CiAgICAgc3Bpbl91bmxvY2soJmhkLT5hcmNo Lm1hcHBpbmdfbG9jayk7CiAKLSAgICBhbWRfaW9tbXVfZmx1c2hfcGFnZXMoZCwgZGZuLCAwKTsK KyAgICBhbWRfaW9tbXVfZmx1c2hfcGFnZXMoZCwgZGZuX3goZGZuKSwgMCk7CiAKICAgICByZXR1 cm4gMDsKIH0KQEAgLTc4Nyw3ICs3OTMsOSBAQCBpbnQgYW1kX2lvbW11X3Jlc2VydmVfZG9tYWlu X3VuaXR5X21hcChzdHJ1Y3QgZG9tYWluICpkb21haW4sCiAgICAgZ2ZuID0gcGh5c19hZGRyID4+ IFBBR0VfU0hJRlQ7CiAgICAgZm9yICggaSA9IDA7IGkgPCBucGFnZXM7IGkrKyApCiAgICAgewot ICAgICAgICBydCA9IGFtZF9pb21tdV9tYXBfcGFnZShkb21haW4sIGdmbiAraSwgZ2ZuICtpLCBm bGFncyk7CisgICAgICAgIHVuc2lnbmVkIGxvbmcgZnJhbWUgPSBnZm4gKyBpOworCisgICAgICAg IHJ0ID0gYW1kX2lvbW11X21hcF9wYWdlKGRvbWFpbiwgX2RmbihmcmFtZSksIF9tZm4oZnJhbWUp LCBmbGFncyk7CiAgICAgICAgIGlmICggcnQgIT0gMCApCiAgICAgICAgICAgICByZXR1cm4gcnQ7 CiAgICAgfQpkaWZmIC0tZ2l0IGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvYXJtL3NtbXUuYyBi L3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2FybS9zbW11LmMKaW5kZXggMWVkYTk2YTcyYS4uNTNl NTgyM2QwNSAxMDA2NDQKLS0tIGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvYXJtL3NtbXUuYwor KysgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9hcm0vc21tdS5jCkBAIC0yNTUwLDggKzI1NTAs NyBAQCBzdGF0aWMgaW50IF9fbXVzdF9jaGVjayBhcm1fc21tdV9pb3RsYl9mbHVzaF9hbGwoc3Ry dWN0IGRvbWFpbiAqZCkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBfX211c3RfY2hlY2sg YXJtX3NtbXVfaW90bGJfZmx1c2goc3RydWN0IGRvbWFpbiAqZCwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgZGZuLAorc3RhdGljIGlu dCBfX211c3RfY2hlY2sgYXJtX3NtbXVfaW90bGJfZmx1c2goc3RydWN0IGRvbWFpbiAqZCwgZGZu X3QgZGZuLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5z aWduZWQgaW50IHBhZ2VfY291bnQpCiB7CiAJLyogQVJNIFNNTVUgdjEgZG9lc24ndCBoYXZlIGZs dXNoIGJ5IFZNQSBhbmQgVk1JRCAqLwpAQCAtMjc0OCw4ICsyNzQ3LDggQEAgc3RhdGljIHZvaWQg YXJtX3NtbXVfaW9tbXVfZG9tYWluX3RlYXJkb3duKHN0cnVjdCBkb21haW4gKmQpCiAJeGZyZWUo eGVuX2RvbWFpbik7CiB9CiAKLXN0YXRpYyBpbnQgX19tdXN0X2NoZWNrIGFybV9zbW11X21hcF9w YWdlKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZGZuLAotCQkJdW5zaWduZWQgbG9u ZyBtZm4sIHVuc2lnbmVkIGludCBmbGFncykKK3N0YXRpYyBpbnQgX19tdXN0X2NoZWNrIGFybV9z bW11X21hcF9wYWdlKHN0cnVjdCBkb21haW4gKmQsIGRmbl90IGRmbiwKKwkJCQkJICBtZm5fdCBt Zm4sIHVuc2lnbmVkIGludCBmbGFncykKIHsKIAlwMm1fdHlwZV90IHQ7CiAKQEAgLTI3NjIsNyAr Mjc2MSw3IEBAIHN0YXRpYyBpbnQgX19tdXN0X2NoZWNrIGFybV9zbW11X21hcF9wYWdlKHN0cnVj dCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZGZuLAogCSAqIGZ1bmN0aW9uIHNob3VsZCBvbmx5 IGJlIHVzZWQgYnkgZ250dGFiIGNvZGUgd2l0aCBnZm4gPT0gbWZuID09IGRmbi4KIAkgKi8KIAlC VUdfT04oIWlzX2RvbWFpbl9kaXJlY3RfbWFwcGVkKGQpKTsKLQlCVUdfT04obWZuICE9IGRmbik7 CisJQlVHX09OKG1mbl94KG1mbikgIT0gZGZuX3goZGZuKSk7CiAKIAkvKiBXZSBvbmx5IHN1cHBv cnQgcmVhZGFibGUgYW5kIHdyaXRhYmxlIGZsYWdzICovCiAJaWYgKCEoZmxhZ3MgJiAoSU9NTVVG X3JlYWRhYmxlIHwgSU9NTVVGX3dyaXRhYmxlKSkpCkBAIC0yNzc0LDEwICsyNzczLDExIEBAIHN0 YXRpYyBpbnQgX19tdXN0X2NoZWNrIGFybV9zbW11X21hcF9wYWdlKHN0cnVjdCBkb21haW4gKmQs IHVuc2lnbmVkIGxvbmcgZGZuLAogCSAqIFRoZSBmdW5jdGlvbiBndWVzdF9waHlzbWFwX2FkZF9l bnRyeSByZXBsYWNlcyB0aGUgY3VycmVudCBtYXBwaW5nCiAJICogaWYgdGhlcmUgaXMgYWxyZWFk eSBvbmUuLi4KIAkgKi8KLQlyZXR1cm4gZ3Vlc3RfcGh5c21hcF9hZGRfZW50cnkoZCwgX2dmbihk Zm4pLCBfbWZuKGRmbiksIDAsIHQpOworCXJldHVybiBndWVzdF9waHlzbWFwX2FkZF9lbnRyeShk LCBfZ2ZuKGRmbl94KGRmbikpLCBfbWZuKGRmbl94KGRmbikpLAorCQkJCSAgICAgICAwLCB0KTsK IH0KIAotc3RhdGljIGludCBfX211c3RfY2hlY2sgYXJtX3NtbXVfdW5tYXBfcGFnZShzdHJ1Y3Qg ZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIGRmbikKK3N0YXRpYyBpbnQgX19tdXN0X2NoZWNrIGFy bV9zbW11X3VubWFwX3BhZ2Uoc3RydWN0IGRvbWFpbiAqZCwgZGZuX3QgZGZuKQogewogCS8qCiAJ ICogVGhpcyBmdW5jdGlvbiBzaG91bGQgb25seSBiZSB1c2VkIGJ5IGdudHRhYiBjb2RlIHdoZW4g dGhlIGRvbWFpbgpAQCAtMjc4Niw3ICsyNzg2LDcgQEAgc3RhdGljIGludCBfX211c3RfY2hlY2sg YXJtX3NtbXVfdW5tYXBfcGFnZShzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIGRmbikK IAlpZiAoICFpc19kb21haW5fZGlyZWN0X21hcHBlZChkKSApCiAJCXJldHVybiAtRUlOVkFMOwog Ci0JcmV0dXJuIGd1ZXN0X3BoeXNtYXBfcmVtb3ZlX3BhZ2UoZCwgX2dmbihkZm4pLCBfbWZuKGRm biksIDApOworCXJldHVybiBndWVzdF9waHlzbWFwX3JlbW92ZV9wYWdlKGQsIF9nZm4oZGZuX3go ZGZuKSksIF9tZm4oZGZuX3goZGZuKSksIDApOwogfQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGlv bW11X29wcyBhcm1fc21tdV9pb21tdV9vcHMgPSB7CmRpZmYgLS1naXQgYS94ZW4vZHJpdmVycy9w YXNzdGhyb3VnaC9pb21tdS5jIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvaW9tbXUuYwppbmRl eCBlZjlkNjUxMzE3Li5kNjFmYmJmNDM5IDEwMDY0NAotLS0gYS94ZW4vZHJpdmVycy9wYXNzdGhy b3VnaC9pb21tdS5jCisrKyBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2lvbW11LmMKQEAgLTIy NCw3ICsyMjQsOCBAQCB2b2lkIF9faHdkb21faW5pdCBpb21tdV9od2RvbV9pbml0KHN0cnVjdCBk b21haW4gKmQpCiAgICAgICAgICAgICAgICAgICA9PSBQR1Rfd3JpdGFibGVfcGFnZSkgKQogICAg ICAgICAgICAgICAgIG1hcHBpbmcgfD0gSU9NTVVGX3dyaXRhYmxlOwogCi0gICAgICAgICAgICBy ZXQgPSBoZC0+cGxhdGZvcm1fb3BzLT5tYXBfcGFnZShkLCBkZm4sIG1mbiwgbWFwcGluZyk7Cisg ICAgICAgICAgICByZXQgPSBoZC0+cGxhdGZvcm1fb3BzLT5tYXBfcGFnZShkLCBfZGZuKGRmbiks IF9tZm4obWZuKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1hcHBpbmcpOwogICAgICAgICAgICAgaWYgKCAhcmMgKQogICAgICAgICAgICAgICAgIHJjID0g cmV0OwogCkBAIC0yOTQsNyArMjk1LDcgQEAgaW50IGlvbW11X21hcF9wYWdlKHN0cnVjdCBkb21h aW4gKmQsIGRmbl90IGRmbiwgbWZuX3QgbWZuLAogICAgIGlmICggIWlvbW11X2VuYWJsZWQgfHwg IWhkLT5wbGF0Zm9ybV9vcHMgKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIHJjID0gaGQtPnBs YXRmb3JtX29wcy0+bWFwX3BhZ2UoZCwgZGZuX3goZGZuKSwgbWZuX3gobWZuKSwgZmxhZ3MpOwor ICAgIHJjID0gaGQtPnBsYXRmb3JtX29wcy0+bWFwX3BhZ2UoZCwgZGZuLCBtZm4sIGZsYWdzKTsK ICAgICBpZiAoIHVubGlrZWx5KHJjKSApCiAgICAgewogICAgICAgICBpZiAoICFkLT5pc19zaHV0 dGluZ19kb3duICYmIHByaW50a19yYXRlbGltaXQoKSApCkBAIC0zMTcsNyArMzE4LDcgQEAgaW50 IGlvbW11X3VubWFwX3BhZ2Uoc3RydWN0IGRvbWFpbiAqZCwgZGZuX3QgZGZuKQogICAgIGlmICgg IWlvbW11X2VuYWJsZWQgfHwgIWhkLT5wbGF0Zm9ybV9vcHMgKQogICAgICAgICByZXR1cm4gMDsK IAotICAgIHJjID0gaGQtPnBsYXRmb3JtX29wcy0+dW5tYXBfcGFnZShkLCBkZm5feChkZm4pKTsK KyAgICByYyA9IGhkLT5wbGF0Zm9ybV9vcHMtPnVubWFwX3BhZ2UoZCwgZGZuKTsKICAgICBpZiAo IHVubGlrZWx5KHJjKSApCiAgICAgewogICAgICAgICBpZiAoICFkLT5pc19zaHV0dGluZ19kb3du ICYmIHByaW50a19yYXRlbGltaXQoKSApCkBAIC0zNTcsNyArMzU4LDcgQEAgaW50IGlvbW11X2lv dGxiX2ZsdXNoKHN0cnVjdCBkb21haW4gKmQsIGRmbl90IGRmbiwgdW5zaWduZWQgaW50IHBhZ2Vf Y291bnQpCiAgICAgaWYgKCAhaW9tbXVfZW5hYmxlZCB8fCAhaGQtPnBsYXRmb3JtX29wcyB8fCAh aGQtPnBsYXRmb3JtX29wcy0+aW90bGJfZmx1c2ggKQogICAgICAgICByZXR1cm4gMDsKIAotICAg IHJjID0gaGQtPnBsYXRmb3JtX29wcy0+aW90bGJfZmx1c2goZCwgZGZuX3goZGZuKSwgcGFnZV9j b3VudCk7CisgICAgcmMgPSBoZC0+cGxhdGZvcm1fb3BzLT5pb3RsYl9mbHVzaChkLCBkZm4sIHBh Z2VfY291bnQpOwogICAgIGlmICggdW5saWtlbHkocmMpICkKICAgICB7CiAgICAgICAgIGlmICgg IWQtPmlzX3NodXR0aW5nX2Rvd24gJiYgcHJpbnRrX3JhdGVsaW1pdCgpICkKZGlmZiAtLWdpdCBh L3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC9pb21tdS5jIGIveGVuL2RyaXZlcnMvcGFzc3Ro cm91Z2gvdnRkL2lvbW11LmMKaW5kZXggNDg1NzA0YmNjZS4uN2UxODVjNDNmMyAxMDA2NDQKLS0t IGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvdnRkL2lvbW11LmMKKysrIGIveGVuL2RyaXZlcnMv cGFzc3Rocm91Z2gvdnRkL2lvbW11LmMKQEAgLTU4NCw4ICs1ODQsNyBAQCBzdGF0aWMgaW50IF9f bXVzdF9jaGVjayBpb21tdV9mbHVzaF9hbGwodm9pZCkKICAgICByZXR1cm4gcmM7CiB9CiAKLXN0 YXRpYyBpbnQgX19tdXN0X2NoZWNrIGlvbW11X2ZsdXNoX2lvdGxiKHN0cnVjdCBkb21haW4gKmQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25n IGRmbiwKK3N0YXRpYyBpbnQgX19tdXN0X2NoZWNrIGlvbW11X2ZsdXNoX2lvdGxiKHN0cnVjdCBk b21haW4gKmQsIGRmbl90IGRmbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGJvb2xfdCBkbWFfb2xkX3B0ZV9wcmVzZW50LAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IHBhZ2VfY291bnQpCiB7CkBAIC02MTIs MTIgKzYxMSwxMiBAQCBzdGF0aWMgaW50IF9fbXVzdF9jaGVjayBpb21tdV9mbHVzaF9pb3RsYihz dHJ1Y3QgZG9tYWluICpkLAogICAgICAgICBpZiAoIGlvbW11X2RvbWlkID09IC0xICkKICAgICAg ICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIGlmICggcGFnZV9jb3VudCAhPSAxIHx8IGRmbiA9 PSBkZm5feChJTlZBTElEX0RGTikgKQorICAgICAgICBpZiAoIHBhZ2VfY291bnQgIT0gMSB8fCBk Zm5fZXEoZGZuLCBJTlZBTElEX0RGTikgKQogICAgICAgICAgICAgcmMgPSBpb21tdV9mbHVzaF9p b3RsYl9kc2koaW9tbXUsIGlvbW11X2RvbWlkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgMCwgZmx1c2hfZGV2X2lvdGxiKTsKICAgICAgICAgZWxzZQogICAgICAgICAg ICAgcmMgPSBpb21tdV9mbHVzaF9pb3RsYl9wc2koaW9tbXUsIGlvbW11X2RvbWlkLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX19kZm5fdG9fZGFkZHIoZGZuKSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRmbl90b19kYWRkcihkZm4pLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUEFHRV9PUkRFUl80SywKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICFkbWFfb2xkX3B0ZV9wcmVzZW50 LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmx1c2hfZGV2X2lvdGxi KTsKQEAgLTYzMyw3ICs2MzIsNyBAQCBzdGF0aWMgaW50IF9fbXVzdF9jaGVjayBpb21tdV9mbHVz aF9pb3RsYihzdHJ1Y3QgZG9tYWluICpkLAogfQogCiBzdGF0aWMgaW50IF9fbXVzdF9jaGVjayBp b21tdV9mbHVzaF9pb3RsYl9wYWdlcyhzdHJ1Y3QgZG9tYWluICpkLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBkZm4sCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZm5fdCBkZm4sCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBp bnQgcGFnZV9jb3VudCkKIHsKICAgICByZXR1cm4gaW9tbXVfZmx1c2hfaW90bGIoZCwgZGZuLCAx LCBwYWdlX2NvdW50KTsKQEAgLTY0MSw3ICs2NDAsNyBAQCBzdGF0aWMgaW50IF9fbXVzdF9jaGVj ayBpb21tdV9mbHVzaF9pb3RsYl9wYWdlcyhzdHJ1Y3QgZG9tYWluICpkLAogCiBzdGF0aWMgaW50 IF9fbXVzdF9jaGVjayBpb21tdV9mbHVzaF9pb3RsYl9hbGwoc3RydWN0IGRvbWFpbiAqZCkKIHsK LSAgICByZXR1cm4gaW9tbXVfZmx1c2hfaW90bGIoZCwgZGZuX3goSU5WQUxJRF9ERk4pLCAwLCAw KTsKKyAgICByZXR1cm4gaW9tbXVfZmx1c2hfaW90bGIoZCwgSU5WQUxJRF9ERk4sIDAsIDApOwog fQogCiAvKiBjbGVhciBvbmUgcGFnZSdzIHBhZ2UgdGFibGUgKi8KQEAgLTY3Niw3ICs2NzUsNyBA QCBzdGF0aWMgaW50IF9fbXVzdF9jaGVjayBkbWFfcHRlX2NsZWFyX29uZShzdHJ1Y3QgZG9tYWlu ICpkb21haW4sIHU2NCBhZGRyKQogICAgIGlvbW11X2ZsdXNoX2NhY2hlX2VudHJ5KHB0ZSwgc2l6 ZW9mKHN0cnVjdCBkbWFfcHRlKSk7CiAKICAgICBpZiAoICF0aGlzX2NwdShpb21tdV9kb250X2Zs dXNoX2lvdGxiKSApCi0gICAgICAgIHJjID0gaW9tbXVfZmx1c2hfaW90bGJfcGFnZXMoZG9tYWlu LCBhZGRyID4+IFBBR0VfU0hJRlRfNEssIDEpOworICAgICAgICByYyA9IGlvbW11X2ZsdXNoX2lv dGxiX3BhZ2VzKGRvbWFpbiwgZGFkZHJfdG9fZGZuKGFkZHIpLCAxKTsKIAogICAgIHVubWFwX3Z0 ZF9kb21haW5fcGFnZShwYWdlKTsKIApAQCAtMTc2Myw4ICsxNzYyLDcgQEAgc3RhdGljIHZvaWQg aW9tbXVfZG9tYWluX3RlYXJkb3duKHN0cnVjdCBkb21haW4gKmQpCiB9CiAKIHN0YXRpYyBpbnQg X19tdXN0X2NoZWNrIGludGVsX2lvbW11X21hcF9wYWdlKHN0cnVjdCBkb21haW4gKmQsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGRm biwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVk IGxvbmcgbWZuLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGZuX3QgZGZuLCBtZm5fdCBtZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1bnNpZ25lZCBpbnQgZmxhZ3MpCiB7CiAgICAgc3RydWN0IGRvbWFpbl9pb21t dSAqaGQgPSBkb21faW9tbXUoZCk7CkBAIC0xNzgyLDE2ICsxNzgwLDE2IEBAIHN0YXRpYyBpbnQg X19tdXN0X2NoZWNrIGludGVsX2lvbW11X21hcF9wYWdlKHN0cnVjdCBkb21haW4gKmQsCiAKICAg ICBzcGluX2xvY2soJmhkLT5hcmNoLm1hcHBpbmdfbG9jayk7CiAKLSAgICBwZ19tYWRkciA9IGFk ZHJfdG9fZG1hX3BhZ2VfbWFkZHIoZCwgX19kZm5fdG9fZGFkZHIoZGZuKSwgMSk7CisgICAgcGdf bWFkZHIgPSBhZGRyX3RvX2RtYV9wYWdlX21hZGRyKGQsIGRmbl90b19kYWRkcihkZm4pLCAxKTsK ICAgICBpZiAoIHBnX21hZGRyID09IDAgKQogICAgIHsKICAgICAgICAgc3Bpbl91bmxvY2soJmhk LT5hcmNoLm1hcHBpbmdfbG9jayk7CiAgICAgICAgIHJldHVybiAtRU5PTUVNOwogICAgIH0KICAg ICBwYWdlID0gKHN0cnVjdCBkbWFfcHRlICopbWFwX3Z0ZF9kb21haW5fcGFnZShwZ19tYWRkcik7 Ci0gICAgcHRlID0gcGFnZSArIChkZm4gJiBMRVZFTF9NQVNLKTsKKyAgICBwdGUgPSBwYWdlICsg KGRmbl94KGRmbikgJiBMRVZFTF9NQVNLKTsKICAgICBvbGQgPSAqcHRlOwotICAgIGRtYV9zZXRf cHRlX2FkZHIobmV3LCAocGFkZHJfdCltZm4gPDwgUEFHRV9TSElGVF80Syk7CisgICAgZG1hX3Nl dF9wdGVfYWRkcihuZXcsIG1mbl90b19tYWRkcihtZm4pKTsKICAgICBkbWFfc2V0X3B0ZV9wcm90 KG5ldywKICAgICAgICAgICAgICAgICAgICAgICgoZmxhZ3MgJiBJT01NVUZfcmVhZGFibGUpID8g RE1BX1BURV9SRUFEICA6IDApIHwKICAgICAgICAgICAgICAgICAgICAgICgoZmxhZ3MgJiBJT01N VUZfd3JpdGFibGUpID8gRE1BX1BURV9XUklURSA6IDApKTsKQEAgLTE4MTksMTMgKzE4MTcsMTMg QEAgc3RhdGljIGludCBfX211c3RfY2hlY2sgaW50ZWxfaW9tbXVfbWFwX3BhZ2Uoc3RydWN0IGRv bWFpbiAqZCwKIH0KIAogc3RhdGljIGludCBfX211c3RfY2hlY2sgaW50ZWxfaW9tbXVfdW5tYXBf cGFnZShzdHJ1Y3QgZG9tYWluICpkLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGRmbikKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZGZuX3QgZGZuKQogewogICAgIC8qIERvIG5vdGhpbmcg aWYgaGFyZHdhcmUgZG9tYWluIGFuZCBpb21tdSBzdXBwb3J0cyBwYXNzIHRocnUuICovCiAgICAg aWYgKCBpb21tdV9od2RvbV9wYXNzdGhyb3VnaCAmJiBpc19oYXJkd2FyZV9kb21haW4oZCkgKQog ICAgICAgICByZXR1cm4gMDsKIAotICAgIHJldHVybiBkbWFfcHRlX2NsZWFyX29uZShkLCBfX2Rm bl90b19kYWRkcihkZm4pKTsKKyAgICByZXR1cm4gZG1hX3B0ZV9jbGVhcl9vbmUoZCwgZGZuX3Rv X2RhZGRyKGRmbikpOwogfQogCiBpbnQgaW9tbXVfcHRlX2ZsdXNoKHN0cnVjdCBkb21haW4gKmQs IHVpbnQ2NF90IGRmbiwgdWludDY0X3QgKnB0ZSwKZGlmZiAtLWdpdCBhL3hlbi9kcml2ZXJzL3Bh c3N0aHJvdWdoL3g4Ni9pb21tdS5jIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gveDg2L2lvbW11 LmMKaW5kZXggMzQ3MjdiNjY1My4uZjQxMDcxN2E1OSAxMDA2NDQKLS0tIGEveGVuL2RyaXZlcnMv cGFzc3Rocm91Z2gveDg2L2lvbW11LmMKKysrIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gveDg2 L2lvbW11LmMKQEAgLTY4LDcgKzY4LDcgQEAgaW50IGFyY2hfaW9tbXVfcG9wdWxhdGVfcGFnZV90 YWJsZShzdHJ1Y3QgZG9tYWluICpkKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIEFT U0VSVCghKGdmbiA+PiBERUZBVUxUX0RPTUFJTl9BRERSRVNTX1dJRFRIKSk7CiAgICAgICAgICAg ICAgICAgQlVHX09OKFNIQVJFRF9NMlAoZ2ZuKSk7Ci0gICAgICAgICAgICAgICAgcmMgPSBoZC0+ cGxhdGZvcm1fb3BzLT5tYXBfcGFnZShkLCBnZm4sIG1mbiwKKyAgICAgICAgICAgICAgICByYyA9 IGhkLT5wbGF0Zm9ybV9vcHMtPm1hcF9wYWdlKGQsIF9kZm4oZ2ZuKSwgX21mbihtZm4pLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSU9NTVVGX3JlYWRh YmxlIHwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElP TU1VRl93cml0YWJsZSk7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9h c20teDg2L2h2bS9zdm0vYW1kLWlvbW11LXByb3RvLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2 bS9zdm0vYW1kLWlvbW11LXByb3RvLmgKaW5kZXggOTliYzIxYzdiMy4uMzA4M2Q2MjViZCAxMDA2 NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vc3ZtL2FtZC1pb21tdS1wcm90by5oCisr KyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3N2bS9hbWQtaW9tbXUtcHJvdG8uaApAQCAtNTIs OSArNTIsOSBAQCBpbnQgYW1kX2lvbW11X2luaXQodm9pZCk7CiBpbnQgYW1kX2lvbW11X3VwZGF0 ZV9pdnJzX21hcHBpbmdfYWNwaSh2b2lkKTsKIAogLyogbWFwcGluZyBmdW5jdGlvbnMgKi8KLWlu dCBfX211c3RfY2hlY2sgYW1kX2lvbW11X21hcF9wYWdlKHN0cnVjdCBkb21haW4gKmQsIHVuc2ln bmVkIGxvbmcgZ2ZuLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWdu ZWQgbG9uZyBtZm4sIHVuc2lnbmVkIGludCBmbGFncyk7Ci1pbnQgX19tdXN0X2NoZWNrIGFtZF9p b21tdV91bm1hcF9wYWdlKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuKTsKK2lu dCBfX211c3RfY2hlY2sgYW1kX2lvbW11X21hcF9wYWdlKHN0cnVjdCBkb21haW4gKmQsIGRmbl90 IGRmbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1mbl90IG1mbiwgdW5z aWduZWQgaW50IGZsYWdzKTsKK2ludCBfX211c3RfY2hlY2sgYW1kX2lvbW11X3VubWFwX3BhZ2Uo c3RydWN0IGRvbWFpbiAqZCwgZGZuX3QgZGZuKTsKIHU2NCBhbWRfaW9tbXVfZ2V0X25leHRfdGFi bGVfZnJvbV9wdGUodTMyICplbnRyeSk7CiBpbnQgX19tdXN0X2NoZWNrIGFtZF9pb21tdV9hbGxv Y19yb290KHN0cnVjdCBkb21haW5faW9tbXUgKmhkKTsKIGludCBhbWRfaW9tbXVfcmVzZXJ2ZV9k b21haW5fdW5pdHlfbWFwKHN0cnVjdCBkb21haW4gKmRvbWFpbiwKQEAgLTc3LDcgKzc3LDcgQEAg dm9pZCBpb21tdV9kdGVfc2V0X2d1ZXN0X2NyMyh1MzIgKmR0ZSwgdTE2IGRvbV9pZCwgdTY0IGdj cjMsCiAKIC8qIHNlbmQgY21kIHRvIGlvbW11ICovCiB2b2lkIGFtZF9pb21tdV9mbHVzaF9hbGxf cGFnZXMoc3RydWN0IGRvbWFpbiAqZCk7Ci12b2lkIGFtZF9pb21tdV9mbHVzaF9wYWdlcyhzdHJ1 Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIGdmbiwKK3ZvaWQgYW1kX2lvbW11X2ZsdXNoX3Bh Z2VzKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZGZuLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgdW5zaWduZWQgaW50IG9yZGVyKTsKIHZvaWQgYW1kX2lvbW11X2ZsdXNoX2lv dGxiKHU4IGRldmZuLCBjb25zdCBzdHJ1Y3QgcGNpX2RldiAqcGRldiwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVpbnQ2NF90IGdhZGRyLCB1bnNpZ25lZCBpbnQgb3JkZXIpOwpkaWZmIC0t Z2l0IGEveGVuL2luY2x1ZGUveGVuL2lvbW11LmggYi94ZW4vaW5jbHVkZS94ZW4vaW9tbXUuaApp bmRleCBmOWQ4NmZjODE2Li43MzEzOTU3YzgxIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS94ZW4v aW9tbXUuaAorKysgYi94ZW4vaW5jbHVkZS94ZW4vaW9tbXUuaApAQCAtNDgsNiArNDgsMTEgQEAg c3RhdGljIGlubGluZSBkZm5fdCBkZm5fYWRkKGRmbl90IGRmbiwgdW5zaWduZWQgbG9uZyBpKQog ICAgIHJldHVybiBfZGZuKGRmbl94KGRmbikgKyBpKTsKIH0KIAorc3RhdGljIGlubGluZSBib29s X3QgZGZuX2VxKGRmbl90IHgsIGRmbl90IHkpCit7CisgICAgcmV0dXJuIGRmbl94KHgpID09IGRm bl94KHkpOworfQorCiBleHRlcm4gYm9vbF90IGlvbW11X2VuYWJsZSwgaW9tbXVfZW5hYmxlZDsK IGV4dGVybiBib29sX3QgZm9yY2VfaW9tbXUsIGlvbW11X3ZlcmJvc2U7CiBleHRlcm4gYm9vbF90 IGlvbW11X3dvcmthcm91bmRfYmlvc19idWcsIGlvbW11X2lnZng7CkBAIC0xNzQsOSArMTc5LDkg QEAgc3RydWN0IGlvbW11X29wcyB7CiAjZW5kaWYgLyogSEFTX1BDSSAqLwogCiAgICAgdm9pZCAo KnRlYXJkb3duKShzdHJ1Y3QgZG9tYWluICpkKTsKLSAgICBpbnQgX19tdXN0X2NoZWNrICgqbWFw X3BhZ2UpKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZGZuLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBtZm4sIHVuc2lnbmVkIGludCBmbGFn cyk7Ci0gICAgaW50IF9fbXVzdF9jaGVjayAoKnVubWFwX3BhZ2UpKHN0cnVjdCBkb21haW4gKmQs IHVuc2lnbmVkIGxvbmcgZGZuKTsKKyAgICBpbnQgX19tdXN0X2NoZWNrICgqbWFwX3BhZ2UpKHN0 cnVjdCBkb21haW4gKmQsIGRmbl90IGRmbiwgbWZuX3QgbWZuLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGZsYWdzKTsKKyAgICBpbnQgX19tdXN0X2NoZWNr ICgqdW5tYXBfcGFnZSkoc3RydWN0IGRvbWFpbiAqZCwgZGZuX3QgZGZuKTsKICAgICB2b2lkICgq ZnJlZV9wYWdlX3RhYmxlKShzdHJ1Y3QgcGFnZV9pbmZvICopOwogI2lmZGVmIENPTkZJR19YODYK ICAgICB2b2lkICgqdXBkYXRlX2lyZV9mcm9tX2FwaWMpKHVuc2lnbmVkIGludCBhcGljLCB1bnNp Z25lZCBpbnQgcmVnLCB1bnNpZ25lZCBpbnQgdmFsdWUpOwpAQCAtMTg3LDcgKzE5Miw3IEBAIHN0 cnVjdCBpb21tdV9vcHMgewogICAgIHZvaWQgKCpyZXN1bWUpKHZvaWQpOwogICAgIHZvaWQgKCpz aGFyZV9wMm0pKHN0cnVjdCBkb21haW4gKmQpOwogICAgIHZvaWQgKCpjcmFzaF9zaHV0ZG93biko dm9pZCk7Ci0gICAgaW50IF9fbXVzdF9jaGVjayAoKmlvdGxiX2ZsdXNoKShzdHJ1Y3QgZG9tYWlu ICpkLCB1bnNpZ25lZCBsb25nIGRmbiwKKyAgICBpbnQgX19tdXN0X2NoZWNrICgqaW90bGJfZmx1 c2gpKHN0cnVjdCBkb21haW4gKmQsIGRmbl90IGRmbiwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVuc2lnbmVkIGludCBwYWdlX2NvdW50KTsKICAgICBpbnQgX19tdXN0X2No ZWNrICgqaW90bGJfZmx1c2hfYWxsKShzdHJ1Y3QgZG9tYWluICpkKTsKICAgICBpbnQgKCpnZXRf cmVzZXJ2ZWRfZGV2aWNlX21lbW9yeSkoaW9tbXVfZ3JkbV90ICosIHZvaWQgKik7Ci0tIAoyLjEx LjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczov L2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs