From: Roger Pau Monne Subject: [PATCH v3 6/8] p2m: change write_p2m_entry to return an error code Date: Fri, 15 Feb 2019 15:18:35 +0100 Message-ID: <20190215141837.1420-7-roger.pau@citrix.com> References: <20190215141837.1420-1-roger.pau@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 1gueKs-0001Bn-FA for xen-devel@lists.xenproject.org; Fri, 15 Feb 2019 14:19:26 +0000 In-Reply-To: <20190215141837.1420-1-roger.pau@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: Wei Liu , George Dunlap , Andrew Cooper , Tim Deegan , Jan Beulich , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org VGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgYWxzbyBjaGFuZ2luZyBwMm1fZW50cnlfbW9kaWZ5 IHRvIHJldHVybiBhbgplcnJvciBjb2RlLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UgaW50ZW5kZWQu CgpTaWduZWQtb2ZmLWJ5OiBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVAY2l0cml4LmNvbT4K LS0tCkNjOiBHZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGV1LmNpdHJpeC5jb20+CkNjOiBK YW4gQmV1bGljaCA8amJldWxpY2hAc3VzZS5jb20+CkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcu Y29vcGVyM0BjaXRyaXguY29tPgpDYzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ2M6 IFRpbSBEZWVnYW4gPHRpbUB4ZW4ub3JnPgotLS0KQ2hhbmdlcyBzaW5jZSB2MjoKIC0gTmV3IGlu IHRoaXMgdmVyc2lvbi4KLS0tCiB4ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jICAgICAgICB8ICA0 ICsrKy0KIHhlbi9hcmNoL3g4Ni9tbS9oYXAvbmVzdGVkX2hhcC5jIHwgIDQgKysrLQogeGVuL2Fy Y2gveDg2L21tL3AybS1wdC5jICAgICAgICAgfCAzMCArKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0KIHhlbi9hcmNoL3g4Ni9tbS9wYWdpbmcuYyAgICAgICAgIHwgMTIgKysrKysrKystLS0t CiB4ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jICB8ICA0ICsrKy0KIHhlbi9hcmNoL3g4 Ni9tbS9zaGFkb3cvbm9uZS5jICAgIHwgIDcgKysrKy0tLQogeGVuL2FyY2gveDg2L21tL3NoYWRv dy9wcml2YXRlLmggfCAgNiArKystLS0KIHhlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmggICAgICAg IHwgIDQgKystLQogeGVuL2luY2x1ZGUvYXNtLXg4Ni9wYWdpbmcuaCAgICAgfCAgOCArKysrLS0t LQogOSBmaWxlcyBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jIGIveGVuL2FyY2gveDg2L21tL2hh cC9oYXAuYwppbmRleCBkYzQ2ZDVlMTRmLi41YjUwNzM3NmJjIDEwMDY0NAotLS0gYS94ZW4vYXJj aC94ODYvbW0vaGFwL2hhcC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9oYXAvaGFwLmMKQEAgLTcw OCw3ICs3MDgsNyBAQCBzdGF0aWMgdm9pZCBoYXBfdXBkYXRlX3BhZ2luZ19tb2RlcyhzdHJ1Y3Qg dmNwdSAqdikKICAgICBwdXRfZ2ZuKGQsIGNyM19nZm4pOwogfQogCi1zdGF0aWMgdm9pZAorc3Rh dGljIGludAogaGFwX3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBs b25nIGdmbiwgbDFfcGdlbnRyeV90ICpwLAogICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5 X3QgbmV3LCB1bnNpZ25lZCBpbnQgbGV2ZWwpCiB7CkBAIC03NDUsNiArNzQ1LDggQEAgaGFwX3dy aXRlX3AybV9lbnRyeShzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIGdmbiwgbDFfcGdl bnRyeV90ICpwLAogCiAgICAgaWYgKCBmbHVzaF9uZXN0ZWRwMm0gKQogICAgICAgICBwMm1fZmx1 c2hfbmVzdGVkcDJtKGQpOworCisgICAgcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyB1bnNpZ25lZCBs b25nIGhhcF9ndmFfdG9fZ2ZuX3JlYWxfbW9kZSgKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9t bS9oYXAvbmVzdGVkX2hhcC5jIGIveGVuL2FyY2gveDg2L21tL2hhcC9uZXN0ZWRfaGFwLmMKaW5k ZXggZDJhMDdhNWM3OS4uYWJlNTk1OGE1MiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL2hh cC9uZXN0ZWRfaGFwLmMKKysrIGIveGVuL2FyY2gveDg2L21tL2hhcC9uZXN0ZWRfaGFwLmMKQEAg LTcxLDcgKzcxLDcgQEAKIC8qICAgICAgICBORVNURUQgVklSVCBQMk0gRlVOQ1RJT05TICAgICAg ICAgKi8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIAot dm9pZAoraW50CiBuZXN0ZWRwMm1fd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpw Mm0sIHVuc2lnbmVkIGxvbmcgZ2ZuLAogICAgIGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90 IG5ldywgdW5zaWduZWQgaW50IGxldmVsKQogewpAQCAtODcsNiArODcsOCBAQCBuZXN0ZWRwMm1f d3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2Zu LAogICAgICAgICBmbHVzaF90bGJfbWFzayhwMm0tPmRpcnR5X2NwdW1hc2spOwogCiAgICAgcGFn aW5nX3VubG9jayhkKTsKKworICAgIHJldHVybiAwOwogfQogCiAvKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKiovCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0v cDJtLXB0LmMgYi94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMKaW5kZXggMDRlOWQ4MWNmNi4uNDRh YmQ2NTk5OSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3AybS1wdC5jCisrKyBiL3hlbi9h cmNoL3g4Ni9tbS9wMm0tcHQuYwpAQCAtMjAyLDcgKzIwMiw3IEBAIHAybV9uZXh0X2xldmVsKHN0 cnVjdCBwMm1fZG9tYWluICpwMm0sIHZvaWQgKip0YWJsZSwKICAgICAgICAgbmV3X2VudHJ5ID0g bDFlX2Zyb21fbWZuKG1mbiwgUDJNX0JBU0VfRkxBR1MgfCBfUEFHRV9SVyk7CiAKICAgICAgICAg cDJtX2FkZF9pb21tdV9mbGFncygmbmV3X2VudHJ5LCBsZXZlbCwgSU9NTVVGX3JlYWRhYmxlfElP TU1VRl93cml0YWJsZSk7Ci0gICAgICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBw Mm1fZW50cnksIG5ld19lbnRyeSwgbGV2ZWwgKyAxKTsKKyAgICAgICAgQlVHX09OKHAybS0+d3Jp dGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBwMm1fZW50cnksIG5ld19lbnRyeSwgbGV2ZWwgKyAxKSk7 CiAgICAgfQogICAgIGVsc2UgaWYgKCBmbGFncyAmIF9QQUdFX1BTRSApCiAgICAgewpAQCAtMjUw LDE0ICsyNTAsMTQgQEAgcDJtX25leHRfbGV2ZWwoc3RydWN0IHAybV9kb21haW4gKnAybSwgdm9p ZCAqKnRhYmxlLAogICAgICAgICB7CiAgICAgICAgICAgICBuZXdfZW50cnkgPSBsMWVfZnJvbV9w Zm4ocGZuIHwgKGkgPDwgKChsZXZlbCAtIDEpICogUEFHRVRBQkxFX09SREVSKSksCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxhZ3MpOwotICAgICAgICAgICAgcDJtLT53 cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIGwxX2VudHJ5ICsgaSwgbmV3X2VudHJ5LCBsZXZlbCk7 CisgICAgICAgICAgICBCVUdfT04ocDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIGwxX2Vu dHJ5ICsgaSwgbmV3X2VudHJ5LCBsZXZlbCkpOwogICAgICAgICB9CiAKICAgICAgICAgdW5tYXBf ZG9tYWluX3BhZ2UobDFfZW50cnkpOwogCiAgICAgICAgIG5ld19lbnRyeSA9IGwxZV9mcm9tX21m bihtZm4sIFAyTV9CQVNFX0ZMQUdTIHwgX1BBR0VfUlcpOwogICAgICAgICBwMm1fYWRkX2lvbW11 X2ZsYWdzKCZuZXdfZW50cnksIGxldmVsLCBJT01NVUZfcmVhZGFibGV8SU9NTVVGX3dyaXRhYmxl KTsKLSAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHAybV9lbnRyeSwgbmV3 X2VudHJ5LCBsZXZlbCArIDEpOworICAgICAgICBCVUdfT04ocDJtLT53cml0ZV9wMm1fZW50cnko cDJtLCBnZm4sIHAybV9lbnRyeSwgbmV3X2VudHJ5LCBsZXZlbCArIDEpKTsKICAgICB9CiAgICAg ZWxzZQogICAgICAgICBBU1NFUlQoZmxhZ3MgJiBfUEFHRV9QUkVTRU5UKTsKQEAgLTMyMSw3ICsz MjEsNyBAQCBzdGF0aWMgaW50IHAybV9wdF9zZXRfcmVjYWxjX3JhbmdlKHN0cnVjdCBwMm1fZG9t YWluICpwMm0sCiAgICAgICAgICAgICBpZiAoIChsMWVfZ2V0X2ZsYWdzKGUpICYgX1BBR0VfUFJF U0VOVCkgJiYgIW5lZWRzX3JlY2FsYyhsMSwgZSkgKQogICAgICAgICAgICAgewogICAgICAgICAg ICAgICAgIHNldF9yZWNhbGMobDEsIGUpOwotICAgICAgICAgICAgICAgIHAybS0+d3JpdGVfcDJt X2VudHJ5KHAybSwgZmlyc3RfZ2ZuLCBwZW50LCBlLCBsZXZlbCk7CisgICAgICAgICAgICAgICAg QlVHX09OKHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZmlyc3RfZ2ZuLCBwZW50LCBlLCBsZXZl bCkpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgZmlyc3RfZ2ZuICs9IDFVTCA8PCAoaSAq IFBBR0VUQUJMRV9PUkRFUik7CiAgICAgICAgIH0KQEAgLTM5MiwxNCArMzkyLDE0IEBAIHN0YXRp YyBpbnQgZG9fcmVjYWxjKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2Zu KQogICAgICAgICAgICAgICAgICAgICAgIW5lZWRzX3JlY2FsYyhsMSwgZW50KSApCiAgICAgICAg ICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICBzZXRfcmVjYWxjKGwxLCBlbnQpOwotICAg ICAgICAgICAgICAgICAgICBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiAtIHJlbWFpbmRl ciwgJnB0YWJbaV0sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVu dCwgbGV2ZWwpOworICAgICAgICAgICAgICAgICAgICBCVUdfT04ocDJtLT53cml0ZV9wMm1fZW50 cnkocDJtLCBnZm4gLSByZW1haW5kZXIsICZwdGFiW2ldLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZW50LCBsZXZlbCkpOwogICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgICAgICByZW1haW5kZXIgLT0gMVVMIDw8ICgobGV2ZWwgLSAxKSAqIFBB R0VUQUJMRV9PUkRFUik7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBzbXBfd21iKCk7CiAg ICAgICAgICAgICBjbGVhcl9yZWNhbGMobDEsIGUpOwotICAgICAgICAgICAgcDJtLT53cml0ZV9w Mm1fZW50cnkocDJtLCBnZm4sIHBlbnQsIGUsIGxldmVsICsgMSk7CisgICAgICAgICAgICBCVUdf T04ocDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHBlbnQsIGUsIGxldmVsICsgMSkpOwog ICAgICAgICB9CiAgICAgICAgIHVubWFwX2RvbWFpbl9wYWdlKCh2b2lkICopKCh1bnNpZ25lZCBs b25nKXBlbnQgJiBQQUdFX01BU0spKTsKICAgICB9CkBAIC00NDQsNyArNDQ0LDcgQEAgc3RhdGlj IGludCBkb19yZWNhbGMoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4p CiAgICAgICAgIH0KICAgICAgICAgZWxzZQogICAgICAgICAgICAgY2xlYXJfcmVjYWxjKGwxLCBl KTsKLSAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHBlbnQsIGUsIGxldmVs ICsgMSk7CisgICAgICAgIEJVR19PTihwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcGVu dCwgZSwgbGV2ZWwgKyAxKSk7CiAgICAgfQogCiAgb3V0OgpAQCAtNTk1LDggKzU5NSwxMCBAQCBw Mm1fcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90 IG1mbiwKICAgICAgICAgaWYgKCBlbnRyeV9jb250ZW50LmwxICE9IDAgKQogICAgICAgICAgICAg cDJtX2FkZF9pb21tdV9mbGFncygmZW50cnlfY29udGVudCwgMCwgaW9tbXVfcHRlX2ZsYWdzKTsK IAotICAgICAgICBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBlbnRy eV9jb250ZW50LCAzKTsKKyAgICAgICAgcmMgPSBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdm biwgcDJtX2VudHJ5LCBlbnRyeV9jb250ZW50LCAzKTsKICAgICAgICAgLyogTkI6IHBhZ2luZ193 cml0ZV9wMm1fZW50cnkoKSBoYW5kbGVzIHRsYiBmbHVzaGVzIHByb3Blcmx5ICovCisgICAgICAg IGlmICggcmMgKQorICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgfQogICAgIGVsc2UgCiAgICAg ewpAQCAtNjMzLDggKzYzNSwxMCBAQCBwMm1fcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWlu ICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwKICAgICAgICAgICAgIHAybV9hZGRfaW9tbXVf ZmxhZ3MoJmVudHJ5X2NvbnRlbnQsIDAsIGlvbW11X3B0ZV9mbGFncyk7CiAKICAgICAgICAgLyog bGV2ZWwgMSBlbnRyeSAqLwotICAgICAgICBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwg cDJtX2VudHJ5LCBlbnRyeV9jb250ZW50LCAxKTsKKyAgICAgICAgcmMgPSBwMm0tPndyaXRlX3Ay bV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBlbnRyeV9jb250ZW50LCAxKTsKICAgICAgICAg LyogTkI6IHBhZ2luZ193cml0ZV9wMm1fZW50cnkoKSBoYW5kbGVzIHRsYiBmbHVzaGVzIHByb3Bl cmx5ICovCisgICAgICAgIGlmICggcmMgKQorICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgfQog ICAgIGVsc2UgaWYgKCBwYWdlX29yZGVyID09IFBBR0VfT1JERVJfMk0gKQogICAgIHsKQEAgLTY2 OSw4ICs2NzMsMTAgQEAgcDJtX3B0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBn Zm5fdCBnZm5fLCBtZm5fdCBtZm4sCiAgICAgICAgIGlmICggZW50cnlfY29udGVudC5sMSAhPSAw ICkKICAgICAgICAgICAgIHAybV9hZGRfaW9tbXVfZmxhZ3MoJmVudHJ5X2NvbnRlbnQsIDAsIGlv bW11X3B0ZV9mbGFncyk7CiAKLSAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4s IHAybV9lbnRyeSwgZW50cnlfY29udGVudCwgMik7CisgICAgICAgIHJjID0gcDJtLT53cml0ZV9w Mm1fZW50cnkocDJtLCBnZm4sIHAybV9lbnRyeSwgZW50cnlfY29udGVudCwgMik7CiAgICAgICAg IC8qIE5COiBwYWdpbmdfd3JpdGVfcDJtX2VudHJ5KCkgaGFuZGxlcyB0bGIgZmx1c2hlcyBwcm9w ZXJseSAqLworICAgICAgICBpZiAoIHJjICkKKyAgICAgICAgICAgIGdvdG8gb3V0OwogICAgIH0K IAogICAgIC8qIFRyYWNrIHRoZSBoaWdoZXN0IGdmbiBmb3Igd2hpY2ggd2UgaGF2ZSBldmVyIGhh ZCBhIHZhbGlkIG1hcHBpbmcgKi8KQEAgLTg5NSw3ICs5MDEsNyBAQCBzdGF0aWMgdm9pZCBwMm1f cHRfY2hhbmdlX2VudHJ5X3R5cGVfZ2xvYmFsKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAgICAg ICAgICAgICAgIW5lZWRzX3JlY2FsYyhsMSwgZSkgKQogICAgICAgICB7CiAgICAgICAgICAgICBz ZXRfcmVjYWxjKGwxLCBlKTsKLSAgICAgICAgICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwg Z2ZuLCAmdGFiW2ldLCBlLCA0KTsKKyAgICAgICAgICAgIEJVR19PTihwMm0tPndyaXRlX3AybV9l bnRyeShwMm0sIGdmbiwgJnRhYltpXSwgZSwgNCkpOwogICAgICAgICAgICAgKytjaGFuZ2VkOwog ICAgICAgICB9CiAgICAgICAgIGdmbiArPSAxVUwgPDwgKEw0X1BBR0VUQUJMRV9TSElGVCAtIFBB R0VfU0hJRlQpOwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3BhZ2luZy5jIGIveGVuL2Fy Y2gveDg2L21tL3BhZ2luZy5jCmluZGV4IGQ1ODM2ZWI2ODguLjZkNDZhYTk2N2IgMTAwNjQ0Ci0t LSBhL3hlbi9hcmNoL3g4Ni9tbS9wYWdpbmcuYworKysgYi94ZW4vYXJjaC94ODYvbW0vcGFnaW5n LmMKQEAgLTkzMiwxOCArOTMyLDIyIEBAIHZvaWQgcGFnaW5nX3VwZGF0ZV9uZXN0ZWRtb2RlKHN0 cnVjdCB2Y3B1ICp2KQogfQogI2VuZGlmCiAKLXZvaWQgcGFnaW5nX3dyaXRlX3AybV9lbnRyeShz dHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlfdCBuZXcsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGxldmVsKQoraW50IHBhZ2luZ193cml0 ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4sCisg ICAgICAgICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlfdCBu ZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpCiB7CiAg ICAgc3RydWN0IGRvbWFpbiAqZCA9IHAybS0+ZG9tYWluOwogICAgIHN0cnVjdCB2Y3B1ICp2ID0g Y3VycmVudDsKKyAgICBpbnQgcmMgPSAwOworCiAgICAgaWYgKCB2LT5kb21haW4gIT0gZCApCiAg ICAgICAgIHYgPSBkLT52Y3B1ID8gZC0+dmNwdVswXSA6IE5VTEw7CiAgICAgaWYgKCBsaWtlbHko diAmJiBwYWdpbmdfbW9kZV9lbmFibGVkKGQpICYmIHBhZ2luZ19nZXRfaG9zdG1vZGUodikgIT0g TlVMTCkgKQotICAgICAgICBwYWdpbmdfZ2V0X2hvc3Rtb2RlKHYpLT53cml0ZV9wMm1fZW50cnko ZCwgZ2ZuLCBwLCBuZXcsIGxldmVsKTsKKyAgICAgICAgcmMgPSBwYWdpbmdfZ2V0X2hvc3Rtb2Rl KHYpLT53cml0ZV9wMm1fZW50cnkoZCwgZ2ZuLCBwLCBuZXcsIGxldmVsKTsKICAgICBlbHNlCiAg ICAgICAgIHNhZmVfd3JpdGVfcHRlKHAsIG5ldyk7CisKKyAgICByZXR1cm4gcmM7CiB9CiAKIGlu dCBwYWdpbmdfc2V0X2FsbG9jYXRpb24oc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHBh Z2VzLCBib29sICpwcmVlbXB0ZWQpCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vc2hhZG93 L2NvbW1vbi5jIGIveGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYwppbmRleCAwNTc2YzNj MmQyLi5mZTQ4YzRhMDJiIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1v bi5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMKQEAgLTMxNzYsNyArMzE3 Niw3IEBAIHN0YXRpYyB2b2lkIHNoX3Vuc2hhZG93X2Zvcl9wMm1fY2hhbmdlKHN0cnVjdCBkb21h aW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuLAogICAgIH0KIH0KIAotdm9pZAoraW50CiBzaGFkb3df d3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuLAogICAg ICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlfdCBuZXcsCiAg ICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBsZXZlbCkKQEAgLTMyMDksNiArMzIw OSw4IEBAIHNoYWRvd193cml0ZV9wMm1fZW50cnkoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQg bG9uZyBnZm4sCiAjZW5kaWYKIAogICAgIHBhZ2luZ191bmxvY2soZCk7CisKKyAgICByZXR1cm4g MDsKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqLwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21t L3NoYWRvdy9ub25lLmMgYi94ZW4vYXJjaC94ODYvbW0vc2hhZG93L25vbmUuYwppbmRleCA0ZGU2 NDVhNDMzLi42MzQ0ZDc1NWFiIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vc2hhZG93L25v bmUuYworKysgYi94ZW4vYXJjaC94ODYvbW0vc2hhZG93L25vbmUuYwpAQCAtNjAsMTEgKzYwLDEy IEBAIHN0YXRpYyB2b2lkIF91cGRhdGVfcGFnaW5nX21vZGVzKHN0cnVjdCB2Y3B1ICp2KQogICAg IEFTU0VSVF9VTlJFQUNIQUJMRSgpOwogfQogCi1zdGF0aWMgdm9pZCBfd3JpdGVfcDJtX2VudHJ5 KHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlfdCBuZXcsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBsZXZlbCkKK3N0YXRpYyBpbnQgX3dyaXRl X3AybV9lbnRyeShzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIGdmbiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlfdCBuZXcsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGxldmVsKQogewogICAgIEFT U0VSVF9VTlJFQUNIQUJMRSgpOworICAgIHJldHVybiAtRU5PU1lTOwogfQogCiBzdGF0aWMgY29u c3Qgc3RydWN0IHBhZ2luZ19tb2RlIHNoX3BhZ2luZ19ub25lID0gewpkaWZmIC0tZ2l0IGEveGVu L2FyY2gveDg2L21tL3NoYWRvdy9wcml2YXRlLmggYi94ZW4vYXJjaC94ODYvbW0vc2hhZG93L3By aXZhdGUuaAppbmRleCBlOGVkN2FjNzE0Li5lMzMxNzcxZDNlIDEwMDY0NAotLS0gYS94ZW4vYXJj aC94ODYvbW0vc2hhZG93L3ByaXZhdGUuaAorKysgYi94ZW4vYXJjaC94ODYvbW0vc2hhZG93L3By aXZhdGUuaApAQCAtMzcyLDkgKzM3Miw5IEBAIGV4dGVybiBpbnQgc2hfcmVtb3ZlX3dyaXRlX2Fj Y2VzcyhzdHJ1Y3QgZG9tYWluICpkLCBtZm5fdCByZWFkb25seV9tZm4sCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBmYXVsdF9hZGRyKTsKIAogLyogRnVu Y3Rpb25zIHRoYXQgYXRvbWljYWxseSB3cml0ZSBQVC9QMk0gZW50cmllcyBhbmQgdXBkYXRlIHN0 YXRlICovCi12b2lkIHNoYWRvd193cml0ZV9wMm1fZW50cnkoc3RydWN0IGRvbWFpbiAqZCwgdW5z aWduZWQgbG9uZyBnZm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbDFfcGdlbnRyeV90 ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2ln bmVkIGludCBsZXZlbCk7CitpbnQgc2hhZG93X3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgZG9tYWlu ICpkLCB1bnNpZ25lZCBsb25nIGdmbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGwxX3Bn ZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90IG5ldywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg IHVuc2lnbmVkIGludCBsZXZlbCk7CiAKIC8qIFVwZGF0ZSBhbGwgdGhlIHRoaW5ncyB0aGF0IGFy ZSBkZXJpdmVkIGZyb20gdGhlIGd1ZXN0J3MgQ1IwL0NSMy9DUjQuCiAgKiBDYWxsZWQgdG8gaW5p dGlhbGl6ZSBwYWdpbmcgc3RydWN0dXJlcyBpZiB0aGUgcGFnaW5nIG1vZGUKZGlmZiAtLWdpdCBh L3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oCmlu ZGV4IDgzNGQ0OWQyZDQuLmY0ZWMyYmVjYmQgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14 ODYvcDJtLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaApAQCAtMjY1LDcgKzI2NSw3 IEBAIHN0cnVjdCBwMm1fZG9tYWluIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBsYXN0X2dmbik7CiAgICAgdm9pZCAgICAg ICAgICAgICAgICgqbWVtb3J5X3R5cGVfY2hhbmdlZCkoc3RydWN0IHAybV9kb21haW4gKnAybSk7 CiAgICAgCi0gICAgdm9pZCAgICAgICAgICAgICAgICgqd3JpdGVfcDJtX2VudHJ5KShzdHJ1Y3Qg cDJtX2RvbWFpbiAqcDJtLAorICAgIGludCAgICAgICAgICAgICAgICAoKndyaXRlX3AybV9lbnRy eSkoc3RydWN0IHAybV9kb21haW4gKnAybSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgZ2ZuLCBsMV9wZ2VudHJ5X3QgKnAsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgbmV3LCB1bnNp Z25lZCBpbnQgbGV2ZWwpOwogICAgIGxvbmcgICAgICAgICAgICAgICAoKmF1ZGl0X3AybSkoc3Ry dWN0IHAybV9kb21haW4gKnAybSk7CkBAIC04MzcsNyArODM3LDcgQEAgdm9pZCBwMm1fZmx1c2hf bmVzdGVkcDJtKHN0cnVjdCBkb21haW4gKmQpOwogLyogRmx1c2hlcyB0aGUgbnAybSBzcGVjaWZp ZWQgYnkgbnAybV9iYXNlIChpZiBpdCBleGlzdHMpICovCiB2b2lkIG5wMm1fZmx1c2hfYmFzZShz dHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgbG9uZyBucDJtX2Jhc2UpOwogCi12b2lkIG5lc3RlZHAy bV93cml0ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBn Zm4sCitpbnQgbmVzdGVkcDJtX3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LCB1bnNpZ25lZCBsb25nIGdmbiwKICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlfdCBu ZXcsIHVuc2lnbmVkIGludCBsZXZlbCk7CiAKIC8qCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9h c20teDg2L3BhZ2luZy5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wYWdpbmcuaAppbmRleCBmZGNj MjI4NDRiLi44MTAzMWJiNzliIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L3BhZ2lu Zy5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcGFnaW5nLmgKQEAgLTEyNCw3ICsxMjQsNyBA QCBzdHJ1Y3QgcGFnaW5nX21vZGUgewogICAgIHZvaWQgICAgICAgICAgKCp1cGRhdGVfY3IzICAg ICAgICAgICAgKShzdHJ1Y3QgdmNwdSAqdiwgaW50IGRvX2xvY2tpbmcsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgbm9mbHVzaCk7CiAgICAgdm9pZCAg ICAgICAgICAoKnVwZGF0ZV9wYWdpbmdfbW9kZXMgICApKHN0cnVjdCB2Y3B1ICp2KTsKLSAgICB2 b2lkICAgICAgICAgICgqd3JpdGVfcDJtX2VudHJ5ICAgICAgICkoc3RydWN0IGRvbWFpbiAqZCwg dW5zaWduZWQgbG9uZyBnZm4sCisgICAgaW50ICAgICAgICAgICAoKndyaXRlX3AybV9lbnRyeSAg ICAgICApKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50 cnlfdCBuZXcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVu c2lnbmVkIGludCBsZXZlbCk7CiAKQEAgLTMzOSw5ICszMzksOSBAQCBzdGF0aWMgaW5saW5lIHZv aWQgc2FmZV93cml0ZV9wdGUobDFfcGdlbnRyeV90ICpwLCBsMV9wZ2VudHJ5X3QgbmV3KQogICog d2UgYXJlIHdyaXRpbmcuICovCiBzdHJ1Y3QgcDJtX2RvbWFpbjsKIAotdm9pZCBwYWdpbmdfd3Jp dGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90 IG5ldywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpOwor aW50IHBhZ2luZ193cml0ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWdu ZWQgbG9uZyBnZm4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAs IGwxX3BnZW50cnlfdCBuZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBp bnQgbGV2ZWwpOwogCiAvKgogICogQ2FsbGVkIGZyb20gdGhlIGd1ZXN0IHRvIGluZGljYXRlIHRo YXQgdGhlIGEgcHJvY2VzcyBpcyBiZWluZwotLSAKMi4xNy4yIChBcHBsZSBHaXQtMTEzKQoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMu eGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=