Return-Path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 171566E450 for ; Mon, 26 Feb 2018 11:16:04 +0000 (UTC) From: Maarten Lankhorst Date: Mon, 26 Feb 2018 12:15:57 +0100 Message-Id: <20180226111558.58056-4-maarten.lankhorst@linux.intel.com> In-Reply-To: <20180226111558.58056-1-maarten.lankhorst@linux.intel.com> References: <20180226111558.58056-1-maarten.lankhorst@linux.intel.com> Subject: [igt-dev] [PATCH i-g-t 3/4] tests/kms_frontbuffer_tracking: Convert test to use igt_display. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: U3RyYWlnaHQgY29udmVyc2lvbiwgbm8gYmVoYXZpb3JhbCBjaGFuZ2VzIHlldC4KClNpZ25lZC1v ZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5j b20+Ci0tLQogdGVzdHMva21zX2Zyb250YnVmZmVyX3RyYWNraW5nLmMgfCA3ODAgKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjY5IGluc2Vy dGlvbnMoKyksIDUxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfZnJvbnRi dWZmZXJfdHJhY2tpbmcuYyBiL3Rlc3RzL2ttc19mcm9udGJ1ZmZlcl90cmFja2luZy5jCmluZGV4 IDE0ODNjMjI4MDQ0ZS4uNjY3MjE1NGU2N2I5IDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfZnJvbnRi dWZmZXJfdHJhY2tpbmcuYworKysgYi90ZXN0cy9rbXNfZnJvbnRidWZmZXJfdHJhY2tpbmcuYwpA QCAtMTUxLDE4ICsxNTEsMTEgQEAgc3RydWN0IHJlY3QgewogCXVpbnQzMl90IGNvbG9yOwogfTsK IAotI2RlZmluZSBNQVhfQ09OTkVDVE9SUyAzMgotI2RlZmluZSBNQVhfUExBTkVTIDMyCi0jZGVm aW5lIE1BWF9FTkNPREVSUyAzMgogc3RydWN0IHsKIAlpbnQgZmQ7CiAJaW50IGRlYnVnZnM7Ci0J ZHJtTW9kZVJlc1B0ciByZXM7Ci0JZHJtTW9kZUNvbm5lY3RvclB0ciBjb25uZWN0b3JzW01BWF9D T05ORUNUT1JTXTsKLQlkcm1Nb2RlRW5jb2RlclB0ciBlbmNvZGVyc1tNQVhfRU5DT0RFUlNdOwot CWRybU1vZGVQbGFuZVJlc1B0ciBwbGFuZV9yZXM7Ci0JZHJtTW9kZVBsYW5lUHRyIHBsYW5lc1tN QVhfUExBTkVTXTsKLQl1aW50NjRfdCBwbGFuZV90eXBlc1tNQVhfUExBTkVTXTsKKwlpZ3RfZGlz cGxheV90IGRpc3BsYXk7CisKIAlkcm1faW50ZWxfYnVmbWdyICpidWZtZ3I7CiB9IGRybTsKIApA QCAtMjIyLDYgKzIxNSw3IEBAIHN0cnVjdCB7CiAgKiBoYXZlIGEgYmlnIGZyYW1lYnVmZmVyIGFu ZCB0aGUgQ1JUQyBpcyBqdXN0IGRpc3BsYXlpbmcgYSBzdWJyZWdpb24gb2YgdGhpcwogICogYmln IEZCLiAqLwogc3RydWN0IGZiX3JlZ2lvbiB7CisJaWd0X3BsYW5lX3QgKnBsYW5lOwogCXN0cnVj dCBpZ3RfZmIgKmZiOwogCWludCB4OwogCWludCB5OwpAQCAtMjc3LDE3ICsyNzEsMTggQEAgc3Ry dWN0IHsKIH07CiAKIHN0cnVjdCBtb2Rlc2V0X3BhcmFtcyB7Ci0JdWludDMyX3QgY3J0Y19pZDsK LQl1aW50MzJfdCBjb25uZWN0b3JfaWQ7Ci0JdWludDMyX3Qgc3ByaXRlX2lkOwotCWRybU1vZGVN b2RlSW5mb1B0ciBtb2RlOwotCXN0cnVjdCBmYl9yZWdpb24gZmI7CisJZW51bSBwaXBlIHBpcGU7 CisJaWd0X291dHB1dF90ICpvdXRwdXQ7CisJZHJtTW9kZU1vZGVJbmZvIG1vZGVfY29weSwgKm1v ZGU7CisKKwlzdHJ1Y3QgZmJfcmVnaW9uIHByaW1hcnk7CiAJc3RydWN0IGZiX3JlZ2lvbiBjdXJz b3I7CiAJc3RydWN0IGZiX3JlZ2lvbiBzcHJpdGU7CiB9OwogCiBzdHJ1Y3QgbW9kZXNldF9wYXJh bXMgcHJpbV9tb2RlX3BhcmFtczsKIHN0cnVjdCBtb2Rlc2V0X3BhcmFtcyBzY25kX21vZGVfcGFy YW1zOworCiBzdHJ1Y3QgZmJfcmVnaW9uIG9mZnNjcmVlbl9mYjsKIHN0cnVjdCBzY3JlZW5fZmJz IHsKIAlib29sIGluaXRpYWxpemVkOwpAQCAtMzM3LDEzICszMzIsMTQgQEAgZHJtTW9kZU1vZGVJ bmZvIHN0ZF8xMDI0X21vZGUgPSB7CiAJLm5hbWUgPSAiQ3VzdG9tIDEwMjR4NzY4IiwKIH07CiAK LXN0YXRpYyBkcm1Nb2RlTW9kZUluZm9QdHIgZ2V0X2Nvbm5lY3Rvcl9zbWFsbGVzdF9tb2RlKGRy bU1vZGVDb25uZWN0b3JQdHIgYykKK3N0YXRpYyBkcm1Nb2RlTW9kZUluZm8gKmdldF9jb25uZWN0 b3Jfc21hbGxlc3RfbW9kZShpZ3Rfb3V0cHV0X3QgKm91dHB1dCkKIHsKKwlkcm1Nb2RlQ29ubmVj dG9yICpjID0gb3V0cHV0LT5jb25maWcuY29ubmVjdG9yOworCWRybU1vZGVNb2RlSW5mbyAqc21h bGxlc3QgPSBOVUxMOwogCWludCBpOwotCWRybU1vZGVNb2RlSW5mb1B0ciBzbWFsbGVzdCA9IE5V TEw7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYy0+Y291bnRfbW9kZXM7IGkrKykgewotCQlkcm1Nb2Rl TW9kZUluZm9QdHIgbW9kZSA9ICZjLT5tb2Rlc1tpXTsKKwkJZHJtTW9kZU1vZGVJbmZvICptb2Rl ID0gJmMtPm1vZGVzW2ldOwogCiAJCWlmICghc21hbGxlc3QpCiAJCQlzbWFsbGVzdCA9IG1vZGU7 CkBAIC0zNTksNzEgKzM1NSw1MyBAQCBzdGF0aWMgZHJtTW9kZU1vZGVJbmZvUHRyIGdldF9jb25u ZWN0b3Jfc21hbGxlc3RfbW9kZShkcm1Nb2RlQ29ubmVjdG9yUHRyIGMpCiAJcmV0dXJuIHNtYWxs ZXN0OwogfQogCi1zdGF0aWMgZHJtTW9kZUNvbm5lY3RvclB0ciBnZXRfY29ubmVjdG9yKHVpbnQz Ml90IGlkKQotewotCWludCBpOwotCi0JZm9yIChpID0gMDsgaSA8IGRybS5yZXMtPmNvdW50X2Nv bm5lY3RvcnM7IGkrKykKLQkJaWYgKGRybS5yZXMtPmNvbm5lY3RvcnNbaV0gPT0gaWQpCi0JCQly ZXR1cm4gZHJtLmNvbm5lY3RvcnNbaV07Ci0KLQlpZ3RfYXNzZXJ0KGZhbHNlKTsKLX0KLQotc3Rh dGljIGRybU1vZGVFbmNvZGVyUHRyIGdldF9lbmNvZGVyKHVpbnQzMl90IGlkKQorc3RhdGljIGRy bU1vZGVNb2RlSW5mbyAqY29ubmVjdG9yX2dldF9tb2RlKGlndF9vdXRwdXRfdCAqb3V0cHV0KQog ewotCWludCBpOworCWRybU1vZGVNb2RlSW5mbyAqbW9kZSA9IE5VTEw7CiAKLQlmb3IgKGkgPSAw OyBpIDwgZHJtLnJlcy0+Y291bnRfZW5jb2RlcnM7IGkrKykKLQkJaWYgKGRybS5yZXMtPmVuY29k ZXJzW2ldID09IGlkKQotCQkJcmV0dXJuIGRybS5lbmNvZGVyc1tpXTsKLQotCWlndF9hc3NlcnQo ZmFsc2UpOwotfQorCWlmIChvcHQuc21hbGxfbW9kZXMpCisJCW1vZGUgPSBnZXRfY29ubmVjdG9y X3NtYWxsZXN0X21vZGUob3V0cHV0KTsKKwllbHNlCisJCW1vZGUgPSAmb3V0cHV0LT5jb25maWcu ZGVmYXVsdF9tb2RlOwogCi1zdGF0aWMgdm9pZCBwcmludF9tb2RlX2luZm8oY29uc3QgY2hhciAq c2NyZWVuLCBzdHJ1Y3QgbW9kZXNldF9wYXJhbXMgKnBhcmFtcykKLXsKLQlkcm1Nb2RlQ29ubmVj dG9yUHRyIGMgPSBnZXRfY29ubmVjdG9yKHBhcmFtcy0+Y29ubmVjdG9yX2lkKTsKKwkgLyogT24g SFNXIHRoZSBDUkMgV0EgaXMgc28gYXdmdWwgdGhhdCBpdCBtYWtlcyB5b3UgdGhpbmsgZXZlcnl0 aGluZyBpcworCSAgKiBidWdnZWQuICovCisJaWYgKElTX0hBU1dFTEwoaW50ZWxfZ2V0X2RybV9k ZXZpZChkcm0uZmQpKSAmJgorCSAgICBvdXRwdXQtPmNvbmZpZy5jb25uZWN0b3ItPmNvbm5lY3Rv cl90eXBlID09IERSTV9NT0RFX0NPTk5FQ1RPUl9lRFApCisJCW1vZGUgPSAmc3RkXzEwMjRfbW9k ZTsKIAotCWlndF9pbmZvKCIlcyBzY3JlZW46ICVzICVzLCBjcnRjICVkXG4iLAotCQkgc2NyZWVu LAotCQkga21zdGVzdF9jb25uZWN0b3JfdHlwZV9zdHIoYy0+Y29ubmVjdG9yX3R5cGUpLAotCQkg cGFyYW1zLT5tb2RlLT5uYW1lLAotCQkga21zdGVzdF9nZXRfY3J0Y19pZHgoZHJtLnJlcywgcGFy YW1zLT5jcnRjX2lkKSk7CisJcmV0dXJuIG1vZGU7CiB9CiAKLXN0YXRpYyB2b2lkIGluaXRfbW9k ZV9wYXJhbXMoc3RydWN0IG1vZGVzZXRfcGFyYW1zICpwYXJhbXMsIHVpbnQzMl90IGNydGNfaWQs Ci0JCQkgICAgIGRybU1vZGVDb25uZWN0b3JQdHIgY29ubmVjdG9yLAotCQkJICAgICBkcm1Nb2Rl TW9kZUluZm9QdHIgbW9kZSkKK3N0YXRpYyB2b2lkIGluaXRfbW9kZV9wYXJhbXMoc3RydWN0IG1v ZGVzZXRfcGFyYW1zICpwYXJhbXMsCisJCQkgICAgIGlndF9vdXRwdXRfdCAqb3V0cHV0LCBlbnVt IHBpcGUgcGlwZSkKIHsKLQl1aW50MzJfdCBvdmVybGF5X3BsYW5lX2lkID0gMDsKLQlpbnQgY3J0 Y19pZHggPSBrbXN0ZXN0X2dldF9jcnRjX2lkeChkcm0ucmVzLCBjcnRjX2lkKTsKLQlpbnQgaTsK LQotCWZvciAoaSA9IDA7IGkgPCBkcm0ucGxhbmVfcmVzLT5jb3VudF9wbGFuZXM7IGkrKykKLQkJ aWYgKChkcm0ucGxhbmVzW2ldLT5wb3NzaWJsZV9jcnRjcyAmICgxIDw8IGNydGNfaWR4KSkgJiYK LQkJICAgIGRybS5wbGFuZV90eXBlc1tpXSA9PSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZKSB7Ci0J CQlvdmVybGF5X3BsYW5lX2lkID0gZHJtLnBsYW5lc1tpXS0+cGxhbmVfaWQ7Ci0JCQlicmVhazsK LQkJfQorCWRybU1vZGVNb2RlSW5mbyAqbW9kZTsKIAotCWlndF9yZXF1aXJlKG92ZXJsYXlfcGxh bmVfaWQpOworCWlndF9vdXRwdXRfb3ZlcnJpZGVfbW9kZShvdXRwdXQsIE5VTEwpOworCW1vZGUg PSBjb25uZWN0b3JfZ2V0X21vZGUob3V0cHV0KTsKIAotCXBhcmFtcy0+Y3J0Y19pZCA9IGNydGNf aWQ7Ci0JcGFyYW1zLT5jb25uZWN0b3JfaWQgPSBjb25uZWN0b3ItPmNvbm5lY3Rvcl9pZDsKLQlw YXJhbXMtPm1vZGUgPSBtb2RlOwotCXBhcmFtcy0+c3ByaXRlX2lkID0gb3ZlcmxheV9wbGFuZV9p ZDsKKwlwYXJhbXMtPnBpcGUgPSBwaXBlOworCXBhcmFtcy0+b3V0cHV0ID0gb3V0cHV0OworCXBh cmFtcy0+bW9kZV9jb3B5ID0gKm1vZGU7CisJcGFyYW1zLT5tb2RlID0gJnBhcmFtcy0+bW9kZV9j b3B5OwogCi0JcGFyYW1zLT5mYi5mYiA9IE5VTEw7Ci0JcGFyYW1zLT5mYi53ID0gbW9kZS0+aGRp c3BsYXk7Ci0JcGFyYW1zLT5mYi5oID0gbW9kZS0+dmRpc3BsYXk7CisJcGFyYW1zLT5wcmltYXJ5 LnBsYW5lID0gaWd0X3BpcGVfZ2V0X3BsYW5lX3R5cGUoJmRybS5kaXNwbGF5LnBpcGVzW3BpcGVd LCBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsKKwlwYXJhbXMtPnByaW1hcnkuZmIgPSBOVUxMOwor CXBhcmFtcy0+cHJpbWFyeS54ID0gMDsKKwlwYXJhbXMtPnByaW1hcnkueSA9IDA7CisJcGFyYW1z LT5wcmltYXJ5LncgPSBtb2RlLT5oZGlzcGxheTsKKwlwYXJhbXMtPnByaW1hcnkuaCA9IG1vZGUt PnZkaXNwbGF5OwogCisJcGFyYW1zLT5jdXJzb3IucGxhbmUgPSBpZ3RfcGlwZV9nZXRfcGxhbmVf dHlwZSgmZHJtLmRpc3BsYXkucGlwZXNbcGlwZV0sIERSTV9QTEFORV9UWVBFX0NVUlNPUik7CiAJ cGFyYW1zLT5jdXJzb3IuZmIgPSBOVUxMOwogCXBhcmFtcy0+Y3Vyc29yLnggPSAwOwogCXBhcmFt cy0+Y3Vyc29yLnkgPSAwOwogCXBhcmFtcy0+Y3Vyc29yLncgPSA2NDsKIAlwYXJhbXMtPmN1cnNv ci5oID0gNjQ7CiAKKwlwYXJhbXMtPnNwcml0ZS5wbGFuZSA9IGlndF9waXBlX2dldF9wbGFuZV90 eXBlKCZkcm0uZGlzcGxheS5waXBlc1twaXBlXSwgRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWSk7CisJ aWd0X3JlcXVpcmUocGFyYW1zLT5zcHJpdGUucGxhbmUpOwogCXBhcmFtcy0+c3ByaXRlLmZiID0g TlVMTDsKIAlwYXJhbXMtPnNwcml0ZS54ID0gMDsKIAlwYXJhbXMtPnNwcml0ZS55ID0gMDsKQEAg LTQzMSw2MyArNDA5LDMyIEBAIHN0YXRpYyB2b2lkIGluaXRfbW9kZV9wYXJhbXMoc3RydWN0IG1v ZGVzZXRfcGFyYW1zICpwYXJhbXMsIHVpbnQzMl90IGNydGNfaWQsCiAJcGFyYW1zLT5zcHJpdGUu aCA9IDY0OwogfQogCi1zdGF0aWMgYm9vbCBjb25uZWN0b3JfZ2V0X21vZGUoZHJtTW9kZUNvbm5l Y3RvclB0ciBjLCBkcm1Nb2RlTW9kZUluZm9QdHIgKm1vZGUpCi17Ci0JKm1vZGUgPSBOVUxMOwot Ci0JaWYgKGMtPmNvbm5lY3Rpb24gIT0gRFJNX01PREVfQ09OTkVDVEVEIHx8ICFjLT5jb3VudF9t b2RlcykKLQkJcmV0dXJuIGZhbHNlOwotCi0JaWYgKGMtPmNvbm5lY3Rvcl90eXBlID09IERSTV9N T0RFX0NPTk5FQ1RPUl9lRFAgJiYgb3B0Lm5vX2VkcCkKLQkJcmV0dXJuIGZhbHNlOwotCi0JaWYg KG9wdC5zbWFsbF9tb2RlcykKLQkJKm1vZGUgPSBnZXRfY29ubmVjdG9yX3NtYWxsZXN0X21vZGUo Yyk7Ci0JZWxzZQotCQkqbW9kZSA9ICZjLT5tb2Rlc1swXTsKLQotCSAvKiBPbiBIU1cgdGhlIENS QyBXQSBpcyBzbyBhd2Z1bCB0aGF0IGl0IG1ha2VzIHlvdSB0aGluayBldmVyeXRoaW5nIGlzCi0J ICAqIGJ1Z2dlZC4gKi8KLQlpZiAoSVNfSEFTV0VMTChpbnRlbF9nZXRfZHJtX2RldmlkKGRybS5m ZCkpICYmCi0JICAgIGMtPmNvbm5lY3Rvcl90eXBlID09IERSTV9NT0RFX0NPTk5FQ1RPUl9lRFAp Ci0JCSptb2RlID0gJnN0ZF8xMDI0X21vZGU7Ci0KLQlyZXR1cm4gdHJ1ZTsKLX0KLQotc3RhdGlj IGJvb2wgY29ubmVjdG9yX3N1cHBvcnRzX3BpcGVfYShkcm1Nb2RlQ29ubmVjdG9yUHRyIGNvbm5l Y3RvcikKLXsKLQlpbnQgaTsKLQotCWZvciAoaSA9IDA7IGkgPCBjb25uZWN0b3ItPmNvdW50X2Vu Y29kZXJzOyBpKyspCi0JCWlmIChnZXRfZW5jb2Rlcihjb25uZWN0b3ItPmVuY29kZXJzW2ldKS0+ cG9zc2libGVfY3J0Y3MgJiAxKQotCQkJcmV0dXJuIHRydWU7Ci0KLQlyZXR1cm4gZmFsc2U7Ci19 Ci0KLXN0YXRpYyBib29sIGZpbmRfY29ubmVjdG9yKGJvb2wgZWRwX29ubHksIGJvb2wgcGlwZV9h LCB1aW50MzJfdCBmb3JiaWRkZW5faWQsCi0JCQkgICBkcm1Nb2RlQ29ubmVjdG9yUHRyICpyZXRf Y29ubmVjdG9yLAotCQkJICAgZHJtTW9kZU1vZGVJbmZvUHRyICpyZXRfbW9kZSkKK3N0YXRpYyBi b29sIGZpbmRfY29ubmVjdG9yKGJvb2wgZWRwX29ubHksIGJvb2wgcGlwZV9hLAorCQkJICAgaWd0 X291dHB1dF90ICpmb3JiaWRkZW5fb3V0cHV0LAorCQkJICAgZW51bSBwaXBlIGZvcmJpZGRlbl9w aXBlLAorCQkJICAgaWd0X291dHB1dF90ICoqcmV0X291dHB1dCwKKwkJCSAgIGVudW0gcGlwZSAq cmV0X3BpcGUpCiB7Ci0JZHJtTW9kZUNvbm5lY3RvclB0ciBjID0gTlVMTDsKLQlkcm1Nb2RlTW9k ZUluZm9QdHIgbW9kZSA9IE5VTEw7Ci0JaW50IGk7CisJaWd0X291dHB1dF90ICpvdXRwdXQ7CisJ ZW51bSBwaXBlIHBpcGU7CiAKLQlmb3IgKGkgPSAwOyBpIDwgZHJtLnJlcy0+Y291bnRfY29ubmVj dG9yczsgaSsrKSB7Ci0JCWMgPSBkcm0uY29ubmVjdG9yc1tpXTsKKwlmb3JfZWFjaF9waXBlX3dp dGhfdmFsaWRfb3V0cHV0KCZkcm0uZGlzcGxheSwgcGlwZSwgb3V0cHV0KSB7CisJCWRybU1vZGVD b25uZWN0b3JQdHIgYyA9IG91dHB1dC0+Y29uZmlnLmNvbm5lY3RvcjsKIAogCQlpZiAoZWRwX29u bHkgJiYgYy0+Y29ubmVjdG9yX3R5cGUgIT0gRFJNX01PREVfQ09OTkVDVE9SX2VEUCkKIAkJCWNv bnRpbnVlOwotCQlpZiAocGlwZV9hICYmICFjb25uZWN0b3Jfc3VwcG9ydHNfcGlwZV9hKGMpKQor CisJCWlmIChwaXBlX2EgJiYgcGlwZSAhPSBQSVBFX0EpCiAJCQljb250aW51ZTsKLQkJaWYgKGMt PmNvbm5lY3Rvcl9pZCA9PSBmb3JiaWRkZW5faWQpCisKKwkJaWYgKG91dHB1dCA9PSBmb3JiaWRk ZW5fb3V0cHV0IHx8IHBpcGUgPT0gZm9yYmlkZGVuX3BpcGUpCiAJCQljb250aW51ZTsKLQkJaWYg KCFjb25uZWN0b3JfZ2V0X21vZGUoYywgJm1vZGUpKQorCisJCWlmIChjLT5jb25uZWN0b3JfdHlw ZSA9PSBEUk1fTU9ERV9DT05ORUNUT1JfZURQICYmIG9wdC5ub19lZHApCiAJCQljb250aW51ZTsK IAotCQkqcmV0X2Nvbm5lY3RvciA9IGM7Ci0JCSpyZXRfbW9kZSA9IG1vZGU7CisJCSpyZXRfb3V0 cHV0ID0gb3V0cHV0OworCQkqcmV0X3BpcGUgPSBwaXBlOwogCQlyZXR1cm4gdHJ1ZTsKIAl9CiAK QEAgLTQ5Niw5ICs0NDMsOCBAQCBzdGF0aWMgYm9vbCBmaW5kX2Nvbm5lY3Rvcihib29sIGVkcF9v bmx5LCBib29sIHBpcGVfYSwgdWludDMyX3QgZm9yYmlkZGVuX2lkLAogCiBzdGF0aWMgYm9vbCBp bml0X21vZGVzZXRfY2FjaGVkX3BhcmFtcyh2b2lkKQogewotCWRybU1vZGVDb25uZWN0b3JQdHIg cHJpbV9jb25uZWN0b3IgPSBOVUxMLCBzY25kX2Nvbm5lY3RvciA9IE5VTEw7Ci0JZHJtTW9kZU1v ZGVJbmZvUHRyIHByaW1fbW9kZSA9IE5VTEwsIHNjbmRfbW9kZSA9IE5VTEw7Ci0JdWludDMyX3Qg cHJpbV9jcnRjX2lkLCBzY25kX2NydGNfaWQ7CisJaWd0X291dHB1dF90ICpwcmltX291dHB1dCA9 IE5VTEwsICpzY25kX291dHB1dCA9IE5VTEw7CisJZW51bSBwaXBlIHByaW1fcGlwZSwgc2NuZF9w aXBlOwogCiAJLyoKIAkgKiBXZSBoYXZlIHRoaXMgcHJvYmxlbSB3aGVyZSBQU1IgaXMgb25seSBw cmVzZW50IG9uIGVEUCBtb25pdG9ycyBhbmQKQEAgLTUwOCwzOSArNDU0LDI5IEBAIHN0YXRpYyBi b29sIGluaXRfbW9kZXNldF9jYWNoZWRfcGFyYW1zKHZvaWQpCiAJICogVE9ETzogcmVmYWN0b3Ig dGhlIGNvZGUgaW4gYSB3YXkgdGhhdCBhbGxvd3MgdXMgdG8gaGF2ZSBkaWZmZXJlbnQKIAkgKiBz ZXRzIG9mIHByaW0vc2NuZCBzdHJ1Y3RzIGZvciBkaWZmZXJlbnQgZmVhdHVyZXMuCiAJICovCi0J ZmluZF9jb25uZWN0b3IodHJ1ZSwgdHJ1ZSwgMCwgJnByaW1fY29ubmVjdG9yLCAmcHJpbV9tb2Rl KTsKLQlpZiAoIXByaW1fY29ubmVjdG9yKQotCQlmaW5kX2Nvbm5lY3Rvcih0cnVlLCBmYWxzZSwg MCwgJnByaW1fY29ubmVjdG9yLCAmcHJpbV9tb2RlKTsKLQlpZiAoIXByaW1fY29ubmVjdG9yKQot CQlmaW5kX2Nvbm5lY3RvcihmYWxzZSwgdHJ1ZSwgMCwgJnByaW1fY29ubmVjdG9yLCAmcHJpbV9t b2RlKTsKLQlpZiAoIXByaW1fY29ubmVjdG9yKQotCQlmaW5kX2Nvbm5lY3RvcihmYWxzZSwgZmFs c2UsIDAsICZwcmltX2Nvbm5lY3RvciwgJnByaW1fbW9kZSk7Ci0KLQlpZiAoIXByaW1fY29ubmVj dG9yKQorCWZpbmRfY29ubmVjdG9yKHRydWUsIHRydWUsIE5VTEwsIFBJUEVfTk9ORSwgJnByaW1f b3V0cHV0LCAmcHJpbV9waXBlKTsKKwlpZiAoIXByaW1fb3V0cHV0KQorCQlmaW5kX2Nvbm5lY3Rv cih0cnVlLCBmYWxzZSwgTlVMTCwgUElQRV9OT05FLCAmcHJpbV9vdXRwdXQsICZwcmltX3BpcGUp OworCWlmICghcHJpbV9vdXRwdXQpCisJCWZpbmRfY29ubmVjdG9yKGZhbHNlLCB0cnVlLCBOVUxM LCBQSVBFX05PTkUsICZwcmltX291dHB1dCwgJnByaW1fcGlwZSk7CisJaWYgKCFwcmltX291dHB1 dCkKKwkJZmluZF9jb25uZWN0b3IoZmFsc2UsIGZhbHNlLCBOVUxMLCBQSVBFX05PTkUsICZwcmlt X291dHB1dCwgJnByaW1fcGlwZSk7CisKKwlpZiAoIXByaW1fb3V0cHV0KQogCQlyZXR1cm4gZmFs c2U7CiAKLQlmaW5kX2Nvbm5lY3RvcihmYWxzZSwgZmFsc2UsIHByaW1fY29ubmVjdG9yLT5jb25u ZWN0b3JfaWQsCi0JCSAgICAgICAmc2NuZF9jb25uZWN0b3IsICZzY25kX21vZGUpOworCWZpbmRf Y29ubmVjdG9yKGZhbHNlLCBmYWxzZSwgcHJpbV9vdXRwdXQsIHByaW1fcGlwZSwKKwkJICAgICAg ICZzY25kX291dHB1dCwgJnNjbmRfcGlwZSk7CiAKLQlwcmltX2NydGNfaWQgPSBrbXN0ZXN0X2Zp bmRfY3J0Y19mb3JfY29ubmVjdG9yKGRybS5mZCwgZHJtLnJlcywKLQkJCQkJCSAgICAgICBwcmlt X2Nvbm5lY3RvciwgMCk7Ci0JaW5pdF9tb2RlX3BhcmFtcygmcHJpbV9tb2RlX3BhcmFtcywgcHJp bV9jcnRjX2lkLAotCQkJIHByaW1fY29ubmVjdG9yLCBwcmltX21vZGUpOwotCXByaW50X21vZGVf aW5mbygiUHJpbWFyeSIsICZwcmltX21vZGVfcGFyYW1zKTsKKwlpbml0X21vZGVfcGFyYW1zKCZw cmltX21vZGVfcGFyYW1zLCBwcmltX291dHB1dCwgcHJpbV9waXBlKTsKIAotCWlmICghc2NuZF9j b25uZWN0b3IpIHsKLQkJc2NuZF9tb2RlX3BhcmFtcy5jb25uZWN0b3JfaWQgPSAwOworCWlmICgh c2NuZF9vdXRwdXQpIHsKKwkJc2NuZF9tb2RlX3BhcmFtcy5waXBlID0gUElQRV9OT05FOworCQlz Y25kX21vZGVfcGFyYW1zLm91dHB1dCA9IE5VTEw7CiAJCXJldHVybiB0cnVlOwogCX0KIAotCWln dF9yZXF1aXJlKGRybS5yZXMtPmNvdW50X2NydGNzID49IDIpOwotCXNjbmRfY3J0Y19pZCA9IGtt c3Rlc3RfZmluZF9jcnRjX2Zvcl9jb25uZWN0b3IoZHJtLmZkLCBkcm0ucmVzLAotCQkJCQkJICAg ICAgc2NuZF9jb25uZWN0b3IsCi0JCQkxIDw8IGttc3Rlc3RfZ2V0X2NydGNfaWR4KGRybS5yZXMs IHByaW1fY3J0Y19pZCkpOwotCWluaXRfbW9kZV9wYXJhbXMoJnNjbmRfbW9kZV9wYXJhbXMsIHNj bmRfY3J0Y19pZCwKLQkJCSBzY25kX2Nvbm5lY3Rvciwgc2NuZF9tb2RlKTsKLQlwcmludF9tb2Rl X2luZm8oIlNlY29uZGFyeSIsICZzY25kX21vZGVfcGFyYW1zKTsKLQorCWluaXRfbW9kZV9wYXJh bXMoJnNjbmRfbW9kZV9wYXJhbXMsIHByaW1fb3V0cHV0LCBwcmltX3BpcGUpOwogCXJldHVybiB0 cnVlOwogfQogCkBAIC02OTksNyArNjM1LDcgQEAgc3RhdGljIHZvaWQgY3JlYXRlX3NoYXJlZF9m YihlbnVtIHBpeGVsX2Zvcm1hdCBmb3JtYXQpCiAJcHJpbV93ID0gcHJpbV9tb2RlX3BhcmFtcy5t b2RlLT5oZGlzcGxheTsKIAlwcmltX2ggPSBwcmltX21vZGVfcGFyYW1zLm1vZGUtPnZkaXNwbGF5 OwogCi0JaWYgKHNjbmRfbW9kZV9wYXJhbXMuY29ubmVjdG9yX2lkKSB7CisJaWYgKHNjbmRfbW9k ZV9wYXJhbXMub3V0cHV0KSB7CiAJCXNjbmRfdyA9IHNjbmRfbW9kZV9wYXJhbXMubW9kZS0+aGRp c3BsYXk7CiAJCXNjbmRfaCA9IHNjbmRfbW9kZV9wYXJhbXMubW9kZS0+dmRpc3BsYXk7CiAJfSBl bHNlIHsKQEAgLTcyOCw3ICs2NjQsNyBAQCBzdGF0aWMgdm9pZCBkZXN0cm95X2ZicyhlbnVtIHBp eGVsX2Zvcm1hdCBmb3JtYXQpCiAJaWYgKCFzLT5pbml0aWFsaXplZCkKIAkJcmV0dXJuOwogCi0J aWYgKHNjbmRfbW9kZV9wYXJhbXMuY29ubmVjdG9yX2lkKSB7CisJaWYgKHNjbmRfbW9kZV9wYXJh bXMub3V0cHV0KSB7CiAJCWlndF9yZW1vdmVfZmIoZHJtLmZkLCAmcy0+c2NuZF9wcmkpOwogCQlp Z3RfcmVtb3ZlX2ZiKGRybS5mZCwgJnMtPnNjbmRfY3VyKTsKIAkJaWd0X3JlbW92ZV9mYihkcm0u ZmQsICZzLT5zY25kX3Nwcik7CkBAIC03NjQsNyArNzAwLDcgQEAgc3RhdGljIHZvaWQgY3JlYXRl X2ZicyhlbnVtIHBpeGVsX2Zvcm1hdCBmb3JtYXQpCiAKIAljcmVhdGVfc2hhcmVkX2ZiKGZvcm1h dCk7CiAKLQlpZiAoIXNjbmRfbW9kZV9wYXJhbXMuY29ubmVjdG9yX2lkKQorCWlmICghc2NuZF9t b2RlX3BhcmFtcy5vdXRwdXQpCiAJCXJldHVybjsKIAogCWNyZWF0ZV9mYihmb3JtYXQsIHNjbmRf bW9kZV9wYXJhbXMubW9kZS0+aGRpc3BsYXksCkBAIC03NzYsMTQgKzcxMiwxNiBAQCBzdGF0aWMg dm9pZCBjcmVhdGVfZmJzKGVudW0gcGl4ZWxfZm9ybWF0IGZvcm1hdCkKIAkJICBvcHQudGlsaW5n LCBQTEFORV9TUFIsICZzLT5zY25kX3Nwcik7CiB9CiAKLXN0YXRpYyBib29sIHNldF9tb2RlX2Zv cl9wYXJhbXMoc3RydWN0IG1vZGVzZXRfcGFyYW1zICpwYXJhbXMpCitzdGF0aWMgdm9pZCBzZXRf bW9kZV9mb3JfcGFyYW1zKHN0cnVjdCBtb2Rlc2V0X3BhcmFtcyAqcGFyYW1zKQogewotCWludCBy YzsKKwlpZ3Rfb3V0cHV0X292ZXJyaWRlX21vZGUocGFyYW1zLT5vdXRwdXQsIHBhcmFtcy0+bW9k ZSk7CisJaWd0X291dHB1dF9zZXRfcGlwZShwYXJhbXMtPm91dHB1dCwgcGFyYW1zLT5waXBlKTsK IAotCXJjID0gZHJtTW9kZVNldENydGMoZHJtLmZkLCBwYXJhbXMtPmNydGNfaWQsIHBhcmFtcy0+ ZmIuZmItPmZiX2lkLAotCQkJICAgIHBhcmFtcy0+ZmIueCwgcGFyYW1zLT5mYi55LAotCQkJICAg ICZwYXJhbXMtPmNvbm5lY3Rvcl9pZCwgMSwgcGFyYW1zLT5tb2RlKTsKLQlyZXR1cm4gKHJjID09 IDApOworCWlndF9wbGFuZV9zZXRfZmIocGFyYW1zLT5wcmltYXJ5LnBsYW5lLCBwYXJhbXMtPnBy aW1hcnkuZmIpOworCWlndF9wbGFuZV9zZXRfcG9zaXRpb24ocGFyYW1zLT5wcmltYXJ5LnBsYW5l LCAwLCAwKTsKKwlpZ3RfZmJfc2V0X3Bvc2l0aW9uKHBhcmFtcy0+cHJpbWFyeS5mYiwgcGFyYW1z LT5wcmltYXJ5LnBsYW5lLCBwYXJhbXMtPnByaW1hcnkueCwgcGFyYW1zLT5wcmltYXJ5LnkpOwor CWlndF9mYl9zZXRfc2l6ZShwYXJhbXMtPnByaW1hcnkuZmIsIHBhcmFtcy0+cHJpbWFyeS5wbGFu ZSwgcGFyYW1zLT5wcmltYXJ5LncsIHBhcmFtcy0+cHJpbWFyeS5oKTsKKwlpZ3RfZGlzcGxheV9j b21taXQoJmRybS5kaXNwbGF5KTsKIH0KIAogc3RhdGljIHZvaWQgX19kZWJ1Z2ZzX3JlYWQoY29u c3QgY2hhciAqcGFyYW0sIGNoYXIgKmJ1ZiwgaW50IGxlbikKQEAgLTEyMzgsMjIgKzExNzYsOCBA QCBzdGF0aWMgdm9pZCBmaWxsX2ZiX3JlZ2lvbihzdHJ1Y3QgZmJfcmVnaW9uICpyZWdpb24sIGVu dW0gY29sb3IgZWNvbG9yKQogCiBzdGF0aWMgdm9pZCB1bnNldF9hbGxfY3J0Y3Modm9pZCkKIHsK LQlpbnQgaSwgcmM7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgZHJtLnJlcy0+Y291bnRfY3J0Y3M7IGkr KykgewotCQlyYyA9IGRybU1vZGVTZXRDcnRjKGRybS5mZCwgZHJtLnJlcy0+Y3J0Y3NbaV0sIC0x LCAwLCAwLCBOVUxMLAotCQkJCSAgICAwLCBOVUxMKTsKLQkJaWd0X2Fzc2VydF9lcShyYywgMCk7 Ci0KLQkJcmMgPSBkcm1Nb2RlU2V0Q3Vyc29yKGRybS5mZCwgZHJtLnJlcy0+Y3J0Y3NbaV0sIDAs IDAsIDApOwotCQlpZ3RfYXNzZXJ0X2VxKHJjLCAwKTsKLQl9Ci0KLQlmb3IgKGkgPSAwOyBpIDwg ZHJtLnBsYW5lX3Jlcy0+Y291bnRfcGxhbmVzOyBpKyspIHsKLQkJcmMgPSBkcm1Nb2RlU2V0UGxh bmUoZHJtLmZkLCBkcm0ucGxhbmVfcmVzLT5wbGFuZXNbaV0sIDAsIDAsIDAsCi0JCQkJICAgICAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwKTsKLQkJaWd0X2Fzc2VydF9lcShyYywgMCk7Ci0JfQorCWln dF9kaXNwbGF5X3Jlc2V0KCZkcm0uZGlzcGxheSk7CisJaWd0X2Rpc3BsYXlfY29tbWl0KCZkcm0u ZGlzcGxheSk7CiB9CiAKIHN0YXRpYyB2b2lkIGRpc2FibGVfZmVhdHVyZXMoY29uc3Qgc3RydWN0 IHRlc3RfbW9kZSAqdCkKQEAgLTEzMjUsMTAgKzEyNDksMTEgQEAgc3RhdGljIHZvaWQgY29sbGVj dF9jcmNzKHN0cnVjdCBib3RoX2NyY3MgKmNyY3MsIGJvb2wgbWFuZGF0b3J5X3NpbmtfY3JjKQog CWdldF9zaW5rX2NyYygmY3Jjcy0+c2luaywgbWFuZGF0b3J5X3NpbmtfY3JjKTsKIH0KIAorc3Rh dGljIHZvaWQgc2V0dXBfc2lua19jcmModm9pZCk7CisKIHN0YXRpYyB2b2lkIGluaXRfYmx1ZV9j cmMoZW51bSBwaXhlbF9mb3JtYXQgZm9ybWF0LCBib29sIG1hbmRhdG9yeV9zaW5rX2NyYykKIHsK IAlzdHJ1Y3QgaWd0X2ZiIGJsdWU7Ci0JaW50IHJjOwogCiAJaWYgKGJsdWVfY3Jjc1tmb3JtYXRd LmluaXRpYWxpemVkKQogCQlyZXR1cm47CkBAIC0xMzM5LDEwICsxMjY0LDE4IEBAIHN0YXRpYyB2 b2lkIGluaXRfYmx1ZV9jcmMoZW51bSBwaXhlbF9mb3JtYXQgZm9ybWF0LCBib29sIG1hbmRhdG9y eV9zaW5rX2NyYykKIAogCWZpbGxfZmIoJmJsdWUsIENPTE9SX1BSSU1fQkcpOwogCi0JcmMgPSBk cm1Nb2RlU2V0Q3J0Yyhkcm0uZmQsIHByaW1fbW9kZV9wYXJhbXMuY3J0Y19pZCwKLQkJCSAgICBi bHVlLmZiX2lkLCAwLCAwLCAmcHJpbV9tb2RlX3BhcmFtcy5jb25uZWN0b3JfaWQsIDEsCi0JCQkg ICAgcHJpbV9tb2RlX3BhcmFtcy5tb2RlKTsKLQlpZ3RfYXNzZXJ0X2VxKHJjLCAwKTsKKwlpZ3Rf b3V0cHV0X3NldF9waXBlKHByaW1fbW9kZV9wYXJhbXMub3V0cHV0LCBwcmltX21vZGVfcGFyYW1z LnBpcGUpOworCWlndF9vdXRwdXRfb3ZlcnJpZGVfbW9kZShwcmltX21vZGVfcGFyYW1zLm91dHB1 dCwgcHJpbV9tb2RlX3BhcmFtcy5tb2RlKTsKKwlpZ3RfcGxhbmVfc2V0X2ZiKHByaW1fbW9kZV9w YXJhbXMucHJpbWFyeS5wbGFuZSwgJmJsdWUpOworCWlndF9kaXNwbGF5X2NvbW1pdCgmZHJtLmRp c3BsYXkpOworCisJaWYgKCFwaXBlX2NyYykgeworCQlwaXBlX2NyYyA9IGlndF9waXBlX2NyY19u ZXcoZHJtLmZkLCBwcmltX21vZGVfcGFyYW1zLnBpcGUsIElOVEVMX1BJUEVfQ1JDX1NPVVJDRV9B VVRPKTsKKwkJaWd0X2Fzc2VydChwaXBlX2NyYyk7CisKKwkJc2V0dXBfc2lua19jcmMoKTsKKwl9 CisKIAljb2xsZWN0X2NyY3MoJmJsdWVfY3Jjc1tmb3JtYXRdLmNyYywgbWFuZGF0b3J5X3Npbmtf Y3JjKTsKIAogCXByaW50X2NyYygiQmx1ZSBDUkM6ICAiLCAmYmx1ZV9jcmNzW2Zvcm1hdF0uY3Jj KTsKQEAgLTEzNTgsNyArMTI5MSw3IEBAIHN0YXRpYyB2b2lkIGluaXRfY3JjcyhlbnVtIHBpeGVs X2Zvcm1hdCBmb3JtYXQsCiAJCSAgICAgIHN0cnVjdCBkcmF3X3BhdHRlcm5faW5mbyAqcGF0dGVy biwKIAkJICAgICAgYm9vbCBtYW5kYXRvcnlfc2lua19jcmMpCiB7Ci0JaW50IHIsIHJfLCByYzsK KwlpbnQgciwgcl87CiAJc3RydWN0IGlndF9mYiB0bXBfZmJzW3BhdHRlcm4tPm5fcmVjdHNdOwog CiAJaWYgKHBhdHRlcm4tPmluaXRpYWxpemVkW2Zvcm1hdF0pCkBAIC0xMzg2LDEyICsxMzE5LDEx IEBAIHN0YXRpYyB2b2lkIGluaXRfY3JjcyhlbnVtIHBpeGVsX2Zvcm1hdCBmb3JtYXQsCiAJCQkJ CSByKTsKIAl9CiAKKwlpZ3Rfb3V0cHV0X3NldF9waXBlKHByaW1fbW9kZV9wYXJhbXMub3V0cHV0 LCBwcmltX21vZGVfcGFyYW1zLnBpcGUpOwogCWZvciAociA9IDA7IHIgPCBwYXR0ZXJuLT5uX3Jl Y3RzOyByKyspIHsKLQkJcmMgPSBkcm1Nb2RlU2V0Q3J0Yyhkcm0uZmQsIHByaW1fbW9kZV9wYXJh bXMuY3J0Y19pZCwKLQkJCQkgICB0bXBfZmJzW3JdLmZiX2lkLCAwLCAwLAotCQkJCSAgICZwcmlt X21vZGVfcGFyYW1zLmNvbm5lY3Rvcl9pZCwgMSwKLQkJCQkgICBwcmltX21vZGVfcGFyYW1zLm1v ZGUpOwotCQlpZ3RfYXNzZXJ0X2VxKHJjLCAwKTsKKwkJaWd0X3BsYW5lX3NldF9mYihwcmltX21v ZGVfcGFyYW1zLnByaW1hcnkucGxhbmUsICZ0bXBfZmJzW3JdKTsKKwkJaWd0X2Rpc3BsYXlfY29t bWl0KCZkcm0uZGlzcGxheSk7CisKIAkJY29sbGVjdF9jcmNzKCZwYXR0ZXJuLT5jcmNzW2Zvcm1h dF1bcl0sIG1hbmRhdG9yeV9zaW5rX2NyYyk7CiAJfQogCkBAIC0xNDA4LDUwICsxMzQwLDEzIEBA IHN0YXRpYyB2b2lkIGluaXRfY3JjcyhlbnVtIHBpeGVsX2Zvcm1hdCBmb3JtYXQsCiAJcGF0dGVy bi0+aW5pdGlhbGl6ZWRbZm9ybWF0XSA9IHRydWU7CiB9CiAKLXN0YXRpYyB1aW50NjRfdCBnZXRf cGxhbmVfdHlwZSh1aW50MzJfdCBwbGFuZV9pZCkKLXsKLQlib29sIGZvdW5kOwotCXVpbnQ2NF90 IHByb3BfdmFsdWU7Ci0JZHJtTW9kZVByb3BlcnR5UHRyIHByb3A7Ci0KLQlmb3VuZCA9IGttc3Rl c3RfZ2V0X3Byb3BlcnR5KGRybS5mZCwgcGxhbmVfaWQsIERSTV9NT0RFX09CSkVDVF9QTEFORSwK LQkJCQkgICAgICJ0eXBlIiwgTlVMTCwgJnByb3BfdmFsdWUsICZwcm9wKTsKLQlpZ3RfYXNzZXJ0 KGZvdW5kKTsKLQlpZ3RfYXNzZXJ0KHByb3AtPmZsYWdzICYgRFJNX01PREVfUFJPUF9FTlVNKTsK LQlpZ3RfYXNzZXJ0KHByb3BfdmFsdWUgPCBwcm9wLT5jb3VudF9lbnVtcyk7Ci0KLQlkcm1Nb2Rl RnJlZVByb3BlcnR5KHByb3ApOwotCXJldHVybiBwcm9wX3ZhbHVlOwotfQotCiBzdGF0aWMgdm9p ZCBzZXR1cF9kcm0odm9pZCkKIHsKLQlpbnQgaSwgcmM7Ci0KIAlkcm0uZmQgPSBkcm1fb3Blbl9k cml2ZXJfbWFzdGVyKERSSVZFUl9JTlRFTCk7CiAJZHJtLmRlYnVnZnMgPSBpZ3RfZGVidWdmc19k aXIoZHJtLmZkKTsKIAotCWRybS5yZXMgPSBkcm1Nb2RlR2V0UmVzb3VyY2VzKGRybS5mZCk7Ci0J aWd0X2Fzc2VydChkcm0ucmVzLT5jb3VudF9jb25uZWN0b3JzIDw9IE1BWF9DT05ORUNUT1JTKTsK LQlpZ3RfYXNzZXJ0KGRybS5yZXMtPmNvdW50X2VuY29kZXJzIDw9IE1BWF9FTkNPREVSUyk7Ci0K LQlmb3IgKGkgPSAwOyBpIDwgZHJtLnJlcy0+Y291bnRfY29ubmVjdG9yczsgaSsrKQotCQlkcm0u Y29ubmVjdG9yc1tpXSA9IGRybU1vZGVHZXRDb25uZWN0b3JDdXJyZW50KGRybS5mZCwKLQkJCQkJ CWRybS5yZXMtPmNvbm5lY3RvcnNbaV0pOwotCWZvciAoaSA9IDA7IGkgPCBkcm0ucmVzLT5jb3Vu dF9lbmNvZGVyczsgaSsrKQotCQlkcm0uZW5jb2RlcnNbaV0gPSBkcm1Nb2RlR2V0RW5jb2Rlcihk cm0uZmQsCi0JCQkJCQkgICAgZHJtLnJlcy0+ZW5jb2RlcnNbaV0pOwotCi0JcmMgPSBkcm1TZXRD bGllbnRDYXAoZHJtLmZkLCBEUk1fQ0xJRU5UX0NBUF9VTklWRVJTQUxfUExBTkVTLCAxKTsKLQlp Z3RfcmVxdWlyZShyYyA9PSAwKTsKLQotCWRybS5wbGFuZV9yZXMgPSBkcm1Nb2RlR2V0UGxhbmVS ZXNvdXJjZXMoZHJtLmZkKTsKLQlpZ3RfYXNzZXJ0KGRybS5wbGFuZV9yZXMtPmNvdW50X3BsYW5l cyA8PSBNQVhfUExBTkVTKTsKLQotCWZvciAoaSA9IDA7IGkgPCBkcm0ucGxhbmVfcmVzLT5jb3Vu dF9wbGFuZXM7IGkrKykgewotCQlkcm0ucGxhbmVzW2ldID0gZHJtTW9kZUdldFBsYW5lKGRybS5m ZCwgZHJtLnBsYW5lX3Jlcy0+cGxhbmVzW2ldKTsKLQkJZHJtLnBsYW5lX3R5cGVzW2ldID0gZ2V0 X3BsYW5lX3R5cGUoZHJtLnBsYW5lX3Jlcy0+cGxhbmVzW2ldKTsKLQl9CisJa21zdGVzdF9zZXRf dnRfZ3JhcGhpY3NfbW9kZSgpOworCWlndF9kaXNwbGF5X2luaXQoJmRybS5kaXNwbGF5LCBkcm0u ZmQpOwogCiAJZHJtLmJ1Zm1nciA9IGRybV9pbnRlbF9idWZtZ3JfZ2VtX2luaXQoZHJtLmZkLCA0 MDk2KTsKIAlpZ3RfYXNzZXJ0KGRybS5idWZtZ3IpOwpAQCAtMTQ2MCwyMCArMTM1NSw4IEBAIHN0 YXRpYyB2b2lkIHNldHVwX2RybSh2b2lkKQogCiBzdGF0aWMgdm9pZCB0ZWFyZG93bl9kcm0odm9p ZCkKIHsKLQlpbnQgaTsKLQogCWRybV9pbnRlbF9idWZtZ3JfZGVzdHJveShkcm0uYnVmbWdyKTsK LQotCWZvciAoaSA9IDA7IGkgPCBkcm0ucGxhbmVfcmVzLT5jb3VudF9wbGFuZXM7IGkrKykKLQkJ ZHJtTW9kZUZyZWVQbGFuZShkcm0ucGxhbmVzW2ldKTsKLQlkcm1Nb2RlRnJlZVBsYW5lUmVzb3Vy Y2VzKGRybS5wbGFuZV9yZXMpOwotCi0JZm9yIChpID0gMDsgaSA8IGRybS5yZXMtPmNvdW50X2Vu Y29kZXJzOyBpKyspCi0JCWRybU1vZGVGcmVlRW5jb2Rlcihkcm0uZW5jb2RlcnNbaV0pOwotCWZv ciAoaSA9IDA7IGkgPCBkcm0ucmVzLT5jb3VudF9jb25uZWN0b3JzOyBpKyspCi0JCWRybU1vZGVG cmVlQ29ubmVjdG9yKGRybS5jb25uZWN0b3JzW2ldKTsKLQotCWRybU1vZGVGcmVlUmVzb3VyY2Vz KGRybS5yZXMpOworCWlndF9kaXNwbGF5X2ZpbmkoJmRybS5kaXNwbGF5KTsKIAljbG9zZShkcm0u ZmQpOwogfQogCkBAIC0xNDg0LDcgKzEzNjcsNiBAQCBzdGF0aWMgdm9pZCBzZXR1cF9tb2Rlc2V0 KHZvaWQpCiAJb2Zmc2NyZWVuX2ZiLncgPSAxMDI0OwogCW9mZnNjcmVlbl9mYi5oID0gMTAyNDsK IAljcmVhdGVfZmJzKEZPUk1BVF9ERUZBVUxUKTsKLQlrbXN0ZXN0X3NldF92dF9ncmFwaGljc19t b2RlKCk7CiB9CiAKIHN0YXRpYyB2b2lkIHRlYXJkb3duX21vZGVzZXQodm9pZCkKQEAgLTE1MDAs NyArMTM4Miw3IEBAIHN0YXRpYyB2b2lkIHNldHVwX3NpbmtfY3JjKHZvaWQpCiAJc2lua19jcmNf dCBjcmM7CiAJZHJtTW9kZUNvbm5lY3RvclB0ciBjOwogCi0JYyA9IGdldF9jb25uZWN0b3IocHJp bV9tb2RlX3BhcmFtcy5jb25uZWN0b3JfaWQpOworCWMgPSBwcmltX21vZGVfcGFyYW1zLm91dHB1 dC0+Y29uZmlnLmNvbm5lY3RvcjsKIAlpZiAoYy0+Y29ubmVjdG9yX3R5cGUgIT0gRFJNX01PREVf Q09OTkVDVE9SX2VEUCkgewogCQlpZ3RfaW5mbygiU2luayBDUkMgbm90IHN1cHBvcnRlZDogcHJp bWFyeSBzY3JlZW4gaXMgbm90IGVEUFxuIik7CiAJCXNpbmtfY3JjLnN1cHBvcnRlZCA9IGZhbHNl OwpAQCAtMTUxMCw5ICsxMzkyLDkgQEAgc3RhdGljIHZvaWQgc2V0dXBfc2lua19jcmModm9pZCkK IAkvKiBXZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGVyZSdzIGEgbW9kZSBzZXQgb24gdGhlIGVEUCBz Y3JlZW4gYW5kIGl0J3MKIAkgKiBub3Qgb24gRFBNUyBzdGF0ZSwgb3RoZXJ3aXNlIHdlIGZhbGwg aW50byB0aGUgIlVuZXhwZWN0ZWQgc2luayBDUkMKIAkgKiBlcnJvciIgY2FzZS4gKi8KLQlwcmlt X21vZGVfcGFyYW1zLmZiLmZiID0gJmZic1tGT1JNQVRfREVGQVVMVF0ucHJpbV9wcmk7Ci0JcHJp bV9tb2RlX3BhcmFtcy5mYi54ID0gcHJpbV9tb2RlX3BhcmFtcy5mYi55ID0gMDsKLQlmaWxsX2Zi X3JlZ2lvbigmcHJpbV9tb2RlX3BhcmFtcy5mYiwgQ09MT1JfUFJJTV9CRyk7CisJcHJpbV9tb2Rl X3BhcmFtcy5wcmltYXJ5LmZiID0gJmZic1tGT1JNQVRfREVGQVVMVF0ucHJpbV9wcmk7CisJcHJp bV9tb2RlX3BhcmFtcy5wcmltYXJ5LnggPSBwcmltX21vZGVfcGFyYW1zLnByaW1hcnkueSA9IDA7 CisJZmlsbF9mYl9yZWdpb24oJnByaW1fbW9kZV9wYXJhbXMucHJpbWFyeSwgQ09MT1JfUFJJTV9C Ryk7CiAJc2V0X21vZGVfZm9yX3BhcmFtcygmcHJpbV9tb2RlX3BhcmFtcyk7CiAKIAlzaW5rX2Ny Yy5mZCA9IG9wZW5hdChkcm0uZGVidWdmcywgImk5MTVfc2lua19jcmNfZURQMSIsIE9fUkRPTkxZ KTsKQEAgLTE1MjUsMTEgKzE0MDcsNiBAQCBzdGF0aWMgdm9pZCBzZXR1cF9zaW5rX2NyYyh2b2lk KQogc3RhdGljIHZvaWQgc2V0dXBfY3Jjcyh2b2lkKQogewogCWVudW0gcGl4ZWxfZm9ybWF0IGY7 Ci0JaW50IGNydGNfaWR4ID0ga21zdGVzdF9nZXRfY3J0Y19pZHgoZHJtLnJlcywgcHJpbV9tb2Rl X3BhcmFtcy5jcnRjX2lkKTsKLQotCXBpcGVfY3JjID0gaWd0X3BpcGVfY3JjX25ldyhkcm0uZmQs IGNydGNfaWR4LCBJTlRFTF9QSVBFX0NSQ19TT1VSQ0VfQVVUTyk7Ci0KLQlzZXR1cF9zaW5rX2Ny YygpOwogCiAJZm9yIChmID0gMDsgZiA8IEZPUk1BVF9DT1VOVDsgZisrKQogCQlibHVlX2NyY3Nb Zl0uaW5pdGlhbGl6ZWQgPSBmYWxzZTsKQEAgLTE2MDEsNyArMTQ3OCw2IEBAIHN0YXRpYyBib29s IGZiY19zdXBwb3J0ZWRfb25fY2hpcHNldCh2b2lkKQogCiBzdGF0aWMgdm9pZCBzZXR1cF9mYmMo dm9pZCkKIHsKLQlkcm1Nb2RlQ29ubmVjdG9yUHRyIGMgPSBnZXRfY29ubmVjdG9yKHByaW1fbW9k ZV9wYXJhbXMuY29ubmVjdG9yX2lkKTsKIAlpbnQgZGV2aWQgPSBpbnRlbF9nZXRfZHJtX2Rldmlk KGRybS5mZCk7CiAKIAlpZiAoIWZiY19zdXBwb3J0ZWRfb25fY2hpcHNldCgpKSB7CkBAIC0xNjE0 LDcgKzE0OTAsNyBAQCBzdGF0aWMgdm9pZCBzZXR1cF9mYmModm9pZCkKIAkgKiBpcyBub3QgcHJl cGFyZWQgZm9yIHRoYXQgeWV0LgogCSAqIFRPRE86IHNvbHZlIHRoaXMuCiAJICovCi0JaWYgKCFj b25uZWN0b3Jfc3VwcG9ydHNfcGlwZV9hKGMpKSB7CisJaWYgKHByaW1fbW9kZV9wYXJhbXMucGlw ZSAhPSBQSVBFX0EpIHsKIAkJaWd0X2luZm8oIkNhbid0IHRlc3QgRkJDOiBwcmltYXJ5IGNvbm5l Y3RvciBkb2Vzbid0IHN1cHBvcnQgIgogCQkJICJwaXBlIEFcbiIpOwogCQlyZXR1cm47CkBAIC0x NjQ2LDcgKzE1MjIsNyBAQCBzdGF0aWMgYm9vbCBwc3Jfc2lua19oYXNfc3VwcG9ydCh2b2lkKQog CiBzdGF0aWMgdm9pZCBzZXR1cF9wc3Iodm9pZCkKIHsKLQlpZiAoZ2V0X2Nvbm5lY3Rvcihwcmlt X21vZGVfcGFyYW1zLmNvbm5lY3Rvcl9pZCktPmNvbm5lY3Rvcl90eXBlICE9CisJaWYgKHByaW1f bW9kZV9wYXJhbXMub3V0cHV0LT5jb25maWcuY29ubmVjdG9yLT5jb25uZWN0b3JfdHlwZSAhPQog CSAgICBEUk1fTU9ERV9DT05ORUNUT1JfZURQKSB7CiAJCWlndF9pbmZvKCJDYW4ndCB0ZXN0IFBT Ujogbm8gdXNhYmxlIGVEUCBzY3JlZW4uXG4iKTsKIAkJcmV0dXJuOwpAQCAtMTY2NSw3ICsxNTQx LDcgQEAgc3RhdGljIHZvaWQgdGVhcmRvd25fcHNyKHZvaWQpCiAKIHN0YXRpYyB2b2lkIHNldHVw X2RycnModm9pZCkKIHsKLQlpZiAoZ2V0X2Nvbm5lY3RvcihwcmltX21vZGVfcGFyYW1zLmNvbm5l Y3Rvcl9pZCktPmNvbm5lY3Rvcl90eXBlICE9CisJaWYgKHByaW1fbW9kZV9wYXJhbXMub3V0cHV0 LT5jb25maWcuY29ubmVjdG9yLT5jb25uZWN0b3JfdHlwZSAhPQogCSAgICBEUk1fTU9ERV9DT05O RUNUT1JfZURQKSB7CiAJCWlndF9pbmZvKCJDYW4ndCB0ZXN0IERSUlM6IG5vIHVzYWJsZSBlRFAg c2NyZWVuLlxuIik7CiAJCXJldHVybjsKQEAgLTE3MzQsNyArMTYxMCw3IEBAIHN0YXRpYyBzdHJ1 Y3QgZmJfcmVnaW9uICpwaWNrX3RhcmdldChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0LAogCiAJ c3dpdGNoICh0LT5wbGFuZSkgewogCWNhc2UgUExBTkVfUFJJOgotCQlyZXR1cm4gJnBhcmFtcy0+ ZmI7CisJCXJldHVybiAmcGFyYW1zLT5wcmltYXJ5OwogCWNhc2UgUExBTkVfQ1VSOgogCQlyZXR1 cm4gJnBhcmFtcy0+Y3Vyc29yOwogCWNhc2UgUExBTkVfU1BSOgpAQCAtMTkwNCw3ICsxNzgwLDcg QEAgc3RhdGljIHZvaWQgX19kb19hc3NlcnRpb25zKGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQs IGludCBmbGFncywKIAogc3RhdGljIHZvaWQgZW5hYmxlX3ByaW1fc2NyZWVuX2FuZF93YWl0KGNv bnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiB7Ci0JZmlsbF9mYl9yZWdpb24oJnByaW1fbW9kZV9w YXJhbXMuZmIsIENPTE9SX1BSSU1fQkcpOworCWZpbGxfZmJfcmVnaW9uKCZwcmltX21vZGVfcGFy YW1zLnByaW1hcnksIENPTE9SX1BSSU1fQkcpOwogCXNldF9tb2RlX2Zvcl9wYXJhbXMoJnByaW1f bW9kZV9wYXJhbXMpOwogCiAJd2FudGVkX2NyYyA9ICZibHVlX2NyY3NbdC0+Zm9ybWF0XS5jcmM7 CkBAIC0xOTE1LDQ1ICsxNzkxLDIzIEBAIHN0YXRpYyB2b2lkIGVuYWJsZV9wcmltX3NjcmVlbl9h bmRfd2FpdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogCiBzdGF0aWMgdm9pZCBlbmFibGVf c2NuZF9zY3JlZW5fYW5kX3dhaXQoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIHsKLQlmaWxs X2ZiX3JlZ2lvbigmc2NuZF9tb2RlX3BhcmFtcy5mYiwgQ09MT1JfU0NORF9CRyk7CisJZmlsbF9m Yl9yZWdpb24oJnNjbmRfbW9kZV9wYXJhbXMucHJpbWFyeSwgQ09MT1JfU0NORF9CRyk7CiAJc2V0 X21vZGVfZm9yX3BhcmFtcygmc2NuZF9tb2RlX3BhcmFtcyk7CiAKIAlkb19hc3NlcnRpb25zKEFT U0VSVF9OT19BQ1RJT05fQ0hBTkdFKTsKIH0KIAotc3RhdGljIHZvaWQgc2V0X2N1cnNvcl9mb3Jf dGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0LAotCQkJCXN0cnVjdCBtb2Rlc2V0X3BhcmFt cyAqcGFyYW1zKQotewotCWludCByYzsKLQotCWZpbGxfZmJfcmVnaW9uKCZwYXJhbXMtPmN1cnNv ciwgQ09MT1JfUFJJTV9CRyk7Ci0KLQlyYyA9IGRybU1vZGVNb3ZlQ3Vyc29yKGRybS5mZCwgcGFy YW1zLT5jcnRjX2lkLCAwLCAwKTsKLQlpZ3RfYXNzZXJ0X2VxKHJjLCAwKTsKLQotCXJjID0gZHJt TW9kZVNldEN1cnNvcihkcm0uZmQsIHBhcmFtcy0+Y3J0Y19pZCwKLQkJCSAgICAgIHBhcmFtcy0+ Y3Vyc29yLmZiLT5nZW1faGFuZGxlLAotCQkJICAgICAgcGFyYW1zLT5jdXJzb3IudywKLQkJCSAg ICAgIHBhcmFtcy0+Y3Vyc29yLmgpOwotCWlndF9hc3NlcnRfZXEocmMsIDApOwotCi0JZG9fYXNz ZXJ0aW9ucyhBU1NFUlRfTk9fQUNUSU9OX0NIQU5HRSk7Ci19Ci0KLXN0YXRpYyB2b2lkIHNldF9z cHJpdGVfZm9yX3Rlc3QoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCwKLQkJCQlzdHJ1Y3QgbW9k ZXNldF9wYXJhbXMgKnBhcmFtcykKK3N0YXRpYyB2b2lkIHNldF9yZWdpb25fZm9yX3Rlc3QoY29u c3Qgc3RydWN0IHRlc3RfbW9kZSAqdCwKKwkJCQlzdHJ1Y3QgZmJfcmVnaW9uICpyZWcpCiB7Ci0J aW50IHJjOwotCi0JZmlsbF9mYl9yZWdpb24oJnBhcmFtcy0+c3ByaXRlLCBDT0xPUl9QUklNX0JH KTsKKwlmaWxsX2ZiX3JlZ2lvbihyZWcsIENPTE9SX1BSSU1fQkcpOwogCi0JcmMgPSBkcm1Nb2Rl U2V0UGxhbmUoZHJtLmZkLCBwYXJhbXMtPnNwcml0ZV9pZCwgcGFyYW1zLT5jcnRjX2lkLAotCQkJ ICAgICBwYXJhbXMtPnNwcml0ZS5mYi0+ZmJfaWQsIDAsIDAsIDAsCi0JCQkgICAgIHBhcmFtcy0+ c3ByaXRlLncsIHBhcmFtcy0+c3ByaXRlLmgsCi0JCQkgICAgIDAsIDAsIHBhcmFtcy0+c3ByaXRl LncgPDwgMTYsCi0JCQkgICAgIHBhcmFtcy0+c3ByaXRlLmggPDwgMTYpOwotCWlndF9hc3NlcnRf ZXEocmMsIDApOworCWlndF9wbGFuZV9zZXRfZmIocmVnLT5wbGFuZSwgcmVnLT5mYik7CisJaWd0 X3BsYW5lX3NldF9wb3NpdGlvbihyZWctPnBsYW5lLCAwLCAwKTsKKwlpZ3RfcGxhbmVfc2V0X3Np emUocmVnLT5wbGFuZSwgcmVnLT53LCByZWctPmgpOworCWlndF9mYl9zZXRfc2l6ZShyZWctPmZi LCByZWctPnBsYW5lLCByZWctPncsIHJlZy0+aCk7CiAKKwlpZ3RfZGlzcGxheV9jb21taXQoJmRy bS5kaXNwbGF5KTsKIAlkb19hc3NlcnRpb25zKEFTU0VSVF9OT19BQ1RJT05fQ0hBTkdFKTsKIH0K IApAQCAtMTk3Myw3ICsxODI3LDcgQEAgc3RhdGljIHZvaWQgZW5hYmxlX2ZlYXR1cmVzX2Zvcl90 ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiBzdGF0aWMgdm9pZCBjaGVja190ZXN0X3Jl cXVpcmVtZW50cyhjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogewogCWlmICh0LT5waXBlcyA9 PSBQSVBFX0RVQUwpCi0JCWlndF9yZXF1aXJlX2Yoc2NuZF9tb2RlX3BhcmFtcy5jb25uZWN0b3Jf aWQsCisJCWlndF9yZXF1aXJlX2YoIXNjbmRfbW9kZV9wYXJhbXMub3V0cHV0LAogCQkJICAgICJD YW4ndCB0ZXN0IGR1YWwgcGlwZXMgd2l0aCB0aGUgY3VycmVudCBvdXRwdXRzXG4iKTsKIAogCWlm ICh0LT5mZWF0dXJlICYgRkVBVFVSRV9GQkMpCkBAIC0yMDExLDMyICsxODY1LDMyIEBAIHN0YXRp YyB2b2lkIHNldF9jcnRjX2Zicyhjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogCiAJc3dpdGNo ICh0LT5mYnMpIHsKIAljYXNlIEZCU19JTkRJVklEVUFMOgotCQlwcmltX21vZGVfcGFyYW1zLmZi LmZiID0gJnMtPnByaW1fcHJpOwotCQlzY25kX21vZGVfcGFyYW1zLmZiLmZiID0gJnMtPnNjbmRf cHJpOworCQlwcmltX21vZGVfcGFyYW1zLnByaW1hcnkuZmIgPSAmcy0+cHJpbV9wcmk7CisJCXNj bmRfbW9kZV9wYXJhbXMucHJpbWFyeS5mYiA9ICZzLT5zY25kX3ByaTsKIAkJb2Zmc2NyZWVuX2Zi LmZiID0gJnMtPm9mZnNjcmVlbjsKIAotCQlwcmltX21vZGVfcGFyYW1zLmZiLnggPSAwOwotCQlz Y25kX21vZGVfcGFyYW1zLmZiLnggPSAwOworCQlwcmltX21vZGVfcGFyYW1zLnByaW1hcnkueCA9 IDA7CisJCXNjbmRfbW9kZV9wYXJhbXMucHJpbWFyeS54ID0gMDsKIAkJb2Zmc2NyZWVuX2ZiLngg PSAwOwogCi0JCXByaW1fbW9kZV9wYXJhbXMuZmIueSA9IDA7Ci0JCXNjbmRfbW9kZV9wYXJhbXMu ZmIueSA9IDA7CisJCXByaW1fbW9kZV9wYXJhbXMucHJpbWFyeS55ID0gMDsKKwkJc2NuZF9tb2Rl X3BhcmFtcy5wcmltYXJ5LnkgPSAwOwogCQlvZmZzY3JlZW5fZmIueSA9IDA7CiAJCWJyZWFrOwog CWNhc2UgRkJTX1NIQVJFRDoKIAkJLyogUGxlYXNlIHNlZSB0aGUgY29tbWVudCBhdCB0aGUgdG9w IG9mIGNyZWF0ZV9zaGFyZWRfZmIoKS4gKi8KLQkJcHJpbV9tb2RlX3BhcmFtcy5mYi5mYiA9ICZz LT5iaWc7Ci0JCXNjbmRfbW9kZV9wYXJhbXMuZmIuZmIgPSAmcy0+YmlnOworCQlwcmltX21vZGVf cGFyYW1zLnByaW1hcnkuZmIgPSAmcy0+YmlnOworCQlzY25kX21vZGVfcGFyYW1zLnByaW1hcnku ZmIgPSAmcy0+YmlnOwogCQlvZmZzY3JlZW5fZmIuZmIgPSAmcy0+YmlnOwogCi0JCXByaW1fbW9k ZV9wYXJhbXMuZmIueCA9IG9wdC5zaGFyZWRfZmJfeF9vZmZzZXQ7Ci0JCXNjbmRfbW9kZV9wYXJh bXMuZmIueCA9IG9wdC5zaGFyZWRfZmJfeF9vZmZzZXQ7CisJCXByaW1fbW9kZV9wYXJhbXMucHJp bWFyeS54ID0gb3B0LnNoYXJlZF9mYl94X29mZnNldDsKKwkJc2NuZF9tb2RlX3BhcmFtcy5wcmlt YXJ5LnggPSBvcHQuc2hhcmVkX2ZiX3hfb2Zmc2V0OwogCQlvZmZzY3JlZW5fZmIueCA9IG9wdC5z aGFyZWRfZmJfeF9vZmZzZXQ7CiAKLQkJcHJpbV9tb2RlX3BhcmFtcy5mYi55ID0gb3B0LnNoYXJl ZF9mYl95X29mZnNldDsKLQkJc2NuZF9tb2RlX3BhcmFtcy5mYi55ID0gcHJpbV9tb2RlX3BhcmFt cy5mYi55ICsKLQkJCQkJcHJpbV9tb2RlX3BhcmFtcy5mYi5oOwotCQlvZmZzY3JlZW5fZmIueSA9 IHNjbmRfbW9kZV9wYXJhbXMuZmIueSArIHNjbmRfbW9kZV9wYXJhbXMuZmIuaDsKKwkJcHJpbV9t b2RlX3BhcmFtcy5wcmltYXJ5LnkgPSBvcHQuc2hhcmVkX2ZiX3lfb2Zmc2V0OworCQlzY25kX21v ZGVfcGFyYW1zLnByaW1hcnkueSA9IHByaW1fbW9kZV9wYXJhbXMucHJpbWFyeS55ICsKKwkJCQkJ cHJpbV9tb2RlX3BhcmFtcy5wcmltYXJ5Lmg7CisJCW9mZnNjcmVlbl9mYi55ID0gc2NuZF9tb2Rl X3BhcmFtcy5wcmltYXJ5LnkgKyBzY25kX21vZGVfcGFyYW1zLnByaW1hcnkuaDsKIAkJYnJlYWs7 CiAJZGVmYXVsdDoKIAkJaWd0X2Fzc2VydChmYWxzZSk7CkBAIC0yMDc1LDkgKzE5MjksOSBAQCBz dGF0aWMgdm9pZCBwcmVwYXJlX3N1YnRlc3Rfc2NyZWVucyhjb25zdCBzdHJ1Y3QgdGVzdF9tb2Rl ICp0KQogCWVuYWJsZV9wcmltX3NjcmVlbl9hbmRfd2FpdCh0KTsKIAlpZiAodC0+c2NyZWVuID09 IFNDUkVFTl9QUklNKSB7CiAJCWlmICh0LT5wbGFuZSA9PSBQTEFORV9DVVIpCi0JCQlzZXRfY3Vy c29yX2Zvcl90ZXN0KHQsICZwcmltX21vZGVfcGFyYW1zKTsKKwkJCXNldF9yZWdpb25fZm9yX3Rl c3QodCwgJnByaW1fbW9kZV9wYXJhbXMuY3Vyc29yKTsKIAkJaWYgKHQtPnBsYW5lID09IFBMQU5F X1NQUikKLQkJCXNldF9zcHJpdGVfZm9yX3Rlc3QodCwgJnByaW1fbW9kZV9wYXJhbXMpOworCQkJ c2V0X3JlZ2lvbl9mb3JfdGVzdCh0LCAmcHJpbV9tb2RlX3BhcmFtcy5zcHJpdGUpOwogCX0KIAog CWlmICh0LT5waXBlcyA9PSBQSVBFX1NJTkdMRSkKQEAgLTIwODYsOSArMTk0MCw5IEBAIHN0YXRp YyB2b2lkIHByZXBhcmVfc3VidGVzdF9zY3JlZW5zKGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQp CiAJZW5hYmxlX3NjbmRfc2NyZWVuX2FuZF93YWl0KHQpOwogCWlmICh0LT5zY3JlZW4gPT0gU0NS RUVOX1NDTkQpIHsKIAkJaWYgKHQtPnBsYW5lID09IFBMQU5FX0NVUikKLQkJCXNldF9jdXJzb3Jf Zm9yX3Rlc3QodCwgJnNjbmRfbW9kZV9wYXJhbXMpOworCQkJc2V0X3JlZ2lvbl9mb3JfdGVzdCh0 LCAmc2NuZF9tb2RlX3BhcmFtcy5jdXJzb3IpOwogCQlpZiAodC0+cGxhbmUgPT0gUExBTkVfU1BS KQotCQkJc2V0X3Nwcml0ZV9mb3JfdGVzdCh0LCAmc2NuZF9tb2RlX3BhcmFtcyk7CisJCQlzZXRf cmVnaW9uX2Zvcl90ZXN0KHQsICZzY25kX21vZGVfcGFyYW1zLnNwcml0ZSk7CiAJfQogfQogCkBA IC0yMTIzLDE1ICsxOTc3LDE1IEBAIHN0YXRpYyB2b2lkIHJ0ZV9zdWJ0ZXN0KGNvbnN0IHN0cnVj dCB0ZXN0X21vZGUgKnQpCiAJCSAgICAgIERPTlRfQVNTRVJUX0NSQyB8IEFTU0VSVF9EUlJTX0lO QUNUSVZFKTsKIAogCWVuYWJsZV9wcmltX3NjcmVlbl9hbmRfd2FpdCh0KTsKLQlzZXRfY3Vyc29y X2Zvcl90ZXN0KHQsICZwcmltX21vZGVfcGFyYW1zKTsKLQlzZXRfc3ByaXRlX2Zvcl90ZXN0KHQs ICZwcmltX21vZGVfcGFyYW1zKTsKKwlzZXRfcmVnaW9uX2Zvcl90ZXN0KHQsICZwcmltX21vZGVf cGFyYW1zLmN1cnNvcik7CisJc2V0X3JlZ2lvbl9mb3JfdGVzdCh0LCAmcHJpbV9tb2RlX3BhcmFt cy5zcHJpdGUpOwogCiAJaWYgKHQtPnBpcGVzID09IFBJUEVfU0lOR0xFKQogCQlyZXR1cm47CiAK IAllbmFibGVfc2NuZF9zY3JlZW5fYW5kX3dhaXQodCk7Ci0Jc2V0X2N1cnNvcl9mb3JfdGVzdCh0 LCAmc2NuZF9tb2RlX3BhcmFtcyk7Ci0Jc2V0X3Nwcml0ZV9mb3JfdGVzdCh0LCAmc2NuZF9tb2Rl X3BhcmFtcyk7CisJc2V0X3JlZ2lvbl9mb3JfdGVzdCh0LCAmc2NuZF9tb2RlX3BhcmFtcy5jdXJz b3IpOworCXNldF9yZWdpb25fZm9yX3Rlc3QodCwgJnNjbmRfbW9kZV9wYXJhbXMuc3ByaXRlKTsK IH0KIAogc3RhdGljIHZvaWQgdXBkYXRlX3dhbnRlZF9jcmMoY29uc3Qgc3RydWN0IHRlc3RfbW9k ZSAqdCwgc3RydWN0IGJvdGhfY3JjcyAqY3JjKQpAQCAtMjM2MCw3ICsyMjE0LDcgQEAgc3RhdGlj IHZvaWQgYmFkZm9ybWF0X3N1YnRlc3QoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIAogCXBy ZXBhcmVfc3VidGVzdF9kYXRhKHQsIE5VTEwpOwogCi0JZmlsbF9mYl9yZWdpb24oJnByaW1fbW9k ZV9wYXJhbXMuZmIsIENPTE9SX1BSSU1fQkcpOworCWZpbGxfZmJfcmVnaW9uKCZwcmltX21vZGVf cGFyYW1zLnByaW1hcnksIENPTE9SX1BSSU1fQkcpOwogCXNldF9tb2RlX2Zvcl9wYXJhbXMoJnBy aW1fbW9kZV9wYXJhbXMpOwogCiAJd2FudGVkX2NyYyA9ICZibHVlX2NyY3NbdC0+Zm9ybWF0XS5j cmM7CkBAIC0yNDcyLDIzICsyMzI2LDE0IEBAIHN0YXRpYyB2b2lkIHdhaXRfZmxpcF9ldmVudCh2 b2lkKQogCiBzdGF0aWMgdm9pZCBzZXRfcHJpbV9wbGFuZV9mb3JfcGFyYW1zKHN0cnVjdCBtb2Rl c2V0X3BhcmFtcyAqcGFyYW1zKQogewotCWludCByYywgaTsKLQlpbnQgY3J0Y19pZHggPSBrbXN0 ZXN0X2dldF9jcnRjX2lkeChkcm0ucmVzLCBwYXJhbXMtPmNydGNfaWQpOwotCXVpbnQzMl90IHBs YW5lX2lkID0gMDsKLQotCWZvciAoaSA9IDA7IGkgPCBkcm0ucGxhbmVfcmVzLT5jb3VudF9wbGFu ZXM7IGkrKykKLQkJaWYgKChkcm0ucGxhbmVzW2ldLT5wb3NzaWJsZV9jcnRjcyAmICgxIDw8IGNy dGNfaWR4KSkgJiYKLQkJICAgIGRybS5wbGFuZV90eXBlc1tpXSA9PSBEUk1fUExBTkVfVFlQRV9Q UklNQVJZKQotCQkJcGxhbmVfaWQgPSBkcm0ucGxhbmVzW2ldLT5wbGFuZV9pZDsKLQlpZ3RfYXNz ZXJ0KHBsYW5lX2lkKTsKLQotCXJjID0gZHJtTW9kZVNldFBsYW5lKGRybS5mZCwgcGxhbmVfaWQs IHBhcmFtcy0+Y3J0Y19pZCwKLQkJCSAgICAgcGFyYW1zLT5mYi5mYi0+ZmJfaWQsIDAsIDAsIDAs Ci0JCQkgICAgIHBhcmFtcy0+bW9kZS0+aGRpc3BsYXksCi0JCQkgICAgIHBhcmFtcy0+bW9kZS0+ dmRpc3BsYXksCi0JCQkgICAgIHBhcmFtcy0+ZmIueCA8PCAxNiwgcGFyYW1zLT5mYi55IDw8IDE2 LAotCQkJICAgICBwYXJhbXMtPmZiLncgPDwgMTYsIHBhcmFtcy0+ZmIuaCA8PCAxNik7Ci0JaWd0 X2Fzc2VydChyYyA9PSAwKTsKKwlpZ3RfcGxhbmVfc2V0X2ZiKHBhcmFtcy0+cHJpbWFyeS5wbGFu ZSwgcGFyYW1zLT5wcmltYXJ5LmZiKTsKKwlpZ3RfcGxhbmVfc2V0X3Bvc2l0aW9uKHBhcmFtcy0+ cHJpbWFyeS5wbGFuZSwgMCwgMCk7CisJaWd0X3BsYW5lX3NldF9zaXplKHBhcmFtcy0+cHJpbWFy eS5wbGFuZSwgcGFyYW1zLT5tb2RlLT5oZGlzcGxheSwgcGFyYW1zLT5tb2RlLT52ZGlzcGxheSk7 CisJaWd0X2ZiX3NldF9wb3NpdGlvbihwYXJhbXMtPnByaW1hcnkuZmIsIHBhcmFtcy0+cHJpbWFy eS5wbGFuZSwKKwkJCSAgICBwYXJhbXMtPnByaW1hcnkueCwgcGFyYW1zLT5wcmltYXJ5LnkpOwor CWlndF9mYl9zZXRfc2l6ZShwYXJhbXMtPnByaW1hcnkuZmIsIHBhcmFtcy0+cHJpbWFyeS5wbGFu ZSwKKwkJCXBhcmFtcy0+cHJpbWFyeS53LCBwYXJhbXMtPnByaW1hcnkuaCk7CisJaWd0X2Rpc3Bs YXlfY29tbWl0MigmZHJtLmRpc3BsYXksIENPTU1JVF9VTklWRVJTQUwpOwogfQogCiBzdGF0aWMg dm9pZCBwYWdlX2ZsaXBfZm9yX3BhcmFtcyhzdHJ1Y3QgbW9kZXNldF9wYXJhbXMgKnBhcmFtcywK QEAgLTI0OTgsOCArMjM0Myw4IEBAIHN0YXRpYyB2b2lkIHBhZ2VfZmxpcF9mb3JfcGFyYW1zKHN0 cnVjdCBtb2Rlc2V0X3BhcmFtcyAqcGFyYW1zLAogCiAJc3dpdGNoICh0eXBlKSB7CiAJY2FzZSBG TElQX1BBR0VGTElQOgotCQlyYyA9IGRybU1vZGVQYWdlRmxpcChkcm0uZmQsIHBhcmFtcy0+Y3J0 Y19pZCwKLQkJCQkgICAgIHBhcmFtcy0+ZmIuZmItPmZiX2lkLAorCQlyYyA9IGRybU1vZGVQYWdl RmxpcChkcm0uZmQsIGRybS5kaXNwbGF5LnBpcGVzW3BhcmFtcy0+cGlwZV0uY3J0Y19pZCwKKwkJ CQkgICAgIHBhcmFtcy0+cHJpbWFyeS5mYi0+ZmJfaWQsCiAJCQkJICAgICBEUk1fTU9ERV9QQUdF X0ZMSVBfRVZFTlQsIE5VTEwpOwogCQlpZ3RfYXNzZXJ0X2VxKHJjLCAwKTsKIAkJd2FpdF9mbGlw X2V2ZW50KCk7CkBAIC0yNTU0LDE3ICsyMzk5LDE3IEBAIHN0YXRpYyB2b2lkIGZsaXBfc3VidGVz dChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogCiAJcHJlcGFyZV9zdWJ0ZXN0KHQsIHBhdHRl cm4pOwogCi0JY3JlYXRlX2ZiKHQtPmZvcm1hdCwgcGFyYW1zLT5mYi5mYi0+d2lkdGgsIHBhcmFt cy0+ZmIuZmItPmhlaWdodCwKKwljcmVhdGVfZmIodC0+Zm9ybWF0LCBwYXJhbXMtPnByaW1hcnku ZmItPndpZHRoLCBwYXJhbXMtPnByaW1hcnkuZmItPmhlaWdodCwKIAkJICBvcHQudGlsaW5nLCB0 LT5wbGFuZSwgJmZiMik7CiAJZmlsbF9mYigmZmIyLCBiZ19jb2xvcik7Ci0Jb3JpZ19mYiA9IHBh cmFtcy0+ZmIuZmI7CisJb3JpZ19mYiA9IHBhcmFtcy0+cHJpbWFyeS5mYjsKIAogCWZvciAociA9 IDA7IHIgPCBwYXR0ZXJuLT5uX3JlY3RzOyByKyspIHsKLQkJcGFyYW1zLT5mYi5mYiA9IChyICUg MiA9PSAwKSA/ICZmYjIgOiBvcmlnX2ZiOworCQlwYXJhbXMtPnByaW1hcnkuZmIgPSAociAlIDIg PT0gMCkgPyAmZmIyIDogb3JpZ19mYjsKIAogCQlpZiAociAhPSAwKQotCQkJZHJhd19yZWN0KHBh dHRlcm4sICZwYXJhbXMtPmZiLCB0LT5tZXRob2QsIHIgLSAxKTsKLQkJZHJhd19yZWN0KHBhdHRl cm4sICZwYXJhbXMtPmZiLCB0LT5tZXRob2QsIHIpOworCQkJZHJhd19yZWN0KHBhdHRlcm4sICZw YXJhbXMtPnByaW1hcnksIHQtPm1ldGhvZCwgciAtIDEpOworCQlkcmF3X3JlY3QocGF0dGVybiwg JnBhcmFtcy0+cHJpbWFyeSwgdC0+bWV0aG9kLCByKTsKIAkJdXBkYXRlX3dhbnRlZF9jcmModCwg JnBhdHRlcm4tPmNyY3NbdC0+Zm9ybWF0XVtyXSk7CiAKIAkJcGFnZV9mbGlwX2Zvcl9wYXJhbXMo cGFyYW1zLCB0LT5mbGlwKTsKQEAgLTI2MDAsMjEgKzI0NDUsMjEgQEAgc3RhdGljIHZvaWQgZmxp cHRyYWNrX3N1YnRlc3QoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCwgZW51bSBmbGlwX3R5cGUg dHlwZSkKIAogCXByZXBhcmVfc3VidGVzdCh0LCBwYXR0ZXJuKTsKIAotCWNyZWF0ZV9mYih0LT5m b3JtYXQsIHBhcmFtcy0+ZmIuZmItPndpZHRoLCBwYXJhbXMtPmZiLmZiLT5oZWlnaHQsCisJY3Jl YXRlX2ZiKHQtPmZvcm1hdCwgcGFyYW1zLT5wcmltYXJ5LmZiLT53aWR0aCwgcGFyYW1zLT5wcmlt YXJ5LmZiLT5oZWlnaHQsCiAJCSAgb3B0LnRpbGluZywgdC0+cGxhbmUsICZmYjIpOwogCWZpbGxf ZmIoJmZiMiwgQ09MT1JfUFJJTV9CRyk7Ci0Jb3JpZ19mYiA9IHBhcmFtcy0+ZmIuZmI7CisJb3Jp Z19mYiA9IHBhcmFtcy0+cHJpbWFyeS5mYjsKIAogCWZvciAociA9IDA7IHIgPCBwYXR0ZXJuLT5u X3JlY3RzOyByKyspIHsKLQkJcGFyYW1zLT5mYi5mYiA9IChyICUgMiA9PSAwKSA/ICZmYjIgOiBv cmlnX2ZiOworCQlwYXJhbXMtPnByaW1hcnkuZmIgPSAociAlIDIgPT0gMCkgPyAmZmIyIDogb3Jp Z19mYjsKIAogCQlpZiAociAhPSAwKQotCQkJZHJhd19yZWN0KHBhdHRlcm4sICZwYXJhbXMtPmZi LCB0LT5tZXRob2QsIHIgLSAxKTsKKwkJCWRyYXdfcmVjdChwYXR0ZXJuLCAmcGFyYW1zLT5wcmlt YXJ5LCB0LT5tZXRob2QsIHIgLSAxKTsKIAogCQlwYWdlX2ZsaXBfZm9yX3BhcmFtcyhwYXJhbXMs IHR5cGUpOwogCQlkb19hc3NlcnRpb25zKDApOwogCi0JCWRyYXdfcmVjdChwYXR0ZXJuLCAmcGFy YW1zLT5mYiwgdC0+bWV0aG9kLCByKTsKKwkJZHJhd19yZWN0KHBhdHRlcm4sICZwYXJhbXMtPnBy aW1hcnksIHQtPm1ldGhvZCwgcik7CiAJCXVwZGF0ZV93YW50ZWRfY3JjKHQsICZwYXR0ZXJuLT5j cmNzW3QtPmZvcm1hdF1bcl0pOwogCiAJCWRvX2Fzc2VydGlvbnMoQVNTRVJUX1BTUl9ESVNBQkxF RCk7CkBAIC0yNjM5LDQxICsyNDg0LDMwIEBAIHN0YXRpYyB2b2lkIGZsaXB0cmFja19zdWJ0ZXN0 KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQsIGVudW0gZmxpcF90eXBlIHR5cGUpCiAgKi8KIHN0 YXRpYyB2b2lkIG1vdmVfc3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogewotCWlu dCByLCByYzsKKwlpbnQgcjsKIAlpbnQgYXNzZXJ0aW9ucyA9IEFTU0VSVF9OT19BQ1RJT05fQ0hB TkdFOwogCXN0cnVjdCBtb2Rlc2V0X3BhcmFtcyAqcGFyYW1zID0gcGlja19wYXJhbXModCk7CiAJ c3RydWN0IGRyYXdfcGF0dGVybl9pbmZvICpwYXR0ZXJuID0gJnBhdHRlcm4zOworCXN0cnVjdCBm Yl9yZWdpb24gKnJlZyA9IHBpY2tfdGFyZ2V0KHQsIHBhcmFtcyk7CiAJYm9vbCByZXBlYXQgPSBm YWxzZTsKIAogCXByZXBhcmVfc3VidGVzdCh0LCBwYXR0ZXJuKTsKIAogCS8qIEp1c3QgcGFpbnQg dGhlIHJpZ2h0IGNvbG9yIHNpbmNlIHdlIHN0YXJ0IGF0IDB4MC4gKi8KLQlkcmF3X3JlY3QocGF0 dGVybiwgcGlja190YXJnZXQodCwgcGFyYW1zKSwgdC0+bWV0aG9kLCAwKTsKKwlkcmF3X3JlY3Qo cGF0dGVybiwgcmVnLCB0LT5tZXRob2QsIDApOwogCXVwZGF0ZV93YW50ZWRfY3JjKHQsICZwYXR0 ZXJuLT5jcmNzW3QtPmZvcm1hdF1bMF0pOwogCiAJZG9fYXNzZXJ0aW9ucyhhc3NlcnRpb25zKTsK IAogCWZvciAociA9IDE7IHIgPCBwYXR0ZXJuLT5uX3JlY3RzOyByKyspIHsKLQkJc3RydWN0IHJl Y3QgcmVjdCA9IHBhdHRlcm4tPmdldF9yZWN0KCZwYXJhbXMtPmZiLCByKTsKLQotCQlzd2l0Y2gg KHQtPnBsYW5lKSB7Ci0JCWNhc2UgUExBTkVfQ1VSOgotCQkJcmMgPSBkcm1Nb2RlTW92ZUN1cnNv cihkcm0uZmQsIHBhcmFtcy0+Y3J0Y19pZCwgcmVjdC54LAotCQkJCQkgICAgICAgcmVjdC55KTsK LQkJCWlndF9hc3NlcnRfZXEocmMsIDApOwotCQkJYnJlYWs7Ci0JCWNhc2UgUExBTkVfU1BSOgot CQkJcmMgPSBkcm1Nb2RlU2V0UGxhbmUoZHJtLmZkLCBwYXJhbXMtPnNwcml0ZV9pZCwKLQkJCQkJ ICAgICBwYXJhbXMtPmNydGNfaWQsCi0JCQkJCSAgICAgcGFyYW1zLT5zcHJpdGUuZmItPmZiX2lk LCAwLAotCQkJCQkgICAgIHJlY3QueCwgcmVjdC55LCByZWN0LncsCi0JCQkJCSAgICAgcmVjdC5o LCAwLCAwLCByZWN0LncgPDwgMTYsCi0JCQkJCSAgICAgcmVjdC5oIDw8IDE2KTsKLQkJCWlndF9h c3NlcnRfZXEocmMsIDApOwotCQkJYnJlYWs7Ci0JCWRlZmF1bHQ6Ci0JCQlpZ3RfYXNzZXJ0KGZh bHNlKTsKLQkJfQorCQlzdHJ1Y3QgcmVjdCByZWN0ID0gcGF0dGVybi0+Z2V0X3JlY3QoJnBhcmFt cy0+cHJpbWFyeSwgcik7CisKKwkJaWd0X3BsYW5lX3NldF9mYihyZWctPnBsYW5lLCByZWctPmZi KTsKKwkJaWd0X3BsYW5lX3NldF9wb3NpdGlvbihyZWctPnBsYW5lLCByZWN0LngsIHJlY3QueSk7 CisJCWlndF9wbGFuZV9zZXRfc2l6ZShyZWctPnBsYW5lLCByZWN0LncsIHJlY3QuaCk7CisJCWln dF9mYl9zZXRfc2l6ZShyZWctPmZiLCByZWctPnBsYW5lLCByZWN0LncsIHJlY3QuaCk7CisJCWln dF9kaXNwbGF5X2NvbW1pdDIoJmRybS5kaXNwbGF5LCBDT01NSVRfVU5JVkVSU0FMKTsKKwogCQl1 cGRhdGVfd2FudGVkX2NyYyh0LCAmcGF0dGVybi0+Y3Jjc1t0LT5mb3JtYXRdW3JdKTsKIAogCQlk b19hc3NlcnRpb25zKGFzc2VydGlvbnMpOwpAQCAtMjcwMyw3ICsyNTM3LDcgQEAgc3RhdGljIHZv aWQgbW92ZV9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiAgKi8KIHN0YXRpYyB2 b2lkIG9ub2ZmX3N1YnRlc3QoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIHsKLQlpbnQgciwg cmM7CisJaW50IHI7CiAJaW50IGFzc2VydGlvbnMgPSBBU1NFUlRfTk9fQUNUSU9OX0NIQU5HRTsK IAlzdHJ1Y3QgbW9kZXNldF9wYXJhbXMgKnBhcmFtcyA9IHBpY2tfcGFyYW1zKHQpOwogCXN0cnVj dCBkcmF3X3BhdHRlcm5faW5mbyAqcGF0dGVybiA9ICZwYXR0ZXJuMzsKQEAgLTI3MTYsNDkgKzI1 NTAsMjEgQEAgc3RhdGljIHZvaWQgb25vZmZfc3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2Rl ICp0KQogCWRvX2Fzc2VydGlvbnMoYXNzZXJ0aW9ucyk7CiAKIAlmb3IgKHIgPSAwOyByIDwgNDsg cisrKSB7CisJCXN0cnVjdCBmYl9yZWdpb24gKnJlZyA9IHBpY2tfdGFyZ2V0KHQsIHBhcmFtcyk7 CisKIAkJaWYgKHIgJSAyID09IDApIHsKLQkJCXN3aXRjaCAodC0+cGxhbmUpIHsKLQkJCWNhc2Ug UExBTkVfQ1VSOgotCQkJCXJjID0gZHJtTW9kZVNldEN1cnNvcihkcm0uZmQsIHBhcmFtcy0+Y3J0 Y19pZCwKLQkJCQkJCSAgICAgIDAsIDAsIDApOwotCQkJCWlndF9hc3NlcnRfZXEocmMsIDApOwot CQkJCWJyZWFrOwotCQkJY2FzZSBQTEFORV9TUFI6Ci0JCQkJcmMgPSBkcm1Nb2RlU2V0UGxhbmUo ZHJtLmZkLCBwYXJhbXMtPnNwcml0ZV9pZCwKLQkJCQkJCSAgICAgMCwgMCwgMCwgMCwgMCwgMCwg MCwgMCwgMCwKLQkJCQkJCSAgICAgMCwgMCk7Ci0JCQkJaWd0X2Fzc2VydF9lcShyYywgMCk7Ci0J CQkJYnJlYWs7Ci0JCQlkZWZhdWx0OgotCQkJCWlndF9hc3NlcnQoZmFsc2UpOwotCQkJfQorCQkJ aWd0X3BsYW5lX3NldF9mYihyZWctPnBsYW5lLCBOVUxMKTsKKwkJCWlndF9kaXNwbGF5X2NvbW1p dCgmZHJtLmRpc3BsYXkpOworCiAJCQl1cGRhdGVfd2FudGVkX2NyYyh0LCAmYmx1ZV9jcmNzW3Qt PmZvcm1hdF0uY3JjKTsKIAogCQl9IGVsc2UgewotCQkJc3dpdGNoICh0LT5wbGFuZSkgewotCQkJ Y2FzZSBQTEFORV9DVVI6Ci0JCQkJcmMgPSBkcm1Nb2RlU2V0Q3Vyc29yKGRybS5mZCwgcGFyYW1z LT5jcnRjX2lkLAotCQkJCQkJICBwYXJhbXMtPmN1cnNvci5mYi0+Z2VtX2hhbmRsZSwKLQkJCQkJ CSAgcGFyYW1zLT5jdXJzb3IudywKLQkJCQkJCSAgcGFyYW1zLT5jdXJzb3IuaCk7Ci0JCQkJaWd0 X2Fzc2VydF9lcShyYywgMCk7Ci0JCQkJYnJlYWs7Ci0JCQljYXNlIFBMQU5FX1NQUjoKLQkJCQly YyA9IGRybU1vZGVTZXRQbGFuZShkcm0uZmQsIHBhcmFtcy0+c3ByaXRlX2lkLAotCQkJCQkJICAg ICBwYXJhbXMtPmNydGNfaWQsCi0JCQkJCQkgICAgIHBhcmFtcy0+c3ByaXRlLmZiLT5mYl9pZCwK LQkJCQkJCSAgICAgMCwgMCwgMCwgcGFyYW1zLT5zcHJpdGUudywKLQkJCQkJCSAgICAgcGFyYW1z LT5zcHJpdGUuaCwgMCwKLQkJCQkJCSAgICAgMCwKLQkJCQkJCSAgICAgcGFyYW1zLT5zcHJpdGUu dyA8PCAxNiwKLQkJCQkJCSAgICAgcGFyYW1zLT5zcHJpdGUuaCA8PCAxNik7Ci0JCQkJaWd0X2Fz c2VydF9lcShyYywgMCk7Ci0JCQkJYnJlYWs7Ci0JCQlkZWZhdWx0OgotCQkJCWlndF9hc3NlcnQo ZmFsc2UpOwotCQkJfQotCQkJdXBkYXRlX3dhbnRlZF9jcmModCwgJnBhdHRlcm4tPmNyY3NbdC0+ Zm9ybWF0XVswXSk7CisJCQlpZ3RfcGxhbmVfc2V0X2ZiKHJlZy0+cGxhbmUsIHJlZy0+ZmIpOwor CQkJaWd0X3BsYW5lX3NldF9zaXplKHJlZy0+cGxhbmUsIHJlZy0+dywgcmVnLT5oKTsKKwkJCWln dF9mYl9zZXRfc2l6ZShyZWctPmZiLCByZWctPnBsYW5lLCByZWctPncsIHJlZy0+aCk7CisJCQlp Z3RfZGlzcGxheV9jb21taXQoJmRybS5kaXNwbGF5KTsKIAorCQkJdXBkYXRlX3dhbnRlZF9jcmMo dCwgJnBhdHRlcm4tPmNyY3NbdC0+Zm9ybWF0XVswXSk7CiAJCX0KIAogCQlkb19hc3NlcnRpb25z KGFzc2VydGlvbnMpOwpAQCAtMjc2NywyNCArMjU3MywxMSBAQCBzdGF0aWMgdm9pZCBvbm9mZl9z dWJ0ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiAKIHN0YXRpYyBib29sIHByaW1fcGxh bmVfZGlzYWJsZWQodm9pZCkKIHsKLQlpbnQgaSwgcmM7Ci0JYm9vbCBkaXNhYmxlZCwgZm91bmQg PSBmYWxzZTsKLQlpbnQgY3J0Y19pZHggPSBrbXN0ZXN0X2dldF9jcnRjX2lkeChkcm0ucmVzLCBw cmltX21vZGVfcGFyYW1zLmNydGNfaWQpOwotCi0JZm9yIChpID0gMDsgaSA8IGRybS5wbGFuZV9y ZXMtPmNvdW50X3BsYW5lczsgaSsrKSB7Ci0JCWlmICgoZHJtLnBsYW5lc1tpXS0+cG9zc2libGVf Y3J0Y3MgJiAoMSA8PCBjcnRjX2lkeCkpICYmCi0JCSAgICBkcm0ucGxhbmVfdHlwZXNbaV0gPT0g RFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkgewotCQkJZm91bmQgPSB0cnVlOwotCQkJZGlzYWJsZWQg PSAoZHJtLnBsYW5lc1tpXS0+Y3J0Y19pZCA9PSAwKTsKLQkJfQotCX0KLQotCWlndF9hc3NlcnQo Zm91bmQpOwotCi0JcmMgPSBkcm1TZXRDbGllbnRDYXAoZHJtLmZkLCBEUk1fQ0xJRU5UX0NBUF9V TklWRVJTQUxfUExBTkVTLCAwKTsKLQlpZ3RfYXNzZXJ0X2VxKHJjLCAwKTsKLQotCXJldHVybiBk aXNhYmxlZDsKKwkvKgorCSAqIENhbm5vdCB1c2UgaWd0X3BsYW5lX2dldF9wcm9wIGhlcmUgdG8g cmV0cmlldmUgZmJfaWQsCisJICogdGhlIHRlc3RzdWl0ZSBkb2Vzbid0IHJlcXVpcmUgQVRPTUlD LgorCSAqLworCXJldHVybiAhcHJpbV9tb2RlX3BhcmFtcy5wcmltYXJ5LnBsYW5lLT52YWx1ZXNb SUdUX1BMQU5FX0ZCX0lEXTsKIH0KIAogLyoKQEAgLTI4MDcsMTEgKzI2MDAsMTAgQEAgc3RhdGlj IHZvaWQgZnVsbHNjcmVlbl9wbGFuZV9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQp CiAJc3RydWN0IHJlY3QgcmVjdDsKIAlzdHJ1Y3QgbW9kZXNldF9wYXJhbXMgKnBhcmFtcyA9IHBp Y2tfcGFyYW1zKHQpOwogCWludCBhc3NlcnRpb25zOwotCWludCByYzsKIAogCXByZXBhcmVfc3Vi dGVzdCh0LCBwYXR0ZXJuKTsKIAotCXJlY3QgPSBwYXR0ZXJuLT5nZXRfcmVjdCgmcGFyYW1zLT5m YiwgMCk7CisJcmVjdCA9IHBhdHRlcm4tPmdldF9yZWN0KCZwYXJhbXMtPnByaW1hcnksIDApOwog CWNyZWF0ZV9mYih0LT5mb3JtYXQsIHJlY3QudywgcmVjdC5oLCBvcHQudGlsaW5nLCB0LT5wbGFu ZSwKIAkJICAmZnVsbHNjcmVlbl9mYik7CiAJLyogQ2FsbCBwaWNrX2NvbG9yKCkgYWdhaW4gc2lu Y2UgUFJJIGFuZCBTUFIgbWF5IG5vdCBzdXBwb3J0IHRoZSBzYW1lCkBAIC0yODE5LDEyICsyNjEx LDggQEAgc3RhdGljIHZvaWQgZnVsbHNjcmVlbl9wbGFuZV9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0 ZXN0X21vZGUgKnQpCiAJcmVjdC5jb2xvciA9IHBpY2tfY29sb3IoJmZ1bGxzY3JlZW5fZmIsIENP TE9SX0dSRUVOKTsKIAlpZ3RfZHJhd19maWxsX2ZiKGRybS5mZCwgJmZ1bGxzY3JlZW5fZmIsIHJl Y3QuY29sb3IpOwogCi0JcmMgPSBkcm1Nb2RlU2V0UGxhbmUoZHJtLmZkLCBwYXJhbXMtPnNwcml0 ZV9pZCwgcGFyYW1zLT5jcnRjX2lkLAotCQkJICAgICBmdWxsc2NyZWVuX2ZiLmZiX2lkLCAwLCAw LCAwLCBmdWxsc2NyZWVuX2ZiLndpZHRoLAotCQkJICAgICBmdWxsc2NyZWVuX2ZiLmhlaWdodCwg MCwgMCwKLQkJCSAgICAgZnVsbHNjcmVlbl9mYi53aWR0aCA8PCAxNiwKLQkJCSAgICAgZnVsbHNj cmVlbl9mYi5oZWlnaHQgPDwgMTYpOwotCWlndF9hc3NlcnRfZXEocmMsIDApOworCWlndF9wbGFu ZV9zZXRfZmIocGFyYW1zLT5zcHJpdGUucGxhbmUsICZmdWxsc2NyZWVuX2ZiKTsKKwlpZ3RfZGlz cGxheV9jb21taXQoJmRybS5kaXNwbGF5KTsKIAl1cGRhdGVfd2FudGVkX2NyYyh0LCAmcGF0dGVy bi0+Y3Jjc1t0LT5mb3JtYXRdWzBdKTsKIAogCXN3aXRjaCAodC0+c2NyZWVuKSB7CkBAIC0yODQy LDkgKzI2MzAsOCBAQCBzdGF0aWMgdm9pZCBmdWxsc2NyZWVuX3BsYW5lX3N1YnRlc3QoY29uc3Qg c3RydWN0IHRlc3RfbW9kZSAqdCkKIAl9CiAJZG9fYXNzZXJ0aW9ucyhhc3NlcnRpb25zKTsKIAot CXJjID0gZHJtTW9kZVNldFBsYW5lKGRybS5mZCwgcGFyYW1zLT5zcHJpdGVfaWQsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsCi0JCQkgICAgIDAsIDAsIDApOwotCWlndF9hc3NlcnRfZXEocmMsIDAp OworCWlndF9wbGFuZV9zZXRfZmIocGFyYW1zLT5zcHJpdGUucGxhbmUsIE5VTEwpOworCWlndF9k aXNwbGF5X2NvbW1pdCgmZHJtLmRpc3BsYXkpOwogCiAJaWYgKHQtPnNjcmVlbiA9PSBTQ1JFRU5f UFJJTSkKIAkJYXNzZXJ0aW9ucyA9IEFTU0VSVF9MQVNUX0FDVElPTl9DSEFOR0VEOwpAQCAtMjg3 OCw5OCArMjY2NSw2OSBAQCBzdGF0aWMgdm9pZCBzY2FsZWRwcmltYXJ5X3N1YnRlc3QoY29uc3Qg c3RydWN0IHRlc3RfbW9kZSAqdCkKIHsKIAlzdHJ1Y3QgaWd0X2ZiIG5ld19mYiwgKm9sZF9mYjsK IAlzdHJ1Y3QgbW9kZXNldF9wYXJhbXMgKnBhcmFtcyA9IHBpY2tfcGFyYW1zKHQpOwotCWludCBp LCByYzsKLQl1aW50MzJfdCBwbGFuZV9pZDsKLQlpbnQgcHJpbV9jcnRjX2lkeCA9IGttc3Rlc3Rf Z2V0X2NydGNfaWR4KGRybS5yZXMsCi0JCQkJCQkgcHJpbV9tb2RlX3BhcmFtcy5jcnRjX2lkKTsK KwlzdHJ1Y3QgZmJfcmVnaW9uICpyZWcgPSAmcGFyYW1zLT5wcmltYXJ5OwogCiAJaWd0X3JlcXVp cmVfZihpbnRlbF9nZW4oaW50ZWxfZ2V0X2RybV9kZXZpZChkcm0uZmQpKSA+PSA5LAogCQkgICAg ICAiQ2FuJ3QgdGVzdCBwcmltYXJ5IHBsYW5lIHNjYWxpbmcgYmVmb3JlIGdlbiA5XG4iKTsKIAog CXByZXBhcmVfc3VidGVzdCh0LCBOVUxMKTsKIAotCW9sZF9mYiA9IHBhcmFtcy0+ZmIuZmI7CisJ b2xkX2ZiID0gcmVnLT5mYjsKIAotCWNyZWF0ZV9mYih0LT5mb3JtYXQsIHBhcmFtcy0+ZmIuZmIt PndpZHRoLCBwYXJhbXMtPmZiLmZiLT5oZWlnaHQsCisJY3JlYXRlX2ZiKHQtPmZvcm1hdCwgcmVn LT5mYi0+d2lkdGgsIHJlZy0+ZmItPmhlaWdodCwKIAkJICBvcHQudGlsaW5nLCB0LT5wbGFuZSwg Jm5ld19mYik7CiAJZmlsbF9mYigmbmV3X2ZiLCBDT0xPUl9CTFVFKTsKIAogCWlndF9kcmF3X3Jl Y3RfZmIoZHJtLmZkLCBkcm0uYnVmbWdyLCBOVUxMLCAmbmV3X2ZiLCB0LT5tZXRob2QsCi0JCQkg cGFyYW1zLT5mYi54LCBwYXJhbXMtPmZiLnksCi0JCQkgcGFyYW1zLT5mYi53IC8gMiwgcGFyYW1z LT5mYi5oIC8gMiwKKwkJCSByZWctPngsIHJlZy0+eSwgcmVnLT53IC8gMiwgcmVnLT5oIC8gMiwK IAkJCSBwaWNrX2NvbG9yKCZuZXdfZmIsIENPTE9SX0dSRUVOKSk7CiAJaWd0X2RyYXdfcmVjdF9m Yihkcm0uZmQsIGRybS5idWZtZ3IsIE5VTEwsICZuZXdfZmIsIHQtPm1ldGhvZCwKLQkJCSBwYXJh bXMtPmZiLnggKyBwYXJhbXMtPmZiLncgLyAyLAotCQkJIHBhcmFtcy0+ZmIueSArIHBhcmFtcy0+ ZmIuaCAvIDIsCi0JCQkgcGFyYW1zLT5mYi53IC8gMiwgcGFyYW1zLT5mYi5oIC8gMiwKKwkJCSBy ZWctPnggKyByZWctPncgLyAyLCByZWctPnkgKyByZWctPmggLyAyLAorCQkJIHJlZy0+dyAvIDIs IHJlZy0+aCAvIDIsCiAJCQkgcGlja19jb2xvcigmbmV3X2ZiLCBDT0xPUl9SRUQpKTsKIAlpZ3Rf ZHJhd19yZWN0X2ZiKGRybS5mZCwgZHJtLmJ1Zm1nciwgTlVMTCwgJm5ld19mYiwgdC0+bWV0aG9k LAotCQkJIHBhcmFtcy0+ZmIueCArIHBhcmFtcy0+ZmIudyAvIDIsCi0JCQkgcGFyYW1zLT5mYi55 ICsgcGFyYW1zLT5mYi5oIC8gMiwKLQkJCSBwYXJhbXMtPmZiLncgLyA0LCBwYXJhbXMtPmZiLmgg LyA0LAorCQkJIHJlZy0+eCArIHJlZy0+dyAvIDIsIHJlZy0+eSArIHJlZy0+aCAvIDIsCisJCQkg cmVnLT53IC8gNCwgcmVnLT5oIC8gNCwKIAkJCSBwaWNrX2NvbG9yKCZuZXdfZmIsIENPTE9SX01B R0VOVEEpKTsKIAotCWZvciAoaSA9IDA7IGkgPCBkcm0ucGxhbmVfcmVzLT5jb3VudF9wbGFuZXM7 IGkrKykKLQkJaWYgKChkcm0ucGxhbmVzW2ldLT5wb3NzaWJsZV9jcnRjcyAmICgxIDw8IHByaW1f Y3J0Y19pZHgpKSAmJgotCQkgICAgZHJtLnBsYW5lX3R5cGVzW2ldID09IERSTV9QTEFORV9UWVBF X1BSSU1BUlkpCi0JCQlwbGFuZV9pZCA9IGRybS5wbGFuZXNbaV0tPnBsYW5lX2lkOwotCiAJLyog Tm8gc2NhbGluZy4gKi8KLQlyYyA9IGRybU1vZGVTZXRQbGFuZShkcm0uZmQsIHBsYW5lX2lkLCBw YXJhbXMtPmNydGNfaWQsCi0JCQkgICAgIG5ld19mYi5mYl9pZCwgMCwKLQkJCSAgICAgMCwgMCwK LQkJCSAgICAgcGFyYW1zLT5tb2RlLT5oZGlzcGxheSwgcGFyYW1zLT5tb2RlLT52ZGlzcGxheSwK LQkJCSAgICAgcGFyYW1zLT5mYi54IDw8IDE2LCBwYXJhbXMtPmZiLnkgPDwgMTYsCi0JCQkgICAg IHBhcmFtcy0+ZmIudyA8PCAxNiwgcGFyYW1zLT5mYi5oIDw8IDE2KTsKLQlpZ3RfYXNzZXJ0KHJj ID09IDApOworCWlndF9wbGFuZV9zZXRfZmIocmVnLT5wbGFuZSwgJm5ld19mYik7CisJaWd0X2Zi X3NldF9wb3NpdGlvbigmbmV3X2ZiLCByZWctPnBsYW5lLCByZWctPngsIHJlZy0+eSk7CisJaWd0 X2ZiX3NldF9zaXplKCZuZXdfZmIsIHJlZy0+cGxhbmUsIHJlZy0+dywgcmVnLT5oKTsKKwlpZ3Rf cGxhbmVfc2V0X3NpemUocmVnLT5wbGFuZSwgcGFyYW1zLT5tb2RlLT5oZGlzcGxheSwgcGFyYW1z LT5tb2RlLT52ZGlzcGxheSk7CisJaWd0X2Rpc3BsYXlfY29tbWl0MigmZHJtLmRpc3BsYXksIENP TU1JVF9VTklWRVJTQUwpOwogCWRvX2Fzc2VydGlvbnMoRE9OVF9BU1NFUlRfQ1JDKTsKIAogCS8q IFNvdXJjZSB1cHNjYWxpbmcuICovCi0JcmMgPSBkcm1Nb2RlU2V0UGxhbmUoZHJtLmZkLCBwbGFu ZV9pZCwgcGFyYW1zLT5jcnRjX2lkLAotCQkJICAgICBuZXdfZmIuZmJfaWQsIDAsCi0JCQkgICAg IDAsIDAsCi0JCQkgICAgIHBhcmFtcy0+bW9kZS0+aGRpc3BsYXksIHBhcmFtcy0+bW9kZS0+dmRp c3BsYXksCi0JCQkgICAgIHBhcmFtcy0+ZmIueCA8PCAxNiwgcGFyYW1zLT5mYi55IDw8IDE2LAot CQkJICAgICAocGFyYW1zLT5mYi53IC8gMikgPDwgMTYsCi0JCQkgICAgIChwYXJhbXMtPmZiLmgg LyAyKSA8PCAxNik7Ci0JaWd0X2Fzc2VydChyYyA9PSAwKTsKKwlpZ3RfZmJfc2V0X3NpemUoJm5l d19mYiwgcmVnLT5wbGFuZSwgcmVnLT53IC8gMiwgcmVnLT5oIC8gMik7CisJaWd0X2Rpc3BsYXlf Y29tbWl0MigmZHJtLmRpc3BsYXksIENPTU1JVF9VTklWRVJTQUwpOwogCWRvX2Fzc2VydGlvbnMo RE9OVF9BU1NFUlRfQ1JDKTsKIAogCS8qIERlc3RpbmF0aW9uIGRvZXNuJ3QgZmlsbCB0aGUgZW50 aXJlIENSVEMsIG5vIHNjYWxpbmcuICovCi0JcmMgPSBkcm1Nb2RlU2V0UGxhbmUoZHJtLmZkLCBw bGFuZV9pZCwgcGFyYW1zLT5jcnRjX2lkLAotCQkJICAgICBuZXdfZmIuZmJfaWQsIDAsCi0JCQkg ICAgIHBhcmFtcy0+bW9kZS0+aGRpc3BsYXkgLyA0LAotCQkJICAgICBwYXJhbXMtPm1vZGUtPnZk aXNwbGF5IC8gNCwKLQkJCSAgICAgcGFyYW1zLT5tb2RlLT5oZGlzcGxheSAvIDIsCi0JCQkgICAg IHBhcmFtcy0+bW9kZS0+dmRpc3BsYXkgLyAyLAotCQkJICAgICBwYXJhbXMtPmZiLnggPDwgMTYs IHBhcmFtcy0+ZmIueSA8PCAxNiwKLQkJCSAgICAgKHBhcmFtcy0+ZmIudyAvIDIpIDw8IDE2LAot CQkJICAgICAocGFyYW1zLT5mYi5oIC8gMikgPDwgMTYpOwotCWlndF9hc3NlcnQocmMgPT0gMCk7 CisJaWd0X2ZiX3NldF9zaXplKCZuZXdfZmIsIHJlZy0+cGxhbmUsIHJlZy0+dyAvIDIsIHJlZy0+ aCAvIDIpOworCWlndF9wbGFuZV9zZXRfcG9zaXRpb24ocmVnLT5wbGFuZSwKKwkJCSAgICAgICBw YXJhbXMtPm1vZGUtPmhkaXNwbGF5IC8gNCwKKwkJCSAgICAgICBwYXJhbXMtPm1vZGUtPnZkaXNw bGF5IC8gNCk7CisJaWd0X3BsYW5lX3NldF9zaXplKHJlZy0+cGxhbmUsCisJCQkgICBwYXJhbXMt Pm1vZGUtPmhkaXNwbGF5IC8gMiwKKwkJCSAgIHBhcmFtcy0+bW9kZS0+dmRpc3BsYXkgLyAyKTsK KwlpZ3RfZGlzcGxheV9jb21taXQyKCZkcm0uZGlzcGxheSwgQ09NTUlUX1VOSVZFUlNBTCk7CiAJ ZG9fYXNzZXJ0aW9ucyhET05UX0FTU0VSVF9DUkMpOwogCiAJLyogRGVzdGluYXRpb24gZG9lc24n dCBmaWxsIHRoZSBlbnRpcmUgQ1JUQywgdXBzY2FsaW5nLiAqLwotCXJjID0gZHJtTW9kZVNldFBs YW5lKGRybS5mZCwgcGxhbmVfaWQsIHBhcmFtcy0+Y3J0Y19pZCwKLQkJCSAgICAgbmV3X2ZiLmZi X2lkLCAwLAotCQkJICAgICBwYXJhbXMtPm1vZGUtPmhkaXNwbGF5IC8gNCwKLQkJCSAgICAgcGFy YW1zLT5tb2RlLT52ZGlzcGxheSAvIDQsCi0JCQkgICAgIHBhcmFtcy0+bW9kZS0+aGRpc3BsYXkg LyAyLAotCQkJICAgICBwYXJhbXMtPm1vZGUtPnZkaXNwbGF5IC8gMiwKLQkJCSAgICAgKHBhcmFt cy0+ZmIueCArIHBhcmFtcy0+ZmIudyAvIDIpIDw8IDE2LAotCQkJICAgICAocGFyYW1zLT5mYi55 ICsgcGFyYW1zLT5mYi5oIC8gMikgPDwgMTYsCi0JCQkgICAgIChwYXJhbXMtPmZiLncgLyA0KSA8 PCAxNiwKLQkJCSAgICAgKHBhcmFtcy0+ZmIuaCAvIDQpIDw8IDE2KTsKLQlpZ3RfYXNzZXJ0KHJj ID09IDApOworCWlndF9mYl9zZXRfcG9zaXRpb24oJm5ld19mYiwgcmVnLT5wbGFuZSwKKwkJCSAg ICByZWctPnggKyByZWctPncgLyA0LCByZWctPnkgKyByZWctPmggLyA0KTsKKwlpZ3RfZmJfc2V0 X3NpemUoJm5ld19mYiwgcmVnLT5wbGFuZSwgcmVnLT53IC8gMiwgcmVnLT5oIC8gMik7CisJaWd0 X2Rpc3BsYXlfY29tbWl0MigmZHJtLmRpc3BsYXksIENPTU1JVF9VTklWRVJTQUwpOwogCWRvX2Fz c2VydGlvbnMoRE9OVF9BU1NFUlRfQ1JDKTsKIAogCS8qIEJhY2sgdG8gdGhlIGdvb2QgYW5kIG9s ZCBibHVlIGZiLiAqLwotCXJjID0gZHJtTW9kZVNldFBsYW5lKGRybS5mZCwgcGxhbmVfaWQsIHBh cmFtcy0+Y3J0Y19pZCwKLQkJCSAgICAgb2xkX2ZiLT5mYl9pZCwgMCwKLQkJCSAgICAgMCwgMCwK LQkJCSAgICAgcGFyYW1zLT5tb2RlLT5oZGlzcGxheSwgcGFyYW1zLT5tb2RlLT52ZGlzcGxheSwK LQkJCSAgICAgcGFyYW1zLT5mYi54IDw8IDE2LCBwYXJhbXMtPmZiLnkgPDwgMTYsCi0JCQkgICAg IHBhcmFtcy0+ZmIudyA8PCAxNiwgcGFyYW1zLT5mYi5oIDw8IDE2KTsKLQlpZ3RfYXNzZXJ0KHJj ID09IDApOworCWlndF9wbGFuZV9zZXRfZmIocmVnLT5wbGFuZSwgb2xkX2ZiKTsKKwlpZ3RfcGxh bmVfc2V0X3Bvc2l0aW9uKHBhcmFtcy0+cHJpbWFyeS5wbGFuZSwgMCwgMCk7CisJaWd0X3BsYW5l X3NldF9zaXplKHJlZy0+cGxhbmUsIHBhcmFtcy0+bW9kZS0+aGRpc3BsYXksIHBhcmFtcy0+bW9k ZS0+dmRpc3BsYXkpOworCWlndF9mYl9zZXRfcG9zaXRpb24ocmVnLT5mYiwgcmVnLT5wbGFuZSwg cmVnLT54LCByZWctPnkpOworCWlndF9mYl9zZXRfc2l6ZShyZWctPmZiLCByZWctPnBsYW5lLCBy ZWctPncsIHJlZy0+aCk7CisJaWd0X2Rpc3BsYXlfY29tbWl0MigmZHJtLmRpc3BsYXksIENPTU1J VF9VTklWRVJTQUwpOwogCWRvX2Fzc2VydGlvbnMoMCk7CiAKIAlpZ3RfcmVtb3ZlX2ZiKGRybS5m ZCwgJm5ld19mYik7CkBAIC0yOTk5LDE1ICsyNzU3LDE1IEBAIHN0YXRpYyB2b2lkIG1vZGVzZXRm cm9tYnVzeV9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiAKIAlwcmVwYXJlX3N1 YnRlc3QodCwgTlVMTCk7CiAKLQljcmVhdGVfZmIodC0+Zm9ybWF0LCBwYXJhbXMtPmZiLmZiLT53 aWR0aCwgcGFyYW1zLT5mYi5mYi0+aGVpZ2h0LAorCWNyZWF0ZV9mYih0LT5mb3JtYXQsIHBhcmFt cy0+cHJpbWFyeS5mYi0+d2lkdGgsIHBhcmFtcy0+cHJpbWFyeS5mYi0+aGVpZ2h0LAogCQkgIG9w dC50aWxpbmcsIHQtPnBsYW5lLCAmZmIyKTsKIAlmaWxsX2ZiKCZmYjIsIENPTE9SX1BSSU1fQkcp OwogCi0Jc3RhcnRfYnVzeV90aHJlYWQocGFyYW1zLT5mYi5mYik7CisJc3RhcnRfYnVzeV90aHJl YWQocGFyYW1zLT5wcmltYXJ5LmZiKTsKIAl1c2xlZXAoMTAwMDApOwogCiAJdW5zZXRfYWxsX2Ny dGNzKCk7Ci0JcGFyYW1zLT5mYi5mYiA9ICZmYjI7CisJcGFyYW1zLT5wcmltYXJ5LmZiID0gJmZi MjsKIAlzZXRfbW9kZV9mb3JfcGFyYW1zKHBhcmFtcyk7CiAKIAlkb19hc3NlcnRpb25zKDApOwpA QCAtMzEwOSw5ICsyODY3LDkgQEAgc3RhdGljIHZvaWQgZmFyZnJvbWZlbmNlX3N1YnRlc3QoY29u c3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIAogCWZpbGxfZmIoJnRhbGxfZmIsIENPTE9SX1BSSU1f QkcpOwogCi0JcGFyYW1zLT5mYi5mYiA9ICZ0YWxsX2ZiOwotCXBhcmFtcy0+ZmIueCA9IDA7Ci0J cGFyYW1zLT5mYi55ID0gbWF4X2hlaWdodCAtIHBhcmFtcy0+bW9kZS0+dmRpc3BsYXk7CisJcGFy YW1zLT5wcmltYXJ5LmZiID0gJnRhbGxfZmI7CisJcGFyYW1zLT5wcmltYXJ5LnggPSAwOworCXBh cmFtcy0+cHJpbWFyeS55ID0gbWF4X2hlaWdodCAtIHBhcmFtcy0+bW9kZS0+dmRpc3BsYXk7CiAJ c2V0X21vZGVfZm9yX3BhcmFtcyhwYXJhbXMpOwogCWRvX2Fzc2VydGlvbnMoYXNzZXJ0aW9ucyk7 CiAKQEAgLTMxNzcsMzAgKzI5MzUsMzAgQEAgc3RhdGljIHZvaWQgYmFkc3RyaWRlX3N1YnRlc3Qo Y29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIAogCXByZXBhcmVfc3VidGVzdCh0LCBOVUxMKTsK IAotCW9sZF9mYiA9IHBhcmFtcy0+ZmIuZmI7CisJb2xkX2ZiID0gcGFyYW1zLT5wcmltYXJ5LmZi OwogCi0JY3JlYXRlX2ZiKHQtPmZvcm1hdCwgcGFyYW1zLT5mYi5mYi0+d2lkdGggKyA0MDk2LCBw YXJhbXMtPmZiLmZiLT5oZWlnaHQsCisJY3JlYXRlX2ZiKHQtPmZvcm1hdCwgcGFyYW1zLT5wcmlt YXJ5LmZiLT53aWR0aCArIDQwOTYsIHBhcmFtcy0+cHJpbWFyeS5mYi0+aGVpZ2h0LAogCQkgIG9w dC50aWxpbmcsIHQtPnBsYW5lLCAmd2lkZV9mYik7CiAJaWd0X2Fzc2VydCh3aWRlX2ZiLnN0cmlk ZSA+IDE2Mzg0KTsKIAogCWZpbGxfZmIoJndpZGVfZmIsIENPTE9SX1BSSU1fQkcpOwogCiAJLyog VHJ5IGEgc2ltcGxlIG1vZGVzZXQgd2l0aCB0aGUgbmV3IGZiLiAqLwotCXBhcmFtcy0+ZmIuZmIg PSAmd2lkZV9mYjsKKwlwYXJhbXMtPnByaW1hcnkuZmIgPSAmd2lkZV9mYjsKIAlzZXRfbW9kZV9m b3JfcGFyYW1zKHBhcmFtcyk7CiAJZG9fYXNzZXJ0aW9ucyhBU1NFUlRfRkJDX0RJU0FCTEVEKTsK IAogCS8qIEdvIGJhY2sgdG8gdGhlIG9sZCBmYiBzbyBGQkMgd29ya3MgYWdhaW4uICovCi0JcGFy YW1zLT5mYi5mYiA9IG9sZF9mYjsKKwlwYXJhbXMtPnByaW1hcnkuZmIgPSBvbGRfZmI7CiAJc2V0 X21vZGVfZm9yX3BhcmFtcyhwYXJhbXMpOwogCWRvX2Fzc2VydGlvbnMoMCk7CiAKIAkvKiBXZSdy ZSBkb2luZyB0aGUgZXF1aXZhbGVudCBvZiBhIG1vZGVzZXQsIGJ1dCB3aXRoIHRoZSBwbGFuZXMg QVBJLiAqLwotCXBhcmFtcy0+ZmIuZmIgPSAmd2lkZV9mYjsKKwlwYXJhbXMtPnByaW1hcnkuZmIg PSAmd2lkZV9mYjsKIAlzZXRfcHJpbV9wbGFuZV9mb3JfcGFyYW1zKHBhcmFtcyk7CiAJZG9fYXNz ZXJ0aW9ucyhBU1NFUlRfRkJDX0RJU0FCTEVEKTsKIAotCXBhcmFtcy0+ZmIuZmIgPSBvbGRfZmI7 CisJcGFyYW1zLT5wcmltYXJ5LmZiID0gb2xkX2ZiOwogCXNldF9tb2RlX2Zvcl9wYXJhbXMocGFy YW1zKTsKIAlkb19hc3NlcnRpb25zKDApOwogCkBAIC0zMjA5LDcgKzI5NjcsNyBAQCBzdGF0aWMg dm9pZCBiYWRzdHJpZGVfc3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogCSAqIHdp dGggYSBkaWZmZXJlbnQgc3RyaWRlLiBXaXRoIHRoZSBhdG9taWMgcGFnZSBmbGlwIGhlbHBlciB3 ZSBjYW4sCiAJICogc28gYWxsb3cgcGFnZSBmbGlwIHRvIGZhaWwgYW5kIHN1Y2NlZWQuCiAJICov Ci0JcmMgPSBkcm1Nb2RlUGFnZUZsaXAoZHJtLmZkLCBwYXJhbXMtPmNydGNfaWQsIHdpZGVfZmIu ZmJfaWQsIDAsIE5VTEwpOworCXJjID0gZHJtTW9kZVBhZ2VGbGlwKGRybS5mZCwgZHJtLmRpc3Bs YXkucGlwZXNbcGFyYW1zLT5waXBlXS5jcnRjX2lkLCB3aWRlX2ZiLmZiX2lkLCAwLCBOVUxMKTsK IAlpZ3RfYXNzZXJ0KHJjID09IC1FSU5WQUwgfHwgcmMgPT0gMCk7CiAJZG9fYXNzZXJ0aW9ucyhy YyA9PSAwID8gQVNTRVJUX0ZCQ19ESVNBQkxFRCA6IDApOwogCkBAIC0zMjQ0LDkgKzMwMDIsOSBA QCBzdGF0aWMgdm9pZCBzdHJpZGVjaGFuZ2Vfc3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2Rl ICp0KQogCiAJcHJlcGFyZV9zdWJ0ZXN0KHQsIE5VTEwpOwogCi0Jb2xkX2ZiID0gcGFyYW1zLT5m Yi5mYjsKKwlvbGRfZmIgPSBwYXJhbXMtPnByaW1hcnkuZmI7CiAKLQljcmVhdGVfZmIodC0+Zm9y bWF0LCBwYXJhbXMtPmZiLmZiLT53aWR0aCArIDUxMiwgcGFyYW1zLT5mYi5mYi0+aGVpZ2h0LAor CWNyZWF0ZV9mYih0LT5mb3JtYXQsIHBhcmFtcy0+cHJpbWFyeS5mYi0+d2lkdGggKyA1MTIsIHBh cmFtcy0+cHJpbWFyeS5mYi0+aGVpZ2h0LAogCQkgIG9wdC50aWxpbmcsIHQtPnBsYW5lLCAmbmV3 X2ZiKTsKIAlmaWxsX2ZiKCZuZXdfZmIsIENPTE9SX1BSSU1fQkcpOwogCkBAIC0zMjU0LDIxICsz MDEyLDIxIEBAIHN0YXRpYyB2b2lkIHN0cmlkZWNoYW5nZV9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0 ZXN0X21vZGUgKnQpCiAKIAkvKiBXZSBjYW4ndCBhc3NlcnQgdGhhdCBGQkMgd2lsbCBiZSBlbmFi bGVkIHNpbmNlIHRoZXJlIG1heSBub3QgYmUKIAkgKiBlbm91Z2ggc3BhY2UgZm9yIHRoZSBDRkIs IGJ1dCB3ZSBjYW4gY2hlY2sgdGhlIENSQy4gKi8KLQlwYXJhbXMtPmZiLmZiID0gJm5ld19mYjsK KwlwYXJhbXMtPnByaW1hcnkuZmIgPSAmbmV3X2ZiOwogCXNldF9tb2RlX2Zvcl9wYXJhbXMocGFy YW1zKTsKIAlkb19hc3NlcnRpb25zKERPTlRfQVNTRVJUX0ZFQVRVUkVfU1RBVFVTKTsKIAogCS8q IEdvIGJhY2sgdG8gdGhlIGZiIHRoYXQgY2FuIGhhdmUgRkJDLiAqLwotCXBhcmFtcy0+ZmIuZmIg PSBvbGRfZmI7CisJcGFyYW1zLT5wcmltYXJ5LmZiID0gb2xkX2ZiOwogCXNldF9tb2RlX2Zvcl9w YXJhbXMocGFyYW1zKTsKIAlkb19hc3NlcnRpb25zKDApOwogCiAJLyogVGhpcyBvcGVyYXRpb24g aXMgdGhlIHNhbWUgYXMgYWJvdmUsIGJ1dCB3aXRoIHRoZSBwbGFuZXMgQVBJLiAqLwotCXBhcmFt cy0+ZmIuZmIgPSAmbmV3X2ZiOworCXBhcmFtcy0+cHJpbWFyeS5mYiA9ICZuZXdfZmI7CiAJc2V0 X3ByaW1fcGxhbmVfZm9yX3BhcmFtcyhwYXJhbXMpOwogCWRvX2Fzc2VydGlvbnMoRE9OVF9BU1NF UlRfRkVBVFVSRV9TVEFUVVMpOwogCi0JcGFyYW1zLT5mYi5mYiA9IG9sZF9mYjsKKwlwYXJhbXMt PnByaW1hcnkuZmIgPSBvbGRfZmI7CiAJc2V0X3ByaW1fcGxhbmVfZm9yX3BhcmFtcyhwYXJhbXMp OwogCWRvX2Fzc2VydGlvbnMoMCk7CiAKQEAgLTMyNzYsNyArMzAzNCw3IEBAIHN0YXRpYyB2b2lk IHN0cmlkZWNoYW5nZV9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiAJICogVHJ5 IHRvIHNldCBhIG5ldyBzdHJpZGUuIHdpdGggdGhlIHBhZ2UgZmxpcCBhcGkuIFRoaXMgaXMgYWxs b3dlZAogCSAqIHdpdGggdGhlIGF0b21pYyBwYWdlIGZsaXAgaGVscGVyLCBidXQgbm90IHdpdGgg dGhlIGxlZ2FjeSBwYWdlIGZsaXAuCiAJICovCi0JcmMgPSBkcm1Nb2RlUGFnZUZsaXAoZHJtLmZk LCBwYXJhbXMtPmNydGNfaWQsIG5ld19mYi5mYl9pZCwgMCwgTlVMTCk7CisJcmMgPSBkcm1Nb2Rl UGFnZUZsaXAoZHJtLmZkLCBkcm0uZGlzcGxheS5waXBlc1twYXJhbXMtPnBpcGVdLmNydGNfaWQs IG5ld19mYi5mYl9pZCwgMCwgTlVMTCk7CiAJaWd0X2Fzc2VydChyYyA9PSAtRUlOVkFMIHx8IHJj ID09IDApOwogCWRvX2Fzc2VydGlvbnMoMCk7CiAKQEAgLTMzMDcsOSArMzA2NSw5IEBAIHN0YXRp YyB2b2lkIHRpbGluZ2NoYW5nZV9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiAK IAlwcmVwYXJlX3N1YnRlc3QodCwgTlVMTCk7CiAKLQlvbGRfZmIgPSBwYXJhbXMtPmZiLmZiOwor CW9sZF9mYiA9IHBhcmFtcy0+cHJpbWFyeS5mYjsKIAotCWNyZWF0ZV9mYih0LT5mb3JtYXQsIHBh cmFtcy0+ZmIuZmItPndpZHRoLCBwYXJhbXMtPmZiLmZiLT5oZWlnaHQsCisJY3JlYXRlX2ZiKHQt PmZvcm1hdCwgcGFyYW1zLT5wcmltYXJ5LmZiLT53aWR0aCwgcGFyYW1zLT5wcmltYXJ5LmZiLT5o ZWlnaHQsCiAJCSAgTE9DQUxfRFJNX0ZPUk1BVF9NT0RfTk9ORSwgdC0+cGxhbmUsICZuZXdfZmIp OwogCWZpbGxfZmIoJm5ld19mYiwgQ09MT1JfUFJJTV9CRyk7CiAKQEAgLTMzMTcsMTIgKzMwNzUs MTIgQEAgc3RhdGljIHZvaWQgdGlsaW5nY2hhbmdlX3N1YnRlc3QoY29uc3Qgc3RydWN0IHRlc3Rf bW9kZSAqdCkKIAkJaWd0X2RlYnVnKCJGbGlwIHR5cGU6ICVkXG4iLCBmbGlwX3R5cGUpOwogCiAJ CS8qIFNldCBhIGJ1ZmZlciB3aXRoIG5vIHRpbGluZy4gKi8KLQkJcGFyYW1zLT5mYi5mYiA9ICZu ZXdfZmI7CisJCXBhcmFtcy0+cHJpbWFyeS5mYiA9ICZuZXdfZmI7CiAJCXBhZ2VfZmxpcF9mb3Jf cGFyYW1zKHBhcmFtcywgZmxpcF90eXBlKTsKIAkJZG9fYXNzZXJ0aW9ucyhBU1NFUlRfRkJDX0RJ U0FCTEVEKTsKIAogCQkvKiBQdXQgRkJDIGJhY2sgaW4gYSB3b3JraW5nIHN0YXRlLiAqLwotCQlw YXJhbXMtPmZiLmZiID0gb2xkX2ZiOworCQlwYXJhbXMtPnByaW1hcnkuZmIgPSBvbGRfZmI7CiAJ CXBhZ2VfZmxpcF9mb3JfcGFyYW1zKHBhcmFtcywgZmxpcF90eXBlKTsKIAkJZG9fYXNzZXJ0aW9u cygwKTsKIAl9CkBAIC0zMzY1LDE1ICszMTIzLDE1IEBAIHN0YXRpYyB2b2lkIGJhc2ljX3N1YnRl c3QoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIAogCXByZXBhcmVfc3VidGVzdCh0LCBwYXR0 ZXJuKTsKIAotCWNyZWF0ZV9mYih0LT5mb3JtYXQsIHBhcmFtcy0+ZmIuZmItPndpZHRoLCBwYXJh bXMtPmZiLmZiLT5oZWlnaHQsCisJY3JlYXRlX2ZiKHQtPmZvcm1hdCwgcGFyYW1zLT5wcmltYXJ5 LmZiLT53aWR0aCwgcGFyYW1zLT5wcmltYXJ5LmZiLT5oZWlnaHQsCiAJCSAgb3B0LnRpbGluZywg dC0+cGxhbmUsICZmYjIpOwotCWZiMSA9IHBhcmFtcy0+ZmIuZmI7CisJZmIxID0gcGFyYW1zLT5w cmltYXJ5LmZiOwogCiAJZm9yIChyID0gMCwgbWV0aG9kID0gMDsgbWV0aG9kIDwgSUdUX0RSQVdf TUVUSE9EX0NPVU5UOyBtZXRob2QrKywgcisrKSB7CiAJCWlmIChyID09IHBhdHRlcm4tPm5fcmVj dHMpIHsKLQkJCXBhcmFtcy0+ZmIuZmIgPSAocGFyYW1zLT5mYi5mYiA9PSBmYjEpID8gJmZiMiA6 IGZiMTsKKwkJCXBhcmFtcy0+cHJpbWFyeS5mYiA9IChwYXJhbXMtPnByaW1hcnkuZmIgPT0gZmIx KSA/ICZmYjIgOiBmYjE7CiAKLQkJCWZpbGxfZmJfcmVnaW9uKCZwYXJhbXMtPmZiLCBDT0xPUl9Q UklNX0JHKTsKKwkJCWZpbGxfZmJfcmVnaW9uKCZwYXJhbXMtPnByaW1hcnksIENPTE9SX1BSSU1f QkcpOwogCQkJdXBkYXRlX3dhbnRlZF9jcmModCwgJmJsdWVfY3Jjc1t0LT5mb3JtYXRdLmNyYyk7 CiAKIAkJCXBhZ2VfZmxpcF9mb3JfcGFyYW1zKHBhcmFtcywgdC0+ZmxpcCk7CkBAIC0zMzgyLDcg KzMxNDAsNyBAQCBzdGF0aWMgdm9pZCBiYXNpY19zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21v ZGUgKnQpCiAJCQlyID0gMDsKIAkJfQogCi0JCWRyYXdfcmVjdChwYXR0ZXJuLCAmcGFyYW1zLT5m YiwgbWV0aG9kLCByKTsKKwkJZHJhd19yZWN0KHBhdHRlcm4sICZwYXJhbXMtPnByaW1hcnksIG1l dGhvZCwgcik7CiAJCXVwZGF0ZV93YW50ZWRfY3JjKHQsICZwYXR0ZXJuLT5jcmNzW3QtPmZvcm1h dF1bcl0pOwogCQlkb19hc3NlcnRpb25zKGFzc2VydGlvbnMpOwogCX0KLS0gCjIuMTYuMgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWls aW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2Cg==