From: George Dunlap Subject: [RFC PATCH 2/2] x86/mm: Add mem access rights to NPT Date: Wed, 26 Sep 2018 17:47:41 +0100 Message-ID: <20180926164741.13405-2-george.dunlap@citrix.com> References: <20180926164741.13405-1-george.dunlap@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 1g5Cya-0004w3-Sj for xen-devel@lists.xenproject.org; Wed, 26 Sep 2018 16:47:48 +0000 In-Reply-To: <20180926164741.13405-1-george.dunlap@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: Razvan Cojocaru , Andrew Cooper , Tim Deegan , George Dunlap , Paul Durrant , Jan Beulich , Tamas K Lengyel , Isaila Alexandru List-Id: xen-devel@lists.xenproject.org RnJvbTogSXNhaWxhIEFsZXhhbmRydSA8YWlzYWlsYUBiaXRkZWZlbmRlci5jb20+CgpUaGlzIHBh dGNoIGFkZHMgYWNjZXNzIGNvbnRyb2wgZm9yIE5QVCBtb2RlLgoKVGhlcmUgYXJlbuKAmXQgZW5v dWdoIGV4dHJhIGJpdHMgdG8gc3RvcmUgdGhlIGFjY2VzcyByaWdodHMgaW4gdGhlIE5QVCBwMm0K dGFibGUsIHNvIHdlIGFkZCBhIHJhZGl4IHRyZWUgdG8gc3RvcmUgZXh0cmEgaW5mb3JtYXRpb24u CgpGb3IgZWZmaWNpZW5jeToKIC0gT25seSBhbGxvY2F0ZSB0aGlzIHJhZGl4IHRyZWUgd2hlbiB3 ZSBmaXJzdCBzdG9yZSAibm9uLWRlZmF1bHQiCiAgIGV4dHJhIGluZm9ybWF0aW9uCgogLSBSZW1v dmUgZW50aXJlcyB3aGljaCBtYXRjaCB0aGUgZGVmYXVsdCBleHRyYSBpbmZvcm1hdGlvbiByYXRo ZXIKICAgdGhhbiBjb250aW51aW5nIHRvIHN0b3JlIHRoZW0KCiAtIEZvciBzdXBlcnBhZ2VzLCBv bmx5IHN0b3JlIGFuIGVudHJ5IGZvciB0aGUgZmlyc3QgZ2ZuIGluIHRoZQogICBzdXBlcnBhZ2Uu ICBVc2UgdGhlIG9yZGVyIG9mIHRoZSBwMm0gZW50cnkgYmVpbmcgcmVhZCB0byBkZXRlcm1pbmUK ICAgdGhlIHByb3BlciBwbGFjZSB0byBsb29rIGluIHRoZSByYWRpeCB0YWJsZS4KCk1vZGlmeSBw Mm1fdHlwZV90b19mbGFncygpIHRvIGFjY2VwdCBhbmQgaW50ZXJwcmV0IGFuIGFjY2VzcyB2YWx1 ZSwKcGFyYWxsZWwgdG8gdGhlIGVwdCBjb2RlLgoKQWRkIGEgc2V0X2RlZmF1bHRfYWNjZXNzKCkg bWV0aG9kIHRvIHRoZSBwMm0tcHQgYW5kIHAybS1lcHQgdmVyc2lvbnMKb2YgdGhlIHAybSByYXRo ZXIgdGhhbiBzZXR0aW5nIGl0IGRpcmVjdGx5LCB0byBkZWFsIHdpdGggZGlmZmVyZW50CmRlZmF1 bHQgcGVybWl0dGVkIGFjY2VzcyB2YWx1ZXMuCgpTaWduZWQtb2ZmLWJ5OiBBbGV4YW5kcnUgSXNh aWxhIDxhaXNhaWxhQGJpdGRlZmVuZGVyLmNvbT4KU2lnbmVkLW9mZi1ieTogR2VvcmdlIER1bmxh cCA8Z2VvcmdlLmR1bmxhcEBjaXRyaXguY29tPgotLS0KTkIsIHRoaXMgaXMgY29tcGlsZS10ZXN0 ZWQgb25seS4KCmNjJ2luZyBQYXVsIGJlY2F1c2UgdGhpcyBpcyBmdW5jdGlvbmFsaXR5IGhlIG1h eSB3YW50IGF0IHNvbWUgcG9pbnQgaW4KdGhlIGZ1dHVyZS4KCkknbSBub3Qgc3VyZSB3aHkgd2Ug b25seSBhbGxvdyAnaW50JyB0byBiZSBzdG9yZWQgaW4gdGhlIHJhZGl4IHRyZWUsCmJ1dCB0aGF0 IHRocm93cyBhd2F5IDMwLXNvbWUgYml0cyB3ZSBjb3VsZCBvdGhlcndpc2UgdXNlLiAgV2UgbWln aHQKY29uc2lkZXIgcmV2aXNpbmcgdGhpcyBpZiB3ZSBydW4gb3V0IG9mIGJpdHMgaGVyZS4KCkND OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgpDQzogSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPgpDQzogVGltIERlZWdhbiA8dGltQHhlbi5vcmc+CkNDOiBU YW1hcyBLIExlbmd5ZWwgPHRhbWFzLmxlbmd5ZWxAemVudGlmaWMuY29tPgpDQzogUGF1bCBEdXJy YW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KQ0M6IFJhenZhbiBDb2pvY2FydSA8cmNvam9j YXJ1QGJpdGRlZmVuZGVyLmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvbW0vbWVtX2FjY2Vzcy5jICAg ICB8ICAgNSArLQogeGVuL2FyY2gveDg2L21tL3AybS1lcHQuYyAgICAgICAgfCAgIDkgKysKIHhl bi9hcmNoL3g4Ni9tbS9wMm0tcHQuYyAgICAgICAgIHwgMTczICsrKysrKysrKysrKysrKysrKysr KysrKysrKystLS0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0uYyAgICAgICAgICAgIHwgICA2ICsrCiB4 ZW4vYXJjaC94ODYvbW9uaXRvci5jICAgICAgICAgICB8ICAgMSArCiB4ZW4vaW5jbHVkZS9hc20t eDg2L21lbV9hY2Nlc3MuaCB8ICAgMiArLQogeGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaCAgICAg ICAgfCAgMTggKysrKwogNyBmaWxlcyBjaGFuZ2VkLCAxOTIgaW5zZXJ0aW9ucygrKSwgMjIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL21lbV9hY2Nlc3MuYyBiL3hl bi9hcmNoL3g4Ni9tbS9tZW1fYWNjZXNzLmMKaW5kZXggNjk5YTMxNTA3Ni4uMGY5NmM0M2Y4OCAx MDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL21lbV9hY2Nlc3MuYworKysgYi94ZW4vYXJjaC94 ODYvbW0vbWVtX2FjY2Vzcy5jCkBAIC0zODksMTAgKzM4OSw3IEBAIGxvbmcgcDJtX3NldF9tZW1f YWNjZXNzKHN0cnVjdCBkb21haW4gKmQsIGdmbl90IGdmbiwgdWludDMyX3QgbnIsCiAKICAgICAv KiBJZiByZXF1ZXN0IHRvIHNldCBkZWZhdWx0IGFjY2Vzcy4gKi8KICAgICBpZiAoIGdmbl9lcShn Zm4sIElOVkFMSURfR0ZOKSApCi0gICAgewotICAgICAgICBwMm0tPmRlZmF1bHRfYWNjZXNzID0g YTsKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgfQorICAgICAgICByZXR1cm4gcDJtLT5zZXRfZGVm YXVsdF9hY2Nlc3MocDJtLCBhKTsKIAogICAgIHAybV9sb2NrKHAybSk7CiAgICAgaWYgKCBhcDJt ICkKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMgYi94ZW4vYXJjaC94ODYv bW0vcDJtLWVwdC5jCmluZGV4IDFmZjRmMTRhZTQuLjM3YmRiY2YxODYgMTAwNjQ0Ci0tLSBhL3hl bi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMKKysrIGIveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYwpA QCAtNjY3LDYgKzY2NywxNCBAQCBib29sX3QgZXB0X2hhbmRsZV9taXNjb25maWcodWludDY0X3Qg Z3BhKQogICAgIHJldHVybiBzcHVyaW91cyA/IChyYyA+PSAwKSA6IChyYyA+IDApOwogfQogCitp bnQgZXB0X3NldF9kZWZhdWx0X2FjY2VzcyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBwMm1fYWNj ZXNzX3QgcDJtYSkKK3sKKyAgICAvKiBBbGwgYWNjZXNzIGlzIHBlcm1pdHRlZCAqLworICAgIHAy bS0+ZGVmYXVsdF9hY2Nlc3MgPSBwMm1hOworICAgIAorICAgIHJldHVybiAwOworfQorCiAvKgog ICogZXB0X3NldF9lbnRyeSgpIGNvbXB1dGVzICduZWVkX21vZGlmeV92dGRfdGFibGUnIGZvciBp dHNlbGYsCiAgKiBieSBvYnNlcnZpbmcgd2hldGhlciBhbnkgZ2ZuLT5tZm4gdHJhbnNsYXRpb25z IGFyZSBtb2RpZmllZC4KQEAgLTEyNTUsNiArMTI2Myw3IEBAIGludCBlcHRfcDJtX2luaXQoc3Ry dWN0IHAybV9kb21haW4gKnAybSkKICAgICBwMm0tPmNoYW5nZV9lbnRyeV90eXBlX2dsb2JhbCA9 IGVwdF9jaGFuZ2VfZW50cnlfdHlwZV9nbG9iYWw7CiAgICAgcDJtLT5jaGFuZ2VfZW50cnlfdHlw ZV9yYW5nZSA9IGVwdF9jaGFuZ2VfZW50cnlfdHlwZV9yYW5nZTsKICAgICBwMm0tPm1lbW9yeV90 eXBlX2NoYW5nZWQgPSBlcHRfbWVtb3J5X3R5cGVfY2hhbmdlZDsKKyAgICBwMm0tPnNldF9kZWZh dWx0X2FjY2VzcyA9IGVwdF9zZXRfZGVmYXVsdF9hY2Nlc3M7CiAgICAgcDJtLT5hdWRpdF9wMm0g PSBOVUxMOwogICAgIHAybS0+dGxiX2ZsdXNoID0gZXB0X3RsYl9mbHVzaDsKIApkaWZmIC0tZ2l0 IGEveGVuL2FyY2gveDg2L21tL3AybS1wdC5jIGIveGVuL2FyY2gveDg2L21tL3AybS1wdC5jCmlu ZGV4IDQwYmZjNzZhNmYuLmNkOGI4YzkxODcgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9w Mm0tcHQuYworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMKQEAgLTY4LDcgKzY4LDggQEAK IHN0YXRpYyB1bnNpZ25lZCBsb25nIHAybV90eXBlX3RvX2ZsYWdzKGNvbnN0IHN0cnVjdCBwMm1f ZG9tYWluICpwMm0sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwMm1f dHlwZV90IHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZm5fdCBt Zm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQg bGV2ZWwpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBp bnQgbGV2ZWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwMm1fYWNj ZXNzX3QgYWNjZXNzKQogewogICAgIHVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAgICAgLyoKQEAgLTg3 LDIzICs4OCwyOCBAQCBzdGF0aWMgdW5zaWduZWQgbG9uZyBwMm1fdHlwZV90b19mbGFncyhjb25z dCBzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgIGNhc2UgcDJtX3JhbV9wYWdlZDoKICAgICBj YXNlIHAybV9yYW1fcGFnaW5nX2luOgogICAgIGRlZmF1bHQ6Ci0gICAgICAgIHJldHVybiBmbGFn cyB8IF9QQUdFX05YX0JJVDsKKyAgICAgICAgZmxhZ3MgfD0gX1BBR0VfTlhfQklUOworICAgICAg ICBicmVhazsKICAgICBjYXNlIHAybV9ncmFudF9tYXBfcm86Ci0gICAgICAgIHJldHVybiBmbGFn cyB8IFAyTV9CQVNFX0ZMQUdTIHwgX1BBR0VfTlhfQklUOworICAgICAgICBmbGFncyB8PSBQMk1f QkFTRV9GTEFHUyB8IF9QQUdFX05YX0JJVDsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBwMm1f aW9yZXFfc2VydmVyOgogICAgICAgICBmbGFncyB8PSBQMk1fQkFTRV9GTEFHUyB8IF9QQUdFX1JX IHwgX1BBR0VfTlhfQklUOwogICAgICAgICBpZiAoIHAybS0+aW9yZXEuZmxhZ3MgJiBYRU5fRE1P UF9JT1JFUV9NRU1fQUNDRVNTX1dSSVRFICkKLSAgICAgICAgICAgIHJldHVybiBmbGFncyAmIH5f UEFHRV9SVzsKLSAgICAgICAgcmV0dXJuIGZsYWdzOworICAgICAgICAgICAgZmxhZ3MgJj0gfl9Q QUdFX1JXOworICAgICAgICBicmVhazsKICAgICBjYXNlIHAybV9yYW1fcm86CiAgICAgY2FzZSBw Mm1fcmFtX2xvZ2RpcnR5OgogICAgIGNhc2UgcDJtX3JhbV9zaGFyZWQ6Ci0gICAgICAgIHJldHVy biBmbGFncyB8IFAyTV9CQVNFX0ZMQUdTOworICAgICAgICBmbGFncyB8PSBQMk1fQkFTRV9GTEFH UzsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBwMm1fcmFtX3J3OgotICAgICAgICByZXR1cm4g ZmxhZ3MgfCBQMk1fQkFTRV9GTEFHUyB8IF9QQUdFX1JXOworICAgICAgICBmbGFncyB8PSBQMk1f QkFTRV9GTEFHUyB8IF9QQUdFX1JXOworICAgICAgICBicmVhazsKICAgICBjYXNlIHAybV9ncmFu dF9tYXBfcnc6CiAgICAgY2FzZSBwMm1fbWFwX2ZvcmVpZ246Ci0gICAgICAgIHJldHVybiBmbGFn cyB8IFAyTV9CQVNFX0ZMQUdTIHwgX1BBR0VfUlcgfCBfUEFHRV9OWF9CSVQ7CisgICAgICAgIGZs YWdzIHw9IFAyTV9CQVNFX0ZMQUdTIHwgX1BBR0VfUlcgfCBfUEFHRV9OWF9CSVQ7CisgICAgICAg IGJyZWFrOwogICAgIGNhc2UgcDJtX21taW9fZGlyZWN0OgogICAgICAgICBpZiAoICFyYW5nZXNl dF9jb250YWluc19zaW5nbGV0b24obW1pb19yb19yYW5nZXMsIG1mbl94KG1mbikpICkKICAgICAg ICAgICAgIGZsYWdzIHw9IF9QQUdFX1JXOwpAQCAtMTEyLDggKzExOCwzMiBAQCBzdGF0aWMgdW5z aWduZWQgbG9uZyBwMm1fdHlwZV90b19mbGFncyhjb25zdCBzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LAogICAgICAgICAgICAgZmxhZ3MgfD0gX1BBR0VfUFdUOwogICAgICAgICAgICAgQVNTRVJUKCFs ZXZlbCk7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIGZsYWdzIHwgUDJNX0JBU0VfRkxBR1Mg fCBfUEFHRV9QQ0Q7CisgICAgICAgIGZsYWdzIHw9IFAyTV9CQVNFX0ZMQUdTIHwgX1BBR0VfUENE OworICAgICAgICBicmVhazsKICAgICB9CisKKyAgICBzd2l0Y2ggKCBhY2Nlc3MgKQorICAgIHsK KyAgICBjYXNlIHAybV9hY2Nlc3NfcjoKKyAgICAgICAgZmxhZ3MgfD0gX1BBR0VfTlhfQklUOwor ICAgICAgICBmbGFncyAmPSB+X1BBR0VfUlc7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgcDJt X2FjY2Vzc19ydzoKKyAgICAgICAgZmxhZ3MgfD0gX1BBR0VfTlhfQklUOworICAgICAgICBicmVh azsKKyAgICBjYXNlIHAybV9hY2Nlc3Nfcng6CisgICAgY2FzZSBwMm1fYWNjZXNzX3J4MnJ3Ogor ICAgICAgICBmbGFncyAmPSB+KF9QQUdFX05YX0JJVCB8IF9QQUdFX1JXKTsKKyAgICAgICAgYnJl YWs7CisgICAgY2FzZSBwMm1fYWNjZXNzX3g6CisgICAgICAgIGZsYWdzICY9IH5fUEFHRV9SVzsK KyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBwMm1fYWNjZXNzX3J3eDoKKyAgICBkZWZhdWx0Ogor ICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICByZXR1cm4gZmxhZ3M7CiB9CiAKIApAQCAtMTc0 LDYgKzIwNCw0OCBAQCBzdGF0aWMgdm9pZCBwMm1fYWRkX2lvbW11X2ZsYWdzKGwxX3BnZW50cnlf dCAqcDJtX2VudHJ5LAogICAgICAgICBsMWVfYWRkX2ZsYWdzKCpwMm1fZW50cnksIGlvbW11X25s ZXZlbF90b19mbGFncyhubGV2ZWwsIGZsYWdzKSk7CiB9CiAKK2NvbnN0IHAybV9leHRyYV90IHB0 X2V4dHJhX2RlZmF1bHQgPSB7IC5hY2Nlc3MgPSBwMm1fYWNjZXNzX3J3eCB9OworCitzdGF0aWMg cDJtX2V4dHJhX3QgcDJtX3B0X2dldF9leHRyYShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNp Z25lZCBsb25nIGdmbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5z aWduZWQgbGV2ZWwpCit7CisgICAgdm9pZCAqcHRyOworICAgIHVuc2lnbmVkIGxvbmcgbWFzayA9 IH4wVUwgPDwgKGxldmVsICogUEFHRVRBQkxFX09SREVSKTsKKworICAgIGlmICggIXAybS0+ZXh0 cmEgKQorICAgICAgICByZXR1cm4gcHRfZXh0cmFfZGVmYXVsdDsKKworICAgIHB0ciA9IHJhZGl4 X3RyZWVfbG9va3VwKHAybS0+ZXh0cmEsIGdmbiAmIG1hc2spOworICAgIGlmICggIXB0ciApCisg ICAgICAgIHJldHVybiBwdF9leHRyYV9kZWZhdWx0OworICAgIGVsc2UKKyAgICAgICAgcmV0dXJu IChwMm1fZXh0cmFfdClyYWRpeF90cmVlX3B0cl90b19pbnQocHRyKTsKK30KKworc3RhdGljIHZv aWQgcDJtX3B0X3NldF9leHRyYShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25n IGdmbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcDJtX2V4dHJhX3Qg ZXh0cmEpCit7CisgICAgaW50IHJjOworCisgICAgaWYgKCBleHRyYS5leHRyYSA9PSBwdF9leHRy YV9kZWZhdWx0LmV4dHJhICkKKyAgICB7CisgICAgICAgIGlmICggcDJtLT5leHRyYSApCisgICAg ICAgICAgICByYWRpeF90cmVlX2RlbGV0ZShwMm0tPmV4dHJhLCBnZm4pOworICAgICAgICByZXR1 cm47CisgICAgfQorCisgICAgQVNTRVJUKHAybS0+ZXh0cmEpOworCisgICAgcmMgPSByYWRpeF90 cmVlX2luc2VydChwMm0tPmV4dHJhLCBnZm4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICBy YWRpeF90cmVlX2ludF90b19wdHIoZXh0cmEuZXh0cmEpKTsKKyAgICBpZiAoIHJjID09IC1FRVhJ U1QgKQorICAgICAgICAvKiBJZiBhIHNldHRpbmcgYWxyZWFkeSBleGlzdHMsIGNoYW5nZSBpdCB0 byB0aGUgbmV3IG9uZS4gKi8KKyAgICAgICAgcmFkaXhfdHJlZV9yZXBsYWNlX3Nsb3QoCisgICAg ICAgICAgICByYWRpeF90cmVlX2xvb2t1cF9zbG90KAorICAgICAgICAgICAgICAgIHAybS0+ZXh0 cmEsIGdmbiksCisgICAgICAgICAgICByYWRpeF90cmVlX2ludF90b19wdHIoZXh0cmEuZXh0cmEp KTsKK30KKwogLyogUmV0dXJuczogMCBmb3Igc3VjY2VzcywgLWVycm5vIGZvciBmYWlsdXJlICov CiBzdGF0aWMgaW50CiBwMm1fbmV4dF9sZXZlbChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB2b2lk ICoqdGFibGUsCkBAIC0yMTAsNiArMjgyLDcgQEAgcDJtX25leHRfbGV2ZWwoc3RydWN0IHAybV9k b21haW4gKnAybSwgdm9pZCAqKnRhYmxlLAogICAgICAgICBtZm5fdCBtZm47CiAgICAgICAgIGwx X3BnZW50cnlfdCAqbDFfZW50cnk7CiAgICAgICAgIHVuc2lnbmVkIGludCBpOworICAgICAgICBw Mm1fZXh0cmFfdCBleHRyYTsKIAogICAgICAgICBzd2l0Y2ggKCBsZXZlbCApCiAgICAgICAgIHsK QEAgLTI0Nyw4ICszMjAsMTQgQEAgcDJtX25leHRfbGV2ZWwoc3RydWN0IHAybV9kb21haW4gKnAy bSwgdm9pZCAqKnRhYmxlLAogCiAgICAgICAgIGZvciAoIGkgPSAwOyBpIDwgKDF1IDw8IFBBR0VU QUJMRV9PUkRFUik7IGkrKyApCiAgICAgICAgIHsKLSAgICAgICAgICAgIG5ld19lbnRyeSA9IGwx ZV9mcm9tX3BmbihwZm4gfCAoaSA8PCAoKGxldmVsIC0gMSkgKiBQQUdFVEFCTEVfT1JERVIpKSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmbGFncyk7CisgICAgICAgICAg ICB1bnNpZ25lZCBsb25nIGZyYW1lX29mZnNldCA9IChpIDw8ICgobGV2ZWwgLSAxKSAqIFBBR0VU QUJMRV9PUkRFUikpOworICAgICAgICAgICAgbmV3X2VudHJ5ID0gbDFlX2Zyb21fcGZuKHBmbiB8 IGZyYW1lX29mZnNldCwgZmxhZ3MpOworCisgICAgICAgICAgICAvKiBTaGF0dGVyaW5nIGEgcDJt IG1hcHBpbmcgcmVxdWlyZXMgZHVwbGljYXRpbmcgZXh0cmEgaW5mbyBhcyB3ZWxsICovCisgICAg ICAgICAgICBpZiAoIGkgPT0gMCApCisgICAgICAgICAgICAgICAgZXh0cmEgPSBwMm1fcHRfZ2V0 X2V4dHJhKHAybSwgZ2ZuLCBsZXZlbCk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAg ICAgcDJtX3B0X3NldF9leHRyYShwMm0sIGdmbiArIGZyYW1lX29mZnNldCwgZXh0cmEpOwogICAg ICAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIGwxX2VudHJ5ICsgaSwgbmV3 X2VudHJ5LCBsZXZlbCk7CiAgICAgICAgIH0KIApAQCAtNDIwLDggKzQ5OSwxMCBAQCBzdGF0aWMg aW50IGRvX3JlY2FsYyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikK ICAgICAgICAgaWYgKCBudCAhPSBvdCApCiAgICAgICAgIHsKICAgICAgICAgICAgIHVuc2lnbmVk IGxvbmcgbWZuID0gbDFlX2dldF9wZm4oZSk7CisgICAgICAgICAgICBwMm1fZXh0cmFfdCBleHRy YSA9IHAybV9wdF9nZXRfZXh0cmEocDJtLCBnZm4sIGxldmVsKTsKICAgICAgICAgICAgIHVuc2ln bmVkIGxvbmcgZmxhZ3MgPSBwMm1fdHlwZV90b19mbGFncyhwMm0sIG50LAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9tZm4obWZuKSwgbGV2ZWwp OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9t Zm4obWZuKSwgbGV2ZWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZXh0cmEuYWNjZXNzKTsKIAogICAgICAgICAgICAgaWYgKCBsZXZlbCApCiAg ICAgICAgICAgICB7CkBAIC00NzEsNiArNTUyLDMyIEBAIGludCBwMm1fcHRfaGFuZGxlX2RlZmVy cmVkX2NoYW5nZXModWludDY0X3QgZ3BhKQogICAgIHJldHVybiByYzsKIH0KIAorLyogUmV0dXJu czogMCBmb3Igc3VjY2VzcywgLWVycm5vIGZvciBmYWlsdXJlICovCitzdGF0aWMgaW50IHAybV9w dF9jaGVja19hY2Nlc3MocDJtX2FjY2Vzc190IHAybWEpCit7CisgICAgc3dpdGNoICggcDJtYSAp CisgICAgeworICAgIGNhc2UgcDJtX2FjY2Vzc19uOgorICAgIGNhc2UgcDJtX2FjY2Vzc193Ogor ICAgIGNhc2UgcDJtX2FjY2Vzc193eDoKKyAgICBjYXNlIHAybV9hY2Nlc3NfbjJyd3g6CisgICAg ICAgIHJldHVybiAtRUlOVkFMOworICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAgIH0K KyAgICByZXR1cm4gMDsKK30KKworc3RhdGljIGludCBwMm1fcHRfc2V0X2RlZmF1bHRfYWNjZXNz KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcDJtX2FjY2Vzc190IHAybWEpIHsKKyAgICBpbnQgcmMgPSBwMm1fcHRfY2hlY2tfYWNj ZXNzKHAybWEpOworCisgICAgaWYgKCAhcmMgKQorICAgICAgICBwMm0tPmRlZmF1bHRfYWNjZXNz ID0gcDJtYTsKKworICAgIHJldHVybiByYzsKK30KKwogLyogUmV0dXJuczogMCBmb3Igc3VjY2Vz cywgLWVycm5vIGZvciBmYWlsdXJlICovCiBzdGF0aWMgaW50CiBwMm1fcHRfc2V0X2VudHJ5KHN0 cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwKQEAgLTUwMCw5ICs2 MDcsMTMgQEAgcDJtX3B0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5fdCBn Zm5fLCBtZm5fdCBtZm4sCiAgICAgICovCiAgICAgdW5zaWduZWQgaW50IGZsYWdzLCBpb21tdV9v bGRfZmxhZ3MgPSAwOwogICAgIHVuc2lnbmVkIGxvbmcgb2xkX21mbiA9IG1mbl94KElOVkFMSURf TUZOKTsKKyAgICBwMm1fZXh0cmFfdCBleHRyYSA9IHB0X2V4dHJhX2RlZmF1bHQ7CiAKICAgICBB U1NFUlQoc3ZlICE9IDApOwogCisgICAgaWYgKCAocmMgPSBwMm1fcHRfY2hlY2tfYWNjZXNzKHAy bWEpKSApCisgICAgICAgIHJldHVybiByYzsKKwogICAgIGlmICggdGJfaW5pdF9kb25lICkKICAg ICB7CiAgICAgICAgIHN0cnVjdCB7CkBAIC01MzIsNiArNjQzLDI0IEBAIHAybV9wdF9zZXRfZW50 cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgZ2ZuX3QgZ2ZuXywgbWZuX3QgbWZuLAogICAgIGlm ICggcmMgPCAwICkKICAgICAgICAgcmV0dXJuIHJjOwogCisgICAgaWYgKCBwMm1hICE9IGV4dHJh LmFjY2VzcyApCisgICAgICAgIGV4dHJhLmFjY2VzcyA9IHAybWE7CisKKyAgICAvKiAKKyAgICAg KiBJZiB3ZSBuZWVkICdleHRyYScgYml0cyBhbmQgd2UgaGF2ZW4ndCBhbGxvY2F0ZWQgc3BhY2Ug Zm9yIGl0CisgICAgICogeWV0LCBkbyBzbworICAgICAqLworICAgIGlmICggKGV4dHJhLmV4dHJh ICE9IHB0X2V4dHJhX2RlZmF1bHQuZXh0cmEpICYmICFwMm0tPmV4dHJhICkKKyAgICB7CisgICAg ICAgIHAybS0+ZXh0cmEgPSB4bWFsbG9jKHN0cnVjdCByYWRpeF90cmVlX3Jvb3QpOworICAgICAg ICAKKyAgICAgICAgaWYoICFwMm0tPmV4dHJhICkKKyAgICAgICAgeworICAgICAgICAgICAgcmV0 dXJuIC1FTk9NRU07CisgICAgICAgIH0KKyAgICAgICAgcmFkaXhfdHJlZV9pbml0KHAybS0+ZXh0 cmEpOworICAgIH0KKwogICAgIHRhYmxlID0gbWFwX2RvbWFpbl9wYWdlKHBhZ2V0YWJsZV9nZXRf bWZuKHAybV9nZXRfcGFnZXRhYmxlKHAybSkpKTsKICAgICByYyA9IHAybV9uZXh0X2xldmVsKHAy bSwgJnRhYmxlLCAmZ2ZuX3JlbWFpbmRlciwgZ2ZuLAogICAgICAgICAgICAgICAgICAgICAgICAg TDRfUEFHRVRBQkxFX1NISUZUIC0gUEFHRV9TSElGVCwKQEAgLTU2OSw3ICs2OTgsNyBAQCBwMm1f cHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1m biwKICAgICAgICAgQVNTRVJUKCFtZm5fdmFsaWQobWZuKSB8fCBwMm10ICE9IHAybV9tbWlvX2Rp cmVjdCk7CiAgICAgICAgIGwzZV9jb250ZW50ID0gbWZuX3ZhbGlkKG1mbikgfHwgcDJtX2FsbG93 c19pbnZhbGlkX21mbihwMm10KQogICAgICAgICAgICAgPyBwMm1fbDNlX2Zyb21fcGZuKG1mbl94 KG1mbiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcDJtX3R5cGVfdG9fZmxhZ3Mo cDJtLCBwMm10LCBtZm4sIDIpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAybV90 eXBlX3RvX2ZsYWdzKHAybSwgcDJtdCwgbWZuLCAyLCBwMm1hKSkKICAgICAgICAgICAgIDogbDNl X2VtcHR5KCk7CiAgICAgICAgIGVudHJ5X2NvbnRlbnQubDEgPSBsM2VfY29udGVudC5sMzsKIApA QCAtNjA4LDcgKzczNyw3IEBAIHAybV9wdF9zZXRfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAy bSwgZ2ZuX3QgZ2ZuXywgbWZuX3QgbWZuLAogCiAgICAgICAgIGlmICggbWZuX3ZhbGlkKG1mbikg fHwgcDJtX2FsbG93c19pbnZhbGlkX21mbihwMm10KSApCiAgICAgICAgICAgICBlbnRyeV9jb250 ZW50ID0gcDJtX2wxZV9mcm9tX3BmbihtZm5feChtZm4pLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBwMm1fdHlwZV90b19mbGFncyhwMm0sIHAybXQsIG1mbiwgMCkp OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwMm1fdHlwZV90b19m bGFncyhwMm0sIHAybXQsIG1mbiwgMCwgcDJtYSkpOwogICAgICAgICBlbHNlCiAgICAgICAgICAg ICBlbnRyeV9jb250ZW50ID0gbDFlX2VtcHR5KCk7CiAKQEAgLTY2MSw3ICs3OTAsNyBAQCBwMm1f cHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1m biwKICAgICAgICAgQVNTRVJUKCFtZm5fdmFsaWQobWZuKSB8fCBwMm10ICE9IHAybV9tbWlvX2Rp cmVjdCk7CiAgICAgICAgIGwyZV9jb250ZW50ID0gbWZuX3ZhbGlkKG1mbikgfHwgcDJtX2FsbG93 c19pbnZhbGlkX21mbihwMm10KQogICAgICAgICAgICAgPyBwMm1fbDJlX2Zyb21fcGZuKG1mbl94 KG1mbiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcDJtX3R5cGVfdG9fZmxhZ3Mo cDJtLCBwMm10LCBtZm4sIDEpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAybV90 eXBlX3RvX2ZsYWdzKHAybSwgcDJtdCwgbWZuLCAxLCBwMm1hKSkKICAgICAgICAgICAgIDogbDJl X2VtcHR5KCk7CiAgICAgICAgIGVudHJ5X2NvbnRlbnQubDEgPSBsMmVfY29udGVudC5sMjsKIApA QCAtNjcyLDYgKzgwMSwxMyBAQCBwMm1fcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpw Mm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwKICAgICAgICAgLyogTkI6IHBhZ2luZ193cml0ZV9w Mm1fZW50cnkoKSBoYW5kbGVzIHRsYiBmbHVzaGVzIHByb3Blcmx5ICovCiAgICAgfQogCisgICAg LyogCisgICAgICogRm9yIHN0b3Jpbmcgb2YgJ2V4dHJhJyBpbmZvcm1hdGlvbiwgb25seSBzZXQg dGhlIGZpcnN0IGdmbiBpbgorICAgICAqIGFueSByYW5nZTsgdXNlIHRoZSBwMm0gdGFibGUgaXRz ZWxmIHRvIHJlY29yZCB0aGUgb3JkZXIgY292ZXJlZAorICAgICAqIGJ5IHRoYXQgZW50cnkuCisg ICAgICovCisgICAgcDJtX3B0X3NldF9leHRyYShwMm0sIGdmbiwgZXh0cmEpOworCiAgICAgLyog VHJhY2sgdGhlIGhpZ2hlc3QgZ2ZuIGZvciB3aGljaCB3ZSBoYXZlIGV2ZXIgaGFkIGEgdmFsaWQg bWFwcGluZyAqLwogICAgIGlmICggcDJtdCAhPSBwMm1faW52YWxpZAogICAgICAgICAgJiYgKGdm biArICgxVUwgPDwgcGFnZV9vcmRlcikgLSAxID4gcDJtLT5tYXhfbWFwcGVkX3BmbikgKQpAQCAt NzQ5LDggKzg4NSw3IEBAIHAybV9wdF9nZXRfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwg Z2ZuX3QgZ2ZuXywKICAgICAgKiBYWFggT25jZSB3ZSBzdGFydCBleHBsaWNpdGx5IHJlZ2lzdGVy aW5nIE1NSU8gcmVnaW9ucyBpbiB0aGUgcDJtIAogICAgICAqIFhYWCB3ZSB3aWxsIHJldHVybiBw Mm1faW52YWxpZCBmb3IgdW5tYXBwZWQgZ2ZucyAqLwogICAgICp0ID0gcDJtX21taW9fZG07Ci0g ICAgLyogTm90IGltcGxlbWVudGVkIGV4Y2VwdCB3aXRoIEVQVCAqLwotICAgICphID0gcDJtX2Fj Y2Vzc19yd3g7IAorICAgICphID0gcDJtX2FjY2Vzc19uOwogCiAgICAgaWYgKCBnZm4gPiBwMm0t Pm1heF9tYXBwZWRfcGZuICkKICAgICB7CkBAIC04MTMsNiArOTQ4LDcgQEAgcG9kX3JldHJ5X2wz OgogICAgICAgICAgICAgICAgICAgICAgICBsMV90YWJsZV9vZmZzZXQoYWRkcikpOwogICAgICAg ICAgICAgKnQgPSBwMm1fcmVjYWxjX3R5cGUocmVjYWxjIHx8IF9uZWVkc19yZWNhbGMoZmxhZ3Mp LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcDJtX2ZsYWdzX3RvX3R5cGUoZmxh Z3MpLCBwMm0sIGdmbik7CisgICAgICAgICAgICAqYSA9IHAybV9wdF9nZXRfZXh0cmEocDJtLCBn Zm4sIDIpLmFjY2VzczsKICAgICAgICAgICAgIHVubWFwX2RvbWFpbl9wYWdlKGwzZSk7CiAKICAg ICAgICAgICAgIEFTU0VSVChtZm5fdmFsaWQobWZuKSB8fCAhcDJtX2lzX3JhbSgqdCkpOwpAQCAt ODUyLDYgKzk4OCw3IEBAIHBvZF9yZXRyeV9sMjoKICAgICAgICAgbWZuID0gX21mbihsMmVfZ2V0 X3BmbigqbDJlKSArIGwxX3RhYmxlX29mZnNldChhZGRyKSk7CiAgICAgICAgICp0ID0gcDJtX3Jl Y2FsY190eXBlKHJlY2FsYyB8fCBfbmVlZHNfcmVjYWxjKGZsYWdzKSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcDJtX2ZsYWdzX3RvX3R5cGUoZmxhZ3MpLCBwMm0sIGdmbik7CisgICAg ICAgICphID0gcDJtX3B0X2dldF9leHRyYShwMm0sIGdmbiwgMSkuYWNjZXNzOwogICAgICAgICB1 bm1hcF9kb21haW5fcGFnZShsMmUpOwogICAgICAgICAKICAgICAgICAgQVNTRVJUKG1mbl92YWxp ZChtZm4pIHx8ICFwMm1faXNfcmFtKCp0KSk7CkBAIC04ODgsNiArMTAyNSw3IEBAIHBvZF9yZXRy eV9sMToKICAgICB9CiAgICAgbWZuID0gbDFlX2dldF9tZm4oKmwxZSk7CiAgICAgKnQgPSBwMm1f cmVjYWxjX3R5cGUocmVjYWxjIHx8IF9uZWVkc19yZWNhbGMoZmxhZ3MpLCBsMXQsIHAybSwgZ2Zu KTsKKyAgICAqYSA9IHAybV9wdF9nZXRfZXh0cmEocDJtLCBnZm4sIDApLmFjY2VzczsKICAgICB1 bm1hcF9kb21haW5fcGFnZShsMWUpOwogCiAgICAgQVNTRVJUKG1mbl92YWxpZChtZm4pIHx8ICFw Mm1faXNfcmFtKCp0KSB8fCBwMm1faXNfcGFnaW5nKCp0KSk7CkBAIC0xMTI5LDYgKzEyNjcsNyBA QCB2b2lkIHAybV9wdF9pbml0KHN0cnVjdCBwMm1fZG9tYWluICpwMm0pCiAgICAgcDJtLT5jaGFu Z2VfZW50cnlfdHlwZV9nbG9iYWwgPSBwMm1fcHRfY2hhbmdlX2VudHJ5X3R5cGVfZ2xvYmFsOwog ICAgIHAybS0+Y2hhbmdlX2VudHJ5X3R5cGVfcmFuZ2UgPSBwMm1fcHRfY2hhbmdlX2VudHJ5X3R5 cGVfcmFuZ2U7CiAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkgPSBwYWdpbmdfd3JpdGVfcDJtX2Vu dHJ5OworICAgIHAybS0+c2V0X2RlZmF1bHRfYWNjZXNzID0gcDJtX3B0X3NldF9kZWZhdWx0X2Fj Y2VzczsKICNpZiBQMk1fQVVESVQKICAgICBwMm0tPmF1ZGl0X3AybSA9IHAybV9wdF9hdWRpdF9w Mm07CiAjZWxzZQpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3AybS5jIGIveGVuL2FyY2gv eDg2L21tL3AybS5jCmluZGV4IGVkMmU4ZGFmNTguLjcwNmE4ZWM4YmIgMTAwNjQ0Ci0tLSBhL3hl bi9hcmNoL3g4Ni9tbS9wMm0uYworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLmMKQEAgLTY4Miw2 ICs2ODIsMTIgQEAgdm9pZCBwMm1fdGVhcmRvd24oc3RydWN0IHAybV9kb21haW4gKnAybSkKIAog ICAgIGQgPSBwMm0tPmRvbWFpbjsKIAorICAgIGlmICggcDJtLT5leHRyYSApCisgICAgeworICAg ICAgICByYWRpeF90cmVlX2Rlc3Ryb3kocDJtLT5leHRyYSwgTlVMTCk7CisgICAgICAgIHhmcmVl KHAybS0+ZXh0cmEpOworICAgIH0KKwogICAgIHAybV9sb2NrKHAybSk7CiAgICAgQVNTRVJUKGF0 b21pY19yZWFkKCZkLT5zaHJfcGFnZXMpID09IDApOwogICAgIHAybS0+cGh5c190YWJsZSA9IHBh Z2V0YWJsZV9udWxsKCk7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW9uaXRvci5jIGIveGVu L2FyY2gveDg2L21vbml0b3IuYwppbmRleCAzYzQyZTIxOTA2Li4yZTZiMWU3NWU0IDEwMDY0NAot LS0gYS94ZW4vYXJjaC94ODYvbW9uaXRvci5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tb25pdG9yLmMK QEAgLTIwLDYgKzIwLDcgQEAKICAqLwogCiAjaW5jbHVkZSA8YXNtL21vbml0b3IuaD4KKyNpbmNs dWRlIDxhc20vcDJtLmg+CiAjaW5jbHVkZSA8cHVibGljL3ZtX2V2ZW50Lmg+CiAKIGludCBhcmNo X21vbml0b3JfaW5pdF9kb21haW4oc3RydWN0IGRvbWFpbiAqZCkKZGlmZiAtLWdpdCBhL3hlbi9p bmNsdWRlL2FzbS14ODYvbWVtX2FjY2Vzcy5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9tZW1fYWNj ZXNzLmgKaW5kZXggNDA0M2M5ZmI0ZC4uMzRmMmMwNzA4OCAxMDA2NDQKLS0tIGEveGVuL2luY2x1 ZGUvYXNtLXg4Ni9tZW1fYWNjZXNzLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9tZW1fYWNj ZXNzLmgKQEAgLTQ2LDcgKzQ2LDcgQEAgYm9vbCBwMm1fbWVtX2FjY2Vzc19lbXVsYXRlX2NoZWNr KHN0cnVjdCB2Y3B1ICp2LAogLyogU2FuaXR5IGNoZWNrIGZvciBtZW1fYWNjZXNzIGhhcmR3YXJl IHN1cHBvcnQgKi8KIHN0YXRpYyBpbmxpbmUgYm9vbCBwMm1fbWVtX2FjY2Vzc19zYW5pdHlfY2hl Y2soc3RydWN0IGRvbWFpbiAqZCkKIHsKLSAgICByZXR1cm4gaXNfaHZtX2RvbWFpbihkKSAmJiBj cHVfaGFzX3ZteCAmJiBoYXBfZW5hYmxlZChkKTsKKyAgICByZXR1cm4gaXNfaHZtX2RvbWFpbihk KSAmJiBoYXBfZW5hYmxlZChkKTsKIH0KIAogI2VuZGlmIC8qX19BU01fWDg2X01FTV9BQ0NFU1Nf SF9fICovCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oIGIveGVuL2luY2x1 ZGUvYXNtLXg4Ni9wMm0uaAppbmRleCBiZTNiNmZjYWYwLi5hNWUxMTkzZGNjIDEwMDY0NAotLS0g YS94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJt LmgKQEAgLTE4NSw2ICsxODUsMTYgQEAgdHlwZWRlZiBlbnVtIHsKICAgICBwMm1fYWx0ZXJuYXRl LAogfSBwMm1fY2xhc3NfdDsKIAordHlwZWRlZiB1bmlvbiB7CisgICAgc3RydWN0IHsKKyAgICAg ICAgdTMyICBhY2Nlc3MgICAgICA6ICAgNCwgIC8qIHAybV9hY2Nlc3NfdCAqLworICAgICAgICAg ICAgX2F2YWlsYWJsZSAgIDogIDI1LAorICAgICAgICAgICAgX3Jlc2VydmVkICAgIDogICAzOyAg LyogVXBwZXIgdHdvIGJpdHMgcmVzZXJ2ZWQgKi8KKyAgICB9OworICAgIGludCBleHRyYTsKK30g cDJtX2V4dHJhX3Q7CisKKwogLyogUGVyLXAybS10YWJsZSBzdGF0ZSAqLwogc3RydWN0IHAybV9k b21haW4gewogICAgIC8qIExvY2sgdGhhdCBwcm90ZWN0cyB1cGRhdGVzIHRvIHRoZSBwMm0gKi8K QEAgLTI3MCw2ICsyODAsOCBAQCBzdHJ1Y3QgcDJtX2RvbWFpbiB7CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGdmbiwgbDFfcGdlbnRyeV90 ICpwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbDFfcGdlbnRy eV90IG5ldywgdW5zaWduZWQgaW50IGxldmVsKTsKICAgICBsb25nICAgICAgICAgICAgICAgKCph dWRpdF9wMm0pKHN0cnVjdCBwMm1fZG9tYWluICpwMm0pOworICAgIGludCAgICAgICAgICAgICAg ICAoKnNldF9kZWZhdWx0X2FjY2Vzcykoc3RydWN0IHAybV9kb21haW4gKnAybSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAybV9hY2Nlc3NfdCBwMm1hKTsK IAogICAgIC8qCiAgICAgICogUDJNIHVwZGF0ZXMgbWF5IHJlcXVpcmUgVExCcyB0byBiZSBmbHVz aGVkIChpbnZhbGlkYXRlZCkuCkBAIC0yOTIsNiArMzA0LDEyIEBAIHN0cnVjdCBwMm1fZG9tYWlu IHsKICAgICAgKiByZXR5cGVkIGdldCB0aGlzIGFjY2VzcyB0eXBlLiAgU2VlIGRlZmluaXRpb24g b2YgcDJtX2FjY2Vzc190LiAqLwogICAgIHAybV9hY2Nlc3NfdCBkZWZhdWx0X2FjY2VzczsKIAor ICAgIC8qCisgICAgICogUmFkaXggdHJlZSB0byBzdG9yZSBleHRyYSBpbmZvcm1hdGlvbiB3aGlj aCBkb2Vzbid0IGZpdCBpbiB0aGUKKyAgICAgKiBwMm0ncyBQVEUKKyAgICAgKi8KKyAgICBzdHJ1 Y3QgcmFkaXhfdHJlZV9yb290ICpleHRyYTsKKwogICAgIC8qIElmIHRydWUsIGFuZCBhbiBhY2Nl c3MgZmF1bHQgY29tZXMgaW4gYW5kIHRoZXJlIGlzIG5vIHZtX2V2ZW50IGxpc3RlbmVyLCAKICAg ICAgKiBwYXVzZSBkb21haW4uICBPdGhlcndpc2UsIHJlbW92ZSBhY2Nlc3MgcmVzdHJpY3Rpb25z LiAqLwogICAgIGJvb2xfdCAgICAgICBhY2Nlc3NfcmVxdWlyZWQ7Ci0tIAoyLjE5LjAKCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFp bGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhl bnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs