From: Juergen Gross Subject: [PATCH RFC 26/49] xen/sched: make credit scheduler vcpu agnostic. Date: Fri, 29 Mar 2019 16:09:11 +0100 Message-ID: <20190329150934.17694-27-jgross@suse.com> References: <20190329150934.17694-1-jgross@suse.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 1h9t8o-0003sr-0h for xen-devel@lists.xenproject.org; Fri, 29 Mar 2019 15:09:58 +0000 In-Reply-To: <20190329150934.17694-1-jgross@suse.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: Juergen Gross , George Dunlap , Dario Faggioli List-Id: xen-devel@lists.xenproject.org U3dpdGNoIGNyZWRpdCBzY2hlZHVsZXIgY29tcGxldGVseSBmcm9tIHZjcHUgdG8gc2NoZWRfaXRl bSB1c2FnZS4KClNpZ25lZC1vZmYtYnk6IEp1ZXJnZW4gR3Jvc3MgPGpncm9zc0BzdXNlLmNvbT4K LS0tCiB4ZW4vY29tbW9uL3NjaGVkX2NyZWRpdC5jIHwgNTAyICsrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNTEgaW5zZXJ0aW9u cygrKSwgMjUxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24vc2NoZWRfY3Jl ZGl0LmMgYi94ZW4vY29tbW9uL3NjaGVkX2NyZWRpdC5jCmluZGV4IDZkMDYzOTEwOWEuLmJhYmNj YjY5ZjcgMTAwNjQ0Ci0tLSBhL3hlbi9jb21tb24vc2NoZWRfY3JlZGl0LmMKKysrIGIveGVuL2Nv bW1vbi9zY2hlZF9jcmVkaXQuYwpAQCAtNzAsMTAgKzcwLDEwIEBACiAgKiBpbmNvbnNpc3RlbnQg c2V0IG9mIGxvY2tzLiBUaGVyZWZvcmUgYXRvbWljLXNhZmUgYml0IG9wZXJhdGlvbnMgbXVzdAog ICogYmUgdXNlZCBmb3IgYWNjZXNzaW5nIGl0LgogICovCi0jZGVmaW5lIENTQ0hFRF9GTEFHX1ZD UFVfUEFSS0VEICAgIDB4MCAgLyogVkNQVSBvdmVyIGNhcHBlZCBjcmVkaXRzICovCi0jZGVmaW5l IENTQ0hFRF9GTEFHX1ZDUFVfWUlFTEQgICAgIDB4MSAgLyogVkNQVSB5aWVsZGluZyAqLwotI2Rl ZmluZSBDU0NIRURfRkxBR19WQ1BVX01JR1JBVElORyAweDIgIC8qIFZDUFUgbWF5IGhhdmUgbW92 ZWQgdG8gYSBuZXcgcGNwdSAqLwotI2RlZmluZSBDU0NIRURfRkxBR19WQ1BVX1BJTk5FRCAgICAw eDQgIC8qIFZDUFUgY2FuIHJ1biBvbmx5IG9uIDEgcGNwdSAqLworI2RlZmluZSBDU0NIRURfRkxB R19JVEVNX1BBUktFRCAgICAweDAgIC8qIElURU0gb3ZlciBjYXBwZWQgY3JlZGl0cyAqLworI2Rl ZmluZSBDU0NIRURfRkxBR19JVEVNX1lJRUxEICAgICAweDEgIC8qIElURU0geWllbGRpbmcgKi8K KyNkZWZpbmUgQ1NDSEVEX0ZMQUdfSVRFTV9NSUdSQVRJTkcgMHgyICAvKiBJVEVNIG1heSBoYXZl IG1vdmVkIHRvIGEgbmV3IHBjcHUgKi8KKyNkZWZpbmUgQ1NDSEVEX0ZMQUdfSVRFTV9QSU5ORUQg ICAgMHg0ICAvKiBJVEVNIGNhbiBydW4gb25seSBvbiAxIHBjcHUgKi8KIAogCiAvKgpAQCAtOTEs NyArOTEsNyBAQAogLyoKICAqIENTQ0hFRF9TVEFUUwogICoKLSAqIE1hbmFnZSB2ZXJ5IGJhc2lj IHBlci12Q1BVIGNvdW50ZXJzIGFuZCBzdGF0cy4KKyAqIE1hbmFnZSB2ZXJ5IGJhc2ljIHBlci1p dGVtIGNvdW50ZXJzIGFuZCBzdGF0cy4KICAqCiAgKiBVc2VmdWwgZm9yIGRlYnVnZ2luZyBsaXZl IHN5c3RlbXMuIFRoZSBzdGF0cyBhcmUgZGlzcGxheWVkCiAgKiB3aXRoIHJ1bnEgZHVtcHMgKCdy JyBvbiB0aGUgWGVuIGNvbnNvbGUpLgpAQCAtMTAwLDIzICsxMDAsMjMgQEAKIAogI2RlZmluZSBD U0NIRURfU1RBVFMKIAotI2RlZmluZSBTQ0hFRF9WQ1BVX1NUQVRTX1JFU0VUKF9WKSAgICAgICAg ICAgICAgICAgICAgICBcCisjZGVmaW5lIFNDSEVEX0lURU1fU1RBVFNfUkVTRVQoX1YpICAgICAg ICAgICAgICAgICAgICAgIFwKICAgICBkbyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXAogICAgIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCiAgICAgICAgIG1lbXNldCgmKF9WKS0+c3RhdHMsIDAsIHNp emVvZigoX1YpLT5zdGF0cykpOyAgIFwKICAgICB9IHdoaWxlICggMCApCiAKLSNkZWZpbmUgU0NI RURfVkNQVV9TVEFUX0NSQU5LKF9WLCBfWCkgICAgICAgKCgoX1YpLT5zdGF0cy5fWCkrKykKKyNk ZWZpbmUgU0NIRURfSVRFTV9TVEFUX0NSQU5LKF9WLCBfWCkgICAgICAgKCgoX1YpLT5zdGF0cy5f WCkrKykKIAotI2RlZmluZSBTQ0hFRF9WQ1BVX1NUQVRfU0VUKF9WLCBfWCwgX1kpICAgICAoKChf ViktPnN0YXRzLl9YKSA9IChfWSkpCisjZGVmaW5lIFNDSEVEX0lURU1fU1RBVF9TRVQoX1YsIF9Y LCBfWSkgICAgICgoKF9WKS0+c3RhdHMuX1gpID0gKF9ZKSkKIAogI2Vsc2UgLyogIVNDSEVEX1NU QVRTICovCiAKICN1bmRlZiBDU0NIRURfU1RBVFMKIAotI2RlZmluZSBTQ0hFRF9WQ1BVX1NUQVRT X1JFU0VUKF9WKSAgICAgICAgIGRvIHt9IHdoaWxlICggMCApCi0jZGVmaW5lIFNDSEVEX1ZDUFVf U1RBVF9DUkFOSyhfViwgX1gpICAgICAgZG8ge30gd2hpbGUgKCAwICkKLSNkZWZpbmUgU0NIRURf VkNQVV9TVEFUX1NFVChfViwgX1gsIF9ZKSAgICBkbyB7fSB3aGlsZSAoIDAgKQorI2RlZmluZSBT Q0hFRF9JVEVNX1NUQVRTX1JFU0VUKF9WKSAgICAgICAgIGRvIHt9IHdoaWxlICggMCApCisjZGVm aW5lIFNDSEVEX0lURU1fU1RBVF9DUkFOSyhfViwgX1gpICAgICAgZG8ge30gd2hpbGUgKCAwICkK KyNkZWZpbmUgU0NIRURfSVRFTV9TVEFUX1NFVChfViwgX1gsIF9ZKSAgICBkbyB7fSB3aGlsZSAo IDAgKQogCiAjZW5kaWYgLyogU0NIRURfU1RBVFMgKi8KIApAQCAtMTI4LDcgKzEyOCw3IEBACiAj ZGVmaW5lIFRSQ19DU0NIRURfU0NIRURfVEFTS0xFVCBUUkNfU0NIRURfQ0xBU1NfRVZUKENTQ0hF RCwgMSkKICNkZWZpbmUgVFJDX0NTQ0hFRF9BQ0NPVU5UX1NUQVJUIFRSQ19TQ0hFRF9DTEFTU19F VlQoQ1NDSEVELCAyKQogI2RlZmluZSBUUkNfQ1NDSEVEX0FDQ09VTlRfU1RPUCAgVFJDX1NDSEVE X0NMQVNTX0VWVChDU0NIRUQsIDMpCi0jZGVmaW5lIFRSQ19DU0NIRURfU1RPTEVOX1ZDUFUgICBU UkNfU0NIRURfQ0xBU1NfRVZUKENTQ0hFRCwgNCkKKyNkZWZpbmUgVFJDX0NTQ0hFRF9TVE9MRU5f SVRFTSAgIFRSQ19TQ0hFRF9DTEFTU19FVlQoQ1NDSEVELCA0KQogI2RlZmluZSBUUkNfQ1NDSEVE X1BJQ0tFRF9DUFUgICAgVFJDX1NDSEVEX0NMQVNTX0VWVChDU0NIRUQsIDUpCiAjZGVmaW5lIFRS Q19DU0NIRURfVElDS0xFICAgICAgICBUUkNfU0NIRURfQ0xBU1NfRVZUKENTQ0hFRCwgNikKICNk ZWZpbmUgVFJDX0NTQ0hFRF9CT09TVF9TVEFSVCAgIFRSQ19TQ0hFRF9DTEFTU19FVlQoQ1NDSEVE LCA3KQpAQCAtMTU4LDE1ICsxNTgsMTUgQEAgc3RydWN0IGNzY2hlZF9wY3B1IHsKIH07CiAKIC8q Ci0gKiBWaXJ0dWFsIENQVQorICogVmlydHVhbCBJVEVNCiAgKi8KIHN0cnVjdCBjc2NoZWRfaXRl bSB7CiAgICAgc3RydWN0IGxpc3RfaGVhZCBydW5xX2VsZW07Ci0gICAgc3RydWN0IGxpc3RfaGVh ZCBhY3RpdmVfdmNwdV9lbGVtOworICAgIHN0cnVjdCBsaXN0X2hlYWQgYWN0aXZlX2l0ZW1fZWxl bTsKIAogICAgIC8qIFVwLXBvaW50ZXJzICovCiAgICAgc3RydWN0IGNzY2hlZF9kb20gKnNkb207 Ci0gICAgc3RydWN0IHZjcHUgKnZjcHU7CisgICAgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW07CiAK ICAgICBzX3RpbWVfdCBzdGFydF90aW1lOyAgIC8qIFdoZW4gd2Ugd2VyZSBzY2hlZHVsZWQgKHVz ZWQgZm9yIGNyZWRpdCkgKi8KICAgICB1bnNpZ25lZCBmbGFnczsKQEAgLTE5MiwxMCArMTkyLDEw IEBAIHN0cnVjdCBjc2NoZWRfaXRlbSB7CiAgKiBEb21haW4KICAqLwogc3RydWN0IGNzY2hlZF9k b20gewotICAgIHN0cnVjdCBsaXN0X2hlYWQgYWN0aXZlX3ZjcHU7CisgICAgc3RydWN0IGxpc3Rf aGVhZCBhY3RpdmVfaXRlbTsKICAgICBzdHJ1Y3QgbGlzdF9oZWFkIGFjdGl2ZV9zZG9tX2VsZW07 CiAgICAgc3RydWN0IGRvbWFpbiAqZG9tOwotICAgIHVpbnQxNl90IGFjdGl2ZV92Y3B1X2NvdW50 OworICAgIHVpbnQxNl90IGFjdGl2ZV9pdGVtX2NvdW50OwogICAgIHVpbnQxNl90IHdlaWdodDsK ICAgICB1aW50MTZfdCBjYXA7CiB9OwpAQCAtMjE1LDcgKzIxNSw3IEBAIHN0cnVjdCBjc2NoZWRf cHJpdmF0ZSB7CiAKICAgICAvKiBQZXJpb2Qgb2YgbWFzdGVyIGFuZCB0aWNrIGluIG1pbGxpc2Vj b25kcyAqLwogICAgIHVuc2lnbmVkIGludCB0aWNrX3BlcmlvZF91cywgdGlja3NfcGVyX3RzbGlj ZTsKLSAgICBzX3RpbWVfdCByYXRlbGltaXQsIHRzbGljZSwgdmNwdV9taWdyX2RlbGF5OworICAg IHNfdGltZV90IHJhdGVsaW1pdCwgdHNsaWNlLCBpdGVtX21pZ3JfZGVsYXk7CiAKICAgICBzdHJ1 Y3QgbGlzdF9oZWFkIGFjdGl2ZV9zZG9tOwogICAgIHVpbnQzMl90IHdlaWdodDsKQEAgLTIzMSw3 ICsyMzEsNyBAQCBzdGF0aWMgdm9pZCBjc2NoZWRfdGljayh2b2lkICpfY3B1KTsKIHN0YXRpYyB2 b2lkIGNzY2hlZF9hY2N0KHZvaWQgKmR1bW15KTsKIAogc3RhdGljIGlubGluZSBpbnQKLV9fdmNw dV9vbl9ydW5xKHN0cnVjdCBjc2NoZWRfaXRlbSAqc3ZjKQorX19pdGVtX29uX3J1bnEoc3RydWN0 IGNzY2hlZF9pdGVtICpzdmMpCiB7CiAgICAgcmV0dXJuICFsaXN0X2VtcHR5KCZzdmMtPnJ1bnFf ZWxlbSk7CiB9CkBAIC0yNDIsNyArMjQyLDcgQEAgX19ydW5xX2VsZW0oc3RydWN0IGxpc3RfaGVh ZCAqZWxlbSkKICAgICByZXR1cm4gbGlzdF9lbnRyeShlbGVtLCBzdHJ1Y3QgY3NjaGVkX2l0ZW0s IHJ1bnFfZWxlbSk7CiB9CiAKLS8qIElzIHRoZSBmaXJzdCBlbGVtZW50IG9mIGNwdSdzIHJ1bnEg KGlmIGFueSkgY3B1J3MgaWRsZSB2Y3B1PyAqLworLyogSXMgdGhlIGZpcnN0IGVsZW1lbnQgb2Yg Y3B1J3MgcnVucSAoaWYgYW55KSBjcHUncyBpZGxlIGl0ZW0/ICovCiBzdGF0aWMgaW5saW5lIGJv b2xfdCBpc19ydW5xX2lkbGUodW5zaWduZWQgaW50IGNwdSkKIHsKICAgICAvKgpAQCAtMjUxLDcg KzI1MSw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbF90IGlzX3J1bnFfaWRsZSh1bnNpZ25lZCBpbnQg Y3B1KQogICAgIEFTU0VSVChzcGluX2lzX2xvY2tlZChwZXJfY3B1KHNjaGVkX3JlcywgY3B1KS0+ c2NoZWR1bGVfbG9jaykpOwogCiAgICAgcmV0dXJuIGxpc3RfZW1wdHkoUlVOUShjcHUpKSB8fAot ICAgICAgICAgICBpc19pZGxlX3ZjcHUoX19ydW5xX2VsZW0oUlVOUShjcHUpLT5uZXh0KS0+dmNw dSk7CisgICAgICAgICAgIGlzX2lkbGVfaXRlbShfX3J1bnFfZWxlbShSVU5RKGNwdSktPm5leHQp LT5pdGVtKTsKIH0KIAogc3RhdGljIGlubGluZSB2b2lkCkBAIC0yNzMsMTEgKzI3MywxMSBAQCBk ZWNfbnJfcnVubmFibGUodW5zaWduZWQgaW50IGNwdSkKIHN0YXRpYyBpbmxpbmUgdm9pZAogX19y dW5xX2luc2VydChzdHJ1Y3QgY3NjaGVkX2l0ZW0gKnN2YykKIHsKLSAgICB1bnNpZ25lZCBpbnQg Y3B1ID0gc3ZjLT52Y3B1LT5wcm9jZXNzb3I7CisgICAgdW5zaWduZWQgaW50IGNwdSA9IHNjaGVk X2l0ZW1fY3B1KHN2Yy0+aXRlbSk7CiAgICAgY29uc3Qgc3RydWN0IGxpc3RfaGVhZCAqIGNvbnN0 IHJ1bnEgPSBSVU5RKGNwdSk7CiAgICAgc3RydWN0IGxpc3RfaGVhZCAqaXRlcjsKIAotICAgIEJV R19PTiggX192Y3B1X29uX3J1bnEoc3ZjKSApOworICAgIEJVR19PTiggX19pdGVtX29uX3J1bnEo c3ZjKSApOwogCiAgICAgbGlzdF9mb3JfZWFjaCggaXRlciwgcnVucSApCiAgICAgewpAQCAtMjg2 LDEwICsyODYsMTAgQEAgX19ydW5xX2luc2VydChzdHJ1Y3QgY3NjaGVkX2l0ZW0gKnN2YykKICAg ICAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIC8qIElmIHRoZSB2Y3B1IHlpZWxkZWQsIHRy eSB0byBwdXQgaXQgYmVoaW5kIG9uZSBsb3dlci1wcmlvcml0eQotICAgICAqIHJ1bm5hYmxlIHZj cHUgaWYgd2UgY2FuLiAgVGhlIG5leHQgcnVucV9zb3J0IHdpbGwgYnJpbmcgaXQgZm9yd2FyZAor ICAgIC8qIElmIHRoZSBpdGVtIHlpZWxkZWQsIHRyeSB0byBwdXQgaXQgYmVoaW5kIG9uZSBsb3dl ci1wcmlvcml0eQorICAgICAqIHJ1bm5hYmxlIGl0ZW0gaWYgd2UgY2FuLiAgVGhlIG5leHQgcnVu cV9zb3J0IHdpbGwgYnJpbmcgaXQgZm9yd2FyZAogICAgICAqIHdpdGhpbiAzMG1zIGlmIHRoZSBx dWV1ZSB0b28gbG9uZy4gKi8KLSAgICBpZiAoIHRlc3RfYml0KENTQ0hFRF9GTEFHX1ZDUFVfWUlF TEQsICZzdmMtPmZsYWdzKQorICAgIGlmICggdGVzdF9iaXQoQ1NDSEVEX0ZMQUdfSVRFTV9ZSUVM RCwgJnN2Yy0+ZmxhZ3MpCiAgICAgICAgICAmJiBfX3J1bnFfZWxlbShpdGVyKS0+cHJpID4gQ1ND SEVEX1BSSV9JRExFICkKICAgICB7CiAgICAgICAgIGl0ZXI9aXRlci0+bmV4dDsKQEAgLTMwNSwy MCArMzA1LDIwIEBAIHN0YXRpYyBpbmxpbmUgdm9pZAogcnVucV9pbnNlcnQoc3RydWN0IGNzY2hl ZF9pdGVtICpzdmMpCiB7CiAgICAgX19ydW5xX2luc2VydChzdmMpOwotICAgIGluY19ucl9ydW5u YWJsZShzdmMtPnZjcHUtPnByb2Nlc3Nvcik7CisgICAgaW5jX25yX3J1bm5hYmxlKHNjaGVkX2l0 ZW1fY3B1KHN2Yy0+aXRlbSkpOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQKIF9fcnVucV9yZW1v dmUoc3RydWN0IGNzY2hlZF9pdGVtICpzdmMpCiB7Ci0gICAgQlVHX09OKCAhX192Y3B1X29uX3J1 bnEoc3ZjKSApOworICAgIEJVR19PTiggIV9faXRlbV9vbl9ydW5xKHN2YykgKTsKICAgICBsaXN0 X2RlbF9pbml0KCZzdmMtPnJ1bnFfZWxlbSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZAogcnVu cV9yZW1vdmUoc3RydWN0IGNzY2hlZF9pdGVtICpzdmMpCiB7Ci0gICAgZGVjX25yX3J1bm5hYmxl KHN2Yy0+dmNwdS0+cHJvY2Vzc29yKTsKKyAgICBkZWNfbnJfcnVubmFibGUoc2NoZWRfaXRlbV9j cHUoc3ZjLT5pdGVtKSk7CiAgICAgX19ydW5xX3JlbW92ZShzdmMpOwogfQogCkBAIC0zMjksNyAr MzI5LDcgQEAgc3RhdGljIHZvaWQgYnVybl9jcmVkaXRzKHN0cnVjdCBjc2NoZWRfaXRlbSAqc3Zj LCBzX3RpbWVfdCBub3cpCiAgICAgdW5zaWduZWQgaW50IGNyZWRpdHM7CiAKICAgICAvKiBBc3Nl cnQgc3ZjIGlzIGN1cnJlbnQgKi8KLSAgICBBU1NFUlQoIHN2YyA9PSBDU0NIRURfSVRFTShjdXJy X29uX2NwdShzdmMtPnZjcHUtPnByb2Nlc3NvcikpICk7CisgICAgQVNTRVJUKCBzdmMgPT0gQ1ND SEVEX0lURU0oY3Vycl9vbl9jcHUoc2NoZWRfaXRlbV9jcHUoc3ZjLT5pdGVtKSkpICk7CiAKICAg ICBpZiAoIChkZWx0YSA9IG5vdyAtIHN2Yy0+c3RhcnRfdGltZSkgPD0gMCApCiAgICAgICAgIHJl dHVybjsKQEAgLTM0OSw4ICszNDksOCBAQCBERUZJTkVfUEVSX0NQVSh1bnNpZ25lZCBpbnQsIGxh c3RfdGlja2xlX2NwdSk7CiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBfX3J1bnFfdGlja2xlKHN0cnVj dCBjc2NoZWRfaXRlbSAqbmV3KQogewotICAgIHVuc2lnbmVkIGludCBjcHUgPSBuZXctPnZjcHUt PnByb2Nlc3NvcjsKLSAgICBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSA9IG5ldy0+dmNwdS0+c2No ZWRfaXRlbTsKKyAgICB1bnNpZ25lZCBpbnQgY3B1ID0gc2NoZWRfaXRlbV9jcHUobmV3LT5pdGVt KTsKKyAgICBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSA9IG5ldy0+aXRlbTsKICAgICBzdHJ1Y3Qg Y3NjaGVkX2l0ZW0gKiBjb25zdCBjdXIgPSBDU0NIRURfSVRFTShjdXJyX29uX2NwdShjcHUpKTsK ICAgICBzdHJ1Y3QgY3NjaGVkX3ByaXZhdGUgKnBydiA9IENTQ0hFRF9QUklWKHBlcl9jcHUoc2No ZWR1bGVyLCBjcHUpKTsKICAgICBjcHVtYXNrX3QgbWFzaywgaWRsZV9tYXNrLCAqb25saW5lOwpA QCAtMzY0LDE2ICszNjQsMTYgQEAgc3RhdGljIGlubGluZSB2b2lkIF9fcnVucV90aWNrbGUoc3Ry dWN0IGNzY2hlZF9pdGVtICpuZXcpCiAgICAgaWRsZXJzX2VtcHR5ID0gY3B1bWFza19lbXB0eSgm aWRsZV9tYXNrKTsKIAogICAgIC8qCi0gICAgICogRXhjbHVzaXZlIHBpbm5pbmcgaXMgd2hlbiBh IHZjcHUgaGFzIGhhcmQtYWZmaW5pdHkgd2l0aCBvbmx5IG9uZQotICAgICAqIGNwdSwgYW5kIHRo ZXJlIGlzIG5vIG90aGVyIHZjcHUgdGhhdCBoYXMgaGFyZC1hZmZpbml0eSB3aXRoIHRoYXQKKyAg ICAgKiBFeGNsdXNpdmUgcGlubmluZyBpcyB3aGVuIGEgaXRlbSBoYXMgaGFyZC1hZmZpbml0eSB3 aXRoIG9ubHkgb25lCisgICAgICogY3B1LCBhbmQgdGhlcmUgaXMgbm8gb3RoZXIgaXRlbSB0aGF0 IGhhcyBoYXJkLWFmZmluaXR5IHdpdGggdGhhdAogICAgICAqIHNhbWUgY3B1LiBUaGlzIGlzIGlu ZnJlcXVlbnQsIGJ1dCBpZiBpdCBoYXBwZW5zLCBpcyBmb3IgYWNoaWV2aW5nCiAgICAgICogdGhl IG1vc3QgcG9zc2libGUgZGV0ZXJtaW5pc20sIGFuZCBsZWFzdCBwb3NzaWJsZSBvdmVyaGVhZCBm b3IKLSAgICAgKiB0aGUgdmNwdXMgaW4gcXVlc3Rpb24uCisgICAgICogdGhlIGl0ZW1zIGluIHF1 ZXN0aW9uLgogICAgICAqCiAgICAgICogVHJ5IHRvIGlkZW50aWZ5IHRoZSB2YXN0IG1ham9yaXR5 IG9mIHRoZXNlIHNpdHVhdGlvbnMsIGFuZCBkZWFsCiAgICAgICogd2l0aCB0aGVtIHF1aWNrbHku CiAgICAgICovCi0gICAgaWYgKCB1bmxpa2VseSh0ZXN0X2JpdChDU0NIRURfRkxBR19WQ1BVX1BJ Tk5FRCwgJm5ldy0+ZmxhZ3MpICYmCisgICAgaWYgKCB1bmxpa2VseSh0ZXN0X2JpdChDU0NIRURf RkxBR19JVEVNX1BJTk5FRCwgJm5ldy0+ZmxhZ3MpICYmCiAgICAgICAgICAgICAgICAgICBjcHVt YXNrX3Rlc3RfY3B1KGNwdSwgJmlkbGVfbWFzaykpICkKICAgICB7CiAgICAgICAgIEFTU0VSVChj cHVtYXNrX2N5Y2xlKGNwdSwgaXRlbS0+Y3B1X2hhcmRfYWZmaW5pdHkpID09IGNwdSk7CkBAIC0z ODQsNyArMzg0LDcgQEAgc3RhdGljIGlubGluZSB2b2lkIF9fcnVucV90aWNrbGUoc3RydWN0IGNz Y2hlZF9pdGVtICpuZXcpCiAKICAgICAvKgogICAgICAqIElmIHRoZSBwY3B1IGlzIGlkbGUsIG9y IHRoZXJlIGFyZSBubyBpZGxlcnMgYW5kIHRoZSBuZXcKLSAgICAgKiB2Y3B1IGlzIGEgaGlnaGVy IHByaW9yaXR5IHRoYW4gdGhlIG9sZCB2Y3B1LCBydW4gaXQgaGVyZS4KKyAgICAgKiBpdGVtIGlz IGEgaGlnaGVyIHByaW9yaXR5IHRoYW4gdGhlIG9sZCBpdGVtLCBydW4gaXQgaGVyZS4KICAgICAg KgogICAgICAqIElmIHRoZXJlIGFyZSBpZGxlIGNwdXMsIGZpcnN0IHRyeSB0byBmaW5kIG9uZSBz dWl0YWJsZSB0byBydW4KICAgICAgKiBuZXcsIHNvIHdlIGNhbiBhdm9pZCBwcmVlbXB0aW5nIGN1 ci4gIElmIHdlIGNhbm5vdCBmaW5kIGEKQEAgLTQwMyw3ICs0MDMsNyBAQCBzdGF0aWMgaW5saW5l IHZvaWQgX19ydW5xX3RpY2tsZShzdHJ1Y3QgY3NjaGVkX2l0ZW0gKm5ldykKICAgICBlbHNlIGlm ICggIWlkbGVyc19lbXB0eSApCiAgICAgewogICAgICAgICAvKgotICAgICAgICAgKiBTb2Z0IGFu ZCBoYXJkIGFmZmluaXR5IGJhbGFuY2luZyBsb29wLiBGb3IgdmNwdXMgd2l0aG91dAorICAgICAg ICAgKiBTb2Z0IGFuZCBoYXJkIGFmZmluaXR5IGJhbGFuY2luZyBsb29wLiBGb3IgaXRlbXMgd2l0 aG91dAogICAgICAgICAgKiBhIHVzZWZ1bCBzb2Z0IGFmZmluaXR5LCBjb25zaWRlciBoYXJkIGFm ZmluaXR5IG9ubHkuCiAgICAgICAgICAqLwogICAgICAgICBmb3JfZWFjaF9hZmZpbml0eV9iYWxh bmNlX3N0ZXAoIGJhbGFuY2Vfc3RlcCApCkBAIC00NDYsMTAgKzQ0NiwxMCBAQCBzdGF0aWMgaW5s aW5lIHZvaWQgX19ydW5xX3RpY2tsZShzdHJ1Y3QgY3NjaGVkX2l0ZW0gKm5ldykKICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICBpZiAoIGNwdW1hc2tfaW50ZXJzZWN0cyhpdGVtLT5jcHVf aGFyZF9hZmZpbml0eSwgJmlkbGVfbWFzaykgKQogICAgICAgICAgICAgICAgIHsKLSAgICAgICAg ICAgICAgICAgICAgU0NIRURfVkNQVV9TVEFUX0NSQU5LKGN1ciwga2lja2VkX2F3YXkpOwotICAg ICAgICAgICAgICAgICAgICBTQ0hFRF9WQ1BVX1NUQVRfQ1JBTksoY3VyLCBtaWdyYXRlX3IpOwor ICAgICAgICAgICAgICAgICAgICBTQ0hFRF9JVEVNX1NUQVRfQ1JBTksoY3VyLCBraWNrZWRfYXdh eSk7CisgICAgICAgICAgICAgICAgICAgIFNDSEVEX0lURU1fU1RBVF9DUkFOSyhjdXIsIG1pZ3Jh dGVfcik7CiAgICAgICAgICAgICAgICAgICAgIFNDSEVEX1NUQVRfQ1JBTksobWlncmF0ZV9raWNr ZWRfYXdheSk7Ci0gICAgICAgICAgICAgICAgICAgIHNldF9iaXQoX1ZQRl9taWdyYXRpbmcsICZj dXItPnZjcHUtPnBhdXNlX2ZsYWdzKTsKKyAgICAgICAgICAgICAgICAgICAgc2NoZWRfc2V0X3Bh dXNlX2ZsYWdzX2F0b21pYyhjdXItPml0ZW0sIF9WUEZfbWlncmF0aW5nKTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgLyogVGlja2xlIGNwdSBhbnl3YXksIHRvIGxldCBuZXcg cHJlZW1wdCBjdXIuICovCiAgICAgICAgICAgICAgICAgU0NIRURfU1RBVF9DUkFOSyh0aWNrbGVk X2J1c3lfY3B1KTsKQEAgLTYwNSw3ICs2MDUsNyBAQCBpbml0X3BkYXRhKHN0cnVjdCBjc2NoZWRf cHJpdmF0ZSAqcHJ2LCBzdHJ1Y3QgY3NjaGVkX3BjcHUgKnNwYywgaW50IGNwdSkKICAgICBzcGMt PmlkbGVfYmlhcyA9IG5yX2NwdV9pZHMgLSAxOwogCiAgICAgLyogU3RhcnQgb2ZmIGlkbGluZy4u LiAqLwotICAgIEJVR19PTighaXNfaWRsZV92Y3B1KGN1cnJfb25fY3B1KGNwdSktPnZjcHUpKTsK KyAgICBCVUdfT04oIWlzX2lkbGVfaXRlbShjdXJyX29uX2NwdShjcHUpKSk7CiAgICAgY3B1bWFz a19zZXRfY3B1KGNwdSwgcHJ2LT5pZGxlcnMpOwogICAgIHNwYy0+bnJfcnVubmFibGUgPSAwOwog fQpAQCAtNjM5LDkgKzYzOSw5IEBAIGNzY2hlZF9zd2l0Y2hfc2NoZWQoc3RydWN0IHNjaGVkdWxl ciAqbmV3X29wcywgdW5zaWduZWQgaW50IGNwdSwKICAgICBzdHJ1Y3QgY3NjaGVkX3ByaXZhdGUg KnBydiA9IENTQ0hFRF9QUklWKG5ld19vcHMpOwogICAgIHN0cnVjdCBjc2NoZWRfaXRlbSAqc3Zj ID0gdmRhdGE7CiAKLSAgICBBU1NFUlQoc3ZjICYmIGlzX2lkbGVfdmNwdShzdmMtPnZjcHUpKTsK KyAgICBBU1NFUlQoc3ZjICYmIGlzX2lkbGVfaXRlbShzdmMtPml0ZW0pKTsKIAotICAgIGlkbGVf dmNwdVtjcHVdLT5zY2hlZF9pdGVtLT5wcml2ID0gdmRhdGE7CisgICAgc2NoZWRfaWRsZV9pdGVt KGNwdSktPnByaXYgPSB2ZGF0YTsKIAogICAgIC8qCiAgICAgICogV2UgYXJlIGhvbGRpbmcgdGhl IHJ1bnF1ZXVlIGxvY2sgYWxyZWFkeSAoaXQncyBiZWVuIHRha2VuIGluCkBAIC02NjcsMzMgKzY2 NywzMyBAQCBjc2NoZWRfc3dpdGNoX3NjaGVkKHN0cnVjdCBzY2hlZHVsZXIgKm5ld19vcHMsIHVu c2lnbmVkIGludCBjcHUsCiAKICNpZm5kZWYgTkRFQlVHCiBzdGF0aWMgaW5saW5lIHZvaWQKLV9f Y3NjaGVkX3ZjcHVfY2hlY2soc3RydWN0IHZjcHUgKnZjKQorX19jc2NoZWRfaXRlbV9jaGVjayhz dHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKIHsKLSAgICBzdHJ1Y3QgY3NjaGVkX2l0ZW0gKiBjb25z dCBzdmMgPSBDU0NIRURfSVRFTSh2Yy0+c2NoZWRfaXRlbSk7CisgICAgc3RydWN0IGNzY2hlZF9p dGVtICogY29uc3Qgc3ZjID0gQ1NDSEVEX0lURU0oaXRlbSk7CiAgICAgc3RydWN0IGNzY2hlZF9k b20gKiBjb25zdCBzZG9tID0gc3ZjLT5zZG9tOwogCi0gICAgQlVHX09OKCBzdmMtPnZjcHUgIT0g dmMgKTsKLSAgICBCVUdfT04oIHNkb20gIT0gQ1NDSEVEX0RPTSh2Yy0+ZG9tYWluKSApOworICAg IEJVR19PTiggc3ZjLT5pdGVtICE9IGl0ZW0gKTsKKyAgICBCVUdfT04oIHNkb20gIT0gQ1NDSEVE X0RPTShpdGVtLT5kb21haW4pICk7CiAgICAgaWYgKCBzZG9tICkKICAgICB7Ci0gICAgICAgIEJV R19PTiggaXNfaWRsZV92Y3B1KHZjKSApOwotICAgICAgICBCVUdfT04oIHNkb20tPmRvbSAhPSB2 Yy0+ZG9tYWluICk7CisgICAgICAgIEJVR19PTiggaXNfaWRsZV9pdGVtKGl0ZW0pICk7CisgICAg ICAgIEJVR19PTiggc2RvbS0+ZG9tICE9IGl0ZW0tPmRvbWFpbiApOwogICAgIH0KICAgICBlbHNl CiAgICAgewotICAgICAgICBCVUdfT04oICFpc19pZGxlX3ZjcHUodmMpICk7CisgICAgICAgIEJV R19PTiggIWlzX2lkbGVfaXRlbShpdGVtKSApOwogICAgIH0KIAogICAgIFNDSEVEX1NUQVRfQ1JB TksoaXRlbV9jaGVjayk7CiB9Ci0jZGVmaW5lIENTQ0hFRF9WQ1BVX0NIRUNLKF92YykgIChfX2Nz Y2hlZF92Y3B1X2NoZWNrKF92YykpCisjZGVmaW5lIENTQ0hFRF9JVEVNX0NIRUNLKGl0ZW0pICAo X19jc2NoZWRfaXRlbV9jaGVjayhpdGVtKSkKICNlbHNlCi0jZGVmaW5lIENTQ0hFRF9WQ1BVX0NI RUNLKF92YykKKyNkZWZpbmUgQ1NDSEVEX0lURU1fQ0hFQ0soaXRlbSkKICNlbmRpZgogCiAvKgot ICogRGVsYXksIGluIG1pY3Jvc2Vjb25kcywgYmV0d2VlbiBtaWdyYXRpb25zIG9mIGEgVkNQVSBi ZXR3ZWVuIFBDUFVzLgotICogVGhpcyBwcmV2ZW50cyByYXBpZCBmbHV0dGVyaW5nIG9mIGEgVkNQ VSBiZXR3ZWVuIENQVXMsIGFuZCByZWR1Y2VzIHRoZQorICogRGVsYXksIGluIG1pY3Jvc2Vjb25k cywgYmV0d2VlbiBtaWdyYXRpb25zIG9mIGEgSVRFTSBiZXR3ZWVuIFBDUFVzLgorICogVGhpcyBw cmV2ZW50cyByYXBpZCBmbHV0dGVyaW5nIG9mIGEgSVRFTSBiZXR3ZWVuIENQVXMsIGFuZCByZWR1 Y2VzIHRoZQogICogaW1wbGljaXQgb3ZlcmhlYWRzIHN1Y2ggYXMgY2FjaGUtd2FybWluZy4gMW1z ICgxMDAwKSBoYXMgYmVlbiBtZWFzdXJlZAogICogYXMgYSBnb29kIHZhbHVlLgogICovCkBAIC03 MDEsMTAgKzcwMSwxMSBAQCBzdGF0aWMgdW5zaWduZWQgaW50IHZjcHVfbWlncmF0aW9uX2RlbGF5 X3VzOwogaW50ZWdlcl9wYXJhbSgidmNwdV9taWdyYXRpb25fZGVsYXkiLCB2Y3B1X21pZ3JhdGlv bl9kZWxheV91cyk7CiAKIHN0YXRpYyBpbmxpbmUgYm9vbAotX19jc2NoZWRfdmNwdV9pc19jYWNo ZV9ob3QoY29uc3Qgc3RydWN0IGNzY2hlZF9wcml2YXRlICpwcnYsIHN0cnVjdCB2Y3B1ICp2KQor X19jc2NoZWRfaXRlbV9pc19jYWNoZV9ob3QoY29uc3Qgc3RydWN0IGNzY2hlZF9wcml2YXRlICpw cnYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkK IHsKLSAgICBib29sIGhvdCA9IHBydi0+dmNwdV9taWdyX2RlbGF5ICYmCi0gICAgICAgICAgICAg ICAoTk9XKCkgLSB2LT5zY2hlZF9pdGVtLT5sYXN0X3J1bl90aW1lKSA8IHBydi0+dmNwdV9taWdy X2RlbGF5OworICAgIGJvb2wgaG90ID0gcHJ2LT5pdGVtX21pZ3JfZGVsYXkgJiYKKyAgICAgICAg ICAgICAgIChOT1coKSAtIGl0ZW0tPmxhc3RfcnVuX3RpbWUpIDwgcHJ2LT5pdGVtX21pZ3JfZGVs YXk7CiAKICAgICBpZiAoIGhvdCApCiAgICAgICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV9ob3Qp OwpAQCAtNzEzLDM2ICs3MTQsMzggQEAgX19jc2NoZWRfdmNwdV9pc19jYWNoZV9ob3QoY29uc3Qg c3RydWN0IGNzY2hlZF9wcml2YXRlICpwcnYsIHN0cnVjdCB2Y3B1ICp2KQogfQogCiBzdGF0aWMg aW5saW5lIGludAotX19jc2NoZWRfdmNwdV9pc19taWdyYXRlYWJsZShjb25zdCBzdHJ1Y3QgY3Nj aGVkX3ByaXZhdGUgKnBydiwgc3RydWN0IHZjcHUgKnZjLAorX19jc2NoZWRfaXRlbV9pc19taWdy YXRlYWJsZShjb25zdCBzdHJ1Y3QgY3NjaGVkX3ByaXZhdGUgKnBydiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0sCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGludCBkZXN0X2NwdSwgY3B1bWFza190ICptYXNrKQogewogICAgIC8qCiAg ICAgICogRG9uJ3QgcGljayB1cCB3b3JrIHRoYXQncyBob3Qgb24gcGVlciBQQ1BVLCBvciB0aGF0 IGNhbid0IChvcgogICAgICAqIHdvdWxkIHByZWZlciBub3QgdG8pIHJ1biBvbiBjcHUuCiAgICAg ICoKLSAgICAgKiBUaGUgY2FsbGVyIGlzIHN1cHBvc2VkIHRvIGhhdmUgYWxyZWFkeSBjaGVja2Vk IHRoYXQgdmMgaXMgYWxzbworICAgICAqIFRoZSBjYWxsZXIgaXMgc3VwcG9zZWQgdG8gaGF2ZSBh bHJlYWR5IGNoZWNrZWQgdGhhdCBpdGVtIGlzIGFsc28KICAgICAgKiBub3QgcnVubmluZy4KICAg ICAgKi8KLSAgICBBU1NFUlQoIXZjcHVfcnVubmluZyh2YykpOworICAgIEFTU0VSVCghaXRlbS0+ aXNfcnVubmluZyk7CiAKLSAgICByZXR1cm4gIV9fY3NjaGVkX3ZjcHVfaXNfY2FjaGVfaG90KHBy diwgdmMpICYmCisgICAgcmV0dXJuICFfX2NzY2hlZF9pdGVtX2lzX2NhY2hlX2hvdChwcnYsIGl0 ZW0pICYmCiAgICAgICAgICAgIGNwdW1hc2tfdGVzdF9jcHUoZGVzdF9jcHUsIG1hc2spOwogfQog CiBzdGF0aWMgaW50Ci1fY3NjaGVkX2NwdV9waWNrKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9w cywgc3RydWN0IHZjcHUgKnZjLCBib29sX3QgY29tbWl0KQorX2NzY2hlZF9jcHVfcGljayhjb25z dCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBzY2hlZF9pdGVtICppdGVtLAorICAgICAg ICAgICAgICAgICBib29sX3QgY29tbWl0KQogewotICAgIC8qIFdlIG11c3QgYWx3YXlzIHVzZSB2 Yy0+cHJvY3Nzb3IncyBzY3JhdGNoIHNwYWNlICovCi0gICAgY3B1bWFza190ICpjcHVzID0gY3B1 bWFza19zY3JhdGNoX2NwdSh2Yy0+cHJvY2Vzc29yKTsKKyAgICBpbnQgY3B1ID0gc2NoZWRfaXRl bV9jcHUoaXRlbSk7CisgICAgLyogV2UgbXVzdCBhbHdheXMgdXNlIGNwdSdzIHNjcmF0Y2ggc3Bh Y2UgKi8KKyAgICBjcHVtYXNrX3QgKmNwdXMgPSBjcHVtYXNrX3NjcmF0Y2hfY3B1KGNwdSk7CiAg ICAgY3B1bWFza190IGlkbGVyczsKLSAgICBjcHVtYXNrX3QgKm9ubGluZSA9IGNwdXBvb2xfZG9t YWluX2NwdW1hc2sodmMtPmRvbWFpbik7CisgICAgY3B1bWFza190ICpvbmxpbmUgPSBjcHVwb29s X2RvbWFpbl9jcHVtYXNrKGl0ZW0tPmRvbWFpbik7CiAgICAgc3RydWN0IGNzY2hlZF9wY3B1ICpz cGMgPSBOVUxMOwotICAgIGludCBjcHUgPSB2Yy0+cHJvY2Vzc29yOwogICAgIGludCBiYWxhbmNl X3N0ZXA7CiAKICAgICBmb3JfZWFjaF9hZmZpbml0eV9iYWxhbmNlX3N0ZXAoIGJhbGFuY2Vfc3Rl cCApCiAgICAgewotICAgICAgICBhZmZpbml0eV9iYWxhbmNlX2NwdW1hc2sodmMtPnNjaGVkX2l0 ZW0sIGJhbGFuY2Vfc3RlcCwgY3B1cyk7CisgICAgICAgIGFmZmluaXR5X2JhbGFuY2VfY3B1bWFz ayhpdGVtLCBiYWxhbmNlX3N0ZXAsIGNwdXMpOwogICAgICAgICBjcHVtYXNrX2FuZChjcHVzLCBv bmxpbmUsIGNwdXMpOwogICAgICAgICAvKgogICAgICAgICAgKiBXZSB3YW50IHRvIHBpY2sgdXAg YSBwY3B1IGFtb25nIHRoZSBvbmVzIHRoYXQgYXJlIG9ubGluZSBhbmQKQEAgLTc2MSwxMiArNzY0 LDEzIEBAIF9jc2NoZWRfY3B1X3BpY2soY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1 Y3QgdmNwdSAqdmMsIGJvb2xfdCBjb21taXQpCiAgICAgICAgICAqIGJhbGFuY2luZyBzdGVwIGFs bCB0b2dldGhlci4KICAgICAgICAgICovCiAgICAgICAgIGlmICggYmFsYW5jZV9zdGVwID09IEJB TEFOQ0VfU09GVF9BRkZJTklUWSAmJgotICAgICAgICAgICAgICghaGFzX3NvZnRfYWZmaW5pdHko dmMtPnNjaGVkX2l0ZW0pIHx8IGNwdW1hc2tfZW1wdHkoY3B1cykpICkKKyAgICAgICAgICAgICAo IWhhc19zb2Z0X2FmZmluaXR5KGl0ZW0pIHx8IGNwdW1hc2tfZW1wdHkoY3B1cykpICkKICAgICAg ICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIC8qIElmIHByZXNlbnQsIHByZWZlciB2YydzIGN1 cnJlbnQgcHJvY2Vzc29yICovCi0gICAgICAgIGNwdSA9IGNwdW1hc2tfdGVzdF9jcHUodmMtPnBy b2Nlc3NvciwgY3B1cykKLSAgICAgICAgICAgICAgICA/IHZjLT5wcm9jZXNzb3IgOiBjcHVtYXNr X2N5Y2xlKHZjLT5wcm9jZXNzb3IsIGNwdXMpOworICAgICAgICBjcHUgPSBjcHVtYXNrX3Rlc3Rf Y3B1KHNjaGVkX2l0ZW1fY3B1KGl0ZW0pLCBjcHVzKQorICAgICAgICAgICAgICAgID8gc2NoZWRf aXRlbV9jcHUoaXRlbSkKKyAgICAgICAgICAgICAgICA6IGNwdW1hc2tfY3ljbGUoc2NoZWRfaXRl bV9jcHUoaXRlbSksIGNwdXMpOwogICAgICAgICBBU1NFUlQoY3B1bWFza190ZXN0X2NwdShjcHUs IGNwdXMpKTsKIAogICAgICAgICAvKgpAQCAtNzc4LDE1ICs3ODIsMTUgQEAgX2NzY2hlZF9jcHVf cGljayhjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCB2Y3B1ICp2YywgYm9vbF90 IGNvbW1pdCkKICAgICAgICAgICogV2UgZ2l2ZSBwcmVmZXJlbmNlIHRvIHRoZSBpZGxlIGV4ZWN1 dGlvbiB2ZWhpY2xlIHdpdGggdGhlIG1vc3QKICAgICAgICAgICogaWRsaW5nIG5laWdoYm91cnMg aW4gaXRzIGdyb3VwaW5nLiBUaGlzIGRpc3RyaWJ1dGVzIHdvcmsgYWNyb3NzCiAgICAgICAgICAq IGRpc3RpbmN0IGNvcmVzIGZpcnN0IGFuZCBndWFyYW50ZWVzIHdlIGRvbid0IGRvIHNvbWV0aGlu ZyBzdHVwaWQKLSAgICAgICAgICogbGlrZSBydW4gdHdvIFZDUFVzIG9uIGNvLWh5cGVydGhyZWFk cyB3aGlsZSB0aGVyZSBhcmUgaWRsZSBjb3JlcworICAgICAgICAgKiBsaWtlIHJ1biB0d28gSVRF TXMgb24gY28taHlwZXJ0aHJlYWRzIHdoaWxlIHRoZXJlIGFyZSBpZGxlIGNvcmVzCiAgICAgICAg ICAqIG9yIHNvY2tldHMuCiAgICAgICAgICAqCiAgICAgICAgICAqIE5vdGljZSB0aGF0LCB3aGVu IGNvbXB1dGluZyB0aGUgImlkbGVuZXNzIiBvZiBjcHUsIHdlIG1heSB3YW50IHRvCi0gICAgICAg ICAqIGRpc2NvdW50IHZjLiBUaGF0IGlzLCBpZmYgdmMgaXMgdGhlIGN1cnJlbnRseSBydW5uaW5n IGFuZCB0aGUgb25seQotICAgICAgICAgKiBydW5uYWJsZSB2Y3B1IG9uIGNwdSwgd2UgYWRkIGNw dSB0byB0aGUgaWRsZXJzLgorICAgICAgICAgKiBkaXNjb3VudCBpdGVtLiBUaGF0IGlzLCBpZmYg aXRlbSBpcyB0aGUgY3VycmVudGx5IHJ1bm5pbmcgYW5kIHRoZQorICAgICAgICAgKiBvbmx5IHJ1 bm5hYmxlIGl0ZW0gb24gY3B1LCB3ZSBhZGQgY3B1IHRvIHRoZSBpZGxlcnMuCiAgICAgICAgICAq LwogICAgICAgICBjcHVtYXNrX2FuZCgmaWRsZXJzLCAmY3B1X29ubGluZV9tYXAsIENTQ0hFRF9Q UklWKG9wcyktPmlkbGVycyk7Ci0gICAgICAgIGlmICggdmMtPnByb2Nlc3NvciA9PSBjcHUgJiYg aXNfcnVucV9pZGxlKGNwdSkgKQorICAgICAgICBpZiAoIHNjaGVkX2l0ZW1fY3B1KGl0ZW0pID09 IGNwdSAmJiBpc19ydW5xX2lkbGUoY3B1KSApCiAgICAgICAgICAgICBfX2NwdW1hc2tfc2V0X2Nw dShjcHUsICZpZGxlcnMpOwogICAgICAgICBjcHVtYXNrX2FuZChjcHVzLCAmaWRsZXJzLCBjcHVz KTsKIApAQCAtNzk2LDcgKzgwMCw3IEBAIF9jc2NoZWRfY3B1X3BpY2soY29uc3Qgc3RydWN0IHNj aGVkdWxlciAqb3BzLCBzdHJ1Y3QgdmNwdSAqdmMsIGJvb2xfdCBjb21taXQpCiAgICAgICAgICAq IENQVSwgYXMgd2UganVzdCAmJi1lZCBpdCB3aXRoIGlkbGVycykuIEluIGZhY3QsIGlmIHdlIGFy ZSBvbiBTTVQsIGFuZAogICAgICAgICAgKiBjcHUgcG9pbnRzIHRvIGEgYnVzeSB0aHJlYWQgd2l0 aCBhbiBpZGxlIHNpYmxpbmcsIGJvdGggdGhlIHRocmVhZHMKICAgICAgICAgICogd2lsbCBiZSBj b25zaWRlcmVkIHRoZSBzYW1lLCBmcm9tIHRoZSAiaWRsZW5lc3MiIGNhbGN1bGF0aW9uIHBvaW50 Ci0gICAgICAgICAqIG9mIHZpZXciLCBwcmV2ZW50aW5nIHZjcHUgZnJvbSBiZWluZyBtb3ZlZCB0 byB0aGUgdGhyZWFkIHRoYXQgaXMKKyAgICAgICAgICogb2YgdmlldyIsIHByZXZlbnRpbmcgaXRl bSBmcm9tIGJlaW5nIG1vdmVkIHRvIHRoZSB0aHJlYWQgdGhhdCBpcwogICAgICAgICAgKiBhY3R1 YWxseSBpZGxlLgogICAgICAgICAgKgogICAgICAgICAgKiBOb3RpY2UgdGhhdCBjcHVtYXNrX3Rl c3RfY3B1KCkgaXMgcXVpY2tlciB0aGFuIGNwdW1hc2tfZW1wdHkoKSwgc28KQEAgLTg2Miw3ICs4 NjYsOCBAQCBfY3NjaGVkX2NwdV9waWNrKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3Ry dWN0IHZjcHUgKnZjLCBib29sX3QgY29tbWl0KQogICAgIGlmICggY29tbWl0ICYmIHNwYyApCiAg ICAgICAgc3BjLT5pZGxlX2JpYXMgPSBjcHU7CiAKLSAgICBUUkFDRV8zRChUUkNfQ1NDSEVEX1BJ Q0tFRF9DUFUsIHZjLT5kb21haW4tPmRvbWFpbl9pZCwgdmMtPnZjcHVfaWQsIGNwdSk7CisgICAg VFJBQ0VfM0QoVFJDX0NTQ0hFRF9QSUNLRURfQ1BVLCBpdGVtLT5kb21haW4tPmRvbWFpbl9pZCwg aXRlbS0+aXRlbV9pZCwKKyAgICAgICAgICAgICBjcHUpOwogCiAgICAgcmV0dXJuIGNwdTsKIH0K QEAgLTg3MCw3ICs4NzUsNiBAQCBfY3NjaGVkX2NwdV9waWNrKGNvbnN0IHN0cnVjdCBzY2hlZHVs ZXIgKm9wcywgc3RydWN0IHZjcHUgKnZjLCBib29sX3QgY29tbWl0KQogc3RhdGljIHN0cnVjdCBz Y2hlZF9yZXNvdXJjZSAqCiBjc2NoZWRfcmVzX3BpY2soY29uc3Qgc3RydWN0IHNjaGVkdWxlciAq b3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKIHsKLSAgICBzdHJ1Y3QgdmNwdSAqdmMgPSBp dGVtLT52Y3B1OwogICAgIHN0cnVjdCBjc2NoZWRfaXRlbSAqc3ZjID0gQ1NDSEVEX0lURU0oaXRl bSk7CiAKICAgICAvKgpAQCAtODgwLDI2ICs4ODQsMjYgQEAgY3NjaGVkX3Jlc19waWNrKGNvbnN0 IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiAgICAgICog Y3NjaGVkX2l0ZW1fd2FrZSgpIChzdGlsbCBjYWxsZWQgZnJvbSB2Y3B1X21pZ3JhdGUoKSkgd2Ug d29uJ3QKICAgICAgKiBnZXQgYm9vc3RlZCwgd2hpY2ggd2UgZG9uJ3QgZGVzZXJ2ZSBhcyB3ZSBh cmUgIm9ubHkiIG1pZ3JhdGluZy4KICAgICAgKi8KLSAgICBzZXRfYml0KENTQ0hFRF9GTEFHX1ZD UFVfTUlHUkFUSU5HLCAmc3ZjLT5mbGFncyk7Ci0gICAgcmV0dXJuIHBlcl9jcHUoc2NoZWRfcmVz LCBfY3NjaGVkX2NwdV9waWNrKG9wcywgdmMsIDEpKTsKKyAgICBzZXRfYml0KENTQ0hFRF9GTEFH X0lURU1fTUlHUkFUSU5HLCAmc3ZjLT5mbGFncyk7CisgICAgcmV0dXJuIHBlcl9jcHUoc2NoZWRf cmVzLCBfY3NjaGVkX2NwdV9waWNrKG9wcywgaXRlbSwgMSkpOwogfQogCiBzdGF0aWMgaW5saW5l IHZvaWQKLV9fY3NjaGVkX3ZjcHVfYWNjdF9zdGFydChzdHJ1Y3QgY3NjaGVkX3ByaXZhdGUgKnBy diwgc3RydWN0IGNzY2hlZF9pdGVtICpzdmMpCitfX2NzY2hlZF9pdGVtX2FjY3Rfc3RhcnQoc3Ry dWN0IGNzY2hlZF9wcml2YXRlICpwcnYsIHN0cnVjdCBjc2NoZWRfaXRlbSAqc3ZjKQogewogICAg IHN0cnVjdCBjc2NoZWRfZG9tICogY29uc3Qgc2RvbSA9IHN2Yy0+c2RvbTsKICAgICB1bnNpZ25l ZCBsb25nIGZsYWdzOwogCiAgICAgc3Bpbl9sb2NrX2lycXNhdmUoJnBydi0+bG9jaywgZmxhZ3Mp OwogCi0gICAgaWYgKCBsaXN0X2VtcHR5KCZzdmMtPmFjdGl2ZV92Y3B1X2VsZW0pICkKKyAgICBp ZiAoIGxpc3RfZW1wdHkoJnN2Yy0+YWN0aXZlX2l0ZW1fZWxlbSkgKQogICAgIHsKLSAgICAgICAg U0NIRURfVkNQVV9TVEFUX0NSQU5LKHN2Yywgc3RhdGVfYWN0aXZlKTsKKyAgICAgICAgU0NIRURf SVRFTV9TVEFUX0NSQU5LKHN2Yywgc3RhdGVfYWN0aXZlKTsKICAgICAgICAgU0NIRURfU1RBVF9D UkFOSyhhY2N0X2l0ZW1fYWN0aXZlKTsKIAotICAgICAgICBzZG9tLT5hY3RpdmVfdmNwdV9jb3Vu dCsrOwotICAgICAgICBsaXN0X2FkZCgmc3ZjLT5hY3RpdmVfdmNwdV9lbGVtLCAmc2RvbS0+YWN0 aXZlX3ZjcHUpOwotICAgICAgICAvKiBNYWtlIHdlaWdodCBwZXItdmNwdSAqLworICAgICAgICBz ZG9tLT5hY3RpdmVfaXRlbV9jb3VudCsrOworICAgICAgICBsaXN0X2FkZCgmc3ZjLT5hY3RpdmVf aXRlbV9lbGVtLCAmc2RvbS0+YWN0aXZlX2l0ZW0pOworICAgICAgICAvKiBNYWtlIHdlaWdodCBw ZXItaXRlbSAqLwogICAgICAgICBwcnYtPndlaWdodCArPSBzZG9tLT53ZWlnaHQ7CiAgICAgICAg IGlmICggbGlzdF9lbXB0eSgmc2RvbS0+YWN0aXZlX3Nkb21fZWxlbSkgKQogICAgICAgICB7CkBA IC05MDgsNTYgKzkxMiw1NiBAQCBfX2NzY2hlZF92Y3B1X2FjY3Rfc3RhcnQoc3RydWN0IGNzY2hl ZF9wcml2YXRlICpwcnYsIHN0cnVjdCBjc2NoZWRfaXRlbSAqc3ZjKQogICAgIH0KIAogICAgIFRS QUNFXzNEKFRSQ19DU0NIRURfQUNDT1VOVF9TVEFSVCwgc2RvbS0+ZG9tLT5kb21haW5faWQsCi0g ICAgICAgICAgICAgc3ZjLT52Y3B1LT52Y3B1X2lkLCBzZG9tLT5hY3RpdmVfdmNwdV9jb3VudCk7 CisgICAgICAgICAgICAgc3ZjLT5pdGVtLT5pdGVtX2lkLCBzZG9tLT5hY3RpdmVfaXRlbV9jb3Vu dCk7CiAKICAgICBzcGluX3VubG9ja19pcnFyZXN0b3JlKCZwcnYtPmxvY2ssIGZsYWdzKTsKIH0K IAogc3RhdGljIGlubGluZSB2b2lkCi1fX2NzY2hlZF92Y3B1X2FjY3Rfc3RvcF9sb2NrZWQoc3Ry dWN0IGNzY2hlZF9wcml2YXRlICpwcnYsCitfX2NzY2hlZF9pdGVtX2FjY3Rfc3RvcF9sb2NrZWQo c3RydWN0IGNzY2hlZF9wcml2YXRlICpwcnYsCiAgICAgc3RydWN0IGNzY2hlZF9pdGVtICpzdmMp CiB7CiAgICAgc3RydWN0IGNzY2hlZF9kb20gKiBjb25zdCBzZG9tID0gc3ZjLT5zZG9tOwogCi0g ICAgQlVHX09OKCBsaXN0X2VtcHR5KCZzdmMtPmFjdGl2ZV92Y3B1X2VsZW0pICk7CisgICAgQlVH X09OKCBsaXN0X2VtcHR5KCZzdmMtPmFjdGl2ZV9pdGVtX2VsZW0pICk7CiAKLSAgICBTQ0hFRF9W Q1BVX1NUQVRfQ1JBTksoc3ZjLCBzdGF0ZV9pZGxlKTsKKyAgICBTQ0hFRF9JVEVNX1NUQVRfQ1JB Tksoc3ZjLCBzdGF0ZV9pZGxlKTsKICAgICBTQ0hFRF9TVEFUX0NSQU5LKGFjY3RfaXRlbV9pZGxl KTsKIAogICAgIEJVR19PTiggcHJ2LT53ZWlnaHQgPCBzZG9tLT53ZWlnaHQgKTsKLSAgICBzZG9t LT5hY3RpdmVfdmNwdV9jb3VudC0tOwotICAgIGxpc3RfZGVsX2luaXQoJnN2Yy0+YWN0aXZlX3Zj cHVfZWxlbSk7CisgICAgc2RvbS0+YWN0aXZlX2l0ZW1fY291bnQtLTsKKyAgICBsaXN0X2RlbF9p bml0KCZzdmMtPmFjdGl2ZV9pdGVtX2VsZW0pOwogICAgIHBydi0+d2VpZ2h0IC09IHNkb20tPndl aWdodDsKLSAgICBpZiAoIGxpc3RfZW1wdHkoJnNkb20tPmFjdGl2ZV92Y3B1KSApCisgICAgaWYg KCBsaXN0X2VtcHR5KCZzZG9tLT5hY3RpdmVfaXRlbSkgKQogICAgIHsKICAgICAgICAgbGlzdF9k ZWxfaW5pdCgmc2RvbS0+YWN0aXZlX3Nkb21fZWxlbSk7CiAgICAgfQogCiAgICAgVFJBQ0VfM0Qo VFJDX0NTQ0hFRF9BQ0NPVU5UX1NUT1AsIHNkb20tPmRvbS0+ZG9tYWluX2lkLAotICAgICAgICAg ICAgIHN2Yy0+dmNwdS0+dmNwdV9pZCwgc2RvbS0+YWN0aXZlX3ZjcHVfY291bnQpOworICAgICAg ICAgICAgIHN2Yy0+aXRlbS0+aXRlbV9pZCwgc2RvbS0+YWN0aXZlX2l0ZW1fY291bnQpOwogfQog CiBzdGF0aWMgdm9pZAotY3NjaGVkX3ZjcHVfYWNjdChzdHJ1Y3QgY3NjaGVkX3ByaXZhdGUgKnBy diwgdW5zaWduZWQgaW50IGNwdSkKK2NzY2hlZF9pdGVtX2FjY3Qoc3RydWN0IGNzY2hlZF9wcml2 YXRlICpwcnYsIHVuc2lnbmVkIGludCBjcHUpCiB7CiAgICAgc3RydWN0IHNjaGVkX2l0ZW0gKmN1 cnJpdGVtID0gY3VycmVudC0+c2NoZWRfaXRlbTsKICAgICBzdHJ1Y3QgY3NjaGVkX2l0ZW0gKiBj b25zdCBzdmMgPSBDU0NIRURfSVRFTShjdXJyaXRlbSk7CiAgICAgY29uc3Qgc3RydWN0IHNjaGVk dWxlciAqb3BzID0gcGVyX2NwdShzY2hlZHVsZXIsIGNwdSk7CiAKLSAgICBBU1NFUlQoIGN1cnJl bnQtPnByb2Nlc3NvciA9PSBjcHUgKTsKKyAgICBBU1NFUlQoIHNjaGVkX2l0ZW1fY3B1KGN1cnJp dGVtKSA9PSBjcHUgKTsKICAgICBBU1NFUlQoIHN2Yy0+c2RvbSAhPSBOVUxMICk7Ci0gICAgQVNT RVJUKCAhaXNfaWRsZV92Y3B1KHN2Yy0+dmNwdSkgKTsKKyAgICBBU1NFUlQoICFpc19pZGxlX2l0 ZW0oc3ZjLT5pdGVtKSApOwogCiAgICAgLyoKLSAgICAgKiBJZiB0aGlzIFZDUFUncyBwcmlvcml0 eSB3YXMgYm9vc3RlZCB3aGVuIGl0IGxhc3QgYXdva2UsIHJlc2V0IGl0LgotICAgICAqIElmIHRo ZSBWQ1BVIGlzIGZvdW5kIGhlcmUsIHRoZW4gaXQncyBjb25zdW1pbmcgYSBub24tbmVnbGlnZWFi bGUKKyAgICAgKiBJZiB0aGlzIElURU0ncyBwcmlvcml0eSB3YXMgYm9vc3RlZCB3aGVuIGl0IGxh c3QgYXdva2UsIHJlc2V0IGl0LgorICAgICAqIElmIHRoZSBJVEVNIGlzIGZvdW5kIGhlcmUsIHRo ZW4gaXQncyBjb25zdW1pbmcgYSBub24tbmVnbGlnZWFibGUKICAgICAgKiBhbW91bnQgb2YgQ1BV IHJlc291cmNlcyBhbmQgc2hvdWxkIG5vIGxvbmdlciBiZSBib29zdGVkLgogICAgICAqLwogICAg IGlmICggc3ZjLT5wcmkgPT0gQ1NDSEVEX1BSSV9UU19CT09TVCApCiAgICAgewogICAgICAgICBz dmMtPnByaSA9IENTQ0hFRF9QUklfVFNfVU5ERVI7CiAgICAgICAgIFRSQUNFXzJEKFRSQ19DU0NI RURfQk9PU1RfRU5ELCBzdmMtPnNkb20tPmRvbS0+ZG9tYWluX2lkLAotICAgICAgICAgICAgICAg ICBzdmMtPnZjcHUtPnZjcHVfaWQpOworICAgICAgICAgICAgICAgICBzdmMtPml0ZW0tPml0ZW1f aWQpOwogICAgIH0KIAogICAgIC8qCkBAIC05NjYsMTIgKzk3MCwxMiBAQCBjc2NoZWRfdmNwdV9h Y2N0KHN0cnVjdCBjc2NoZWRfcHJpdmF0ZSAqcHJ2LCB1bnNpZ25lZCBpbnQgY3B1KQogICAgIGJ1 cm5fY3JlZGl0cyhzdmMsIE5PVygpKTsKIAogICAgIC8qCi0gICAgICogUHV0IHRoaXMgVkNQVSBh bmQgZG9tYWluIGJhY2sgb24gdGhlIGFjdGl2ZSBsaXN0IGlmIGl0IHdhcworICAgICAqIFB1dCB0 aGlzIElURU0gYW5kIGRvbWFpbiBiYWNrIG9uIHRoZSBhY3RpdmUgbGlzdCBpZiBpdCB3YXMKICAg ICAgKiBpZGxpbmcuCiAgICAgICovCi0gICAgaWYgKCBsaXN0X2VtcHR5KCZzdmMtPmFjdGl2ZV92 Y3B1X2VsZW0pICkKKyAgICBpZiAoIGxpc3RfZW1wdHkoJnN2Yy0+YWN0aXZlX2l0ZW1fZWxlbSkg KQogICAgIHsKLSAgICAgICAgX19jc2NoZWRfdmNwdV9hY2N0X3N0YXJ0KHBydiwgc3ZjKTsKKyAg ICAgICAgX19jc2NoZWRfaXRlbV9hY2N0X3N0YXJ0KHBydiwgc3ZjKTsKICAgICB9CiAgICAgZWxz ZQogICAgIHsKQEAgLTk4NCwxNSArOTg4LDE1IEBAIGNzY2hlZF92Y3B1X2FjY3Qoc3RydWN0IGNz Y2hlZF9wcml2YXRlICpwcnYsIHVuc2lnbmVkIGludCBjcHUpCiAgICAgICAgICAqIG1pZ3JhdGlu ZyBpdCB0byBydW4gZWxzZXdoZXJlIChzZWUgbXVsdGktY29yZSBhbmQgbXVsdGktdGhyZWFkCiAg ICAgICAgICAqIHN1cHBvcnQgaW4gY3NjaGVkX3Jlc19waWNrKCkpLgogICAgICAgICAgKi8KLSAg ICAgICAgbmV3X2NwdSA9IF9jc2NoZWRfY3B1X3BpY2sob3BzLCBjdXJyZW50LCAwKTsKKyAgICAg ICAgbmV3X2NwdSA9IF9jc2NoZWRfY3B1X3BpY2sob3BzLCBjdXJyaXRlbSwgMCk7CiAKICAgICAg ICAgaXRlbV9zY2hlZHVsZV91bmxvY2tfaXJxcmVzdG9yZShsb2NrLCBmbGFncywgY3Vycml0ZW0p OwogCiAgICAgICAgIGlmICggbmV3X2NwdSAhPSBjcHUgKQogICAgICAgICB7Ci0gICAgICAgICAg ICBTQ0hFRF9WQ1BVX1NUQVRfQ1JBTksoc3ZjLCBtaWdyYXRlX3IpOworICAgICAgICAgICAgU0NI RURfSVRFTV9TVEFUX0NSQU5LKHN2YywgbWlncmF0ZV9yKTsKICAgICAgICAgICAgIFNDSEVEX1NU QVRfQ1JBTksobWlncmF0ZV9ydW5uaW5nKTsKLSAgICAgICAgICAgIHNldF9iaXQoX1ZQRl9taWdy YXRpbmcsICZjdXJyZW50LT5wYXVzZV9mbGFncyk7CisgICAgICAgICAgICBzY2hlZF9zZXRfcGF1 c2VfZmxhZ3NfYXRvbWljKGN1cnJpdGVtLCBfVlBGX21pZ3JhdGluZyk7CiAgICAgICAgICAgICAv KgogICAgICAgICAgICAgICogQXMgd2UgYXJlIGFib3V0IHRvIHRpY2tsZSBjcHUsIHdlIHNob3Vs ZCBjbGVhciBpdHMgYml0IGluCiAgICAgICAgICAgICAgKiBpZGxlcnMuIEJ1dCwgaWYgd2UgYXJl IGhlcmUsIGl0IG1lYW5zIHRoZXJlIGlzIHNvbWVvbmUgcnVubmluZwpAQCAtMTAwOSwyMSArMTAx MywyMCBAQCBzdGF0aWMgdm9pZCAqCiBjc2NoZWRfYWxsb2NfdmRhdGEoY29uc3Qgc3RydWN0IHNj aGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSwKICAgICAgICAgICAgICAgICAg ICB2b2lkICpkZCkKIHsKLSAgICBzdHJ1Y3QgdmNwdSAqdmMgPSBpdGVtLT52Y3B1OwogICAgIHN0 cnVjdCBjc2NoZWRfaXRlbSAqc3ZjOwogCi0gICAgLyogQWxsb2NhdGUgcGVyLVZDUFUgaW5mbyAq LworICAgIC8qIEFsbG9jYXRlIHBlci1JVEVNIGluZm8gKi8KICAgICBzdmMgPSB4emFsbG9jKHN0 cnVjdCBjc2NoZWRfaXRlbSk7CiAgICAgaWYgKCBzdmMgPT0gTlVMTCApCiAgICAgICAgIHJldHVy biBOVUxMOwogCiAgICAgSU5JVF9MSVNUX0hFQUQoJnN2Yy0+cnVucV9lbGVtKTsKLSAgICBJTklU X0xJU1RfSEVBRCgmc3ZjLT5hY3RpdmVfdmNwdV9lbGVtKTsKKyAgICBJTklUX0xJU1RfSEVBRCgm c3ZjLT5hY3RpdmVfaXRlbV9lbGVtKTsKICAgICBzdmMtPnNkb20gPSBkZDsKLSAgICBzdmMtPnZj cHUgPSB2YzsKLSAgICBzdmMtPnByaSA9IGlzX2lkbGVfZG9tYWluKHZjLT5kb21haW4pID8KKyAg ICBzdmMtPml0ZW0gPSBpdGVtOworICAgIHN2Yy0+cHJpID0gaXNfaWRsZV9pdGVtKGl0ZW0pID8K ICAgICAgICAgQ1NDSEVEX1BSSV9JRExFIDogQ1NDSEVEX1BSSV9UU19VTkRFUjsKLSAgICBTQ0hF RF9WQ1BVX1NUQVRTX1JFU0VUKHN2Yyk7CisgICAgU0NIRURfSVRFTV9TVEFUU19SRVNFVChzdmMp OwogICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV9hbGxvYyk7CiAgICAgcmV0dXJuIHN2YzsKIH0K QEAgLTEwMzEsMjMgKzEwMzQsMjEgQEAgY3NjaGVkX2FsbG9jX3ZkYXRhKGNvbnN0IHN0cnVjdCBz Y2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0sCiBzdGF0aWMgdm9pZAogY3Nj aGVkX2l0ZW1faW5zZXJ0KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVk X2l0ZW0gKml0ZW0pCiB7Ci0gICAgc3RydWN0IHZjcHUgKnZjID0gaXRlbS0+dmNwdTsKICAgICBz dHJ1Y3QgY3NjaGVkX2l0ZW0gKnN2YyA9IGl0ZW0tPnByaXY7CiAgICAgc3BpbmxvY2tfdCAqbG9j azsKIAotICAgIEJVR19PTiggaXNfaWRsZV92Y3B1KHZjKSApOworICAgIEJVR19PTiggaXNfaWRs ZV9pdGVtKGl0ZW0pICk7CiAKICAgICAvKiBjc2NoZWRfcmVzX3BpY2soKSBsb29rcyBpbiB2Yy0+ cHJvY2Vzc29yJ3MgcnVucSwgc28gd2UgbmVlZCB0aGUgbG9jay4gKi8KICAgICBsb2NrID0gaXRl bV9zY2hlZHVsZV9sb2NrX2lycShpdGVtKTsKIAotICAgIGl0ZW0tPnJlcyA9IGNzY2hlZF9yZXNf cGljayhvcHMsIGl0ZW0pOwotICAgIHZjLT5wcm9jZXNzb3IgPSBpdGVtLT5yZXMtPnByb2Nlc3Nv cjsKKyAgICBzY2hlZF9zZXRfcmVzKGl0ZW0sIGNzY2hlZF9yZXNfcGljayhvcHMsIGl0ZW0pKTsK IAogICAgIHNwaW5fdW5sb2NrX2lycShsb2NrKTsKIAogICAgIGxvY2sgPSBpdGVtX3NjaGVkdWxl X2xvY2tfaXJxKGl0ZW0pOwogCi0gICAgaWYgKCAhX192Y3B1X29uX3J1bnEoc3ZjKSAmJiB2Y3B1 X3J1bm5hYmxlKHZjKSAmJiAhdmNwdV9ydW5uaW5nKHZjKSApCisgICAgaWYgKCAhX19pdGVtX29u X3J1bnEoc3ZjKSAmJiBpdGVtX3J1bm5hYmxlKGl0ZW0pICYmICFpdGVtLT5pc19ydW5uaW5nICkK ICAgICAgICAgcnVucV9pbnNlcnQoc3ZjKTsKIAogICAgIGl0ZW1fc2NoZWR1bGVfdW5sb2NrX2ly cShsb2NrLCBpdGVtKTsKQEAgLTEwNzQsMTggKzEwNzUsMTggQEAgY3NjaGVkX2l0ZW1fcmVtb3Zl KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiAK ICAgICBTQ0hFRF9TVEFUX0NSQU5LKGl0ZW1fcmVtb3ZlKTsKIAotICAgIEFTU0VSVCghX192Y3B1 X29uX3J1bnEoc3ZjKSk7CisgICAgQVNTRVJUKCFfX2l0ZW1fb25fcnVucShzdmMpKTsKIAotICAg IGlmICggdGVzdF9hbmRfY2xlYXJfYml0KENTQ0hFRF9GTEFHX1ZDUFVfUEFSS0VELCAmc3ZjLT5m bGFncykgKQorICAgIGlmICggdGVzdF9hbmRfY2xlYXJfYml0KENTQ0hFRF9GTEFHX0lURU1fUEFS S0VELCAmc3ZjLT5mbGFncykgKQogICAgIHsKICAgICAgICAgU0NIRURfU1RBVF9DUkFOSyhpdGVt X3VucGFyayk7Ci0gICAgICAgIHZjcHVfdW5wYXVzZShzdmMtPnZjcHUpOworICAgICAgICB2Y3B1 X3VucGF1c2Uoc3ZjLT5pdGVtLT52Y3B1KTsKICAgICB9CiAKICAgICBzcGluX2xvY2tfaXJxKCZw cnYtPmxvY2spOwogCi0gICAgaWYgKCAhbGlzdF9lbXB0eSgmc3ZjLT5hY3RpdmVfdmNwdV9lbGVt KSApCi0gICAgICAgIF9fY3NjaGVkX3ZjcHVfYWNjdF9zdG9wX2xvY2tlZChwcnYsIHN2Yyk7Cisg ICAgaWYgKCAhbGlzdF9lbXB0eSgmc3ZjLT5hY3RpdmVfaXRlbV9lbGVtKSApCisgICAgICAgIF9f Y3NjaGVkX2l0ZW1fYWNjdF9zdG9wX2xvY2tlZChwcnYsIHN2Yyk7CiAKICAgICBzcGluX3VubG9j a19pcnEoJnBydi0+bG9jayk7CiAKQEAgLTEwOTUsODYgKzEwOTYsODUgQEAgY3NjaGVkX2l0ZW1f cmVtb3ZlKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0 ZW0pCiBzdGF0aWMgdm9pZAogY3NjaGVkX2l0ZW1fc2xlZXAoY29uc3Qgc3RydWN0IHNjaGVkdWxl ciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKIHsKLSAgICBzdHJ1Y3QgdmNwdSAqdmMg PSBpdGVtLT52Y3B1OwogICAgIHN0cnVjdCBjc2NoZWRfaXRlbSAqIGNvbnN0IHN2YyA9IENTQ0hF RF9JVEVNKGl0ZW0pOwotICAgIHVuc2lnbmVkIGludCBjcHUgPSB2Yy0+cHJvY2Vzc29yOworICAg IHVuc2lnbmVkIGludCBjcHUgPSBzY2hlZF9pdGVtX2NwdShpdGVtKTsKIAogICAgIFNDSEVEX1NU QVRfQ1JBTksoaXRlbV9zbGVlcCk7CiAKLSAgICBCVUdfT04oIGlzX2lkbGVfdmNwdSh2YykgKTsK KyAgICBCVUdfT04oIGlzX2lkbGVfaXRlbShpdGVtKSApOwogCiAgICAgaWYgKCBjdXJyX29uX2Nw dShjcHUpID09IGl0ZW0gKQogICAgIHsKICAgICAgICAgLyoKICAgICAgICAgICogV2UgYXJlIGFi b3V0IHRvIHRpY2tsZSBjcHUsIHNvIHdlIHNob3VsZCBjbGVhciBpdHMgYml0IGluIGlkbGVycy4K LSAgICAgICAgICogQnV0LCB3ZSBhcmUgaGVyZSBiZWNhdXNlIHZjIGlzIGdvaW5nIHRvIHNsZWVw IHdoaWxlIHJ1bm5pbmcgb24gY3B1LAorICAgICAgICAgKiBCdXQsIHdlIGFyZSBoZXJlIGJlY2F1 c2UgaXRlbSBpcyBnb2luZyB0byBzbGVlcCB3aGlsZSBydW5uaW5nIG9uIGNwdSwKICAgICAgICAg ICogc28gdGhlIGJpdCBtdXN0IGJlIHplcm8gYWxyZWFkeS4KICAgICAgICAgICovCiAgICAgICAg IEFTU0VSVCghY3B1bWFza190ZXN0X2NwdShjcHUsIENTQ0hFRF9QUklWKHBlcl9jcHUoc2NoZWR1 bGVyLCBjcHUpKS0+aWRsZXJzKSk7CiAgICAgICAgIGNwdV9yYWlzZV9zb2Z0aXJxKGNwdSwgU0NI RURVTEVfU09GVElSUSk7CiAgICAgfQotICAgIGVsc2UgaWYgKCBfX3ZjcHVfb25fcnVucShzdmMp ICkKKyAgICBlbHNlIGlmICggX19pdGVtX29uX3J1bnEoc3ZjKSApCiAgICAgICAgIHJ1bnFfcmVt b3ZlKHN2Yyk7CiB9CiAKIHN0YXRpYyB2b2lkCiBjc2NoZWRfaXRlbV93YWtlKGNvbnN0IHN0cnVj dCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiB7Ci0gICAgc3RydWN0 IHZjcHUgKnZjID0gaXRlbS0+dmNwdTsKICAgICBzdHJ1Y3QgY3NjaGVkX2l0ZW0gKiBjb25zdCBz dmMgPSBDU0NIRURfSVRFTShpdGVtKTsKICAgICBib29sX3QgbWlncmF0aW5nOwogCi0gICAgQlVH X09OKCBpc19pZGxlX3ZjcHUodmMpICk7CisgICAgQlVHX09OKCBpc19pZGxlX2l0ZW0oaXRlbSkg KTsKIAotICAgIGlmICggdW5saWtlbHkoY3Vycl9vbl9jcHUodmMtPnByb2Nlc3NvcikgPT0gaXRl bSkgKQorICAgIGlmICggdW5saWtlbHkoY3Vycl9vbl9jcHUoc2NoZWRfaXRlbV9jcHUoaXRlbSkp ID09IGl0ZW0pICkKICAgICB7CiAgICAgICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV93YWtlX3J1 bm5pbmcpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGlmICggdW5saWtlbHkoX192Y3B1 X29uX3J1bnEoc3ZjKSkgKQorICAgIGlmICggdW5saWtlbHkoX19pdGVtX29uX3J1bnEoc3ZjKSkg KQogICAgIHsKICAgICAgICAgU0NIRURfU1RBVF9DUkFOSyhpdGVtX3dha2Vfb25ydW5xKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmICggbGlrZWx5KHZjcHVfcnVubmFibGUodmMp KSApCisgICAgaWYgKCBsaWtlbHkoaXRlbV9ydW5uYWJsZShpdGVtKSkgKQogICAgICAgICBTQ0hF RF9TVEFUX0NSQU5LKGl0ZW1fd2FrZV9ydW5uYWJsZSk7CiAgICAgZWxzZQogICAgICAgICBTQ0hF RF9TVEFUX0NSQU5LKGl0ZW1fd2FrZV9ub3RfcnVubmFibGUpOwogCiAgICAgLyoKLSAgICAgKiBX ZSB0ZW1wb3Jhcmx5IGJvb3N0IHRoZSBwcmlvcml0eSBvZiBhd2FraW5nIFZDUFVzIQorICAgICAq IFdlIHRlbXBvcmFyaWx5IGJvb3N0IHRoZSBwcmlvcml0eSBvZiBhd2FraW5nIElURU1zIQogICAg ICAqCi0gICAgICogSWYgdGhpcyBWQ1BVIGNvbnN1bWVzIGEgbm9uIG5lZ2xpZ2VhYmxlIGFtb3Vu dCBvZiBDUFUsIGl0CisgICAgICogSWYgdGhpcyBJVEVNIGNvbnN1bWVzIGEgbm9uIG5lZ2xpZ2li bGUgYW1vdW50IG9mIENQVSwgaXQKICAgICAgKiB3aWxsIGV2ZW50dWFsbHkgZmluZCBpdHNlbGYg aW4gdGhlIGNyZWRpdCBhY2NvdW50aW5nIGNvZGUKICAgICAgKiBwYXRoIHdoZXJlIGl0cyBwcmlv cml0eSB3aWxsIGJlIHJlc2V0IHRvIG5vcm1hbC4KICAgICAgKgotICAgICAqIElmIG9uIHRoZSBv dGhlciBoYW5kIHRoZSBWQ1BVIGNvbnN1bWVzIGxpdHRsZSBDUFUgYW5kIGlzCisgICAgICogSWYg b24gdGhlIG90aGVyIGhhbmQgdGhlIElURU0gY29uc3VtZXMgbGl0dGxlIENQVSBhbmQgaXMKICAg ICAgKiBibG9ja2luZyBhbmQgYXdva2VuIGEgbG90IChkb2luZyBJL08gZm9yIGV4YW1wbGUpLCBp dHMKICAgICAgKiBwcmlvcml0eSB3aWxsIHJlbWFpbiBib29zdGVkLCBvcHRpbWl6aW5nIGl0J3Mg d2FrZS10by1ydW4KICAgICAgKiBsYXRlbmNpZXMuCiAgICAgICoKLSAgICAgKiBUaGlzIGFsbG93 cyB3YWtlLXRvLXJ1biBsYXRlbmN5IHNlbnNpdGl2ZSBWQ1BVcyB0byBwcmVlbXB0Ci0gICAgICog bW9yZSBDUFUgcmVzb3VyY2UgaW50ZW5zaXZlIFZDUFVzIHdpdGhvdXQgaW1wYWN0aW5nIG92ZXJh bGwgCisgICAgICogVGhpcyBhbGxvd3Mgd2FrZS10by1ydW4gbGF0ZW5jeSBzZW5zaXRpdmUgSVRF TXMgdG8gcHJlZW1wdAorICAgICAqIG1vcmUgQ1BVIHJlc291cmNlIGludGVuc2l2ZSBJVEVNcyB3 aXRob3V0IGltcGFjdGluZyBvdmVyYWxsCiAgICAgICogc3lzdGVtIGZhaXJuZXNzLgogICAgICAq CiAgICAgICogVGhlcmUgYXJlIHR3byBjYXNlcywgd2hlbiB3ZSBkb24ndCB3YW50IHRvIGJvb3N0 OgotICAgICAqICAtIFZDUFVzIHRoYXQgYXJlIHdha2luZyB1cCBhZnRlciBhIG1pZ3JhdGlvbiwg cmF0aGVyIHRoYW4KKyAgICAgKiAgLSBJVEVNcyB0aGF0IGFyZSB3YWtpbmcgdXAgYWZ0ZXIgYSBt aWdyYXRpb24sIHJhdGhlciB0aGFuCiAgICAgICogICAgYWZ0ZXIgaGF2aW5nIGJsb2NrOwotICAg ICAqICAtIFZDUFVzIG9mIGNhcHBlZCBkb21haW5zIHVucGF1c2luZyBhZnRlciBlYXJuaW5nIGNy ZWRpdHMKKyAgICAgKiAgLSBJVEVNcyBvZiBjYXBwZWQgZG9tYWlucyB1bnBhdXNpbmcgYWZ0ZXIg ZWFybmluZyBjcmVkaXRzCiAgICAgICogICAgdGhleSBoYWQgb3ZlcnNwZW50LgogICAgICAqLwot ICAgIG1pZ3JhdGluZyA9IHRlc3RfYW5kX2NsZWFyX2JpdChDU0NIRURfRkxBR19WQ1BVX01JR1JB VElORywgJnN2Yy0+ZmxhZ3MpOworICAgIG1pZ3JhdGluZyA9IHRlc3RfYW5kX2NsZWFyX2JpdChD U0NIRURfRkxBR19JVEVNX01JR1JBVElORywgJnN2Yy0+ZmxhZ3MpOwogCiAgICAgaWYgKCAhbWln cmF0aW5nICYmIHN2Yy0+cHJpID09IENTQ0hFRF9QUklfVFNfVU5ERVIgJiYKLSAgICAgICAgICF0 ZXN0X2JpdChDU0NIRURfRkxBR19WQ1BVX1BBUktFRCwgJnN2Yy0+ZmxhZ3MpICkKKyAgICAgICAg ICF0ZXN0X2JpdChDU0NIRURfRkxBR19JVEVNX1BBUktFRCwgJnN2Yy0+ZmxhZ3MpICkKICAgICB7 Ci0gICAgICAgIFRSQUNFXzJEKFRSQ19DU0NIRURfQk9PU1RfU1RBUlQsIHZjLT5kb21haW4tPmRv bWFpbl9pZCwgdmMtPnZjcHVfaWQpOworICAgICAgICBUUkFDRV8yRChUUkNfQ1NDSEVEX0JPT1NU X1NUQVJULCBpdGVtLT5kb21haW4tPmRvbWFpbl9pZCwKKyAgICAgICAgICAgICAgICAgaXRlbS0+ aXRlbV9pZCk7CiAgICAgICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV9ib29zdCk7CiAgICAgICAg IHN2Yy0+cHJpID0gQ1NDSEVEX1BSSV9UU19CT09TVDsKICAgICB9CiAKLSAgICAvKiBQdXQgdGhl IFZDUFUgb24gdGhlIHJ1bnEgYW5kIHRpY2tsZSBDUFVzICovCisgICAgLyogUHV0IHRoZSBJVEVN IG9uIHRoZSBydW5xIGFuZCB0aWNrbGUgQ1BVcyAqLwogICAgIHJ1bnFfaW5zZXJ0KHN2Yyk7CiAg ICAgX19ydW5xX3RpY2tsZShzdmMpOwogfQpAQCAtMTE4NSw3ICsxMTg1LDcgQEAgY3NjaGVkX2l0 ZW1feWllbGQoY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAq aXRlbSkKICAgICBzdHJ1Y3QgY3NjaGVkX2l0ZW0gKiBjb25zdCBzdmMgPSBDU0NIRURfSVRFTShp dGVtKTsKIAogICAgIC8qIExldCB0aGUgc2NoZWR1bGVyIGtub3cgdGhhdCB0aGlzIHZjcHUgaXMg dHJ5aW5nIHRvIHlpZWxkICovCi0gICAgc2V0X2JpdChDU0NIRURfRkxBR19WQ1BVX1lJRUxELCAm c3ZjLT5mbGFncyk7CisgICAgc2V0X2JpdChDU0NIRURfRkxBR19JVEVNX1lJRUxELCAmc3ZjLT5m bGFncyk7CiB9CiAKIHN0YXRpYyBpbnQKQEAgLTEyMTQsOCArMTIxNCw4IEBAIGNzY2hlZF9kb21f Y250bCgKICAgICAgICAgewogICAgICAgICAgICAgaWYgKCAhbGlzdF9lbXB0eSgmc2RvbS0+YWN0 aXZlX3Nkb21fZWxlbSkgKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHBydi0+d2Vp Z2h0IC09IHNkb20tPndlaWdodCAqIHNkb20tPmFjdGl2ZV92Y3B1X2NvdW50OwotICAgICAgICAg ICAgICAgIHBydi0+d2VpZ2h0ICs9IG9wLT51LmNyZWRpdC53ZWlnaHQgKiBzZG9tLT5hY3RpdmVf dmNwdV9jb3VudDsKKyAgICAgICAgICAgICAgICBwcnYtPndlaWdodCAtPSBzZG9tLT53ZWlnaHQg KiBzZG9tLT5hY3RpdmVfaXRlbV9jb3VudDsKKyAgICAgICAgICAgICAgICBwcnYtPndlaWdodCAr PSBvcC0+dS5jcmVkaXQud2VpZ2h0ICogc2RvbS0+YWN0aXZlX2l0ZW1fY291bnQ7CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBzZG9tLT53ZWlnaHQgPSBvcC0+dS5jcmVkaXQud2VpZ2h0Owog ICAgICAgICB9CkBAIC0xMjQ0LDkgKzEyNDQsOSBAQCBjc2NoZWRfYWZmX2NudGwoY29uc3Qgc3Ry dWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSwKIAogICAgIC8qIEFy ZSB3ZSBiZWNvbWluZyBleGNsdXNpdmVseSBwaW5uZWQ/ICovCiAgICAgaWYgKCBjcHVtYXNrX3dl aWdodChoYXJkKSA9PSAxICkKLSAgICAgICAgc2V0X2JpdChDU0NIRURfRkxBR19WQ1BVX1BJTk5F RCwgJnN2Yy0+ZmxhZ3MpOworICAgICAgICBzZXRfYml0KENTQ0hFRF9GTEFHX0lURU1fUElOTkVE LCAmc3ZjLT5mbGFncyk7CiAgICAgZWxzZQotICAgICAgICBjbGVhcl9iaXQoQ1NDSEVEX0ZMQUdf VkNQVV9QSU5ORUQsICZzdmMtPmZsYWdzKTsKKyAgICAgICAgY2xlYXJfYml0KENTQ0hFRF9GTEFH X0lURU1fUElOTkVELCAmc3ZjLT5mbGFncyk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZApAQCAt MTI4OSwxNCArMTI4OSwxNCBAQCBjc2NoZWRfc3lzX2NudGwoY29uc3Qgc3RydWN0IHNjaGVkdWxl ciAqb3BzLAogICAgICAgICBlbHNlIGlmICggcHJ2LT5yYXRlbGltaXQgJiYgIXBhcmFtcy0+cmF0 ZWxpbWl0X3VzICkKICAgICAgICAgICAgIHByaW50ayhYRU5MT0dfSU5GTyAiRGlzYWJsaW5nIGNv bnRleHQgc3dpdGNoIHJhdGUgbGltaXRpbmdcbiIpOwogICAgICAgICBwcnYtPnJhdGVsaW1pdCA9 IE1JQ1JPU0VDUyhwYXJhbXMtPnJhdGVsaW1pdF91cyk7Ci0gICAgICAgIHBydi0+dmNwdV9taWdy X2RlbGF5ID0gTUlDUk9TRUNTKHBhcmFtcy0+dmNwdV9taWdyX2RlbGF5X3VzKTsKKyAgICAgICAg cHJ2LT5pdGVtX21pZ3JfZGVsYXkgPSBNSUNST1NFQ1MocGFyYW1zLT52Y3B1X21pZ3JfZGVsYXlf dXMpOwogICAgICAgICBzcGluX3VubG9ja19pcnFyZXN0b3JlKCZwcnYtPmxvY2ssIGZsYWdzKTsK IAogICAgICAgICAvKiBGQUxMVEhSVSAqLwogICAgIGNhc2UgWEVOX1NZU0NUTF9TQ0hFRE9QX2dl dGluZm86CiAgICAgICAgIHBhcmFtcy0+dHNsaWNlX21zID0gcHJ2LT50c2xpY2UgLyBNSUxMSVNF Q1MoMSk7CiAgICAgICAgIHBhcmFtcy0+cmF0ZWxpbWl0X3VzID0gcHJ2LT5yYXRlbGltaXQgLyBN SUNST1NFQ1MoMSk7Ci0gICAgICAgIHBhcmFtcy0+dmNwdV9taWdyX2RlbGF5X3VzID0gcHJ2LT52 Y3B1X21pZ3JfZGVsYXkgLyBNSUNST1NFQ1MoMSk7CisgICAgICAgIHBhcmFtcy0+dmNwdV9taWdy X2RlbGF5X3VzID0gcHJ2LT5pdGVtX21pZ3JfZGVsYXkgLyBNSUNST1NFQ1MoMSk7CiAgICAgICAg IHJjID0gMDsKICAgICAgICAgYnJlYWs7CiAgICAgfQpAQCAtMTMxNCw3ICsxMzE0LDcgQEAgY3Nj aGVkX2FsbG9jX2RvbWRhdGEoY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3QgZG9t YWluICpkb20pCiAgICAgICAgIHJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwogCiAgICAgLyogSW5p dGlhbGl6ZSBjcmVkaXQgYW5kIHdlaWdodCAqLwotICAgIElOSVRfTElTVF9IRUFEKCZzZG9tLT5h Y3RpdmVfdmNwdSk7CisgICAgSU5JVF9MSVNUX0hFQUQoJnNkb20tPmFjdGl2ZV9pdGVtKTsKICAg ICBJTklUX0xJU1RfSEVBRCgmc2RvbS0+YWN0aXZlX3Nkb21fZWxlbSk7CiAgICAgc2RvbS0+ZG9t ID0gZG9tOwogICAgIHNkb20tPndlaWdodCA9IENTQ0hFRF9ERUZBVUxUX1dFSUdIVDsKQEAgLTEz MzEsNyArMTMzMSw3IEBAIGNzY2hlZF9mcmVlX2RvbWRhdGEoY29uc3Qgc3RydWN0IHNjaGVkdWxl ciAqb3BzLCB2b2lkICpkYXRhKQogLyoKICAqIFRoaXMgaXMgYSBPKG4pIG9wdGltaXplZCBzb3J0 IG9mIHRoZSBydW5xLgogICoKLSAqIFRpbWUtc2hhcmUgVkNQVXMgY2FuIG9ubHkgYmUgb25lIG9m IHR3byBwcmlvcml0aWVzLCBVTkRFUiBvciBPVkVSLiBXZSB3YWxrCisgKiBUaW1lLXNoYXJlIElU RU1zIGNhbiBvbmx5IGJlIG9uZSBvZiB0d28gcHJpb3JpdGllcywgVU5ERVIgb3IgT1ZFUi4gV2Ug d2FsawogICogdGhyb3VnaCB0aGUgcnVucSBhbmQgbW92ZSB1cCBhbnkgVU5ERVJzIHRoYXQgYXJl IHByZWNlZGVkIGJ5IE9WRVJTLiBXZQogICogcmVtZW1iZXIgdGhlIGxhc3QgVU5ERVIgdG8gbWFr ZSB0aGUgbW92ZSB1cCBvcGVyYXRpb24gTygxKS4KICAqLwpAQCAtMTM4NCw3ICsxMzg0LDcgQEAg Y3NjaGVkX2FjY3Qodm9pZCogZHVtbXkpCiB7CiAgICAgc3RydWN0IGNzY2hlZF9wcml2YXRlICpw cnYgPSBkdW1teTsKICAgICB1bnNpZ25lZCBsb25nIGZsYWdzOwotICAgIHN0cnVjdCBsaXN0X2hl YWQgKml0ZXJfdmNwdSwgKm5leHRfdmNwdTsKKyAgICBzdHJ1Y3QgbGlzdF9oZWFkICppdGVyX2l0 ZW0sICpuZXh0X2l0ZW07CiAgICAgc3RydWN0IGxpc3RfaGVhZCAqaXRlcl9zZG9tLCAqbmV4dF9z ZG9tOwogICAgIHN0cnVjdCBjc2NoZWRfaXRlbSAqc3ZjOwogICAgIHN0cnVjdCBjc2NoZWRfZG9t ICpzZG9tOwpAQCAtMTQzMSwyNiArMTQzMSwyNiBAQCBjc2NoZWRfYWNjdCh2b2lkKiBkdW1teSkK ICAgICAgICAgc2RvbSA9IGxpc3RfZW50cnkoaXRlcl9zZG9tLCBzdHJ1Y3QgY3NjaGVkX2RvbSwg YWN0aXZlX3Nkb21fZWxlbSk7CiAKICAgICAgICAgQlVHX09OKCBpc19pZGxlX2RvbWFpbihzZG9t LT5kb20pICk7Ci0gICAgICAgIEJVR19PTiggc2RvbS0+YWN0aXZlX3ZjcHVfY291bnQgPT0gMCAp OworICAgICAgICBCVUdfT04oIHNkb20tPmFjdGl2ZV9pdGVtX2NvdW50ID09IDAgKTsKICAgICAg ICAgQlVHX09OKCBzZG9tLT53ZWlnaHQgPT0gMCApOwotICAgICAgICBCVUdfT04oIChzZG9tLT53 ZWlnaHQgKiBzZG9tLT5hY3RpdmVfdmNwdV9jb3VudCkgPiB3ZWlnaHRfbGVmdCApOworICAgICAg ICBCVUdfT04oIChzZG9tLT53ZWlnaHQgKiBzZG9tLT5hY3RpdmVfaXRlbV9jb3VudCkgPiB3ZWln aHRfbGVmdCApOwogCi0gICAgICAgIHdlaWdodF9sZWZ0IC09ICggc2RvbS0+d2VpZ2h0ICogc2Rv bS0+YWN0aXZlX3ZjcHVfY291bnQgKTsKKyAgICAgICAgd2VpZ2h0X2xlZnQgLT0gKCBzZG9tLT53 ZWlnaHQgKiBzZG9tLT5hY3RpdmVfaXRlbV9jb3VudCApOwogCiAgICAgICAgIC8qCiAgICAgICAg ICAqIEEgZG9tYWluJ3MgZmFpciBzaGFyZSBpcyBjb21wdXRlZCB1c2luZyBpdHMgd2VpZ2h0IGlu IGNvbXBldGl0aW9uCiAgICAgICAgICAqIHdpdGggdGhhdCBvZiBhbGwgb3RoZXIgYWN0aXZlIGRv bWFpbnMuCiAgICAgICAgICAqCi0gICAgICAgICAqIEF0IG1vc3QsIGEgZG9tYWluIGNhbiB1c2Ug Y3JlZGl0cyB0byBydW4gYWxsIGl0cyBhY3RpdmUgVkNQVXMKKyAgICAgICAgICogQXQgbW9zdCwg YSBkb21haW4gY2FuIHVzZSBjcmVkaXRzIHRvIHJ1biBhbGwgaXRzIGFjdGl2ZSBJVEVNcwogICAg ICAgICAgKiBmb3Igb25lIGZ1bGwgYWNjb3VudGluZyBwZXJpb2QuIFdlIGFsbG93IGEgZG9tYWlu IHRvIGVhcm4gbW9yZQogICAgICAgICAgKiBvbmx5IHdoZW4gdGhlIHN5c3RlbS13aWRlIGNyZWRp dCBiYWxhbmNlIGlzIG5lZ2F0aXZlLgogICAgICAgICAgKi8KLSAgICAgICAgY3JlZGl0X3BlYWsg PSBzZG9tLT5hY3RpdmVfdmNwdV9jb3VudCAqIHBydi0+Y3JlZGl0c19wZXJfdHNsaWNlOworICAg ICAgICBjcmVkaXRfcGVhayA9IHNkb20tPmFjdGl2ZV9pdGVtX2NvdW50ICogcHJ2LT5jcmVkaXRz X3Blcl90c2xpY2U7CiAgICAgICAgIGlmICggcHJ2LT5jcmVkaXRfYmFsYW5jZSA8IDAgKQogICAg ICAgICB7CiAgICAgICAgICAgICBjcmVkaXRfcGVhayArPSAoICggLXBydi0+Y3JlZGl0X2JhbGFu Y2UKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqIHNkb20tPndlaWdodAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICogc2RvbS0+YWN0aXZlX3ZjcHVfY291bnQpICsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqIHNkb20tPmFjdGl2ZV9pdGVtX2NvdW50KSAr CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICh3ZWlnaHRfdG90YWwgLSAxKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgKSAvIHdlaWdodF90b3RhbDsKICAgICAgICAgfQpAQCAtMTQ2 MSwxNCArMTQ2MSwxNCBAQCBjc2NoZWRfYWNjdCh2b2lkKiBkdW1teSkKICAgICAgICAgICAgIGlm ICggY3JlZGl0X2NhcCA8IGNyZWRpdF9wZWFrICkKICAgICAgICAgICAgICAgICBjcmVkaXRfcGVh ayA9IGNyZWRpdF9jYXA7CiAKLSAgICAgICAgICAgIC8qIEZJWE1FIC0tIHNldCBjYXAgcGVyLXZj cHUgYXMgd2VsbC4uLj8gKi8KLSAgICAgICAgICAgIGNyZWRpdF9jYXAgPSAoIGNyZWRpdF9jYXAg KyAoIHNkb20tPmFjdGl2ZV92Y3B1X2NvdW50IC0gMSApCi0gICAgICAgICAgICAgICAgICAgICAg ICAgKSAvIHNkb20tPmFjdGl2ZV92Y3B1X2NvdW50OworICAgICAgICAgICAgLyogRklYTUUgLS0g c2V0IGNhcCBwZXItaXRlbSBhcyB3ZWxsLi4uPyAqLworICAgICAgICAgICAgY3JlZGl0X2NhcCA9 ICggY3JlZGl0X2NhcCArICggc2RvbS0+YWN0aXZlX2l0ZW1fY291bnQgLSAxICkKKyAgICAgICAg ICAgICAgICAgICAgICAgICApIC8gc2RvbS0+YWN0aXZlX2l0ZW1fY291bnQ7CiAgICAgICAgIH0K IAogICAgICAgICBjcmVkaXRfZmFpciA9ICggKCBjcmVkaXRfdG90YWwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgKiBzZG9tLT53ZWlnaHQKLSAgICAgICAgICAgICAgICAgICAgICAgICAgKiBz ZG9tLT5hY3RpdmVfdmNwdV9jb3VudCApCisgICAgICAgICAgICAgICAgICAgICAgICAgICogc2Rv bS0+YWN0aXZlX2l0ZW1fY291bnQgKQogICAgICAgICAgICAgICAgICAgICAgICAgKyAod2VpZ2h0 X3RvdGFsIC0gMSkKICAgICAgICAgICAgICAgICAgICAgICApIC8gd2VpZ2h0X3RvdGFsOwogCkBA IC0xNTAyLDE0ICsxNTAyLDE0IEBAIGNzY2hlZF9hY2N0KHZvaWQqIGR1bW15KQogICAgICAgICAg ICAgY3JlZGl0X2ZhaXIgPSBjcmVkaXRfcGVhazsKICAgICAgICAgfQogCi0gICAgICAgIC8qIENv bXB1dGUgZmFpciBzaGFyZSBwZXIgVkNQVSAqLwotICAgICAgICBjcmVkaXRfZmFpciA9ICggY3Jl ZGl0X2ZhaXIgKyAoIHNkb20tPmFjdGl2ZV92Y3B1X2NvdW50IC0gMSApCi0gICAgICAgICAgICAg ICAgICAgICAgKSAvIHNkb20tPmFjdGl2ZV92Y3B1X2NvdW50OworICAgICAgICAvKiBDb21wdXRl IGZhaXIgc2hhcmUgcGVyIElURU0gKi8KKyAgICAgICAgY3JlZGl0X2ZhaXIgPSAoIGNyZWRpdF9m YWlyICsgKCBzZG9tLT5hY3RpdmVfaXRlbV9jb3VudCAtIDEgKQorICAgICAgICAgICAgICAgICAg ICAgICkgLyBzZG9tLT5hY3RpdmVfaXRlbV9jb3VudDsKIAogCi0gICAgICAgIGxpc3RfZm9yX2Vh Y2hfc2FmZSggaXRlcl92Y3B1LCBuZXh0X3ZjcHUsICZzZG9tLT5hY3RpdmVfdmNwdSApCisgICAg ICAgIGxpc3RfZm9yX2VhY2hfc2FmZSggaXRlcl9pdGVtLCBuZXh0X2l0ZW0sICZzZG9tLT5hY3Rp dmVfaXRlbSApCiAgICAgICAgIHsKLSAgICAgICAgICAgIHN2YyA9IGxpc3RfZW50cnkoaXRlcl92 Y3B1LCBzdHJ1Y3QgY3NjaGVkX2l0ZW0sIGFjdGl2ZV92Y3B1X2VsZW0pOworICAgICAgICAgICAg c3ZjID0gbGlzdF9lbnRyeShpdGVyX2l0ZW0sIHN0cnVjdCBjc2NoZWRfaXRlbSwgYWN0aXZlX2l0 ZW1fZWxlbSk7CiAgICAgICAgICAgICBCVUdfT04oIHNkb20gIT0gc3ZjLT5zZG9tICk7CiAKICAg ICAgICAgICAgIC8qIEluY3JlbWVudCBjcmVkaXQgKi8KQEAgLTE1MTcsMjAgKzE1MTcsMjAgQEAg Y3NjaGVkX2FjY3Qodm9pZCogZHVtbXkpCiAgICAgICAgICAgICBjcmVkaXQgPSBhdG9taWNfcmVh ZCgmc3ZjLT5jcmVkaXQpOwogCiAgICAgICAgICAgICAvKgotICAgICAgICAgICAgICogUmVjb21w dXRlIHByaW9yaXR5IG9yLCBpZiBWQ1BVIGlzIGlkbGluZywgcmVtb3ZlIGl0IGZyb20KKyAgICAg ICAgICAgICAqIFJlY29tcHV0ZSBwcmlvcml0eSBvciwgaWYgSVRFTSBpcyBpZGxpbmcsIHJlbW92 ZSBpdCBmcm9tCiAgICAgICAgICAgICAgKiB0aGUgYWN0aXZlIGxpc3QuCiAgICAgICAgICAgICAg Ki8KICAgICAgICAgICAgIGlmICggY3JlZGl0IDwgMCApCiAgICAgICAgICAgICB7CiAgICAgICAg ICAgICAgICAgc3ZjLT5wcmkgPSBDU0NIRURfUFJJX1RTX09WRVI7CiAKLSAgICAgICAgICAgICAg ICAvKiBQYXJrIHJ1bm5pbmcgVkNQVXMgb2YgY2FwcGVkLW91dCBkb21haW5zICovCisgICAgICAg ICAgICAgICAgLyogUGFyayBydW5uaW5nIElURU1zIG9mIGNhcHBlZC1vdXQgZG9tYWlucyAqLwog ICAgICAgICAgICAgICAgIGlmICggc2RvbS0+Y2FwICE9IDBVICYmCiAgICAgICAgICAgICAgICAg ICAgICBjcmVkaXQgPCAtY3JlZGl0X2NhcCAmJgotICAgICAgICAgICAgICAgICAgICAgIXRlc3Rf YW5kX3NldF9iaXQoQ1NDSEVEX0ZMQUdfVkNQVV9QQVJLRUQsICZzdmMtPmZsYWdzKSApCisgICAg ICAgICAgICAgICAgICAgICAhdGVzdF9hbmRfc2V0X2JpdChDU0NIRURfRkxBR19JVEVNX1BBUktF RCwgJnN2Yy0+ZmxhZ3MpICkKICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAg IFNDSEVEX1NUQVRfQ1JBTksoaXRlbV9wYXJrKTsKLSAgICAgICAgICAgICAgICAgICAgdmNwdV9w YXVzZV9ub3N5bmMoc3ZjLT52Y3B1KTsKKyAgICAgICAgICAgICAgICAgICAgdmNwdV9wYXVzZV9u b3N5bmMoc3ZjLT5pdGVtLT52Y3B1KTsKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAg ICAgICAvKiBMb3dlciBib3VuZCBvbiBjcmVkaXRzICovCkBAIC0xNTQ2LDIxICsxNTQ2LDIxIEBA IGNzY2hlZF9hY2N0KHZvaWQqIGR1bW15KQogICAgICAgICAgICAgICAgIHN2Yy0+cHJpID0gQ1ND SEVEX1BSSV9UU19VTkRFUjsKIAogICAgICAgICAgICAgICAgIC8qIFVucGFyayBhbnkgY2FwcGVk IGRvbWFpbnMgd2hvc2UgY3JlZGl0cyBnbyBwb3NpdGl2ZSAqLwotICAgICAgICAgICAgICAgIGlm ICggdGVzdF9hbmRfY2xlYXJfYml0KENTQ0hFRF9GTEFHX1ZDUFVfUEFSS0VELCAmc3ZjLT5mbGFn cykgKQorICAgICAgICAgICAgICAgIGlmICggdGVzdF9hbmRfY2xlYXJfYml0KENTQ0hFRF9GTEFH X0lURU1fUEFSS0VELCAmc3ZjLT5mbGFncykgKQogICAgICAgICAgICAgICAgIHsKICAgICAgICAg ICAgICAgICAgICAgLyoKICAgICAgICAgICAgICAgICAgICAgICogSXQncyBpbXBvcnRhbnQgdG8g dW5zZXQgdGhlIGZsYWcgQUZURVIgdGhlIHVucGF1c2UoKQotICAgICAgICAgICAgICAgICAgICAg KiBjYWxsIHRvIG1ha2Ugc3VyZSB0aGUgVkNQVSdzIHByaW9yaXR5IGlzIG5vdCBib29zdGVkCisg ICAgICAgICAgICAgICAgICAgICAqIGNhbGwgdG8gbWFrZSBzdXJlIHRoZSBJVEVNJ3MgcHJpb3Jp dHkgaXMgbm90IGJvb3N0ZWQKICAgICAgICAgICAgICAgICAgICAgICogaWYgaXQgaXMgd29rZW4g dXAgaGVyZS4KICAgICAgICAgICAgICAgICAgICAgICovCiAgICAgICAgICAgICAgICAgICAgIFND SEVEX1NUQVRfQ1JBTksoaXRlbV91bnBhcmspOwotICAgICAgICAgICAgICAgICAgICB2Y3B1X3Vu cGF1c2Uoc3ZjLT52Y3B1KTsKKyAgICAgICAgICAgICAgICAgICAgdmNwdV91bnBhdXNlKHN2Yy0+ aXRlbS0+dmNwdSk7CiAgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgLyogVXBw ZXIgYm91bmQgb24gY3JlZGl0cyBtZWFucyBWQ1BVIHN0b3BzIGVhcm5pbmcgKi8KKyAgICAgICAg ICAgICAgICAvKiBVcHBlciBib3VuZCBvbiBjcmVkaXRzIG1lYW5zIElURU0gc3RvcHMgZWFybmlu ZyAqLwogICAgICAgICAgICAgICAgIGlmICggY3JlZGl0ID4gcHJ2LT5jcmVkaXRzX3Blcl90c2xp Y2UgKQogICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgX19jc2NoZWRfdmNw dV9hY2N0X3N0b3BfbG9ja2VkKHBydiwgc3ZjKTsKKyAgICAgICAgICAgICAgICAgICAgX19jc2No ZWRfaXRlbV9hY2N0X3N0b3BfbG9ja2VkKHBydiwgc3ZjKTsKICAgICAgICAgICAgICAgICAgICAg LyogRGl2aWRlIGNyZWRpdHMgaW4gaGFsZiwgc28gdGhhdCB3aGVuIGl0IHN0YXJ0cwogICAgICAg ICAgICAgICAgICAgICAgKiBhY2NvdW50aW5nIGFnYWluLCBpdCBzdGFydHMgYSBsaXR0bGUgYml0 ICJhaGVhZCIgKi8KICAgICAgICAgICAgICAgICAgICAgY3JlZGl0IC89IDI7CkBAIC0xNTY4LDgg KzE1NjgsOCBAQCBjc2NoZWRfYWNjdCh2b2lkKiBkdW1teSkKICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIFNDSEVEX1ZDUFVfU1RBVF9TRVQoc3ZjLCBjcmVk aXRfbGFzdCwgY3JlZGl0KTsKLSAgICAgICAgICAgIFNDSEVEX1ZDUFVfU1RBVF9TRVQoc3ZjLCBj cmVkaXRfaW5jciwgY3JlZGl0X2ZhaXIpOworICAgICAgICAgICAgU0NIRURfSVRFTV9TVEFUX1NF VChzdmMsIGNyZWRpdF9sYXN0LCBjcmVkaXQpOworICAgICAgICAgICAgU0NIRURfSVRFTV9TVEFU X1NFVChzdmMsIGNyZWRpdF9pbmNyLCBjcmVkaXRfZmFpcik7CiAgICAgICAgICAgICBjcmVkaXRf YmFsYW5jZSArPSBjcmVkaXQ7CiAgICAgICAgIH0KICAgICB9CkBAIC0xNTk1LDEwICsxNTk1LDEw IEBAIGNzY2hlZF90aWNrKHZvaWQgKl9jcHUpCiAgICAgc3BjLT50aWNrKys7CiAKICAgICAvKgot ICAgICAqIEFjY291bnRpbmcgZm9yIHJ1bm5pbmcgVkNQVQorICAgICAqIEFjY291bnRpbmcgZm9y IHJ1bm5pbmcgSVRFTQogICAgICAqLwotICAgIGlmICggIWlzX2lkbGVfdmNwdShjdXJyZW50KSAp Ci0gICAgICAgIGNzY2hlZF92Y3B1X2FjY3QocHJ2LCBjcHUpOworICAgIGlmICggIWlzX2lkbGVf aXRlbShjdXJyZW50LT5zY2hlZF9pdGVtKSApCisgICAgICAgIGNzY2hlZF9pdGVtX2FjY3QocHJ2 LCBjcHUpOwogCiAgICAgLyoKICAgICAgKiBDaGVjayBpZiBydW5xIG5lZWRzIHRvIGJlIHNvcnRl ZApAQCAtMTYxOSw3ICsxNjE5LDcgQEAgY3NjaGVkX3J1bnFfc3RlYWwoaW50IHBlZXJfY3B1LCBp bnQgY3B1LCBpbnQgcHJpLCBpbnQgYmFsYW5jZV9zdGVwKQogICAgIGNvbnN0IHN0cnVjdCBjc2No ZWRfcGNwdSAqIGNvbnN0IHBlZXJfcGNwdSA9IENTQ0hFRF9QQ1BVKHBlZXJfY3B1KTsKICAgICBz dHJ1Y3QgY3NjaGVkX2l0ZW0gKnNwZWVyOwogICAgIHN0cnVjdCBsaXN0X2hlYWQgKml0ZXI7Ci0g ICAgc3RydWN0IHZjcHUgKnZjOworICAgIHN0cnVjdCBzY2hlZF9pdGVtICppdGVtOwogCiAgICAg QVNTRVJUKHBlZXJfcGNwdSAhPSBOVUxMKTsKIApAQCAtMTYyNyw3ICsxNjI3LDcgQEAgY3NjaGVk X3J1bnFfc3RlYWwoaW50IHBlZXJfY3B1LCBpbnQgY3B1LCBpbnQgcHJpLCBpbnQgYmFsYW5jZV9z dGVwKQogICAgICAqIERvbid0IHN0ZWFsIGZyb20gYW4gaWRsZSBDUFUncyBydW5xIGJlY2F1c2Ug aXQncyBhYm91dCB0bwogICAgICAqIHBpY2sgdXAgd29yayBmcm9tIGl0IGl0c2VsZi4KICAgICAg Ki8KLSAgICBpZiAoIHVubGlrZWx5KGlzX2lkbGVfdmNwdShjdXJyX29uX2NwdShwZWVyX2NwdSkt PnZjcHUpKSApCisgICAgaWYgKCB1bmxpa2VseShpc19pZGxlX2l0ZW0oY3Vycl9vbl9jcHUocGVl cl9jcHUpKSkgKQogICAgICAgICBnb3RvIG91dDsKIAogICAgIGxpc3RfZm9yX2VhY2goIGl0ZXIs ICZwZWVyX3BjcHUtPnJ1bnEgKQpAQCAtMTYzNSw0NSArMTYzNSw0NCBAQCBjc2NoZWRfcnVucV9z dGVhbChpbnQgcGVlcl9jcHUsIGludCBjcHUsIGludCBwcmksIGludCBiYWxhbmNlX3N0ZXApCiAg ICAgICAgIHNwZWVyID0gX19ydW5xX2VsZW0oaXRlcik7CiAKICAgICAgICAgLyoKLSAgICAgICAg ICogSWYgbmV4dCBhdmFpbGFibGUgVkNQVSBoZXJlIGlzIG5vdCBvZiBzdHJpY3RseSBoaWdoZXIK KyAgICAgICAgICogSWYgbmV4dCBhdmFpbGFibGUgSVRFTSBoZXJlIGlzIG5vdCBvZiBzdHJpY3Rs eSBoaWdoZXIKICAgICAgICAgICogcHJpb3JpdHkgdGhhbiBvdXJzLCB0aGlzIFBDUFUgaXMgdXNl bGVzcyB0byB1cy4KICAgICAgICAgICovCiAgICAgICAgIGlmICggc3BlZXItPnByaSA8PSBwcmkg KQogICAgICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAgLyogSXMgdGhpcyBWQ1BVIHJ1bm5hYmxl IG9uIG91ciBQQ1BVPyAqLwotICAgICAgICB2YyA9IHNwZWVyLT52Y3B1OwotICAgICAgICBCVUdf T04oIGlzX2lkbGVfdmNwdSh2YykgKTsKKyAgICAgICAgLyogSXMgdGhpcyBJVEVNIHJ1bm5hYmxl IG9uIG91ciBQQ1BVPyAqLworICAgICAgICBpdGVtID0gc3BlZXItPml0ZW07CisgICAgICAgIEJV R19PTiggaXNfaWRsZV9pdGVtKGl0ZW0pICk7CiAKICAgICAgICAgLyoKLSAgICAgICAgICogSWYg dGhlIHZjcHUgaXMgc3RpbGwgaW4gcGVlcl9jcHUncyBzY2hlZHVsaW5nIHRhaWwsIG9yIGlmIGl0 CisgICAgICAgICAqIElmIHRoZSBpdGVtIGlzIHN0aWxsIGluIHBlZXJfY3B1J3Mgc2NoZWR1bGlu ZyB0YWlsLCBvciBpZiBpdAogICAgICAgICAgKiBoYXMgbm8gdXNlZnVsIHNvZnQgYWZmaW5pdHks IHNraXAgaXQuCiAgICAgICAgICAqCiAgICAgICAgICAqIEluIGZhY3QsIHdoYXQgd2Ugd2FudCBp cyB0byBjaGVjayBpZiB3ZSBoYXZlIGFueSAic29mdC1hZmZpbmUKICAgICAgICAgICogd29yayIg dG8gc3RlYWwsIGJlZm9yZSBzdGFydGluZyB0byBsb29rIGF0ICJoYXJkLWFmZmluZSB3b3JrIi4K ICAgICAgICAgICoKLSAgICAgICAgICogTm90aWNlIHRoYXQsIGlmIG5vdCBldmVuIG9uZSB2Q1BV IG9uIHRoaXMgcnVucSBoYXMgYSB1c2VmdWwKKyAgICAgICAgICogTm90aWNlIHRoYXQsIGlmIG5v dCBldmVuIG9uZSBpdGVtIG9uIHRoaXMgcnVucSBoYXMgYSB1c2VmdWwKICAgICAgICAgICogc29m dCBhZmZpbml0eSwgd2UgY291bGQgaGF2ZSBhdm9pZCBjb25zaWRlcmluZyB0aGlzIHJ1bnEgZm9y CiAgICAgICAgICAqIGEgc29mdCBiYWxhbmNpbmcgc3RlcCBpbiB0aGUgZmlyc3QgcGxhY2UuIFRo aXMsIGZvciBpbnN0YW5jZSwKICAgICAgICAgICogY2FuIGJlIGltcGxlbWVudGVkIGJ5IHRha2lu ZyBub3RlIG9mIG9uIHdoYXQgcnVucSB0aGVyZSBhcmUKLSAgICAgICAgICogdkNQVXMgd2l0aCB1 c2VmdWwgc29mdCBhZmZpbml0aWVzIGluIHNvbWUgc29ydCBvZiBiaXRtYXAKKyAgICAgICAgICog aXRlbXMgd2l0aCB1c2VmdWwgc29mdCBhZmZpbml0aWVzIGluIHNvbWUgc29ydCBvZiBiaXRtYXAK ICAgICAgICAgICogb3IgY291bnRlci4KICAgICAgICAgICovCi0gICAgICAgIGlmICggdmNwdV9y dW5uaW5nKHZjKSB8fCAoYmFsYW5jZV9zdGVwID09IEJBTEFOQ0VfU09GVF9BRkZJTklUWSAmJgot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICFoYXNfc29mdF9hZmZpbml0eSh2Yy0+ c2NoZWRfaXRlbSkpICkKKyAgICAgICAgaWYgKCBpdGVtLT5pc19ydW5uaW5nIHx8IChiYWxhbmNl X3N0ZXAgPT0gQkFMQU5DRV9TT0ZUX0FGRklOSVRZICYmCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIWhhc19zb2Z0X2FmZmluaXR5KGl0ZW0pKSApCiAgICAgICAgICAgICBjb250 aW51ZTsKIAotICAgICAgICBhZmZpbml0eV9iYWxhbmNlX2NwdW1hc2sodmMtPnNjaGVkX2l0ZW0s IGJhbGFuY2Vfc3RlcCwgY3B1bWFza19zY3JhdGNoKTsKLSAgICAgICAgaWYgKCBfX2NzY2hlZF92 Y3B1X2lzX21pZ3JhdGVhYmxlKHBydiwgdmMsIGNwdSwgY3B1bWFza19zY3JhdGNoKSApCisgICAg ICAgIGFmZmluaXR5X2JhbGFuY2VfY3B1bWFzayhpdGVtLCBiYWxhbmNlX3N0ZXAsIGNwdW1hc2tf c2NyYXRjaCk7CisgICAgICAgIGlmICggX19jc2NoZWRfaXRlbV9pc19taWdyYXRlYWJsZShwcnYs IGl0ZW0sIGNwdSwgY3B1bWFza19zY3JhdGNoKSApCiAgICAgICAgIHsKICAgICAgICAgICAgIC8q IFdlIGdvdCBhIGNhbmRpZGF0ZS4gR3JhYiBpdCEgKi8KLSAgICAgICAgICAgIFRSQUNFXzNEKFRS Q19DU0NIRURfU1RPTEVOX1ZDUFUsIHBlZXJfY3B1LAotICAgICAgICAgICAgICAgICAgICAgdmMt PmRvbWFpbi0+ZG9tYWluX2lkLCB2Yy0+dmNwdV9pZCk7Ci0gICAgICAgICAgICBTQ0hFRF9WQ1BV X1NUQVRfQ1JBTksoc3BlZXIsIG1pZ3JhdGVfcSk7CisgICAgICAgICAgICBUUkFDRV8zRChUUkNf Q1NDSEVEX1NUT0xFTl9JVEVNLCBwZWVyX2NwdSwKKyAgICAgICAgICAgICAgICAgICAgIGl0ZW0t PmRvbWFpbi0+ZG9tYWluX2lkLCBpdGVtLT5pdGVtX2lkKTsKKyAgICAgICAgICAgIFNDSEVEX0lU RU1fU1RBVF9DUkFOSyhzcGVlciwgbWlncmF0ZV9xKTsKICAgICAgICAgICAgIFNDSEVEX1NUQVRf Q1JBTksobWlncmF0ZV9xdWV1ZWQpOwotICAgICAgICAgICAgV0FSTl9PTih2Yy0+aXNfdXJnZW50 KTsKICAgICAgICAgICAgIHJ1bnFfcmVtb3ZlKHNwZWVyKTsKLSAgICAgICAgICAgIHNjaGVkX3Nl dF9yZXModmMtPnNjaGVkX2l0ZW0sIHBlcl9jcHUoc2NoZWRfcmVzLCBjcHUpKTsKKyAgICAgICAg ICAgIHNjaGVkX3NldF9yZXMoaXRlbSwgcGVyX2NwdShzY2hlZF9yZXMsIGNwdSkpOwogICAgICAg ICAgICAgLyoKICAgICAgICAgICAgICAqIHNwZWVyIHdpbGwgc3RhcnQgZXhlY3V0aW5nIGRpcmVj dGx5IG9uIGNwdSwgd2l0aG91dCBoYXZpbmcgdG8KICAgICAgICAgICAgICAqIGdvIHRocm91Z2gg cnVucV9pbnNlcnQoKS4gU28gd2UgbXVzdCB1cGRhdGUgdGhlIHJ1bm5hYmxlIGNvdW50CkBAIC0x Njk5LDcgKzE2OTgsNyBAQCBjc2NoZWRfbG9hZF9iYWxhbmNlKHN0cnVjdCBjc2NoZWRfcHJpdmF0 ZSAqcHJ2LCBpbnQgY3B1LAogICAgIGludCBwZWVyX2NwdSwgZmlyc3RfY3B1LCBwZWVyX25vZGUs IGJzdGVwOwogICAgIGludCBub2RlID0gY3B1X3RvX25vZGUoY3B1KTsKIAotICAgIEJVR19PTigg Y3B1ICE9IHNuZXh0LT52Y3B1LT5wcm9jZXNzb3IgKTsKKyAgICBCVUdfT04oIGNwdSAhPSBzY2hl ZF9pdGVtX2NwdShzbmV4dC0+aXRlbSkgKTsKICAgICBvbmxpbmUgPSBjcHVwb29sX29ubGluZV9j cHVtYXNrKGMpOwogCiAgICAgLyoKQEAgLTE3MjgsNyArMTcyNyw3IEBAIGNzY2hlZF9sb2FkX2Jh bGFuY2Uoc3RydWN0IGNzY2hlZF9wcml2YXRlICpwcnYsIGludCBjcHUsCiAgICAgICAgIC8qCiAg ICAgICAgICAqIFdlIHBlZWsgYXQgdGhlIG5vbi1pZGxpbmcgQ1BVcyBpbiBhIG5vZGUtd2lzZSBm YXNoaW9uLiBJbiBmYWN0LAogICAgICAgICAgKiBpdCBpcyBtb3JlIGxpa2VseSB0aGF0IHdlIGZp bmQgc29tZSBhZmZpbmUgd29yayBvbiBvdXIgc2FtZQotICAgICAgICAgKiBub2RlLCBub3QgdG8g bWVudGlvbiB0aGF0IG1pZ3JhdGluZyB2Y3B1cyB3aXRoaW4gdGhlIHNhbWUgbm9kZQorICAgICAg ICAgKiBub2RlLCBub3QgdG8gbWVudGlvbiB0aGF0IG1pZ3JhdGluZyBpdGVtcyB3aXRoaW4gdGhl IHNhbWUgbm9kZQogICAgICAgICAgKiBjb3VsZCB3ZWxsIGV4cGVjdGVkIHRvIGJlIGNoZWFwZXIg dGhhbiBhY3Jvc3Mtbm9kZXMgKG1lbW9yeQogICAgICAgICAgKiBzdGF5cyBsb2NhbCwgdGhlcmUg bWlnaHQgYmUgc29tZSBub2RlLXdpZGUgY2FjaGVbc10sIGV0Yy4pLgogICAgICAgICAgKi8KQEAg LTE3NDksNyArMTc0OCw3IEBAIGNzY2hlZF9sb2FkX2JhbGFuY2Uoc3RydWN0IGNzY2hlZF9wcml2 YXRlICpwcnYsIGludCBjcHUsCiAgICAgICAgICAgICAgICAgc3BpbmxvY2tfdCAqbG9jazsKIAog ICAgICAgICAgICAgICAgIC8qCi0gICAgICAgICAgICAgICAgICogSWYgdGhlcmUgaXMgb25seSBv bmUgcnVubmFibGUgdkNQVSBvbiBwZWVyX2NwdSwgaXQgbWVhbnMKKyAgICAgICAgICAgICAgICAg KiBJZiB0aGVyZSBpcyBvbmx5IG9uZSBydW5uYWJsZSBpdGVtIG9uIHBlZXJfY3B1LCBpdCBtZWFu cwogICAgICAgICAgICAgICAgICAqIHRoZXJlJ3Mgbm8gb25lIHRvIGJlIHN0b2xlbiBpbiBpdHMg cnVucXVldWUsIHNvIHNraXAgaXQuCiAgICAgICAgICAgICAgICAgICoKICAgICAgICAgICAgICAg ICAgKiBDaGVja2luZyB0aGlzIHdpdGhvdXQgaG9sZGluZyB0aGUgbG9jayBpcyByYWN5Li4uIEJ1 dCB0aGF0J3MKQEAgLTE3NjIsMTMgKzE3NjEsMTMgQEAgY3NjaGVkX2xvYWRfYmFsYW5jZShzdHJ1 Y3QgY3NjaGVkX3ByaXZhdGUgKnBydiwgaW50IGNwdSwKICAgICAgICAgICAgICAgICAgKiAgIEFu ZCB3ZSBjYW4gYXZvaWQgdGhhdCBieSByZS1jaGVja2luZyBucl9ydW5uYWJsZSBhZnRlcgogICAg ICAgICAgICAgICAgICAqICAgaGF2aW5nIGdyYWJiZWQgdGhlIGxvY2ssIGlmIHdlIHdhbnQ7CiAg ICAgICAgICAgICAgICAgICogLSBpZiB3ZSByYWNlIHdpdGggaW5jX25yX3J1bm5hYmxlKCksIHdl IHNraXAgYSBwQ1BVIHRoYXQgbWF5Ci0gICAgICAgICAgICAgICAgICogICBoYXZlIHJ1bm5hYmxl IHZDUFVzIGluIGl0cyBydW5xdWV1ZSwgYnV0IHRoYXQncyBub3QgYQorICAgICAgICAgICAgICAg ICAqICAgaGF2ZSBydW5uYWJsZSBpdGVtcyBpbiBpdHMgcnVucXVldWUsIGJ1dCB0aGF0J3Mgbm90 IGEKICAgICAgICAgICAgICAgICAgKiAgIHByb2JsZW0gYmVjYXVzZToKICAgICAgICAgICAgICAg ICAgKiAgICsgaWYgcmFjaW5nIHdpdGggY3NjaGVkX2l0ZW1faW5zZXJ0KCkgb3IgY3NjaGVkX2l0 ZW1fd2FrZSgpLAotICAgICAgICAgICAgICAgICAqICAgICBfX3J1bnFfdGlja2xlKCkgd2lsbCBi ZSBjYWxsZWQgYWZ0ZXJ3b3Jkcywgc28gdGhlIHZDUFUKKyAgICAgICAgICAgICAgICAgKiAgICAg X19ydW5xX3RpY2tsZSgpIHdpbGwgYmUgY2FsbGVkIGFmdGVyd29yZHMsIHNvIHRoZSBpdGVtCiAg ICAgICAgICAgICAgICAgICogICAgIHdvbid0IGdldCBzdHVjayBpbiB0aGUgcnVucXVldWUgZm9y IHRvbyBsb25nOwotICAgICAgICAgICAgICAgICAqICAgKyBpZiByYWNpbmcgd2l0aCBjc2NoZWRf cnVucV9zdGVhbCgpLCBpdCBtYXkgYmUgdGhhdCBhCi0gICAgICAgICAgICAgICAgICogICAgIHZD UFUgdGhhdCB3ZSBjb3VsZCBoYXZlIHBpY2tlZCB1cCwgc3RheXMgaW4gYSBydW5xdWV1ZQorICAg ICAgICAgICAgICAgICAqICAgKyBpZiByYWNpbmcgd2l0aCBjc2NoZWRfcnVucV9zdGVhbCgpLCBp dCBtYXkgYmUgdGhhdCBhbgorICAgICAgICAgICAgICAgICAqICAgICBpdGVtIHRoYXQgd2UgY291 bGQgaGF2ZSBwaWNrZWQgdXAsIHN0YXlzIGluIGEgcnVucXVldWUKICAgICAgICAgICAgICAgICAg KiAgICAgdW50aWwgc29tZW9uZSBlbHNlIHRyaWVzIHRvIHN0ZWFsIGl0IGFnYWluLiBCdXQgdGhp cyBpcwogICAgICAgICAgICAgICAgICAqICAgICBubyB3b3JzZSB0aGFuIHdoYXQgY2FuIGhhcHBl biBhbHJlYWR5ICh3aXRob3V0IHRoaXMKICAgICAgICAgICAgICAgICAgKiAgICAgb3B0aW1pemF0 aW9uKSwgaXQgdGhlIHBDUFUgd291bGQgc2NoZWR1bGUgcmlnaHQgYWZ0ZXIgd2UKQEAgLTE4MDMs NyArMTgwMiw3IEBAIGNzY2hlZF9sb2FkX2JhbGFuY2Uoc3RydWN0IGNzY2hlZF9wcml2YXRlICpw cnYsIGludCBjcHUsCiAgICAgICAgICAgICAgICAgICAgIGNzY2hlZF9ydW5xX3N0ZWFsKHBlZXJf Y3B1LCBjcHUsIHNuZXh0LT5wcmksIGJzdGVwKSA6IE5VTEw7CiAgICAgICAgICAgICAgICAgcGNw dV9zY2hlZHVsZV91bmxvY2sobG9jaywgcGVlcl9jcHUpOwogCi0gICAgICAgICAgICAgICAgLyog QXMgc29vbiBhcyBvbmUgdmNwdSBpcyBmb3VuZCwgYmFsYW5jaW5nIGVuZHMgKi8KKyAgICAgICAg ICAgICAgICAvKiBBcyBzb29uIGFzIG9uZSBpdGVtIGlzIGZvdW5kLCBiYWxhbmNpbmcgZW5kcyAq LwogICAgICAgICAgICAgICAgIGlmICggc3BlZXIgIT0gTlVMTCApCiAgICAgICAgICAgICAgICAg ewogICAgICAgICAgICAgICAgICAgICAqc3RvbGVuID0gMTsKQEAgLTE4NDIsMTQgKzE4NDEsMTUg QEAgY3NjaGVkX3NjaGVkdWxlKAogewogICAgIGNvbnN0IGludCBjcHUgPSBzbXBfcHJvY2Vzc29y X2lkKCk7CiAgICAgc3RydWN0IGxpc3RfaGVhZCAqIGNvbnN0IHJ1bnEgPSBSVU5RKGNwdSk7Ci0g ICAgc3RydWN0IGNzY2hlZF9pdGVtICogY29uc3Qgc2N1cnIgPSBDU0NIRURfSVRFTShjdXJyZW50 LT5zY2hlZF9pdGVtKTsKKyAgICBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSA9IGN1cnJlbnQtPnNj aGVkX2l0ZW07CisgICAgc3RydWN0IGNzY2hlZF9pdGVtICogY29uc3Qgc2N1cnIgPSBDU0NIRURf SVRFTShpdGVtKTsKICAgICBzdHJ1Y3QgY3NjaGVkX3ByaXZhdGUgKnBydiA9IENTQ0hFRF9QUklW KG9wcyk7CiAgICAgc3RydWN0IGNzY2hlZF9pdGVtICpzbmV4dDsKICAgICBzdHJ1Y3QgdGFza19z bGljZSByZXQ7CiAgICAgc190aW1lX3QgcnVudGltZSwgdHNsaWNlOwogCiAgICAgU0NIRURfU1RB VF9DUkFOSyhzY2hlZHVsZSk7Ci0gICAgQ1NDSEVEX1ZDUFVfQ0hFQ0soY3VycmVudCk7CisgICAg Q1NDSEVEX0lURU1fQ0hFQ0soaXRlbSk7CiAKICAgICAvKgogICAgICAqIEhlcmUgaW4gQ3JlZGl0 MSBjb2RlLCB3ZSB1c3VhbGx5IGp1c3QgY2FsbCBUUkFDRV9uRCgpIGhlbHBlcnMsIGFuZApAQCAt MTg2MywzMCArMTg2MywzMCBAQCBjc2NoZWRfc2NoZWR1bGUoCiAgICAgICAgIH0gZDsKICAgICAg ICAgZC5jcHUgPSBjcHU7CiAgICAgICAgIGQudGFza2xldCA9IHRhc2tsZXRfd29ya19zY2hlZHVs ZWQ7Ci0gICAgICAgIGQuaWRsZSA9IGlzX2lkbGVfdmNwdShjdXJyZW50KTsKKyAgICAgICAgZC5p ZGxlID0gaXNfaWRsZV9pdGVtKGl0ZW0pOwogICAgICAgICBfX3RyYWNlX3ZhcihUUkNfQ1NDSEVE X1NDSEVEVUxFLCAxLCBzaXplb2YoZCksCiAgICAgICAgICAgICAgICAgICAgICh1bnNpZ25lZCBj aGFyICopJmQpOwogICAgIH0KIAotICAgIHJ1bnRpbWUgPSBub3cgLSBjdXJyZW50LT5zY2hlZF9p dGVtLT5zdGF0ZV9lbnRyeV90aW1lOworICAgIHJ1bnRpbWUgPSBub3cgLSBpdGVtLT5zdGF0ZV9l bnRyeV90aW1lOwogICAgIGlmICggcnVudGltZSA8IDAgKSAvKiBEb2VzIHRoaXMgZXZlciBoYXBw ZW4/ICovCiAgICAgICAgIHJ1bnRpbWUgPSAwOwogCi0gICAgaWYgKCAhaXNfaWRsZV92Y3B1KHNj dXJyLT52Y3B1KSApCisgICAgaWYgKCAhaXNfaWRsZV9pdGVtKGl0ZW0pICkKICAgICB7Ci0gICAg ICAgIC8qIFVwZGF0ZSBjcmVkaXRzIG9mIGEgbm9uLWlkbGUgVkNQVS4gKi8KKyAgICAgICAgLyog VXBkYXRlIGNyZWRpdHMgb2YgYSBub24taWRsZSBJVEVNLiAqLwogICAgICAgICBidXJuX2NyZWRp dHMoc2N1cnIsIG5vdyk7CiAgICAgICAgIHNjdXJyLT5zdGFydF90aW1lIC09IG5vdzsKICAgICB9 CiAgICAgZWxzZQogICAgIHsKLSAgICAgICAgLyogUmUtaW5zdGF0ZSBhIGJvb3N0ZWQgaWRsZSBW Q1BVIGFzIG5vcm1hbC1pZGxlLiAqLworICAgICAgICAvKiBSZS1pbnN0YXRlIGEgYm9vc3RlZCBp ZGxlIElURU0gYXMgbm9ybWFsLWlkbGUuICovCiAgICAgICAgIHNjdXJyLT5wcmkgPSBDU0NIRURf UFJJX0lETEU7CiAgICAgfQogCiAgICAgLyogQ2hvaWNlcywgY2hvaWNlczoKLSAgICAgKiAtIElm IHdlIGhhdmUgYSB0YXNrbGV0LCB3ZSBuZWVkIHRvIHJ1biB0aGUgaWRsZSB2Y3B1IG5vIG1hdHRl ciB3aGF0LgotICAgICAqIC0gSWYgc2NoZWQgcmF0ZSBsaW1pdGluZyBpcyBpbiBlZmZlY3QsIGFu ZCB0aGUgY3VycmVudCB2Y3B1IGhhcworICAgICAqIC0gSWYgd2UgaGF2ZSBhIHRhc2tsZXQsIHdl IG5lZWQgdG8gcnVuIHRoZSBpZGxlIGl0ZW0gbm8gbWF0dGVyIHdoYXQuCisgICAgICogLSBJZiBz Y2hlZCByYXRlIGxpbWl0aW5nIGlzIGluIGVmZmVjdCwgYW5kIHRoZSBjdXJyZW50IGl0ZW0gaGFz CiAgICAgICogICBydW4gZm9yIGxlc3MgdGhhbiB0aGF0IGFtb3VudCBvZiB0aW1lLCBjb250aW51 ZSB0aGUgY3VycmVudCBvbmUsCiAgICAgICogICBidXQgd2l0aCBhIHNob3J0ZXIgdGltZXNsaWNl IGFuZCByZXR1cm4gaXQgaW1tZWRpYXRlbHkKICAgICAgKiAtIE90aGVyd2lzZSwgY2hvc2UgdGhl IG9uZSB3aXRoIHRoZSBoaWdoZXN0IHByaW9yaXR5ICh3aGljaCBtYXkKQEAgLTE5MDQsMTEgKzE5 MDQsMTEgQEAgY3NjaGVkX3NjaGVkdWxlKAogICAgICAqIEluIGZhY3QsIGl0IG1heSBiZSB0aGUg Y2FzZSB0aGF0IHNjdXJyIGlzIGFib3V0IHRvIHNwaW4sIGFuZCB0aGVyZSdzCiAgICAgICogbm8g cG9pbnQgZm9yY2luZyBpdCB0byBkbyBzbyB1bnRpbCByYXRlIGxpbWl0aW5nIGV4cGlyZXMuCiAg ICAgICovCi0gICAgaWYgKCAhdGVzdF9iaXQoQ1NDSEVEX0ZMQUdfVkNQVV9ZSUVMRCwgJnNjdXJy LT5mbGFncykKKyAgICBpZiAoICF0ZXN0X2JpdChDU0NIRURfRkxBR19JVEVNX1lJRUxELCAmc2N1 cnItPmZsYWdzKQogICAgICAgICAgJiYgIXRhc2tsZXRfd29ya19zY2hlZHVsZWQKICAgICAgICAg ICYmIHBydi0+cmF0ZWxpbWl0Ci0gICAgICAgICAmJiB2Y3B1X3J1bm5hYmxlKGN1cnJlbnQpCi0g ICAgICAgICAmJiAhaXNfaWRsZV92Y3B1KGN1cnJlbnQpCisgICAgICAgICAmJiBpdGVtX3J1bm5h YmxlKGl0ZW0pCisgICAgICAgICAmJiAhaXNfaWRsZV9pdGVtKGl0ZW0pCiAgICAgICAgICAmJiBy dW50aW1lIDwgcHJ2LT5yYXRlbGltaXQgKQogICAgIHsKICAgICAgICAgc25leHQgPSBzY3VycjsK QEAgLTE5MjYsMTEgKzE5MjYsMTEgQEAgY3NjaGVkX3NjaGVkdWxlKAogICAgICAgICBpZiAoIHVu bGlrZWx5KHRiX2luaXRfZG9uZSkgKQogICAgICAgICB7CiAgICAgICAgICAgICBzdHJ1Y3Qgewot ICAgICAgICAgICAgICAgIHVuc2lnbmVkIHZjcHU6MTYsIGRvbToxNjsKKyAgICAgICAgICAgICAg ICB1bnNpZ25lZCBpdGVtOjE2LCBkb206MTY7CiAgICAgICAgICAgICAgICAgdW5zaWduZWQgcnVu dGltZTsKICAgICAgICAgICAgIH0gZDsKLSAgICAgICAgICAgIGQuZG9tID0gc2N1cnItPnZjcHUt PmRvbWFpbi0+ZG9tYWluX2lkOwotICAgICAgICAgICAgZC52Y3B1ID0gc2N1cnItPnZjcHUtPnZj cHVfaWQ7CisgICAgICAgICAgICBkLmRvbSA9IGl0ZW0tPmRvbWFpbi0+ZG9tYWluX2lkOworICAg ICAgICAgICAgZC5pdGVtID0gaXRlbS0+aXRlbV9pZDsKICAgICAgICAgICAgIGQucnVudGltZSA9 IHJ1bnRpbWU7CiAgICAgICAgICAgICBfX3RyYWNlX3ZhcihUUkNfQ1NDSEVEX1JBVEVMSU1JVCwg MSwgc2l6ZW9mKGQpLAogICAgICAgICAgICAgICAgICAgICAgICAgKHVuc2lnbmVkIGNoYXIgKikm ZCk7CkBAIC0xOTQyLDEzICsxOTQyLDEzIEBAIGNzY2hlZF9zY2hlZHVsZSgKICAgICB0c2xpY2Ug PSBwcnYtPnRzbGljZTsKIAogICAgIC8qCi0gICAgICogU2VsZWN0IG5leHQgcnVubmFibGUgbG9j YWwgVkNQVSAoaWUgdG9wIG9mIGxvY2FsIHJ1bnEpCisgICAgICogU2VsZWN0IG5leHQgcnVubmFi bGUgbG9jYWwgSVRFTSAoaWUgdG9wIG9mIGxvY2FsIHJ1bnEpCiAgICAgICovCi0gICAgaWYgKCB2 Y3B1X3J1bm5hYmxlKGN1cnJlbnQpICkKKyAgICBpZiAoIGl0ZW1fcnVubmFibGUoaXRlbSkgKQog ICAgICAgICBfX3J1bnFfaW5zZXJ0KHNjdXJyKTsKICAgICBlbHNlCiAgICAgewotICAgICAgICBC VUdfT04oIGlzX2lkbGVfdmNwdShjdXJyZW50KSB8fCBsaXN0X2VtcHR5KHJ1bnEpICk7CisgICAg ICAgIEJVR19PTiggaXNfaWRsZV9pdGVtKGl0ZW0pIHx8IGxpc3RfZW1wdHkocnVucSkgKTsKICAg ICAgICAgLyogQ3VycmVudCBoYXMgYmxvY2tlZC4gVXBkYXRlIHRoZSBydW5uYWJsZSBjb3VudGVy IGZvciB0aGlzIGNwdS4gKi8KICAgICAgICAgZGVjX25yX3J1bm5hYmxlKGNwdSk7CiAgICAgfQpA QCAtMTk1NiwyMyArMTk1NiwyMyBAQCBjc2NoZWRfc2NoZWR1bGUoCiAgICAgc25leHQgPSBfX3J1 bnFfZWxlbShydW5xLT5uZXh0KTsKICAgICByZXQubWlncmF0ZWQgPSAwOwogCi0gICAgLyogVGFz a2xldCB3b3JrICh3aGljaCBydW5zIGluIGlkbGUgVkNQVSBjb250ZXh0KSBvdmVycmlkZXMgYWxs IGVsc2UuICovCisgICAgLyogVGFza2xldCB3b3JrICh3aGljaCBydW5zIGluIGlkbGUgSVRFTSBj b250ZXh0KSBvdmVycmlkZXMgYWxsIGVsc2UuICovCiAgICAgaWYgKCB0YXNrbGV0X3dvcmtfc2No ZWR1bGVkICkKICAgICB7CiAgICAgICAgIFRSQUNFXzBEKFRSQ19DU0NIRURfU0NIRURfVEFTS0xF VCk7Ci0gICAgICAgIHNuZXh0ID0gQ1NDSEVEX0lURU0oaWRsZV92Y3B1W2NwdV0tPnNjaGVkX2l0 ZW0pOworICAgICAgICBzbmV4dCA9IENTQ0hFRF9JVEVNKHNjaGVkX2lkbGVfaXRlbShjcHUpKTsK ICAgICAgICAgc25leHQtPnByaSA9IENTQ0hFRF9QUklfVFNfQk9PU1Q7CiAgICAgfQogCiAgICAg LyoKICAgICAgKiBDbGVhciBZSUVMRCBmbGFnIGJlZm9yZSBzY2hlZHVsaW5nIG91dAogICAgICAq LwotICAgIGNsZWFyX2JpdChDU0NIRURfRkxBR19WQ1BVX1lJRUxELCAmc2N1cnItPmZsYWdzKTsK KyAgICBjbGVhcl9iaXQoQ1NDSEVEX0ZMQUdfSVRFTV9ZSUVMRCwgJnNjdXJyLT5mbGFncyk7CiAK ICAgICAvKgogICAgICAqIFNNUCBMb2FkIGJhbGFuY2U6CiAgICAgICoKLSAgICAgKiBJZiB0aGUg bmV4dCBoaWdoZXN0IHByaW9yaXR5IGxvY2FsIHJ1bm5hYmxlIFZDUFUgaGFzIGFscmVhZHkgZWF0 ZW4KKyAgICAgKiBJZiB0aGUgbmV4dCBoaWdoZXN0IHByaW9yaXR5IGxvY2FsIHJ1bm5hYmxlIElU RU0gaGFzIGFscmVhZHkgZWF0ZW4KICAgICAgKiB0aHJvdWdoIGl0cyBjcmVkaXRzLCBsb29rIG9u IG90aGVyIFBDUFVzIHRvIHNlZSBpZiB3ZSBoYXZlIG1vcmUKICAgICAgKiB1cmdlbnQgd29yay4u LiBJZiBub3QsIGNzY2hlZF9sb2FkX2JhbGFuY2UoKSB3aWxsIHJldHVybiBzbmV4dCwgYnV0CiAg ICAgICogYWxyZWFkeSByZW1vdmVkIGZyb20gdGhlIHJ1bnEuCkBAIC0xOTk2LDMyICsxOTk2LDMy IEBAIGNzY2hlZF9zY2hlZHVsZSgKICAgICAgICAgY3B1bWFza19jbGVhcl9jcHUoY3B1LCBwcnYt PmlkbGVycyk7CiAgICAgfQogCi0gICAgaWYgKCAhaXNfaWRsZV92Y3B1KHNuZXh0LT52Y3B1KSAp CisgICAgaWYgKCAhaXNfaWRsZV9pdGVtKHNuZXh0LT5pdGVtKSApCiAgICAgICAgIHNuZXh0LT5z dGFydF90aW1lICs9IG5vdzsKIAogb3V0OgogICAgIC8qCiAgICAgICogUmV0dXJuIHRhc2sgdG8g cnVuIG5leHQuLi4KICAgICAgKi8KLSAgICByZXQudGltZSA9IChpc19pZGxlX3ZjcHUoc25leHQt PnZjcHUpID8KKyAgICByZXQudGltZSA9IChpc19pZGxlX2l0ZW0oc25leHQtPml0ZW0pID8KICAg ICAgICAgICAgICAgICAtMSA6IHRzbGljZSk7Ci0gICAgcmV0LnRhc2sgPSBzbmV4dC0+dmNwdS0+ c2NoZWRfaXRlbTsKKyAgICByZXQudGFzayA9IHNuZXh0LT5pdGVtOwogCi0gICAgQ1NDSEVEX1ZD UFVfQ0hFQ0socmV0LnRhc2stPnZjcHUpOworICAgIENTQ0hFRF9JVEVNX0NIRUNLKHJldC50YXNr KTsKICAgICByZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZAotY3NjaGVkX2R1bXBfdmNwdShz dHJ1Y3QgY3NjaGVkX2l0ZW0gKnN2YykKK2NzY2hlZF9kdW1wX2l0ZW0oc3RydWN0IGNzY2hlZF9p dGVtICpzdmMpCiB7CiAgICAgc3RydWN0IGNzY2hlZF9kb20gKiBjb25zdCBzZG9tID0gc3ZjLT5z ZG9tOwogCiAgICAgcHJpbnRrKCJbJWkuJWldIHByaT0laSBmbGFncz0leCBjcHU9JWkiLAotICAg ICAgICAgICAgc3ZjLT52Y3B1LT5kb21haW4tPmRvbWFpbl9pZCwKLSAgICAgICAgICAgIHN2Yy0+ dmNwdS0+dmNwdV9pZCwKKyAgICAgICAgICAgIHN2Yy0+aXRlbS0+ZG9tYWluLT5kb21haW5faWQs CisgICAgICAgICAgICBzdmMtPml0ZW0tPml0ZW1faWQsCiAgICAgICAgICAgICBzdmMtPnByaSwK ICAgICAgICAgICAgIHN2Yy0+ZmxhZ3MsCi0gICAgICAgICAgICBzdmMtPnZjcHUtPnByb2Nlc3Nv cik7CisgICAgICAgICAgICBzY2hlZF9pdGVtX2NwdShzdmMtPml0ZW0pKTsKIAogICAgIGlmICgg c2RvbSApCiAgICAgewpAQCAtMjA1NSw3ICsyMDU1LDcgQEAgY3NjaGVkX2R1bXBfcGNwdShjb25z dCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIGludCBjcHUpCiAKICAgICAvKgogICAgICAqIFdlIG5l ZWQgYm90aCBsb2NrczoKLSAgICAgKiAtIGNzY2hlZF9kdW1wX3ZjcHUoKSB3YW50cyB0byBhY2Nl c3MgZG9tYWlucycgc2NoZWR1bGluZworICAgICAqIC0gY3NjaGVkX2R1bXBfaXRlbSgpIHdhbnRz IHRvIGFjY2VzcyBkb21haW5zJyBzY2hlZHVsaW5nCiAgICAgICogICBwYXJhbWV0ZXJzLCB3aGlj aCBhcmUgcHJvdGVjdGVkIGJ5IHRoZSBwcml2YXRlIHNjaGVkdWxlciBsb2NrOwogICAgICAqIC0g d2Ugc2NhbiB0aHJvdWdoIHRoZSBydW5xdWV1ZSwgc28gd2UgbmVlZCB0aGUgcHJvcGVyIHJ1bnF1 ZXVlCiAgICAgICogICBsb2NrICh0aGUgb25lIG9mIHRoZSBydW5xdWV1ZSBvZiB0aGlzIGNwdSku CkBAIC0yMDcxLDEyICsyMDcxLDEyIEBAIGNzY2hlZF9kdW1wX3BjcHUoY29uc3Qgc3RydWN0IHNj aGVkdWxlciAqb3BzLCBpbnQgY3B1KQogICAgICAgICAgICBucl9jcHVfaWRzLCBjcHVtYXNrX2Jp dHMocGVyX2NwdShjcHVfc2libGluZ19tYXNrLCBjcHUpKSwKICAgICAgICAgICAgbnJfY3B1X2lk cywgY3B1bWFza19iaXRzKHBlcl9jcHUoY3B1X2NvcmVfbWFzaywgY3B1KSkpOwogCi0gICAgLyog Y3VycmVudCBWQ1BVIChub3RoaW5nIHRvIHNheSBpZiB0aGF0J3MgdGhlIGlkbGUgdmNwdSkuICov CisgICAgLyogY3VycmVudCBJVEVNIChub3RoaW5nIHRvIHNheSBpZiB0aGF0J3MgdGhlIGlkbGUg aXRlbSkuICovCiAgICAgc3ZjID0gQ1NDSEVEX0lURU0oY3Vycl9vbl9jcHUoY3B1KSk7Ci0gICAg aWYgKCBzdmMgJiYgIWlzX2lkbGVfdmNwdShzdmMtPnZjcHUpICkKKyAgICBpZiAoIHN2YyAmJiAh aXNfaWRsZV9pdGVtKHN2Yy0+aXRlbSkgKQogICAgIHsKICAgICAgICAgcHJpbnRrKCJcdHJ1bjog Iik7Ci0gICAgICAgIGNzY2hlZF9kdW1wX3ZjcHUoc3ZjKTsKKyAgICAgICAgY3NjaGVkX2R1bXBf aXRlbShzdmMpOwogICAgIH0KIAogICAgIGxvb3AgPSAwOwpAQCAtMjA4Niw3ICsyMDg2LDcgQEAg Y3NjaGVkX2R1bXBfcGNwdShjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIGludCBjcHUpCiAg ICAgICAgIGlmICggc3ZjICkKICAgICAgICAgewogICAgICAgICAgICAgcHJpbnRrKCJcdCUzZDog IiwgKytsb29wKTsKLSAgICAgICAgICAgIGNzY2hlZF9kdW1wX3ZjcHUoc3ZjKTsKKyAgICAgICAg ICAgIGNzY2hlZF9kdW1wX2l0ZW0oc3ZjKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMjEyOCwy OSArMjEyOCwyOSBAQCBjc2NoZWRfZHVtcChjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMpCiAg ICAgICAgICAgIHBydi0+cmF0ZWxpbWl0IC8gTUlDUk9TRUNTKDEpLAogICAgICAgICAgICBDU0NI RURfQ1JFRElUU19QRVJfTVNFQywKICAgICAgICAgICAgcHJ2LT50aWNrc19wZXJfdHNsaWNlLAot ICAgICAgICAgICBwcnYtPnZjcHVfbWlncl9kZWxheS8gTUlDUk9TRUNTKDEpKTsKKyAgICAgICAg ICAgcHJ2LT5pdGVtX21pZ3JfZGVsYXkvIE1JQ1JPU0VDUygxKSk7CiAKICAgICBwcmludGsoImlk bGVyczogJSpwYlxuIiwgbnJfY3B1X2lkcywgY3B1bWFza19iaXRzKHBydi0+aWRsZXJzKSk7CiAK LSAgICBwcmludGsoImFjdGl2ZSB2Y3B1czpcbiIpOworICAgIHByaW50aygiYWN0aXZlIGl0ZW1z OlxuIik7CiAgICAgbG9vcCA9IDA7CiAgICAgbGlzdF9mb3JfZWFjaCggaXRlcl9zZG9tLCAmcHJ2 LT5hY3RpdmVfc2RvbSApCiAgICAgewogICAgICAgICBzdHJ1Y3QgY3NjaGVkX2RvbSAqc2RvbTsK ICAgICAgICAgc2RvbSA9IGxpc3RfZW50cnkoaXRlcl9zZG9tLCBzdHJ1Y3QgY3NjaGVkX2RvbSwg YWN0aXZlX3Nkb21fZWxlbSk7CiAKLSAgICAgICAgbGlzdF9mb3JfZWFjaCggaXRlcl9zdmMsICZz ZG9tLT5hY3RpdmVfdmNwdSApCisgICAgICAgIGxpc3RfZm9yX2VhY2goIGl0ZXJfc3ZjLCAmc2Rv bS0+YWN0aXZlX2l0ZW0gKQogICAgICAgICB7CiAgICAgICAgICAgICBzdHJ1Y3QgY3NjaGVkX2l0 ZW0gKnN2YzsKICAgICAgICAgICAgIHNwaW5sb2NrX3QgKmxvY2s7CiAKLSAgICAgICAgICAgIHN2 YyA9IGxpc3RfZW50cnkoaXRlcl9zdmMsIHN0cnVjdCBjc2NoZWRfaXRlbSwgYWN0aXZlX3ZjcHVf ZWxlbSk7Ci0gICAgICAgICAgICBsb2NrID0gaXRlbV9zY2hlZHVsZV9sb2NrKHN2Yy0+dmNwdS0+ c2NoZWRfaXRlbSk7CisgICAgICAgICAgICBzdmMgPSBsaXN0X2VudHJ5KGl0ZXJfc3ZjLCBzdHJ1 Y3QgY3NjaGVkX2l0ZW0sIGFjdGl2ZV9pdGVtX2VsZW0pOworICAgICAgICAgICAgbG9jayA9IGl0 ZW1fc2NoZWR1bGVfbG9jayhzdmMtPml0ZW0pOwogCiAgICAgICAgICAgICBwcmludGsoIlx0JTNk OiAiLCArK2xvb3ApOwotICAgICAgICAgICAgY3NjaGVkX2R1bXBfdmNwdShzdmMpOworICAgICAg ICAgICAgY3NjaGVkX2R1bXBfaXRlbShzdmMpOwogCi0gICAgICAgICAgICBpdGVtX3NjaGVkdWxl X3VubG9jayhsb2NrLCBzdmMtPnZjcHUtPnNjaGVkX2l0ZW0pOworICAgICAgICAgICAgaXRlbV9z Y2hlZHVsZV91bmxvY2sobG9jaywgc3ZjLT5pdGVtKTsKICAgICAgICAgfQogICAgIH0KIApAQCAt MjIyNCw3ICsyMjI0LDcgQEAgY3NjaGVkX2luaXQoc3RydWN0IHNjaGVkdWxlciAqb3BzKQogICAg IGVsc2UKICAgICAgICAgcHJ2LT5yYXRlbGltaXQgPSBNSUNST1NFQ1Moc2NoZWRfcmF0ZWxpbWl0 X3VzKTsKIAotICAgIHBydi0+dmNwdV9taWdyX2RlbGF5ID0gTUlDUk9TRUNTKHZjcHVfbWlncmF0 aW9uX2RlbGF5X3VzKTsKKyAgICBwcnYtPml0ZW1fbWlncl9kZWxheSA9IE1JQ1JPU0VDUyh2Y3B1 X21pZ3JhdGlvbl9kZWxheV91cyk7CiAKICAgICByZXR1cm4gMDsKIH0KLS0gCjIuMTYuNAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMu eGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=