Return-Path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id B60F26E5D6 for ; Tue, 27 Feb 2018 07:04:27 +0000 (UTC) From: Maarten Lankhorst Date: Tue, 27 Feb 2018 08:04:23 +0100 Message-Id: <20180227070423.3009-1-maarten.lankhorst@linux.intel.com> In-Reply-To: <20180226111558.58056-4-maarten.lankhorst@linux.intel.com> References: <20180226111558.58056-4-maarten.lankhorst@linux.intel.com> Subject: [igt-dev] [PATCH i-g-t] tests/kms_frontbuffer_tracking: Convert test to use igt_display, v2. 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: U3RyYWlnaHQgY29udmVyc2lvbiwgbm8gYmVoYXZpb3JhbCBjaGFuZ2VzIHlldC4KCkNoYW5nZXMg c2luY2UgdjE6Ci0gSGFuZGxlIDJ4IG91dHB1dHMgY29ycmVjdGx5LgoKU2lnbmVkLW9mZi1ieTog TWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0t CiB0ZXN0cy9rbXNfZnJvbnRidWZmZXJfdHJhY2tpbmcuYyB8IDc4MCArKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNjkgaW5zZXJ0aW9ucygr KSwgNTExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2ttc19mcm9udGJ1ZmZlcl90 cmFja2luZy5jIGIvdGVzdHMva21zX2Zyb250YnVmZmVyX3RyYWNraW5nLmMKaW5kZXggMTQ4M2My MjgwNDRlLi4xN2VkNmEyYWY3YWQgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19mcm9udGJ1ZmZlcl90 cmFja2luZy5jCisrKyBiL3Rlc3RzL2ttc19mcm9udGJ1ZmZlcl90cmFja2luZy5jCkBAIC0xNTEs MTggKzE1MSwxMSBAQCBzdHJ1Y3QgcmVjdCB7CiAJdWludDMyX3QgY29sb3I7CiB9OwogCi0jZGVm aW5lIE1BWF9DT05ORUNUT1JTIDMyCi0jZGVmaW5lIE1BWF9QTEFORVMgMzIKLSNkZWZpbmUgTUFY X0VOQ09ERVJTIDMyCiBzdHJ1Y3QgewogCWludCBmZDsKIAlpbnQgZGVidWdmczsKLQlkcm1Nb2Rl UmVzUHRyIHJlczsKLQlkcm1Nb2RlQ29ubmVjdG9yUHRyIGNvbm5lY3RvcnNbTUFYX0NPTk5FQ1RP UlNdOwotCWRybU1vZGVFbmNvZGVyUHRyIGVuY29kZXJzW01BWF9FTkNPREVSU107Ci0JZHJtTW9k ZVBsYW5lUmVzUHRyIHBsYW5lX3JlczsKLQlkcm1Nb2RlUGxhbmVQdHIgcGxhbmVzW01BWF9QTEFO RVNdOwotCXVpbnQ2NF90IHBsYW5lX3R5cGVzW01BWF9QTEFORVNdOworCWlndF9kaXNwbGF5X3Qg ZGlzcGxheTsKKwogCWRybV9pbnRlbF9idWZtZ3IgKmJ1Zm1ncjsKIH0gZHJtOwogCkBAIC0yMjIs NiArMjE1LDcgQEAgc3RydWN0IHsKICAqIGhhdmUgYSBiaWcgZnJhbWVidWZmZXIgYW5kIHRoZSBD UlRDIGlzIGp1c3QgZGlzcGxheWluZyBhIHN1YnJlZ2lvbiBvZiB0aGlzCiAgKiBiaWcgRkIuICov CiBzdHJ1Y3QgZmJfcmVnaW9uIHsKKwlpZ3RfcGxhbmVfdCAqcGxhbmU7CiAJc3RydWN0IGlndF9m YiAqZmI7CiAJaW50IHg7CiAJaW50IHk7CkBAIC0yNzcsMTcgKzI3MSwxOCBAQCBzdHJ1Y3Qgewog fTsKIAogc3RydWN0IG1vZGVzZXRfcGFyYW1zIHsKLQl1aW50MzJfdCBjcnRjX2lkOwotCXVpbnQz Ml90IGNvbm5lY3Rvcl9pZDsKLQl1aW50MzJfdCBzcHJpdGVfaWQ7Ci0JZHJtTW9kZU1vZGVJbmZv UHRyIG1vZGU7Ci0Jc3RydWN0IGZiX3JlZ2lvbiBmYjsKKwllbnVtIHBpcGUgcGlwZTsKKwlpZ3Rf b3V0cHV0X3QgKm91dHB1dDsKKwlkcm1Nb2RlTW9kZUluZm8gbW9kZV9jb3B5LCAqbW9kZTsKKwor CXN0cnVjdCBmYl9yZWdpb24gcHJpbWFyeTsKIAlzdHJ1Y3QgZmJfcmVnaW9uIGN1cnNvcjsKIAlz dHJ1Y3QgZmJfcmVnaW9uIHNwcml0ZTsKIH07CiAKIHN0cnVjdCBtb2Rlc2V0X3BhcmFtcyBwcmlt X21vZGVfcGFyYW1zOwogc3RydWN0IG1vZGVzZXRfcGFyYW1zIHNjbmRfbW9kZV9wYXJhbXM7CisK IHN0cnVjdCBmYl9yZWdpb24gb2Zmc2NyZWVuX2ZiOwogc3RydWN0IHNjcmVlbl9mYnMgewogCWJv b2wgaW5pdGlhbGl6ZWQ7CkBAIC0zMzcsMTMgKzMzMiwxNCBAQCBkcm1Nb2RlTW9kZUluZm8gc3Rk XzEwMjRfbW9kZSA9IHsKIAkubmFtZSA9ICJDdXN0b20gMTAyNHg3NjgiLAogfTsKIAotc3RhdGlj IGRybU1vZGVNb2RlSW5mb1B0ciBnZXRfY29ubmVjdG9yX3NtYWxsZXN0X21vZGUoZHJtTW9kZUNv bm5lY3RvclB0ciBjKQorc3RhdGljIGRybU1vZGVNb2RlSW5mbyAqZ2V0X2Nvbm5lY3Rvcl9zbWFs bGVzdF9tb2RlKGlndF9vdXRwdXRfdCAqb3V0cHV0KQogeworCWRybU1vZGVDb25uZWN0b3IgKmMg PSBvdXRwdXQtPmNvbmZpZy5jb25uZWN0b3I7CisJZHJtTW9kZU1vZGVJbmZvICpzbWFsbGVzdCA9 IE5VTEw7CiAJaW50IGk7Ci0JZHJtTW9kZU1vZGVJbmZvUHRyIHNtYWxsZXN0ID0gTlVMTDsKIAog CWZvciAoaSA9IDA7IGkgPCBjLT5jb3VudF9tb2RlczsgaSsrKSB7Ci0JCWRybU1vZGVNb2RlSW5m b1B0ciBtb2RlID0gJmMtPm1vZGVzW2ldOworCQlkcm1Nb2RlTW9kZUluZm8gKm1vZGUgPSAmYy0+ bW9kZXNbaV07CiAKIAkJaWYgKCFzbWFsbGVzdCkKIAkJCXNtYWxsZXN0ID0gbW9kZTsKQEAgLTM1 OSw3MSArMzU1LDUzIEBAIHN0YXRpYyBkcm1Nb2RlTW9kZUluZm9QdHIgZ2V0X2Nvbm5lY3Rvcl9z bWFsbGVzdF9tb2RlKGRybU1vZGVDb25uZWN0b3JQdHIgYykKIAlyZXR1cm4gc21hbGxlc3Q7CiB9 CiAKLXN0YXRpYyBkcm1Nb2RlQ29ubmVjdG9yUHRyIGdldF9jb25uZWN0b3IodWludDMyX3QgaWQp Ci17Ci0JaW50IGk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgZHJtLnJlcy0+Y291bnRfY29ubmVjdG9y czsgaSsrKQotCQlpZiAoZHJtLnJlcy0+Y29ubmVjdG9yc1tpXSA9PSBpZCkKLQkJCXJldHVybiBk cm0uY29ubmVjdG9yc1tpXTsKLQotCWlndF9hc3NlcnQoZmFsc2UpOwotfQotCi1zdGF0aWMgZHJt TW9kZUVuY29kZXJQdHIgZ2V0X2VuY29kZXIodWludDMyX3QgaWQpCitzdGF0aWMgZHJtTW9kZU1v ZGVJbmZvICpjb25uZWN0b3JfZ2V0X21vZGUoaWd0X291dHB1dF90ICpvdXRwdXQpCiB7Ci0JaW50 IGk7CisJZHJtTW9kZU1vZGVJbmZvICptb2RlID0gTlVMTDsKIAotCWZvciAoaSA9IDA7IGkgPCBk cm0ucmVzLT5jb3VudF9lbmNvZGVyczsgaSsrKQotCQlpZiAoZHJtLnJlcy0+ZW5jb2RlcnNbaV0g PT0gaWQpCi0JCQlyZXR1cm4gZHJtLmVuY29kZXJzW2ldOwotCi0JaWd0X2Fzc2VydChmYWxzZSk7 Ci19CisJaWYgKG9wdC5zbWFsbF9tb2RlcykKKwkJbW9kZSA9IGdldF9jb25uZWN0b3Jfc21hbGxl c3RfbW9kZShvdXRwdXQpOworCWVsc2UKKwkJbW9kZSA9ICZvdXRwdXQtPmNvbmZpZy5kZWZhdWx0 X21vZGU7CiAKLXN0YXRpYyB2b2lkIHByaW50X21vZGVfaW5mbyhjb25zdCBjaGFyICpzY3JlZW4s IHN0cnVjdCBtb2Rlc2V0X3BhcmFtcyAqcGFyYW1zKQotewotCWRybU1vZGVDb25uZWN0b3JQdHIg YyA9IGdldF9jb25uZWN0b3IocGFyYW1zLT5jb25uZWN0b3JfaWQpOworCSAvKiBPbiBIU1cgdGhl IENSQyBXQSBpcyBzbyBhd2Z1bCB0aGF0IGl0IG1ha2VzIHlvdSB0aGluayBldmVyeXRoaW5nIGlz CisJICAqIGJ1Z2dlZC4gKi8KKwlpZiAoSVNfSEFTV0VMTChpbnRlbF9nZXRfZHJtX2RldmlkKGRy bS5mZCkpICYmCisJICAgIG91dHB1dC0+Y29uZmlnLmNvbm5lY3Rvci0+Y29ubmVjdG9yX3R5cGUg PT0gRFJNX01PREVfQ09OTkVDVE9SX2VEUCkKKwkJbW9kZSA9ICZzdGRfMTAyNF9tb2RlOwogCi0J aWd0X2luZm8oIiVzIHNjcmVlbjogJXMgJXMsIGNydGMgJWRcbiIsCi0JCSBzY3JlZW4sCi0JCSBr bXN0ZXN0X2Nvbm5lY3Rvcl90eXBlX3N0cihjLT5jb25uZWN0b3JfdHlwZSksCi0JCSBwYXJhbXMt Pm1vZGUtPm5hbWUsCi0JCSBrbXN0ZXN0X2dldF9jcnRjX2lkeChkcm0ucmVzLCBwYXJhbXMtPmNy dGNfaWQpKTsKKwlyZXR1cm4gbW9kZTsKIH0KIAotc3RhdGljIHZvaWQgaW5pdF9tb2RlX3BhcmFt cyhzdHJ1Y3QgbW9kZXNldF9wYXJhbXMgKnBhcmFtcywgdWludDMyX3QgY3J0Y19pZCwKLQkJCSAg ICAgZHJtTW9kZUNvbm5lY3RvclB0ciBjb25uZWN0b3IsCi0JCQkgICAgIGRybU1vZGVNb2RlSW5m b1B0ciBtb2RlKQorc3RhdGljIHZvaWQgaW5pdF9tb2RlX3BhcmFtcyhzdHJ1Y3QgbW9kZXNldF9w YXJhbXMgKnBhcmFtcywKKwkJCSAgICAgaWd0X291dHB1dF90ICpvdXRwdXQsIGVudW0gcGlwZSBw aXBlKQogewotCXVpbnQzMl90IG92ZXJsYXlfcGxhbmVfaWQgPSAwOwotCWludCBjcnRjX2lkeCA9 IGttc3Rlc3RfZ2V0X2NydGNfaWR4KGRybS5yZXMsIGNydGNfaWQpOwotCWludCBpOwotCi0JZm9y IChpID0gMDsgaSA8IGRybS5wbGFuZV9yZXMtPmNvdW50X3BsYW5lczsgaSsrKQotCQlpZiAoKGRy bS5wbGFuZXNbaV0tPnBvc3NpYmxlX2NydGNzICYgKDEgPDwgY3J0Y19pZHgpKSAmJgotCQkgICAg ZHJtLnBsYW5lX3R5cGVzW2ldID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkpIHsKLQkJCW92ZXJs YXlfcGxhbmVfaWQgPSBkcm0ucGxhbmVzW2ldLT5wbGFuZV9pZDsKLQkJCWJyZWFrOwotCQl9CisJ ZHJtTW9kZU1vZGVJbmZvICptb2RlOwogCi0JaWd0X3JlcXVpcmUob3ZlcmxheV9wbGFuZV9pZCk7 CisJaWd0X291dHB1dF9vdmVycmlkZV9tb2RlKG91dHB1dCwgTlVMTCk7CisJbW9kZSA9IGNvbm5l Y3Rvcl9nZXRfbW9kZShvdXRwdXQpOwogCi0JcGFyYW1zLT5jcnRjX2lkID0gY3J0Y19pZDsKLQlw YXJhbXMtPmNvbm5lY3Rvcl9pZCA9IGNvbm5lY3Rvci0+Y29ubmVjdG9yX2lkOwotCXBhcmFtcy0+ bW9kZSA9IG1vZGU7Ci0JcGFyYW1zLT5zcHJpdGVfaWQgPSBvdmVybGF5X3BsYW5lX2lkOworCXBh cmFtcy0+cGlwZSA9IHBpcGU7CisJcGFyYW1zLT5vdXRwdXQgPSBvdXRwdXQ7CisJcGFyYW1zLT5t b2RlX2NvcHkgPSAqbW9kZTsKKwlwYXJhbXMtPm1vZGUgPSAmcGFyYW1zLT5tb2RlX2NvcHk7CiAK LQlwYXJhbXMtPmZiLmZiID0gTlVMTDsKLQlwYXJhbXMtPmZiLncgPSBtb2RlLT5oZGlzcGxheTsK LQlwYXJhbXMtPmZiLmggPSBtb2RlLT52ZGlzcGxheTsKKwlwYXJhbXMtPnByaW1hcnkucGxhbmUg PSBpZ3RfcGlwZV9nZXRfcGxhbmVfdHlwZSgmZHJtLmRpc3BsYXkucGlwZXNbcGlwZV0sIERSTV9Q TEFORV9UWVBFX1BSSU1BUlkpOworCXBhcmFtcy0+cHJpbWFyeS5mYiA9IE5VTEw7CisJcGFyYW1z LT5wcmltYXJ5LnggPSAwOworCXBhcmFtcy0+cHJpbWFyeS55ID0gMDsKKwlwYXJhbXMtPnByaW1h cnkudyA9IG1vZGUtPmhkaXNwbGF5OworCXBhcmFtcy0+cHJpbWFyeS5oID0gbW9kZS0+dmRpc3Bs YXk7CiAKKwlwYXJhbXMtPmN1cnNvci5wbGFuZSA9IGlndF9waXBlX2dldF9wbGFuZV90eXBlKCZk cm0uZGlzcGxheS5waXBlc1twaXBlXSwgRFJNX1BMQU5FX1RZUEVfQ1VSU09SKTsKIAlwYXJhbXMt PmN1cnNvci5mYiA9IE5VTEw7CiAJcGFyYW1zLT5jdXJzb3IueCA9IDA7CiAJcGFyYW1zLT5jdXJz b3IueSA9IDA7CiAJcGFyYW1zLT5jdXJzb3IudyA9IDY0OwogCXBhcmFtcy0+Y3Vyc29yLmggPSA2 NDsKIAorCXBhcmFtcy0+c3ByaXRlLnBsYW5lID0gaWd0X3BpcGVfZ2V0X3BsYW5lX3R5cGUoJmRy bS5kaXNwbGF5LnBpcGVzW3BpcGVdLCBEUk1fUExBTkVfVFlQRV9PVkVSTEFZKTsKKwlpZ3RfcmVx dWlyZShwYXJhbXMtPnNwcml0ZS5wbGFuZSk7CiAJcGFyYW1zLT5zcHJpdGUuZmIgPSBOVUxMOwog CXBhcmFtcy0+c3ByaXRlLnggPSAwOwogCXBhcmFtcy0+c3ByaXRlLnkgPSAwOwpAQCAtNDMxLDYz ICs0MDksMzIgQEAgc3RhdGljIHZvaWQgaW5pdF9tb2RlX3BhcmFtcyhzdHJ1Y3QgbW9kZXNldF9w YXJhbXMgKnBhcmFtcywgdWludDMyX3QgY3J0Y19pZCwKIAlwYXJhbXMtPnNwcml0ZS5oID0gNjQ7 CiB9CiAKLXN0YXRpYyBib29sIGNvbm5lY3Rvcl9nZXRfbW9kZShkcm1Nb2RlQ29ubmVjdG9yUHRy IGMsIGRybU1vZGVNb2RlSW5mb1B0ciAqbW9kZSkKLXsKLQkqbW9kZSA9IE5VTEw7Ci0KLQlpZiAo Yy0+Y29ubmVjdGlvbiAhPSBEUk1fTU9ERV9DT05ORUNURUQgfHwgIWMtPmNvdW50X21vZGVzKQot CQlyZXR1cm4gZmFsc2U7Ci0KLQlpZiAoYy0+Y29ubmVjdG9yX3R5cGUgPT0gRFJNX01PREVfQ09O TkVDVE9SX2VEUCAmJiBvcHQubm9fZWRwKQotCQlyZXR1cm4gZmFsc2U7Ci0KLQlpZiAob3B0LnNt YWxsX21vZGVzKQotCQkqbW9kZSA9IGdldF9jb25uZWN0b3Jfc21hbGxlc3RfbW9kZShjKTsKLQll bHNlCi0JCSptb2RlID0gJmMtPm1vZGVzWzBdOwotCi0JIC8qIE9uIEhTVyB0aGUgQ1JDIFdBIGlz IHNvIGF3ZnVsIHRoYXQgaXQgbWFrZXMgeW91IHRoaW5rIGV2ZXJ5dGhpbmcgaXMKLQkgICogYnVn Z2VkLiAqLwotCWlmIChJU19IQVNXRUxMKGludGVsX2dldF9kcm1fZGV2aWQoZHJtLmZkKSkgJiYK LQkgICAgYy0+Y29ubmVjdG9yX3R5cGUgPT0gRFJNX01PREVfQ09OTkVDVE9SX2VEUCkKLQkJKm1v ZGUgPSAmc3RkXzEwMjRfbW9kZTsKLQotCXJldHVybiB0cnVlOwotfQotCi1zdGF0aWMgYm9vbCBj b25uZWN0b3Jfc3VwcG9ydHNfcGlwZV9hKGRybU1vZGVDb25uZWN0b3JQdHIgY29ubmVjdG9yKQot ewotCWludCBpOwotCi0JZm9yIChpID0gMDsgaSA8IGNvbm5lY3Rvci0+Y291bnRfZW5jb2RlcnM7 IGkrKykKLQkJaWYgKGdldF9lbmNvZGVyKGNvbm5lY3Rvci0+ZW5jb2RlcnNbaV0pLT5wb3NzaWJs ZV9jcnRjcyAmIDEpCi0JCQlyZXR1cm4gdHJ1ZTsKLQotCXJldHVybiBmYWxzZTsKLX0KLQotc3Rh dGljIGJvb2wgZmluZF9jb25uZWN0b3IoYm9vbCBlZHBfb25seSwgYm9vbCBwaXBlX2EsIHVpbnQz Ml90IGZvcmJpZGRlbl9pZCwKLQkJCSAgIGRybU1vZGVDb25uZWN0b3JQdHIgKnJldF9jb25uZWN0 b3IsCi0JCQkgICBkcm1Nb2RlTW9kZUluZm9QdHIgKnJldF9tb2RlKQorc3RhdGljIGJvb2wgZmlu ZF9jb25uZWN0b3IoYm9vbCBlZHBfb25seSwgYm9vbCBwaXBlX2EsCisJCQkgICBpZ3Rfb3V0cHV0 X3QgKmZvcmJpZGRlbl9vdXRwdXQsCisJCQkgICBlbnVtIHBpcGUgZm9yYmlkZGVuX3BpcGUsCisJ CQkgICBpZ3Rfb3V0cHV0X3QgKipyZXRfb3V0cHV0LAorCQkJICAgZW51bSBwaXBlICpyZXRfcGlw ZSkKIHsKLQlkcm1Nb2RlQ29ubmVjdG9yUHRyIGMgPSBOVUxMOwotCWRybU1vZGVNb2RlSW5mb1B0 ciBtb2RlID0gTlVMTDsKLQlpbnQgaTsKKwlpZ3Rfb3V0cHV0X3QgKm91dHB1dDsKKwllbnVtIHBp cGUgcGlwZTsKIAotCWZvciAoaSA9IDA7IGkgPCBkcm0ucmVzLT5jb3VudF9jb25uZWN0b3JzOyBp KyspIHsKLQkJYyA9IGRybS5jb25uZWN0b3JzW2ldOworCWZvcl9lYWNoX3BpcGVfd2l0aF92YWxp ZF9vdXRwdXQoJmRybS5kaXNwbGF5LCBwaXBlLCBvdXRwdXQpIHsKKwkJZHJtTW9kZUNvbm5lY3Rv clB0ciBjID0gb3V0cHV0LT5jb25maWcuY29ubmVjdG9yOwogCiAJCWlmIChlZHBfb25seSAmJiBj LT5jb25uZWN0b3JfdHlwZSAhPSBEUk1fTU9ERV9DT05ORUNUT1JfZURQKQogCQkJY29udGludWU7 Ci0JCWlmIChwaXBlX2EgJiYgIWNvbm5lY3Rvcl9zdXBwb3J0c19waXBlX2EoYykpCisKKwkJaWYg KHBpcGVfYSAmJiBwaXBlICE9IFBJUEVfQSkKIAkJCWNvbnRpbnVlOwotCQlpZiAoYy0+Y29ubmVj dG9yX2lkID09IGZvcmJpZGRlbl9pZCkKKworCQlpZiAob3V0cHV0ID09IGZvcmJpZGRlbl9vdXRw dXQgfHwgcGlwZSA9PSBmb3JiaWRkZW5fcGlwZSkKIAkJCWNvbnRpbnVlOwotCQlpZiAoIWNvbm5l Y3Rvcl9nZXRfbW9kZShjLCAmbW9kZSkpCisKKwkJaWYgKGMtPmNvbm5lY3Rvcl90eXBlID09IERS TV9NT0RFX0NPTk5FQ1RPUl9lRFAgJiYgb3B0Lm5vX2VkcCkKIAkJCWNvbnRpbnVlOwogCi0JCSpy ZXRfY29ubmVjdG9yID0gYzsKLQkJKnJldF9tb2RlID0gbW9kZTsKKwkJKnJldF9vdXRwdXQgPSBv dXRwdXQ7CisJCSpyZXRfcGlwZSA9IHBpcGU7CiAJCXJldHVybiB0cnVlOwogCX0KIApAQCAtNDk2 LDkgKzQ0Myw4IEBAIHN0YXRpYyBib29sIGZpbmRfY29ubmVjdG9yKGJvb2wgZWRwX29ubHksIGJv b2wgcGlwZV9hLCB1aW50MzJfdCBmb3JiaWRkZW5faWQsCiAKIHN0YXRpYyBib29sIGluaXRfbW9k ZXNldF9jYWNoZWRfcGFyYW1zKHZvaWQpCiB7Ci0JZHJtTW9kZUNvbm5lY3RvclB0ciBwcmltX2Nv bm5lY3RvciA9IE5VTEwsIHNjbmRfY29ubmVjdG9yID0gTlVMTDsKLQlkcm1Nb2RlTW9kZUluZm9Q dHIgcHJpbV9tb2RlID0gTlVMTCwgc2NuZF9tb2RlID0gTlVMTDsKLQl1aW50MzJfdCBwcmltX2Ny dGNfaWQsIHNjbmRfY3J0Y19pZDsKKwlpZ3Rfb3V0cHV0X3QgKnByaW1fb3V0cHV0ID0gTlVMTCwg KnNjbmRfb3V0cHV0ID0gTlVMTDsKKwllbnVtIHBpcGUgcHJpbV9waXBlLCBzY25kX3BpcGU7CiAK IAkvKgogCSAqIFdlIGhhdmUgdGhpcyBwcm9ibGVtIHdoZXJlIFBTUiBpcyBvbmx5IHByZXNlbnQg b24gZURQIG1vbml0b3JzIGFuZApAQCAtNTA4LDM5ICs0NTQsMjkgQEAgc3RhdGljIGJvb2wgaW5p dF9tb2Rlc2V0X2NhY2hlZF9wYXJhbXModm9pZCkKIAkgKiBUT0RPOiByZWZhY3RvciB0aGUgY29k ZSBpbiBhIHdheSB0aGF0IGFsbG93cyB1cyB0byBoYXZlIGRpZmZlcmVudAogCSAqIHNldHMgb2Yg cHJpbS9zY25kIHN0cnVjdHMgZm9yIGRpZmZlcmVudCBmZWF0dXJlcy4KIAkgKi8KLQlmaW5kX2Nv bm5lY3Rvcih0cnVlLCB0cnVlLCAwLCAmcHJpbV9jb25uZWN0b3IsICZwcmltX21vZGUpOwotCWlm ICghcHJpbV9jb25uZWN0b3IpCi0JCWZpbmRfY29ubmVjdG9yKHRydWUsIGZhbHNlLCAwLCAmcHJp bV9jb25uZWN0b3IsICZwcmltX21vZGUpOwotCWlmICghcHJpbV9jb25uZWN0b3IpCi0JCWZpbmRf Y29ubmVjdG9yKGZhbHNlLCB0cnVlLCAwLCAmcHJpbV9jb25uZWN0b3IsICZwcmltX21vZGUpOwot CWlmICghcHJpbV9jb25uZWN0b3IpCi0JCWZpbmRfY29ubmVjdG9yKGZhbHNlLCBmYWxzZSwgMCwg JnByaW1fY29ubmVjdG9yLCAmcHJpbV9tb2RlKTsKLQotCWlmICghcHJpbV9jb25uZWN0b3IpCisJ ZmluZF9jb25uZWN0b3IodHJ1ZSwgdHJ1ZSwgTlVMTCwgUElQRV9OT05FLCAmcHJpbV9vdXRwdXQs ICZwcmltX3BpcGUpOworCWlmICghcHJpbV9vdXRwdXQpCisJCWZpbmRfY29ubmVjdG9yKHRydWUs IGZhbHNlLCBOVUxMLCBQSVBFX05PTkUsICZwcmltX291dHB1dCwgJnByaW1fcGlwZSk7CisJaWYg KCFwcmltX291dHB1dCkKKwkJZmluZF9jb25uZWN0b3IoZmFsc2UsIHRydWUsIE5VTEwsIFBJUEVf Tk9ORSwgJnByaW1fb3V0cHV0LCAmcHJpbV9waXBlKTsKKwlpZiAoIXByaW1fb3V0cHV0KQorCQlm aW5kX2Nvbm5lY3RvcihmYWxzZSwgZmFsc2UsIE5VTEwsIFBJUEVfTk9ORSwgJnByaW1fb3V0cHV0 LCAmcHJpbV9waXBlKTsKKworCWlmICghcHJpbV9vdXRwdXQpCiAJCXJldHVybiBmYWxzZTsKIAot CWZpbmRfY29ubmVjdG9yKGZhbHNlLCBmYWxzZSwgcHJpbV9jb25uZWN0b3ItPmNvbm5lY3Rvcl9p ZCwKLQkJICAgICAgICZzY25kX2Nvbm5lY3RvciwgJnNjbmRfbW9kZSk7CisJZmluZF9jb25uZWN0 b3IoZmFsc2UsIGZhbHNlLCBwcmltX291dHB1dCwgcHJpbV9waXBlLAorCQkgICAgICAgJnNjbmRf b3V0cHV0LCAmc2NuZF9waXBlKTsKIAotCXByaW1fY3J0Y19pZCA9IGttc3Rlc3RfZmluZF9jcnRj X2Zvcl9jb25uZWN0b3IoZHJtLmZkLCBkcm0ucmVzLAotCQkJCQkJICAgICAgIHByaW1fY29ubmVj dG9yLCAwKTsKLQlpbml0X21vZGVfcGFyYW1zKCZwcmltX21vZGVfcGFyYW1zLCBwcmltX2NydGNf aWQsCi0JCQkgcHJpbV9jb25uZWN0b3IsIHByaW1fbW9kZSk7Ci0JcHJpbnRfbW9kZV9pbmZvKCJQ cmltYXJ5IiwgJnByaW1fbW9kZV9wYXJhbXMpOworCWluaXRfbW9kZV9wYXJhbXMoJnByaW1fbW9k ZV9wYXJhbXMsIHByaW1fb3V0cHV0LCBwcmltX3BpcGUpOwogCi0JaWYgKCFzY25kX2Nvbm5lY3Rv cikgewotCQlzY25kX21vZGVfcGFyYW1zLmNvbm5lY3Rvcl9pZCA9IDA7CisJaWYgKCFzY25kX291 dHB1dCkgeworCQlzY25kX21vZGVfcGFyYW1zLnBpcGUgPSBQSVBFX05PTkU7CisJCXNjbmRfbW9k ZV9wYXJhbXMub3V0cHV0ID0gTlVMTDsKIAkJcmV0dXJuIHRydWU7CiAJfQogCi0JaWd0X3JlcXVp cmUoZHJtLnJlcy0+Y291bnRfY3J0Y3MgPj0gMik7Ci0Jc2NuZF9jcnRjX2lkID0ga21zdGVzdF9m aW5kX2NydGNfZm9yX2Nvbm5lY3Rvcihkcm0uZmQsIGRybS5yZXMsCi0JCQkJCQkgICAgICBzY25k X2Nvbm5lY3RvciwKLQkJCTEgPDwga21zdGVzdF9nZXRfY3J0Y19pZHgoZHJtLnJlcywgcHJpbV9j cnRjX2lkKSk7Ci0JaW5pdF9tb2RlX3BhcmFtcygmc2NuZF9tb2RlX3BhcmFtcywgc2NuZF9jcnRj X2lkLAotCQkJIHNjbmRfY29ubmVjdG9yLCBzY25kX21vZGUpOwotCXByaW50X21vZGVfaW5mbygi U2Vjb25kYXJ5IiwgJnNjbmRfbW9kZV9wYXJhbXMpOwotCisJaW5pdF9tb2RlX3BhcmFtcygmc2Nu ZF9tb2RlX3BhcmFtcywgc2NuZF9vdXRwdXQsIHNjbmRfcGlwZSk7CiAJcmV0dXJuIHRydWU7CiB9 CiAKQEAgLTY5OSw3ICs2MzUsNyBAQCBzdGF0aWMgdm9pZCBjcmVhdGVfc2hhcmVkX2ZiKGVudW0g cGl4ZWxfZm9ybWF0IGZvcm1hdCkKIAlwcmltX3cgPSBwcmltX21vZGVfcGFyYW1zLm1vZGUtPmhk aXNwbGF5OwogCXByaW1faCA9IHByaW1fbW9kZV9wYXJhbXMubW9kZS0+dmRpc3BsYXk7CiAKLQlp ZiAoc2NuZF9tb2RlX3BhcmFtcy5jb25uZWN0b3JfaWQpIHsKKwlpZiAoc2NuZF9tb2RlX3BhcmFt cy5vdXRwdXQpIHsKIAkJc2NuZF93ID0gc2NuZF9tb2RlX3BhcmFtcy5tb2RlLT5oZGlzcGxheTsK IAkJc2NuZF9oID0gc2NuZF9tb2RlX3BhcmFtcy5tb2RlLT52ZGlzcGxheTsKIAl9IGVsc2UgewpA QCAtNzI4LDcgKzY2NCw3IEBAIHN0YXRpYyB2b2lkIGRlc3Ryb3lfZmJzKGVudW0gcGl4ZWxfZm9y bWF0IGZvcm1hdCkKIAlpZiAoIXMtPmluaXRpYWxpemVkKQogCQlyZXR1cm47CiAKLQlpZiAoc2Nu ZF9tb2RlX3BhcmFtcy5jb25uZWN0b3JfaWQpIHsKKwlpZiAoc2NuZF9tb2RlX3BhcmFtcy5vdXRw dXQpIHsKIAkJaWd0X3JlbW92ZV9mYihkcm0uZmQsICZzLT5zY25kX3ByaSk7CiAJCWlndF9yZW1v dmVfZmIoZHJtLmZkLCAmcy0+c2NuZF9jdXIpOwogCQlpZ3RfcmVtb3ZlX2ZiKGRybS5mZCwgJnMt PnNjbmRfc3ByKTsKQEAgLTc2NCw3ICs3MDAsNyBAQCBzdGF0aWMgdm9pZCBjcmVhdGVfZmJzKGVu dW0gcGl4ZWxfZm9ybWF0IGZvcm1hdCkKIAogCWNyZWF0ZV9zaGFyZWRfZmIoZm9ybWF0KTsKIAot CWlmICghc2NuZF9tb2RlX3BhcmFtcy5jb25uZWN0b3JfaWQpCisJaWYgKCFzY25kX21vZGVfcGFy YW1zLm91dHB1dCkKIAkJcmV0dXJuOwogCiAJY3JlYXRlX2ZiKGZvcm1hdCwgc2NuZF9tb2RlX3Bh cmFtcy5tb2RlLT5oZGlzcGxheSwKQEAgLTc3NiwxNCArNzEyLDE2IEBAIHN0YXRpYyB2b2lkIGNy ZWF0ZV9mYnMoZW51bSBwaXhlbF9mb3JtYXQgZm9ybWF0KQogCQkgIG9wdC50aWxpbmcsIFBMQU5F X1NQUiwgJnMtPnNjbmRfc3ByKTsKIH0KIAotc3RhdGljIGJvb2wgc2V0X21vZGVfZm9yX3BhcmFt cyhzdHJ1Y3QgbW9kZXNldF9wYXJhbXMgKnBhcmFtcykKK3N0YXRpYyB2b2lkIHNldF9tb2RlX2Zv cl9wYXJhbXMoc3RydWN0IG1vZGVzZXRfcGFyYW1zICpwYXJhbXMpCiB7Ci0JaW50IHJjOworCWln dF9vdXRwdXRfb3ZlcnJpZGVfbW9kZShwYXJhbXMtPm91dHB1dCwgcGFyYW1zLT5tb2RlKTsKKwlp Z3Rfb3V0cHV0X3NldF9waXBlKHBhcmFtcy0+b3V0cHV0LCBwYXJhbXMtPnBpcGUpOwogCi0JcmMg PSBkcm1Nb2RlU2V0Q3J0Yyhkcm0uZmQsIHBhcmFtcy0+Y3J0Y19pZCwgcGFyYW1zLT5mYi5mYi0+ ZmJfaWQsCi0JCQkgICAgcGFyYW1zLT5mYi54LCBwYXJhbXMtPmZiLnksCi0JCQkgICAgJnBhcmFt cy0+Y29ubmVjdG9yX2lkLCAxLCBwYXJhbXMtPm1vZGUpOwotCXJldHVybiAocmMgPT0gMCk7CisJ aWd0X3BsYW5lX3NldF9mYihwYXJhbXMtPnByaW1hcnkucGxhbmUsIHBhcmFtcy0+cHJpbWFyeS5m Yik7CisJaWd0X3BsYW5lX3NldF9wb3NpdGlvbihwYXJhbXMtPnByaW1hcnkucGxhbmUsIDAsIDAp OworCWlndF9mYl9zZXRfcG9zaXRpb24ocGFyYW1zLT5wcmltYXJ5LmZiLCBwYXJhbXMtPnByaW1h cnkucGxhbmUsIHBhcmFtcy0+cHJpbWFyeS54LCBwYXJhbXMtPnByaW1hcnkueSk7CisJaWd0X2Zi X3NldF9zaXplKHBhcmFtcy0+cHJpbWFyeS5mYiwgcGFyYW1zLT5wcmltYXJ5LnBsYW5lLCBwYXJh bXMtPnByaW1hcnkudywgcGFyYW1zLT5wcmltYXJ5LmgpOworCWlndF9kaXNwbGF5X2NvbW1pdCgm ZHJtLmRpc3BsYXkpOwogfQogCiBzdGF0aWMgdm9pZCBfX2RlYnVnZnNfcmVhZChjb25zdCBjaGFy ICpwYXJhbSwgY2hhciAqYnVmLCBpbnQgbGVuKQpAQCAtMTIzOCwyMiArMTE3Niw4IEBAIHN0YXRp YyB2b2lkIGZpbGxfZmJfcmVnaW9uKHN0cnVjdCBmYl9yZWdpb24gKnJlZ2lvbiwgZW51bSBjb2xv ciBlY29sb3IpCiAKIHN0YXRpYyB2b2lkIHVuc2V0X2FsbF9jcnRjcyh2b2lkKQogewotCWludCBp LCByYzsKLQotCWZvciAoaSA9IDA7IGkgPCBkcm0ucmVzLT5jb3VudF9jcnRjczsgaSsrKSB7Ci0J CXJjID0gZHJtTW9kZVNldENydGMoZHJtLmZkLCBkcm0ucmVzLT5jcnRjc1tpXSwgLTEsIDAsIDAs IE5VTEwsCi0JCQkJICAgIDAsIE5VTEwpOwotCQlpZ3RfYXNzZXJ0X2VxKHJjLCAwKTsKLQotCQly YyA9IGRybU1vZGVTZXRDdXJzb3IoZHJtLmZkLCBkcm0ucmVzLT5jcnRjc1tpXSwgMCwgMCwgMCk7 Ci0JCWlndF9hc3NlcnRfZXEocmMsIDApOwotCX0KLQotCWZvciAoaSA9IDA7IGkgPCBkcm0ucGxh bmVfcmVzLT5jb3VudF9wbGFuZXM7IGkrKykgewotCQlyYyA9IGRybU1vZGVTZXRQbGFuZShkcm0u ZmQsIGRybS5wbGFuZV9yZXMtPnBsYW5lc1tpXSwgMCwgMCwgMCwKLQkJCQkgICAgIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDApOwotCQlpZ3RfYXNzZXJ0X2VxKHJjLCAwKTsKLQl9CisJaWd0X2Rpc3Bs YXlfcmVzZXQoJmRybS5kaXNwbGF5KTsKKwlpZ3RfZGlzcGxheV9jb21taXQoJmRybS5kaXNwbGF5 KTsKIH0KIAogc3RhdGljIHZvaWQgZGlzYWJsZV9mZWF0dXJlcyhjb25zdCBzdHJ1Y3QgdGVzdF9t b2RlICp0KQpAQCAtMTMyNSwxMCArMTI0OSwxMSBAQCBzdGF0aWMgdm9pZCBjb2xsZWN0X2NyY3Mo c3RydWN0IGJvdGhfY3JjcyAqY3JjcywgYm9vbCBtYW5kYXRvcnlfc2lua19jcmMpCiAJZ2V0X3Np bmtfY3JjKCZjcmNzLT5zaW5rLCBtYW5kYXRvcnlfc2lua19jcmMpOwogfQogCitzdGF0aWMgdm9p ZCBzZXR1cF9zaW5rX2NyYyh2b2lkKTsKKwogc3RhdGljIHZvaWQgaW5pdF9ibHVlX2NyYyhlbnVt IHBpeGVsX2Zvcm1hdCBmb3JtYXQsIGJvb2wgbWFuZGF0b3J5X3NpbmtfY3JjKQogewogCXN0cnVj dCBpZ3RfZmIgYmx1ZTsKLQlpbnQgcmM7CiAKIAlpZiAoYmx1ZV9jcmNzW2Zvcm1hdF0uaW5pdGlh bGl6ZWQpCiAJCXJldHVybjsKQEAgLTEzMzksMTAgKzEyNjQsMTggQEAgc3RhdGljIHZvaWQgaW5p dF9ibHVlX2NyYyhlbnVtIHBpeGVsX2Zvcm1hdCBmb3JtYXQsIGJvb2wgbWFuZGF0b3J5X3Npbmtf Y3JjKQogCiAJZmlsbF9mYigmYmx1ZSwgQ09MT1JfUFJJTV9CRyk7CiAKLQlyYyA9IGRybU1vZGVT ZXRDcnRjKGRybS5mZCwgcHJpbV9tb2RlX3BhcmFtcy5jcnRjX2lkLAotCQkJICAgIGJsdWUuZmJf aWQsIDAsIDAsICZwcmltX21vZGVfcGFyYW1zLmNvbm5lY3Rvcl9pZCwgMSwKLQkJCSAgICBwcmlt X21vZGVfcGFyYW1zLm1vZGUpOwotCWlndF9hc3NlcnRfZXEocmMsIDApOworCWlndF9vdXRwdXRf c2V0X3BpcGUocHJpbV9tb2RlX3BhcmFtcy5vdXRwdXQsIHByaW1fbW9kZV9wYXJhbXMucGlwZSk7 CisJaWd0X291dHB1dF9vdmVycmlkZV9tb2RlKHByaW1fbW9kZV9wYXJhbXMub3V0cHV0LCBwcmlt X21vZGVfcGFyYW1zLm1vZGUpOworCWlndF9wbGFuZV9zZXRfZmIocHJpbV9tb2RlX3BhcmFtcy5w cmltYXJ5LnBsYW5lLCAmYmx1ZSk7CisJaWd0X2Rpc3BsYXlfY29tbWl0KCZkcm0uZGlzcGxheSk7 CisKKwlpZiAoIXBpcGVfY3JjKSB7CisJCXBpcGVfY3JjID0gaWd0X3BpcGVfY3JjX25ldyhkcm0u ZmQsIHByaW1fbW9kZV9wYXJhbXMucGlwZSwgSU5URUxfUElQRV9DUkNfU09VUkNFX0FVVE8pOwor CQlpZ3RfYXNzZXJ0KHBpcGVfY3JjKTsKKworCQlzZXR1cF9zaW5rX2NyYygpOworCX0KKwogCWNv bGxlY3RfY3JjcygmYmx1ZV9jcmNzW2Zvcm1hdF0uY3JjLCBtYW5kYXRvcnlfc2lua19jcmMpOwog CiAJcHJpbnRfY3JjKCJCbHVlIENSQzogICIsICZibHVlX2NyY3NbZm9ybWF0XS5jcmMpOwpAQCAt MTM1OCw3ICsxMjkxLDcgQEAgc3RhdGljIHZvaWQgaW5pdF9jcmNzKGVudW0gcGl4ZWxfZm9ybWF0 IGZvcm1hdCwKIAkJICAgICAgc3RydWN0IGRyYXdfcGF0dGVybl9pbmZvICpwYXR0ZXJuLAogCQkg ICAgICBib29sIG1hbmRhdG9yeV9zaW5rX2NyYykKIHsKLQlpbnQgciwgcl8sIHJjOworCWludCBy LCByXzsKIAlzdHJ1Y3QgaWd0X2ZiIHRtcF9mYnNbcGF0dGVybi0+bl9yZWN0c107CiAKIAlpZiAo cGF0dGVybi0+aW5pdGlhbGl6ZWRbZm9ybWF0XSkKQEAgLTEzODYsMTIgKzEzMTksMTEgQEAgc3Rh dGljIHZvaWQgaW5pdF9jcmNzKGVudW0gcGl4ZWxfZm9ybWF0IGZvcm1hdCwKIAkJCQkJIHIpOwog CX0KIAorCWlndF9vdXRwdXRfc2V0X3BpcGUocHJpbV9tb2RlX3BhcmFtcy5vdXRwdXQsIHByaW1f bW9kZV9wYXJhbXMucGlwZSk7CiAJZm9yIChyID0gMDsgciA8IHBhdHRlcm4tPm5fcmVjdHM7IHIr KykgewotCQlyYyA9IGRybU1vZGVTZXRDcnRjKGRybS5mZCwgcHJpbV9tb2RlX3BhcmFtcy5jcnRj X2lkLAotCQkJCSAgIHRtcF9mYnNbcl0uZmJfaWQsIDAsIDAsCi0JCQkJICAgJnByaW1fbW9kZV9w YXJhbXMuY29ubmVjdG9yX2lkLCAxLAotCQkJCSAgIHByaW1fbW9kZV9wYXJhbXMubW9kZSk7Ci0J CWlndF9hc3NlcnRfZXEocmMsIDApOworCQlpZ3RfcGxhbmVfc2V0X2ZiKHByaW1fbW9kZV9wYXJh bXMucHJpbWFyeS5wbGFuZSwgJnRtcF9mYnNbcl0pOworCQlpZ3RfZGlzcGxheV9jb21taXQoJmRy bS5kaXNwbGF5KTsKKwogCQljb2xsZWN0X2NyY3MoJnBhdHRlcm4tPmNyY3NbZm9ybWF0XVtyXSwg bWFuZGF0b3J5X3NpbmtfY3JjKTsKIAl9CiAKQEAgLTE0MDgsNTAgKzEzNDAsMTMgQEAgc3RhdGlj IHZvaWQgaW5pdF9jcmNzKGVudW0gcGl4ZWxfZm9ybWF0IGZvcm1hdCwKIAlwYXR0ZXJuLT5pbml0 aWFsaXplZFtmb3JtYXRdID0gdHJ1ZTsKIH0KIAotc3RhdGljIHVpbnQ2NF90IGdldF9wbGFuZV90 eXBlKHVpbnQzMl90IHBsYW5lX2lkKQotewotCWJvb2wgZm91bmQ7Ci0JdWludDY0X3QgcHJvcF92 YWx1ZTsKLQlkcm1Nb2RlUHJvcGVydHlQdHIgcHJvcDsKLQotCWZvdW5kID0ga21zdGVzdF9nZXRf cHJvcGVydHkoZHJtLmZkLCBwbGFuZV9pZCwgRFJNX01PREVfT0JKRUNUX1BMQU5FLAotCQkJCSAg ICAgInR5cGUiLCBOVUxMLCAmcHJvcF92YWx1ZSwgJnByb3ApOwotCWlndF9hc3NlcnQoZm91bmQp OwotCWlndF9hc3NlcnQocHJvcC0+ZmxhZ3MgJiBEUk1fTU9ERV9QUk9QX0VOVU0pOwotCWlndF9h c3NlcnQocHJvcF92YWx1ZSA8IHByb3AtPmNvdW50X2VudW1zKTsKLQotCWRybU1vZGVGcmVlUHJv cGVydHkocHJvcCk7Ci0JcmV0dXJuIHByb3BfdmFsdWU7Ci19Ci0KIHN0YXRpYyB2b2lkIHNldHVw X2RybSh2b2lkKQogewotCWludCBpLCByYzsKLQogCWRybS5mZCA9IGRybV9vcGVuX2RyaXZlcl9t YXN0ZXIoRFJJVkVSX0lOVEVMKTsKIAlkcm0uZGVidWdmcyA9IGlndF9kZWJ1Z2ZzX2Rpcihkcm0u ZmQpOwogCi0JZHJtLnJlcyA9IGRybU1vZGVHZXRSZXNvdXJjZXMoZHJtLmZkKTsKLQlpZ3RfYXNz ZXJ0KGRybS5yZXMtPmNvdW50X2Nvbm5lY3RvcnMgPD0gTUFYX0NPTk5FQ1RPUlMpOwotCWlndF9h c3NlcnQoZHJtLnJlcy0+Y291bnRfZW5jb2RlcnMgPD0gTUFYX0VOQ09ERVJTKTsKLQotCWZvciAo aSA9IDA7IGkgPCBkcm0ucmVzLT5jb3VudF9jb25uZWN0b3JzOyBpKyspCi0JCWRybS5jb25uZWN0 b3JzW2ldID0gZHJtTW9kZUdldENvbm5lY3RvckN1cnJlbnQoZHJtLmZkLAotCQkJCQkJZHJtLnJl cy0+Y29ubmVjdG9yc1tpXSk7Ci0JZm9yIChpID0gMDsgaSA8IGRybS5yZXMtPmNvdW50X2VuY29k ZXJzOyBpKyspCi0JCWRybS5lbmNvZGVyc1tpXSA9IGRybU1vZGVHZXRFbmNvZGVyKGRybS5mZCwK LQkJCQkJCSAgICBkcm0ucmVzLT5lbmNvZGVyc1tpXSk7Ci0KLQlyYyA9IGRybVNldENsaWVudENh cChkcm0uZmQsIERSTV9DTElFTlRfQ0FQX1VOSVZFUlNBTF9QTEFORVMsIDEpOwotCWlndF9yZXF1 aXJlKHJjID09IDApOwotCi0JZHJtLnBsYW5lX3JlcyA9IGRybU1vZGVHZXRQbGFuZVJlc291cmNl cyhkcm0uZmQpOwotCWlndF9hc3NlcnQoZHJtLnBsYW5lX3Jlcy0+Y291bnRfcGxhbmVzIDw9IE1B WF9QTEFORVMpOwotCi0JZm9yIChpID0gMDsgaSA8IGRybS5wbGFuZV9yZXMtPmNvdW50X3BsYW5l czsgaSsrKSB7Ci0JCWRybS5wbGFuZXNbaV0gPSBkcm1Nb2RlR2V0UGxhbmUoZHJtLmZkLCBkcm0u cGxhbmVfcmVzLT5wbGFuZXNbaV0pOwotCQlkcm0ucGxhbmVfdHlwZXNbaV0gPSBnZXRfcGxhbmVf dHlwZShkcm0ucGxhbmVfcmVzLT5wbGFuZXNbaV0pOwotCX0KKwlrbXN0ZXN0X3NldF92dF9ncmFw aGljc19tb2RlKCk7CisJaWd0X2Rpc3BsYXlfaW5pdCgmZHJtLmRpc3BsYXksIGRybS5mZCk7CiAK IAlkcm0uYnVmbWdyID0gZHJtX2ludGVsX2J1Zm1ncl9nZW1faW5pdChkcm0uZmQsIDQwOTYpOwog CWlndF9hc3NlcnQoZHJtLmJ1Zm1ncik7CkBAIC0xNDYwLDIwICsxMzU1LDggQEAgc3RhdGljIHZv aWQgc2V0dXBfZHJtKHZvaWQpCiAKIHN0YXRpYyB2b2lkIHRlYXJkb3duX2RybSh2b2lkKQogewot CWludCBpOwotCiAJZHJtX2ludGVsX2J1Zm1ncl9kZXN0cm95KGRybS5idWZtZ3IpOwotCi0JZm9y IChpID0gMDsgaSA8IGRybS5wbGFuZV9yZXMtPmNvdW50X3BsYW5lczsgaSsrKQotCQlkcm1Nb2Rl RnJlZVBsYW5lKGRybS5wbGFuZXNbaV0pOwotCWRybU1vZGVGcmVlUGxhbmVSZXNvdXJjZXMoZHJt LnBsYW5lX3Jlcyk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgZHJtLnJlcy0+Y291bnRfZW5jb2RlcnM7 IGkrKykKLQkJZHJtTW9kZUZyZWVFbmNvZGVyKGRybS5lbmNvZGVyc1tpXSk7Ci0JZm9yIChpID0g MDsgaSA8IGRybS5yZXMtPmNvdW50X2Nvbm5lY3RvcnM7IGkrKykKLQkJZHJtTW9kZUZyZWVDb25u ZWN0b3IoZHJtLmNvbm5lY3RvcnNbaV0pOwotCi0JZHJtTW9kZUZyZWVSZXNvdXJjZXMoZHJtLnJl cyk7CisJaWd0X2Rpc3BsYXlfZmluaSgmZHJtLmRpc3BsYXkpOwogCWNsb3NlKGRybS5mZCk7CiB9 CiAKQEAgLTE0ODQsNyArMTM2Nyw2IEBAIHN0YXRpYyB2b2lkIHNldHVwX21vZGVzZXQodm9pZCkK IAlvZmZzY3JlZW5fZmIudyA9IDEwMjQ7CiAJb2Zmc2NyZWVuX2ZiLmggPSAxMDI0OwogCWNyZWF0 ZV9mYnMoRk9STUFUX0RFRkFVTFQpOwotCWttc3Rlc3Rfc2V0X3Z0X2dyYXBoaWNzX21vZGUoKTsK IH0KIAogc3RhdGljIHZvaWQgdGVhcmRvd25fbW9kZXNldCh2b2lkKQpAQCAtMTUwMCw3ICsxMzgy LDcgQEAgc3RhdGljIHZvaWQgc2V0dXBfc2lua19jcmModm9pZCkKIAlzaW5rX2NyY190IGNyYzsK IAlkcm1Nb2RlQ29ubmVjdG9yUHRyIGM7CiAKLQljID0gZ2V0X2Nvbm5lY3RvcihwcmltX21vZGVf cGFyYW1zLmNvbm5lY3Rvcl9pZCk7CisJYyA9IHByaW1fbW9kZV9wYXJhbXMub3V0cHV0LT5jb25m aWcuY29ubmVjdG9yOwogCWlmIChjLT5jb25uZWN0b3JfdHlwZSAhPSBEUk1fTU9ERV9DT05ORUNU T1JfZURQKSB7CiAJCWlndF9pbmZvKCJTaW5rIENSQyBub3Qgc3VwcG9ydGVkOiBwcmltYXJ5IHNj cmVlbiBpcyBub3QgZURQXG4iKTsKIAkJc2lua19jcmMuc3VwcG9ydGVkID0gZmFsc2U7CkBAIC0x NTEwLDkgKzEzOTIsOSBAQCBzdGF0aWMgdm9pZCBzZXR1cF9zaW5rX2NyYyh2b2lkKQogCS8qIFdl IG5lZWQgdG8gbWFrZSBzdXJlIHRoZXJlJ3MgYSBtb2RlIHNldCBvbiB0aGUgZURQIHNjcmVlbiBh bmQgaXQncwogCSAqIG5vdCBvbiBEUE1TIHN0YXRlLCBvdGhlcndpc2Ugd2UgZmFsbCBpbnRvIHRo ZSAiVW5leHBlY3RlZCBzaW5rIENSQwogCSAqIGVycm9yIiBjYXNlLiAqLwotCXByaW1fbW9kZV9w YXJhbXMuZmIuZmIgPSAmZmJzW0ZPUk1BVF9ERUZBVUxUXS5wcmltX3ByaTsKLQlwcmltX21vZGVf cGFyYW1zLmZiLnggPSBwcmltX21vZGVfcGFyYW1zLmZiLnkgPSAwOwotCWZpbGxfZmJfcmVnaW9u KCZwcmltX21vZGVfcGFyYW1zLmZiLCBDT0xPUl9QUklNX0JHKTsKKwlwcmltX21vZGVfcGFyYW1z LnByaW1hcnkuZmIgPSAmZmJzW0ZPUk1BVF9ERUZBVUxUXS5wcmltX3ByaTsKKwlwcmltX21vZGVf cGFyYW1zLnByaW1hcnkueCA9IHByaW1fbW9kZV9wYXJhbXMucHJpbWFyeS55ID0gMDsKKwlmaWxs X2ZiX3JlZ2lvbigmcHJpbV9tb2RlX3BhcmFtcy5wcmltYXJ5LCBDT0xPUl9QUklNX0JHKTsKIAlz ZXRfbW9kZV9mb3JfcGFyYW1zKCZwcmltX21vZGVfcGFyYW1zKTsKIAogCXNpbmtfY3JjLmZkID0g b3BlbmF0KGRybS5kZWJ1Z2ZzLCAiaTkxNV9zaW5rX2NyY19lRFAxIiwgT19SRE9OTFkpOwpAQCAt MTUyNSwxMSArMTQwNyw2IEBAIHN0YXRpYyB2b2lkIHNldHVwX3NpbmtfY3JjKHZvaWQpCiBzdGF0 aWMgdm9pZCBzZXR1cF9jcmNzKHZvaWQpCiB7CiAJZW51bSBwaXhlbF9mb3JtYXQgZjsKLQlpbnQg Y3J0Y19pZHggPSBrbXN0ZXN0X2dldF9jcnRjX2lkeChkcm0ucmVzLCBwcmltX21vZGVfcGFyYW1z LmNydGNfaWQpOwotCi0JcGlwZV9jcmMgPSBpZ3RfcGlwZV9jcmNfbmV3KGRybS5mZCwgY3J0Y19p ZHgsIElOVEVMX1BJUEVfQ1JDX1NPVVJDRV9BVVRPKTsKLQotCXNldHVwX3NpbmtfY3JjKCk7CiAK IAlmb3IgKGYgPSAwOyBmIDwgRk9STUFUX0NPVU5UOyBmKyspCiAJCWJsdWVfY3Jjc1tmXS5pbml0 aWFsaXplZCA9IGZhbHNlOwpAQCAtMTYwMSw3ICsxNDc4LDYgQEAgc3RhdGljIGJvb2wgZmJjX3N1 cHBvcnRlZF9vbl9jaGlwc2V0KHZvaWQpCiAKIHN0YXRpYyB2b2lkIHNldHVwX2ZiYyh2b2lkKQog ewotCWRybU1vZGVDb25uZWN0b3JQdHIgYyA9IGdldF9jb25uZWN0b3IocHJpbV9tb2RlX3BhcmFt cy5jb25uZWN0b3JfaWQpOwogCWludCBkZXZpZCA9IGludGVsX2dldF9kcm1fZGV2aWQoZHJtLmZk KTsKIAogCWlmICghZmJjX3N1cHBvcnRlZF9vbl9jaGlwc2V0KCkpIHsKQEAgLTE2MTQsNyArMTQ5 MCw3IEBAIHN0YXRpYyB2b2lkIHNldHVwX2ZiYyh2b2lkKQogCSAqIGlzIG5vdCBwcmVwYXJlZCBm b3IgdGhhdCB5ZXQuCiAJICogVE9ETzogc29sdmUgdGhpcy4KIAkgKi8KLQlpZiAoIWNvbm5lY3Rv cl9zdXBwb3J0c19waXBlX2EoYykpIHsKKwlpZiAocHJpbV9tb2RlX3BhcmFtcy5waXBlICE9IFBJ UEVfQSkgewogCQlpZ3RfaW5mbygiQ2FuJ3QgdGVzdCBGQkM6IHByaW1hcnkgY29ubmVjdG9yIGRv ZXNuJ3Qgc3VwcG9ydCAiCiAJCQkgInBpcGUgQVxuIik7CiAJCXJldHVybjsKQEAgLTE2NDYsNyAr MTUyMiw3IEBAIHN0YXRpYyBib29sIHBzcl9zaW5rX2hhc19zdXBwb3J0KHZvaWQpCiAKIHN0YXRp YyB2b2lkIHNldHVwX3Bzcih2b2lkKQogewotCWlmIChnZXRfY29ubmVjdG9yKHByaW1fbW9kZV9w YXJhbXMuY29ubmVjdG9yX2lkKS0+Y29ubmVjdG9yX3R5cGUgIT0KKwlpZiAocHJpbV9tb2RlX3Bh cmFtcy5vdXRwdXQtPmNvbmZpZy5jb25uZWN0b3ItPmNvbm5lY3Rvcl90eXBlICE9CiAJICAgIERS TV9NT0RFX0NPTk5FQ1RPUl9lRFApIHsKIAkJaWd0X2luZm8oIkNhbid0IHRlc3QgUFNSOiBubyB1 c2FibGUgZURQIHNjcmVlbi5cbiIpOwogCQlyZXR1cm47CkBAIC0xNjY1LDcgKzE1NDEsNyBAQCBz dGF0aWMgdm9pZCB0ZWFyZG93bl9wc3Iodm9pZCkKIAogc3RhdGljIHZvaWQgc2V0dXBfZHJycyh2 b2lkKQogewotCWlmIChnZXRfY29ubmVjdG9yKHByaW1fbW9kZV9wYXJhbXMuY29ubmVjdG9yX2lk KS0+Y29ubmVjdG9yX3R5cGUgIT0KKwlpZiAocHJpbV9tb2RlX3BhcmFtcy5vdXRwdXQtPmNvbmZp Zy5jb25uZWN0b3ItPmNvbm5lY3Rvcl90eXBlICE9CiAJICAgIERSTV9NT0RFX0NPTk5FQ1RPUl9l RFApIHsKIAkJaWd0X2luZm8oIkNhbid0IHRlc3QgRFJSUzogbm8gdXNhYmxlIGVEUCBzY3JlZW4u XG4iKTsKIAkJcmV0dXJuOwpAQCAtMTczNCw3ICsxNjEwLDcgQEAgc3RhdGljIHN0cnVjdCBmYl9y ZWdpb24gKnBpY2tfdGFyZ2V0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQsCiAKIAlzd2l0Y2gg KHQtPnBsYW5lKSB7CiAJY2FzZSBQTEFORV9QUkk6Ci0JCXJldHVybiAmcGFyYW1zLT5mYjsKKwkJ cmV0dXJuICZwYXJhbXMtPnByaW1hcnk7CiAJY2FzZSBQTEFORV9DVVI6CiAJCXJldHVybiAmcGFy YW1zLT5jdXJzb3I7CiAJY2FzZSBQTEFORV9TUFI6CkBAIC0xOTA0LDcgKzE3ODAsNyBAQCBzdGF0 aWMgdm9pZCBfX2RvX2Fzc2VydGlvbnMoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCwgaW50IGZs YWdzLAogCiBzdGF0aWMgdm9pZCBlbmFibGVfcHJpbV9zY3JlZW5fYW5kX3dhaXQoY29uc3Qgc3Ry dWN0IHRlc3RfbW9kZSAqdCkKIHsKLQlmaWxsX2ZiX3JlZ2lvbigmcHJpbV9tb2RlX3BhcmFtcy5m YiwgQ09MT1JfUFJJTV9CRyk7CisJZmlsbF9mYl9yZWdpb24oJnByaW1fbW9kZV9wYXJhbXMucHJp bWFyeSwgQ09MT1JfUFJJTV9CRyk7CiAJc2V0X21vZGVfZm9yX3BhcmFtcygmcHJpbV9tb2RlX3Bh cmFtcyk7CiAKIAl3YW50ZWRfY3JjID0gJmJsdWVfY3Jjc1t0LT5mb3JtYXRdLmNyYzsKQEAgLTE5 MTUsNDUgKzE3OTEsMjMgQEAgc3RhdGljIHZvaWQgZW5hYmxlX3ByaW1fc2NyZWVuX2FuZF93YWl0 KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiAKIHN0YXRpYyB2b2lkIGVuYWJsZV9zY25kX3Nj cmVlbl9hbmRfd2FpdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogewotCWZpbGxfZmJfcmVn aW9uKCZzY25kX21vZGVfcGFyYW1zLmZiLCBDT0xPUl9TQ05EX0JHKTsKKwlmaWxsX2ZiX3JlZ2lv bigmc2NuZF9tb2RlX3BhcmFtcy5wcmltYXJ5LCBDT0xPUl9TQ05EX0JHKTsKIAlzZXRfbW9kZV9m b3JfcGFyYW1zKCZzY25kX21vZGVfcGFyYW1zKTsKIAogCWRvX2Fzc2VydGlvbnMoQVNTRVJUX05P X0FDVElPTl9DSEFOR0UpOwogfQogCi1zdGF0aWMgdm9pZCBzZXRfY3Vyc29yX2Zvcl90ZXN0KGNv bnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQsCi0JCQkJc3RydWN0IG1vZGVzZXRfcGFyYW1zICpwYXJh bXMpCi17Ci0JaW50IHJjOwotCi0JZmlsbF9mYl9yZWdpb24oJnBhcmFtcy0+Y3Vyc29yLCBDT0xP Ul9QUklNX0JHKTsKLQotCXJjID0gZHJtTW9kZU1vdmVDdXJzb3IoZHJtLmZkLCBwYXJhbXMtPmNy dGNfaWQsIDAsIDApOwotCWlndF9hc3NlcnRfZXEocmMsIDApOwotCi0JcmMgPSBkcm1Nb2RlU2V0 Q3Vyc29yKGRybS5mZCwgcGFyYW1zLT5jcnRjX2lkLAotCQkJICAgICAgcGFyYW1zLT5jdXJzb3Iu ZmItPmdlbV9oYW5kbGUsCi0JCQkgICAgICBwYXJhbXMtPmN1cnNvci53LAotCQkJICAgICAgcGFy YW1zLT5jdXJzb3IuaCk7Ci0JaWd0X2Fzc2VydF9lcShyYywgMCk7Ci0KLQlkb19hc3NlcnRpb25z KEFTU0VSVF9OT19BQ1RJT05fQ0hBTkdFKTsKLX0KLQotc3RhdGljIHZvaWQgc2V0X3Nwcml0ZV9m b3JfdGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0LAotCQkJCXN0cnVjdCBtb2Rlc2V0X3Bh cmFtcyAqcGFyYW1zKQorc3RhdGljIHZvaWQgc2V0X3JlZ2lvbl9mb3JfdGVzdChjb25zdCBzdHJ1 Y3QgdGVzdF9tb2RlICp0LAorCQkJCXN0cnVjdCBmYl9yZWdpb24gKnJlZykKIHsKLQlpbnQgcmM7 Ci0KLQlmaWxsX2ZiX3JlZ2lvbigmcGFyYW1zLT5zcHJpdGUsIENPTE9SX1BSSU1fQkcpOworCWZp bGxfZmJfcmVnaW9uKHJlZywgQ09MT1JfUFJJTV9CRyk7CiAKLQlyYyA9IGRybU1vZGVTZXRQbGFu ZShkcm0uZmQsIHBhcmFtcy0+c3ByaXRlX2lkLCBwYXJhbXMtPmNydGNfaWQsCi0JCQkgICAgIHBh cmFtcy0+c3ByaXRlLmZiLT5mYl9pZCwgMCwgMCwgMCwKLQkJCSAgICAgcGFyYW1zLT5zcHJpdGUu dywgcGFyYW1zLT5zcHJpdGUuaCwKLQkJCSAgICAgMCwgMCwgcGFyYW1zLT5zcHJpdGUudyA8PCAx NiwKLQkJCSAgICAgcGFyYW1zLT5zcHJpdGUuaCA8PCAxNik7Ci0JaWd0X2Fzc2VydF9lcShyYywg MCk7CisJaWd0X3BsYW5lX3NldF9mYihyZWctPnBsYW5lLCByZWctPmZiKTsKKwlpZ3RfcGxhbmVf c2V0X3Bvc2l0aW9uKHJlZy0+cGxhbmUsIDAsIDApOworCWlndF9wbGFuZV9zZXRfc2l6ZShyZWct PnBsYW5lLCByZWctPncsIHJlZy0+aCk7CisJaWd0X2ZiX3NldF9zaXplKHJlZy0+ZmIsIHJlZy0+ cGxhbmUsIHJlZy0+dywgcmVnLT5oKTsKIAorCWlndF9kaXNwbGF5X2NvbW1pdCgmZHJtLmRpc3Bs YXkpOwogCWRvX2Fzc2VydGlvbnMoQVNTRVJUX05PX0FDVElPTl9DSEFOR0UpOwogfQogCkBAIC0x OTczLDcgKzE4MjcsNyBAQCBzdGF0aWMgdm9pZCBlbmFibGVfZmVhdHVyZXNfZm9yX3Rlc3QoY29u c3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIHN0YXRpYyB2b2lkIGNoZWNrX3Rlc3RfcmVxdWlyZW1l bnRzKGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiB7CiAJaWYgKHQtPnBpcGVzID09IFBJUEVf RFVBTCkKLQkJaWd0X3JlcXVpcmVfZihzY25kX21vZGVfcGFyYW1zLmNvbm5lY3Rvcl9pZCwKKwkJ aWd0X3JlcXVpcmVfZihzY25kX21vZGVfcGFyYW1zLm91dHB1dCwKIAkJCSAgICAiQ2FuJ3QgdGVz dCBkdWFsIHBpcGVzIHdpdGggdGhlIGN1cnJlbnQgb3V0cHV0c1xuIik7CiAKIAlpZiAodC0+ZmVh dHVyZSAmIEZFQVRVUkVfRkJDKQpAQCAtMjAxMSwzMiArMTg2NSwzMiBAQCBzdGF0aWMgdm9pZCBz ZXRfY3J0Y19mYnMoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIAogCXN3aXRjaCAodC0+ZmJz KSB7CiAJY2FzZSBGQlNfSU5ESVZJRFVBTDoKLQkJcHJpbV9tb2RlX3BhcmFtcy5mYi5mYiA9ICZz LT5wcmltX3ByaTsKLQkJc2NuZF9tb2RlX3BhcmFtcy5mYi5mYiA9ICZzLT5zY25kX3ByaTsKKwkJ cHJpbV9tb2RlX3BhcmFtcy5wcmltYXJ5LmZiID0gJnMtPnByaW1fcHJpOworCQlzY25kX21vZGVf cGFyYW1zLnByaW1hcnkuZmIgPSAmcy0+c2NuZF9wcmk7CiAJCW9mZnNjcmVlbl9mYi5mYiA9ICZz LT5vZmZzY3JlZW47CiAKLQkJcHJpbV9tb2RlX3BhcmFtcy5mYi54ID0gMDsKLQkJc2NuZF9tb2Rl X3BhcmFtcy5mYi54ID0gMDsKKwkJcHJpbV9tb2RlX3BhcmFtcy5wcmltYXJ5LnggPSAwOworCQlz Y25kX21vZGVfcGFyYW1zLnByaW1hcnkueCA9IDA7CiAJCW9mZnNjcmVlbl9mYi54ID0gMDsKIAot CQlwcmltX21vZGVfcGFyYW1zLmZiLnkgPSAwOwotCQlzY25kX21vZGVfcGFyYW1zLmZiLnkgPSAw OworCQlwcmltX21vZGVfcGFyYW1zLnByaW1hcnkueSA9IDA7CisJCXNjbmRfbW9kZV9wYXJhbXMu cHJpbWFyeS55ID0gMDsKIAkJb2Zmc2NyZWVuX2ZiLnkgPSAwOwogCQlicmVhazsKIAljYXNlIEZC U19TSEFSRUQ6CiAJCS8qIFBsZWFzZSBzZWUgdGhlIGNvbW1lbnQgYXQgdGhlIHRvcCBvZiBjcmVh dGVfc2hhcmVkX2ZiKCkuICovCi0JCXByaW1fbW9kZV9wYXJhbXMuZmIuZmIgPSAmcy0+YmlnOwot CQlzY25kX21vZGVfcGFyYW1zLmZiLmZiID0gJnMtPmJpZzsKKwkJcHJpbV9tb2RlX3BhcmFtcy5w cmltYXJ5LmZiID0gJnMtPmJpZzsKKwkJc2NuZF9tb2RlX3BhcmFtcy5wcmltYXJ5LmZiID0gJnMt PmJpZzsKIAkJb2Zmc2NyZWVuX2ZiLmZiID0gJnMtPmJpZzsKIAotCQlwcmltX21vZGVfcGFyYW1z LmZiLnggPSBvcHQuc2hhcmVkX2ZiX3hfb2Zmc2V0OwotCQlzY25kX21vZGVfcGFyYW1zLmZiLngg PSBvcHQuc2hhcmVkX2ZiX3hfb2Zmc2V0OworCQlwcmltX21vZGVfcGFyYW1zLnByaW1hcnkueCA9 IG9wdC5zaGFyZWRfZmJfeF9vZmZzZXQ7CisJCXNjbmRfbW9kZV9wYXJhbXMucHJpbWFyeS54ID0g b3B0LnNoYXJlZF9mYl94X29mZnNldDsKIAkJb2Zmc2NyZWVuX2ZiLnggPSBvcHQuc2hhcmVkX2Zi X3hfb2Zmc2V0OwogCi0JCXByaW1fbW9kZV9wYXJhbXMuZmIueSA9IG9wdC5zaGFyZWRfZmJfeV9v ZmZzZXQ7Ci0JCXNjbmRfbW9kZV9wYXJhbXMuZmIueSA9IHByaW1fbW9kZV9wYXJhbXMuZmIueSAr Ci0JCQkJCXByaW1fbW9kZV9wYXJhbXMuZmIuaDsKLQkJb2Zmc2NyZWVuX2ZiLnkgPSBzY25kX21v ZGVfcGFyYW1zLmZiLnkgKyBzY25kX21vZGVfcGFyYW1zLmZiLmg7CisJCXByaW1fbW9kZV9wYXJh bXMucHJpbWFyeS55ID0gb3B0LnNoYXJlZF9mYl95X29mZnNldDsKKwkJc2NuZF9tb2RlX3BhcmFt cy5wcmltYXJ5LnkgPSBwcmltX21vZGVfcGFyYW1zLnByaW1hcnkueSArCisJCQkJCXByaW1fbW9k ZV9wYXJhbXMucHJpbWFyeS5oOworCQlvZmZzY3JlZW5fZmIueSA9IHNjbmRfbW9kZV9wYXJhbXMu cHJpbWFyeS55ICsgc2NuZF9tb2RlX3BhcmFtcy5wcmltYXJ5Lmg7CiAJCWJyZWFrOwogCWRlZmF1 bHQ6CiAJCWlndF9hc3NlcnQoZmFsc2UpOwpAQCAtMjA3NSw5ICsxOTI5LDkgQEAgc3RhdGljIHZv aWQgcHJlcGFyZV9zdWJ0ZXN0X3NjcmVlbnMoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIAll bmFibGVfcHJpbV9zY3JlZW5fYW5kX3dhaXQodCk7CiAJaWYgKHQtPnNjcmVlbiA9PSBTQ1JFRU5f UFJJTSkgewogCQlpZiAodC0+cGxhbmUgPT0gUExBTkVfQ1VSKQotCQkJc2V0X2N1cnNvcl9mb3Jf dGVzdCh0LCAmcHJpbV9tb2RlX3BhcmFtcyk7CisJCQlzZXRfcmVnaW9uX2Zvcl90ZXN0KHQsICZw cmltX21vZGVfcGFyYW1zLmN1cnNvcik7CiAJCWlmICh0LT5wbGFuZSA9PSBQTEFORV9TUFIpCi0J CQlzZXRfc3ByaXRlX2Zvcl90ZXN0KHQsICZwcmltX21vZGVfcGFyYW1zKTsKKwkJCXNldF9yZWdp b25fZm9yX3Rlc3QodCwgJnByaW1fbW9kZV9wYXJhbXMuc3ByaXRlKTsKIAl9CiAKIAlpZiAodC0+ cGlwZXMgPT0gUElQRV9TSU5HTEUpCkBAIC0yMDg2LDkgKzE5NDAsOSBAQCBzdGF0aWMgdm9pZCBw cmVwYXJlX3N1YnRlc3Rfc2NyZWVucyhjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogCWVuYWJs ZV9zY25kX3NjcmVlbl9hbmRfd2FpdCh0KTsKIAlpZiAodC0+c2NyZWVuID09IFNDUkVFTl9TQ05E KSB7CiAJCWlmICh0LT5wbGFuZSA9PSBQTEFORV9DVVIpCi0JCQlzZXRfY3Vyc29yX2Zvcl90ZXN0 KHQsICZzY25kX21vZGVfcGFyYW1zKTsKKwkJCXNldF9yZWdpb25fZm9yX3Rlc3QodCwgJnNjbmRf bW9kZV9wYXJhbXMuY3Vyc29yKTsKIAkJaWYgKHQtPnBsYW5lID09IFBMQU5FX1NQUikKLQkJCXNl dF9zcHJpdGVfZm9yX3Rlc3QodCwgJnNjbmRfbW9kZV9wYXJhbXMpOworCQkJc2V0X3JlZ2lvbl9m b3JfdGVzdCh0LCAmc2NuZF9tb2RlX3BhcmFtcy5zcHJpdGUpOwogCX0KIH0KIApAQCAtMjEyMywx NSArMTk3NywxNSBAQCBzdGF0aWMgdm9pZCBydGVfc3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9t b2RlICp0KQogCQkgICAgICBET05UX0FTU0VSVF9DUkMgfCBBU1NFUlRfRFJSU19JTkFDVElWRSk7 CiAKIAllbmFibGVfcHJpbV9zY3JlZW5fYW5kX3dhaXQodCk7Ci0Jc2V0X2N1cnNvcl9mb3JfdGVz dCh0LCAmcHJpbV9tb2RlX3BhcmFtcyk7Ci0Jc2V0X3Nwcml0ZV9mb3JfdGVzdCh0LCAmcHJpbV9t b2RlX3BhcmFtcyk7CisJc2V0X3JlZ2lvbl9mb3JfdGVzdCh0LCAmcHJpbV9tb2RlX3BhcmFtcy5j dXJzb3IpOworCXNldF9yZWdpb25fZm9yX3Rlc3QodCwgJnByaW1fbW9kZV9wYXJhbXMuc3ByaXRl KTsKIAogCWlmICh0LT5waXBlcyA9PSBQSVBFX1NJTkdMRSkKIAkJcmV0dXJuOwogCiAJZW5hYmxl X3NjbmRfc2NyZWVuX2FuZF93YWl0KHQpOwotCXNldF9jdXJzb3JfZm9yX3Rlc3QodCwgJnNjbmRf bW9kZV9wYXJhbXMpOwotCXNldF9zcHJpdGVfZm9yX3Rlc3QodCwgJnNjbmRfbW9kZV9wYXJhbXMp OworCXNldF9yZWdpb25fZm9yX3Rlc3QodCwgJnNjbmRfbW9kZV9wYXJhbXMuY3Vyc29yKTsKKwlz ZXRfcmVnaW9uX2Zvcl90ZXN0KHQsICZzY25kX21vZGVfcGFyYW1zLnNwcml0ZSk7CiB9CiAKIHN0 YXRpYyB2b2lkIHVwZGF0ZV93YW50ZWRfY3JjKGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQsIHN0 cnVjdCBib3RoX2NyY3MgKmNyYykKQEAgLTIzNjAsNyArMjIxNCw3IEBAIHN0YXRpYyB2b2lkIGJh ZGZvcm1hdF9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiAKIAlwcmVwYXJlX3N1 YnRlc3RfZGF0YSh0LCBOVUxMKTsKIAotCWZpbGxfZmJfcmVnaW9uKCZwcmltX21vZGVfcGFyYW1z LmZiLCBDT0xPUl9QUklNX0JHKTsKKwlmaWxsX2ZiX3JlZ2lvbigmcHJpbV9tb2RlX3BhcmFtcy5w cmltYXJ5LCBDT0xPUl9QUklNX0JHKTsKIAlzZXRfbW9kZV9mb3JfcGFyYW1zKCZwcmltX21vZGVf cGFyYW1zKTsKIAogCXdhbnRlZF9jcmMgPSAmYmx1ZV9jcmNzW3QtPmZvcm1hdF0uY3JjOwpAQCAt MjQ3MiwyMyArMjMyNiwxNCBAQCBzdGF0aWMgdm9pZCB3YWl0X2ZsaXBfZXZlbnQodm9pZCkKIAog c3RhdGljIHZvaWQgc2V0X3ByaW1fcGxhbmVfZm9yX3BhcmFtcyhzdHJ1Y3QgbW9kZXNldF9wYXJh bXMgKnBhcmFtcykKIHsKLQlpbnQgcmMsIGk7Ci0JaW50IGNydGNfaWR4ID0ga21zdGVzdF9nZXRf Y3J0Y19pZHgoZHJtLnJlcywgcGFyYW1zLT5jcnRjX2lkKTsKLQl1aW50MzJfdCBwbGFuZV9pZCA9 IDA7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgZHJtLnBsYW5lX3Jlcy0+Y291bnRfcGxhbmVzOyBpKysp Ci0JCWlmICgoZHJtLnBsYW5lc1tpXS0+cG9zc2libGVfY3J0Y3MgJiAoMSA8PCBjcnRjX2lkeCkp ICYmCi0JCSAgICBkcm0ucGxhbmVfdHlwZXNbaV0gPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkK LQkJCXBsYW5lX2lkID0gZHJtLnBsYW5lc1tpXS0+cGxhbmVfaWQ7Ci0JaWd0X2Fzc2VydChwbGFu ZV9pZCk7Ci0KLQlyYyA9IGRybU1vZGVTZXRQbGFuZShkcm0uZmQsIHBsYW5lX2lkLCBwYXJhbXMt PmNydGNfaWQsCi0JCQkgICAgIHBhcmFtcy0+ZmIuZmItPmZiX2lkLCAwLCAwLCAwLAotCQkJICAg ICBwYXJhbXMtPm1vZGUtPmhkaXNwbGF5LAotCQkJICAgICBwYXJhbXMtPm1vZGUtPnZkaXNwbGF5 LAotCQkJICAgICBwYXJhbXMtPmZiLnggPDwgMTYsIHBhcmFtcy0+ZmIueSA8PCAxNiwKLQkJCSAg ICAgcGFyYW1zLT5mYi53IDw8IDE2LCBwYXJhbXMtPmZiLmggPDwgMTYpOwotCWlndF9hc3NlcnQo cmMgPT0gMCk7CisJaWd0X3BsYW5lX3NldF9mYihwYXJhbXMtPnByaW1hcnkucGxhbmUsIHBhcmFt cy0+cHJpbWFyeS5mYik7CisJaWd0X3BsYW5lX3NldF9wb3NpdGlvbihwYXJhbXMtPnByaW1hcnku cGxhbmUsIDAsIDApOworCWlndF9wbGFuZV9zZXRfc2l6ZShwYXJhbXMtPnByaW1hcnkucGxhbmUs IHBhcmFtcy0+bW9kZS0+aGRpc3BsYXksIHBhcmFtcy0+bW9kZS0+dmRpc3BsYXkpOworCWlndF9m Yl9zZXRfcG9zaXRpb24ocGFyYW1zLT5wcmltYXJ5LmZiLCBwYXJhbXMtPnByaW1hcnkucGxhbmUs CisJCQkgICAgcGFyYW1zLT5wcmltYXJ5LngsIHBhcmFtcy0+cHJpbWFyeS55KTsKKwlpZ3RfZmJf c2V0X3NpemUocGFyYW1zLT5wcmltYXJ5LmZiLCBwYXJhbXMtPnByaW1hcnkucGxhbmUsCisJCQlw YXJhbXMtPnByaW1hcnkudywgcGFyYW1zLT5wcmltYXJ5LmgpOworCWlndF9kaXNwbGF5X2NvbW1p dDIoJmRybS5kaXNwbGF5LCBDT01NSVRfVU5JVkVSU0FMKTsKIH0KIAogc3RhdGljIHZvaWQgcGFn ZV9mbGlwX2Zvcl9wYXJhbXMoc3RydWN0IG1vZGVzZXRfcGFyYW1zICpwYXJhbXMsCkBAIC0yNDk4 LDggKzIzNDMsOCBAQCBzdGF0aWMgdm9pZCBwYWdlX2ZsaXBfZm9yX3BhcmFtcyhzdHJ1Y3QgbW9k ZXNldF9wYXJhbXMgKnBhcmFtcywKIAogCXN3aXRjaCAodHlwZSkgewogCWNhc2UgRkxJUF9QQUdF RkxJUDoKLQkJcmMgPSBkcm1Nb2RlUGFnZUZsaXAoZHJtLmZkLCBwYXJhbXMtPmNydGNfaWQsCi0J CQkJICAgICBwYXJhbXMtPmZiLmZiLT5mYl9pZCwKKwkJcmMgPSBkcm1Nb2RlUGFnZUZsaXAoZHJt LmZkLCBkcm0uZGlzcGxheS5waXBlc1twYXJhbXMtPnBpcGVdLmNydGNfaWQsCisJCQkJICAgICBw YXJhbXMtPnByaW1hcnkuZmItPmZiX2lkLAogCQkJCSAgICAgRFJNX01PREVfUEFHRV9GTElQX0VW RU5ULCBOVUxMKTsKIAkJaWd0X2Fzc2VydF9lcShyYywgMCk7CiAJCXdhaXRfZmxpcF9ldmVudCgp OwpAQCAtMjU1NCwxNyArMjM5OSwxNyBAQCBzdGF0aWMgdm9pZCBmbGlwX3N1YnRlc3QoY29uc3Qg c3RydWN0IHRlc3RfbW9kZSAqdCkKIAogCXByZXBhcmVfc3VidGVzdCh0LCBwYXR0ZXJuKTsKIAot CWNyZWF0ZV9mYih0LT5mb3JtYXQsIHBhcmFtcy0+ZmIuZmItPndpZHRoLCBwYXJhbXMtPmZiLmZi LT5oZWlnaHQsCisJY3JlYXRlX2ZiKHQtPmZvcm1hdCwgcGFyYW1zLT5wcmltYXJ5LmZiLT53aWR0 aCwgcGFyYW1zLT5wcmltYXJ5LmZiLT5oZWlnaHQsCiAJCSAgb3B0LnRpbGluZywgdC0+cGxhbmUs ICZmYjIpOwogCWZpbGxfZmIoJmZiMiwgYmdfY29sb3IpOwotCW9yaWdfZmIgPSBwYXJhbXMtPmZi LmZiOworCW9yaWdfZmIgPSBwYXJhbXMtPnByaW1hcnkuZmI7CiAKIAlmb3IgKHIgPSAwOyByIDwg cGF0dGVybi0+bl9yZWN0czsgcisrKSB7Ci0JCXBhcmFtcy0+ZmIuZmIgPSAociAlIDIgPT0gMCkg PyAmZmIyIDogb3JpZ19mYjsKKwkJcGFyYW1zLT5wcmltYXJ5LmZiID0gKHIgJSAyID09IDApID8g JmZiMiA6IG9yaWdfZmI7CiAKIAkJaWYgKHIgIT0gMCkKLQkJCWRyYXdfcmVjdChwYXR0ZXJuLCAm cGFyYW1zLT5mYiwgdC0+bWV0aG9kLCByIC0gMSk7Ci0JCWRyYXdfcmVjdChwYXR0ZXJuLCAmcGFy YW1zLT5mYiwgdC0+bWV0aG9kLCByKTsKKwkJCWRyYXdfcmVjdChwYXR0ZXJuLCAmcGFyYW1zLT5w cmltYXJ5LCB0LT5tZXRob2QsIHIgLSAxKTsKKwkJZHJhd19yZWN0KHBhdHRlcm4sICZwYXJhbXMt PnByaW1hcnksIHQtPm1ldGhvZCwgcik7CiAJCXVwZGF0ZV93YW50ZWRfY3JjKHQsICZwYXR0ZXJu LT5jcmNzW3QtPmZvcm1hdF1bcl0pOwogCiAJCXBhZ2VfZmxpcF9mb3JfcGFyYW1zKHBhcmFtcywg dC0+ZmxpcCk7CkBAIC0yNjAwLDIxICsyNDQ1LDIxIEBAIHN0YXRpYyB2b2lkIGZsaXB0cmFja19z dWJ0ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQsIGVudW0gZmxpcF90eXBlIHR5cGUpCiAK IAlwcmVwYXJlX3N1YnRlc3QodCwgcGF0dGVybik7CiAKLQljcmVhdGVfZmIodC0+Zm9ybWF0LCBw YXJhbXMtPmZiLmZiLT53aWR0aCwgcGFyYW1zLT5mYi5mYi0+aGVpZ2h0LAorCWNyZWF0ZV9mYih0 LT5mb3JtYXQsIHBhcmFtcy0+cHJpbWFyeS5mYi0+d2lkdGgsIHBhcmFtcy0+cHJpbWFyeS5mYi0+ aGVpZ2h0LAogCQkgIG9wdC50aWxpbmcsIHQtPnBsYW5lLCAmZmIyKTsKIAlmaWxsX2ZiKCZmYjIs IENPTE9SX1BSSU1fQkcpOwotCW9yaWdfZmIgPSBwYXJhbXMtPmZiLmZiOworCW9yaWdfZmIgPSBw YXJhbXMtPnByaW1hcnkuZmI7CiAKIAlmb3IgKHIgPSAwOyByIDwgcGF0dGVybi0+bl9yZWN0czsg cisrKSB7Ci0JCXBhcmFtcy0+ZmIuZmIgPSAociAlIDIgPT0gMCkgPyAmZmIyIDogb3JpZ19mYjsK KwkJcGFyYW1zLT5wcmltYXJ5LmZiID0gKHIgJSAyID09IDApID8gJmZiMiA6IG9yaWdfZmI7CiAK IAkJaWYgKHIgIT0gMCkKLQkJCWRyYXdfcmVjdChwYXR0ZXJuLCAmcGFyYW1zLT5mYiwgdC0+bWV0 aG9kLCByIC0gMSk7CisJCQlkcmF3X3JlY3QocGF0dGVybiwgJnBhcmFtcy0+cHJpbWFyeSwgdC0+ bWV0aG9kLCByIC0gMSk7CiAKIAkJcGFnZV9mbGlwX2Zvcl9wYXJhbXMocGFyYW1zLCB0eXBlKTsK IAkJZG9fYXNzZXJ0aW9ucygwKTsKIAotCQlkcmF3X3JlY3QocGF0dGVybiwgJnBhcmFtcy0+ZmIs IHQtPm1ldGhvZCwgcik7CisJCWRyYXdfcmVjdChwYXR0ZXJuLCAmcGFyYW1zLT5wcmltYXJ5LCB0 LT5tZXRob2QsIHIpOwogCQl1cGRhdGVfd2FudGVkX2NyYyh0LCAmcGF0dGVybi0+Y3Jjc1t0LT5m b3JtYXRdW3JdKTsKIAogCQlkb19hc3NlcnRpb25zKEFTU0VSVF9QU1JfRElTQUJMRUQpOwpAQCAt MjYzOSw0MSArMjQ4NCwzMCBAQCBzdGF0aWMgdm9pZCBmbGlwdHJhY2tfc3VidGVzdChjb25zdCBz dHJ1Y3QgdGVzdF9tb2RlICp0LCBlbnVtIGZsaXBfdHlwZSB0eXBlKQogICovCiBzdGF0aWMgdm9p ZCBtb3ZlX3N1YnRlc3QoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIHsKLQlpbnQgciwgcmM7 CisJaW50IHI7CiAJaW50IGFzc2VydGlvbnMgPSBBU1NFUlRfTk9fQUNUSU9OX0NIQU5HRTsKIAlz dHJ1Y3QgbW9kZXNldF9wYXJhbXMgKnBhcmFtcyA9IHBpY2tfcGFyYW1zKHQpOwogCXN0cnVjdCBk cmF3X3BhdHRlcm5faW5mbyAqcGF0dGVybiA9ICZwYXR0ZXJuMzsKKwlzdHJ1Y3QgZmJfcmVnaW9u ICpyZWcgPSBwaWNrX3RhcmdldCh0LCBwYXJhbXMpOwogCWJvb2wgcmVwZWF0ID0gZmFsc2U7CiAK IAlwcmVwYXJlX3N1YnRlc3QodCwgcGF0dGVybik7CiAKIAkvKiBKdXN0IHBhaW50IHRoZSByaWdo dCBjb2xvciBzaW5jZSB3ZSBzdGFydCBhdCAweDAuICovCi0JZHJhd19yZWN0KHBhdHRlcm4sIHBp Y2tfdGFyZ2V0KHQsIHBhcmFtcyksIHQtPm1ldGhvZCwgMCk7CisJZHJhd19yZWN0KHBhdHRlcm4s IHJlZywgdC0+bWV0aG9kLCAwKTsKIAl1cGRhdGVfd2FudGVkX2NyYyh0LCAmcGF0dGVybi0+Y3Jj c1t0LT5mb3JtYXRdWzBdKTsKIAogCWRvX2Fzc2VydGlvbnMoYXNzZXJ0aW9ucyk7CiAKIAlmb3Ig KHIgPSAxOyByIDwgcGF0dGVybi0+bl9yZWN0czsgcisrKSB7Ci0JCXN0cnVjdCByZWN0IHJlY3Qg PSBwYXR0ZXJuLT5nZXRfcmVjdCgmcGFyYW1zLT5mYiwgcik7Ci0KLQkJc3dpdGNoICh0LT5wbGFu ZSkgewotCQljYXNlIFBMQU5FX0NVUjoKLQkJCXJjID0gZHJtTW9kZU1vdmVDdXJzb3IoZHJtLmZk LCBwYXJhbXMtPmNydGNfaWQsIHJlY3QueCwKLQkJCQkJICAgICAgIHJlY3QueSk7Ci0JCQlpZ3Rf YXNzZXJ0X2VxKHJjLCAwKTsKLQkJCWJyZWFrOwotCQljYXNlIFBMQU5FX1NQUjoKLQkJCXJjID0g ZHJtTW9kZVNldFBsYW5lKGRybS5mZCwgcGFyYW1zLT5zcHJpdGVfaWQsCi0JCQkJCSAgICAgcGFy YW1zLT5jcnRjX2lkLAotCQkJCQkgICAgIHBhcmFtcy0+c3ByaXRlLmZiLT5mYl9pZCwgMCwKLQkJ CQkJICAgICByZWN0LngsIHJlY3QueSwgcmVjdC53LAotCQkJCQkgICAgIHJlY3QuaCwgMCwgMCwg cmVjdC53IDw8IDE2LAotCQkJCQkgICAgIHJlY3QuaCA8PCAxNik7Ci0JCQlpZ3RfYXNzZXJ0X2Vx KHJjLCAwKTsKLQkJCWJyZWFrOwotCQlkZWZhdWx0OgotCQkJaWd0X2Fzc2VydChmYWxzZSk7Ci0J CX0KKwkJc3RydWN0IHJlY3QgcmVjdCA9IHBhdHRlcm4tPmdldF9yZWN0KCZwYXJhbXMtPnByaW1h cnksIHIpOworCisJCWlndF9wbGFuZV9zZXRfZmIocmVnLT5wbGFuZSwgcmVnLT5mYik7CisJCWln dF9wbGFuZV9zZXRfcG9zaXRpb24ocmVnLT5wbGFuZSwgcmVjdC54LCByZWN0LnkpOworCQlpZ3Rf cGxhbmVfc2V0X3NpemUocmVnLT5wbGFuZSwgcmVjdC53LCByZWN0LmgpOworCQlpZ3RfZmJfc2V0 X3NpemUocmVnLT5mYiwgcmVnLT5wbGFuZSwgcmVjdC53LCByZWN0LmgpOworCQlpZ3RfZGlzcGxh eV9jb21taXQyKCZkcm0uZGlzcGxheSwgQ09NTUlUX1VOSVZFUlNBTCk7CisKIAkJdXBkYXRlX3dh bnRlZF9jcmModCwgJnBhdHRlcm4tPmNyY3NbdC0+Zm9ybWF0XVtyXSk7CiAKIAkJZG9fYXNzZXJ0 aW9ucyhhc3NlcnRpb25zKTsKQEAgLTI3MDMsNyArMjUzNyw3IEBAIHN0YXRpYyB2b2lkIG1vdmVf c3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogICovCiBzdGF0aWMgdm9pZCBvbm9m Zl9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiB7Ci0JaW50IHIsIHJjOworCWlu dCByOwogCWludCBhc3NlcnRpb25zID0gQVNTRVJUX05PX0FDVElPTl9DSEFOR0U7CiAJc3RydWN0 IG1vZGVzZXRfcGFyYW1zICpwYXJhbXMgPSBwaWNrX3BhcmFtcyh0KTsKIAlzdHJ1Y3QgZHJhd19w YXR0ZXJuX2luZm8gKnBhdHRlcm4gPSAmcGF0dGVybjM7CkBAIC0yNzE2LDQ5ICsyNTUwLDIxIEBA IHN0YXRpYyB2b2lkIG9ub2ZmX3N1YnRlc3QoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIAlk b19hc3NlcnRpb25zKGFzc2VydGlvbnMpOwogCiAJZm9yIChyID0gMDsgciA8IDQ7IHIrKykgewor CQlzdHJ1Y3QgZmJfcmVnaW9uICpyZWcgPSBwaWNrX3RhcmdldCh0LCBwYXJhbXMpOworCiAJCWlm IChyICUgMiA9PSAwKSB7Ci0JCQlzd2l0Y2ggKHQtPnBsYW5lKSB7Ci0JCQljYXNlIFBMQU5FX0NV UjoKLQkJCQlyYyA9IGRybU1vZGVTZXRDdXJzb3IoZHJtLmZkLCBwYXJhbXMtPmNydGNfaWQsCi0J CQkJCQkgICAgICAwLCAwLCAwKTsKLQkJCQlpZ3RfYXNzZXJ0X2VxKHJjLCAwKTsKLQkJCQlicmVh azsKLQkJCWNhc2UgUExBTkVfU1BSOgotCQkJCXJjID0gZHJtTW9kZVNldFBsYW5lKGRybS5mZCwg cGFyYW1zLT5zcHJpdGVfaWQsCi0JCQkJCQkgICAgIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs Ci0JCQkJCQkgICAgIDAsIDApOwotCQkJCWlndF9hc3NlcnRfZXEocmMsIDApOwotCQkJCWJyZWFr OwotCQkJZGVmYXVsdDoKLQkJCQlpZ3RfYXNzZXJ0KGZhbHNlKTsKLQkJCX0KKwkJCWlndF9wbGFu ZV9zZXRfZmIocmVnLT5wbGFuZSwgTlVMTCk7CisJCQlpZ3RfZGlzcGxheV9jb21taXQoJmRybS5k aXNwbGF5KTsKKwogCQkJdXBkYXRlX3dhbnRlZF9jcmModCwgJmJsdWVfY3Jjc1t0LT5mb3JtYXRd LmNyYyk7CiAKIAkJfSBlbHNlIHsKLQkJCXN3aXRjaCAodC0+cGxhbmUpIHsKLQkJCWNhc2UgUExB TkVfQ1VSOgotCQkJCXJjID0gZHJtTW9kZVNldEN1cnNvcihkcm0uZmQsIHBhcmFtcy0+Y3J0Y19p ZCwKLQkJCQkJCSAgcGFyYW1zLT5jdXJzb3IuZmItPmdlbV9oYW5kbGUsCi0JCQkJCQkgIHBhcmFt cy0+Y3Vyc29yLncsCi0JCQkJCQkgIHBhcmFtcy0+Y3Vyc29yLmgpOwotCQkJCWlndF9hc3NlcnRf ZXEocmMsIDApOwotCQkJCWJyZWFrOwotCQkJY2FzZSBQTEFORV9TUFI6Ci0JCQkJcmMgPSBkcm1N b2RlU2V0UGxhbmUoZHJtLmZkLCBwYXJhbXMtPnNwcml0ZV9pZCwKLQkJCQkJCSAgICAgcGFyYW1z LT5jcnRjX2lkLAotCQkJCQkJICAgICBwYXJhbXMtPnNwcml0ZS5mYi0+ZmJfaWQsCi0JCQkJCQkg ICAgIDAsIDAsIDAsIHBhcmFtcy0+c3ByaXRlLncsCi0JCQkJCQkgICAgIHBhcmFtcy0+c3ByaXRl LmgsIDAsCi0JCQkJCQkgICAgIDAsCi0JCQkJCQkgICAgIHBhcmFtcy0+c3ByaXRlLncgPDwgMTYs Ci0JCQkJCQkgICAgIHBhcmFtcy0+c3ByaXRlLmggPDwgMTYpOwotCQkJCWlndF9hc3NlcnRfZXEo cmMsIDApOwotCQkJCWJyZWFrOwotCQkJZGVmYXVsdDoKLQkJCQlpZ3RfYXNzZXJ0KGZhbHNlKTsK LQkJCX0KLQkJCXVwZGF0ZV93YW50ZWRfY3JjKHQsICZwYXR0ZXJuLT5jcmNzW3QtPmZvcm1hdF1b MF0pOworCQkJaWd0X3BsYW5lX3NldF9mYihyZWctPnBsYW5lLCByZWctPmZiKTsKKwkJCWlndF9w bGFuZV9zZXRfc2l6ZShyZWctPnBsYW5lLCByZWctPncsIHJlZy0+aCk7CisJCQlpZ3RfZmJfc2V0 X3NpemUocmVnLT5mYiwgcmVnLT5wbGFuZSwgcmVnLT53LCByZWctPmgpOworCQkJaWd0X2Rpc3Bs YXlfY29tbWl0KCZkcm0uZGlzcGxheSk7CiAKKwkJCXVwZGF0ZV93YW50ZWRfY3JjKHQsICZwYXR0 ZXJuLT5jcmNzW3QtPmZvcm1hdF1bMF0pOwogCQl9CiAKIAkJZG9fYXNzZXJ0aW9ucyhhc3NlcnRp b25zKTsKQEAgLTI3NjcsMjQgKzI1NzMsMTEgQEAgc3RhdGljIHZvaWQgb25vZmZfc3VidGVzdChj b25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogCiBzdGF0aWMgYm9vbCBwcmltX3BsYW5lX2Rpc2Fi bGVkKHZvaWQpCiB7Ci0JaW50IGksIHJjOwotCWJvb2wgZGlzYWJsZWQsIGZvdW5kID0gZmFsc2U7 Ci0JaW50IGNydGNfaWR4ID0ga21zdGVzdF9nZXRfY3J0Y19pZHgoZHJtLnJlcywgcHJpbV9tb2Rl X3BhcmFtcy5jcnRjX2lkKTsKLQotCWZvciAoaSA9IDA7IGkgPCBkcm0ucGxhbmVfcmVzLT5jb3Vu dF9wbGFuZXM7IGkrKykgewotCQlpZiAoKGRybS5wbGFuZXNbaV0tPnBvc3NpYmxlX2NydGNzICYg KDEgPDwgY3J0Y19pZHgpKSAmJgotCQkgICAgZHJtLnBsYW5lX3R5cGVzW2ldID09IERSTV9QTEFO RV9UWVBFX1BSSU1BUlkpIHsKLQkJCWZvdW5kID0gdHJ1ZTsKLQkJCWRpc2FibGVkID0gKGRybS5w bGFuZXNbaV0tPmNydGNfaWQgPT0gMCk7Ci0JCX0KLQl9Ci0KLQlpZ3RfYXNzZXJ0KGZvdW5kKTsK LQotCXJjID0gZHJtU2V0Q2xpZW50Q2FwKGRybS5mZCwgRFJNX0NMSUVOVF9DQVBfVU5JVkVSU0FM X1BMQU5FUywgMCk7Ci0JaWd0X2Fzc2VydF9lcShyYywgMCk7Ci0KLQlyZXR1cm4gZGlzYWJsZWQ7 CisJLyoKKwkgKiBDYW5ub3QgdXNlIGlndF9wbGFuZV9nZXRfcHJvcCBoZXJlIHRvIHJldHJpZXZl IGZiX2lkLAorCSAqIHRoZSB0ZXN0c3VpdGUgZG9lc24ndCByZXF1aXJlIEFUT01JQy4KKwkgKi8K KwlyZXR1cm4gIXByaW1fbW9kZV9wYXJhbXMucHJpbWFyeS5wbGFuZS0+dmFsdWVzW0lHVF9QTEFO RV9GQl9JRF07CiB9CiAKIC8qCkBAIC0yODA3LDExICsyNjAwLDEwIEBAIHN0YXRpYyB2b2lkIGZ1 bGxzY3JlZW5fcGxhbmVfc3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogCXN0cnVj dCByZWN0IHJlY3Q7CiAJc3RydWN0IG1vZGVzZXRfcGFyYW1zICpwYXJhbXMgPSBwaWNrX3BhcmFt cyh0KTsKIAlpbnQgYXNzZXJ0aW9uczsKLQlpbnQgcmM7CiAKIAlwcmVwYXJlX3N1YnRlc3QodCwg cGF0dGVybik7CiAKLQlyZWN0ID0gcGF0dGVybi0+Z2V0X3JlY3QoJnBhcmFtcy0+ZmIsIDApOwor CXJlY3QgPSBwYXR0ZXJuLT5nZXRfcmVjdCgmcGFyYW1zLT5wcmltYXJ5LCAwKTsKIAljcmVhdGVf ZmIodC0+Zm9ybWF0LCByZWN0LncsIHJlY3QuaCwgb3B0LnRpbGluZywgdC0+cGxhbmUsCiAJCSAg JmZ1bGxzY3JlZW5fZmIpOwogCS8qIENhbGwgcGlja19jb2xvcigpIGFnYWluIHNpbmNlIFBSSSBh bmQgU1BSIG1heSBub3Qgc3VwcG9ydCB0aGUgc2FtZQpAQCAtMjgxOSwxMiArMjYxMSw4IEBAIHN0 YXRpYyB2b2lkIGZ1bGxzY3JlZW5fcGxhbmVfc3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2Rl ICp0KQogCXJlY3QuY29sb3IgPSBwaWNrX2NvbG9yKCZmdWxsc2NyZWVuX2ZiLCBDT0xPUl9HUkVF Tik7CiAJaWd0X2RyYXdfZmlsbF9mYihkcm0uZmQsICZmdWxsc2NyZWVuX2ZiLCByZWN0LmNvbG9y KTsKIAotCXJjID0gZHJtTW9kZVNldFBsYW5lKGRybS5mZCwgcGFyYW1zLT5zcHJpdGVfaWQsIHBh cmFtcy0+Y3J0Y19pZCwKLQkJCSAgICAgZnVsbHNjcmVlbl9mYi5mYl9pZCwgMCwgMCwgMCwgZnVs bHNjcmVlbl9mYi53aWR0aCwKLQkJCSAgICAgZnVsbHNjcmVlbl9mYi5oZWlnaHQsIDAsIDAsCi0J CQkgICAgIGZ1bGxzY3JlZW5fZmIud2lkdGggPDwgMTYsCi0JCQkgICAgIGZ1bGxzY3JlZW5fZmIu aGVpZ2h0IDw8IDE2KTsKLQlpZ3RfYXNzZXJ0X2VxKHJjLCAwKTsKKwlpZ3RfcGxhbmVfc2V0X2Zi KHBhcmFtcy0+c3ByaXRlLnBsYW5lLCAmZnVsbHNjcmVlbl9mYik7CisJaWd0X2Rpc3BsYXlfY29t bWl0KCZkcm0uZGlzcGxheSk7CiAJdXBkYXRlX3dhbnRlZF9jcmModCwgJnBhdHRlcm4tPmNyY3Nb dC0+Zm9ybWF0XVswXSk7CiAKIAlzd2l0Y2ggKHQtPnNjcmVlbikgewpAQCAtMjg0Miw5ICsyNjMw LDggQEAgc3RhdGljIHZvaWQgZnVsbHNjcmVlbl9wbGFuZV9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0 ZXN0X21vZGUgKnQpCiAJfQogCWRvX2Fzc2VydGlvbnMoYXNzZXJ0aW9ucyk7CiAKLQlyYyA9IGRy bU1vZGVTZXRQbGFuZShkcm0uZmQsIHBhcmFtcy0+c3ByaXRlX2lkLCAwLCAwLCAwLCAwLCAwLCAw LCAwLCAwLAotCQkJICAgICAwLCAwLCAwKTsKLQlpZ3RfYXNzZXJ0X2VxKHJjLCAwKTsKKwlpZ3Rf cGxhbmVfc2V0X2ZiKHBhcmFtcy0+c3ByaXRlLnBsYW5lLCBOVUxMKTsKKwlpZ3RfZGlzcGxheV9j b21taXQoJmRybS5kaXNwbGF5KTsKIAogCWlmICh0LT5zY3JlZW4gPT0gU0NSRUVOX1BSSU0pCiAJ CWFzc2VydGlvbnMgPSBBU1NFUlRfTEFTVF9BQ1RJT05fQ0hBTkdFRDsKQEAgLTI4NzgsOTggKzI2 NjUsNjkgQEAgc3RhdGljIHZvaWQgc2NhbGVkcHJpbWFyeV9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0 ZXN0X21vZGUgKnQpCiB7CiAJc3RydWN0IGlndF9mYiBuZXdfZmIsICpvbGRfZmI7CiAJc3RydWN0 IG1vZGVzZXRfcGFyYW1zICpwYXJhbXMgPSBwaWNrX3BhcmFtcyh0KTsKLQlpbnQgaSwgcmM7Ci0J dWludDMyX3QgcGxhbmVfaWQ7Ci0JaW50IHByaW1fY3J0Y19pZHggPSBrbXN0ZXN0X2dldF9jcnRj X2lkeChkcm0ucmVzLAotCQkJCQkJIHByaW1fbW9kZV9wYXJhbXMuY3J0Y19pZCk7CisJc3RydWN0 IGZiX3JlZ2lvbiAqcmVnID0gJnBhcmFtcy0+cHJpbWFyeTsKIAogCWlndF9yZXF1aXJlX2YoaW50 ZWxfZ2VuKGludGVsX2dldF9kcm1fZGV2aWQoZHJtLmZkKSkgPj0gOSwKIAkJICAgICAgIkNhbid0 IHRlc3QgcHJpbWFyeSBwbGFuZSBzY2FsaW5nIGJlZm9yZSBnZW4gOVxuIik7CiAKIAlwcmVwYXJl X3N1YnRlc3QodCwgTlVMTCk7CiAKLQlvbGRfZmIgPSBwYXJhbXMtPmZiLmZiOworCW9sZF9mYiA9 IHJlZy0+ZmI7CiAKLQljcmVhdGVfZmIodC0+Zm9ybWF0LCBwYXJhbXMtPmZiLmZiLT53aWR0aCwg cGFyYW1zLT5mYi5mYi0+aGVpZ2h0LAorCWNyZWF0ZV9mYih0LT5mb3JtYXQsIHJlZy0+ZmItPndp ZHRoLCByZWctPmZiLT5oZWlnaHQsCiAJCSAgb3B0LnRpbGluZywgdC0+cGxhbmUsICZuZXdfZmIp OwogCWZpbGxfZmIoJm5ld19mYiwgQ09MT1JfQkxVRSk7CiAKIAlpZ3RfZHJhd19yZWN0X2ZiKGRy bS5mZCwgZHJtLmJ1Zm1nciwgTlVMTCwgJm5ld19mYiwgdC0+bWV0aG9kLAotCQkJIHBhcmFtcy0+ ZmIueCwgcGFyYW1zLT5mYi55LAotCQkJIHBhcmFtcy0+ZmIudyAvIDIsIHBhcmFtcy0+ZmIuaCAv IDIsCisJCQkgcmVnLT54LCByZWctPnksIHJlZy0+dyAvIDIsIHJlZy0+aCAvIDIsCiAJCQkgcGlj a19jb2xvcigmbmV3X2ZiLCBDT0xPUl9HUkVFTikpOwogCWlndF9kcmF3X3JlY3RfZmIoZHJtLmZk LCBkcm0uYnVmbWdyLCBOVUxMLCAmbmV3X2ZiLCB0LT5tZXRob2QsCi0JCQkgcGFyYW1zLT5mYi54 ICsgcGFyYW1zLT5mYi53IC8gMiwKLQkJCSBwYXJhbXMtPmZiLnkgKyBwYXJhbXMtPmZiLmggLyAy LAotCQkJIHBhcmFtcy0+ZmIudyAvIDIsIHBhcmFtcy0+ZmIuaCAvIDIsCisJCQkgcmVnLT54ICsg cmVnLT53IC8gMiwgcmVnLT55ICsgcmVnLT5oIC8gMiwKKwkJCSByZWctPncgLyAyLCByZWctPmgg LyAyLAogCQkJIHBpY2tfY29sb3IoJm5ld19mYiwgQ09MT1JfUkVEKSk7CiAJaWd0X2RyYXdfcmVj dF9mYihkcm0uZmQsIGRybS5idWZtZ3IsIE5VTEwsICZuZXdfZmIsIHQtPm1ldGhvZCwKLQkJCSBw YXJhbXMtPmZiLnggKyBwYXJhbXMtPmZiLncgLyAyLAotCQkJIHBhcmFtcy0+ZmIueSArIHBhcmFt cy0+ZmIuaCAvIDIsCi0JCQkgcGFyYW1zLT5mYi53IC8gNCwgcGFyYW1zLT5mYi5oIC8gNCwKKwkJ CSByZWctPnggKyByZWctPncgLyAyLCByZWctPnkgKyByZWctPmggLyAyLAorCQkJIHJlZy0+dyAv IDQsIHJlZy0+aCAvIDQsCiAJCQkgcGlja19jb2xvcigmbmV3X2ZiLCBDT0xPUl9NQUdFTlRBKSk7 CiAKLQlmb3IgKGkgPSAwOyBpIDwgZHJtLnBsYW5lX3Jlcy0+Y291bnRfcGxhbmVzOyBpKyspCi0J CWlmICgoZHJtLnBsYW5lc1tpXS0+cG9zc2libGVfY3J0Y3MgJiAoMSA8PCBwcmltX2NydGNfaWR4 KSkgJiYKLQkJICAgIGRybS5wbGFuZV90eXBlc1tpXSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZ KQotCQkJcGxhbmVfaWQgPSBkcm0ucGxhbmVzW2ldLT5wbGFuZV9pZDsKLQogCS8qIE5vIHNjYWxp bmcuICovCi0JcmMgPSBkcm1Nb2RlU2V0UGxhbmUoZHJtLmZkLCBwbGFuZV9pZCwgcGFyYW1zLT5j cnRjX2lkLAotCQkJICAgICBuZXdfZmIuZmJfaWQsIDAsCi0JCQkgICAgIDAsIDAsCi0JCQkgICAg IHBhcmFtcy0+bW9kZS0+aGRpc3BsYXksIHBhcmFtcy0+bW9kZS0+dmRpc3BsYXksCi0JCQkgICAg IHBhcmFtcy0+ZmIueCA8PCAxNiwgcGFyYW1zLT5mYi55IDw8IDE2LAotCQkJICAgICBwYXJhbXMt PmZiLncgPDwgMTYsIHBhcmFtcy0+ZmIuaCA8PCAxNik7Ci0JaWd0X2Fzc2VydChyYyA9PSAwKTsK KwlpZ3RfcGxhbmVfc2V0X2ZiKHJlZy0+cGxhbmUsICZuZXdfZmIpOworCWlndF9mYl9zZXRfcG9z aXRpb24oJm5ld19mYiwgcmVnLT5wbGFuZSwgcmVnLT54LCByZWctPnkpOworCWlndF9mYl9zZXRf c2l6ZSgmbmV3X2ZiLCByZWctPnBsYW5lLCByZWctPncsIHJlZy0+aCk7CisJaWd0X3BsYW5lX3Nl dF9zaXplKHJlZy0+cGxhbmUsIHBhcmFtcy0+bW9kZS0+aGRpc3BsYXksIHBhcmFtcy0+bW9kZS0+ dmRpc3BsYXkpOworCWlndF9kaXNwbGF5X2NvbW1pdDIoJmRybS5kaXNwbGF5LCBDT01NSVRfVU5J VkVSU0FMKTsKIAlkb19hc3NlcnRpb25zKERPTlRfQVNTRVJUX0NSQyk7CiAKIAkvKiBTb3VyY2Ug dXBzY2FsaW5nLiAqLwotCXJjID0gZHJtTW9kZVNldFBsYW5lKGRybS5mZCwgcGxhbmVfaWQsIHBh cmFtcy0+Y3J0Y19pZCwKLQkJCSAgICAgbmV3X2ZiLmZiX2lkLCAwLAotCQkJICAgICAwLCAwLAot CQkJICAgICBwYXJhbXMtPm1vZGUtPmhkaXNwbGF5LCBwYXJhbXMtPm1vZGUtPnZkaXNwbGF5LAot CQkJICAgICBwYXJhbXMtPmZiLnggPDwgMTYsIHBhcmFtcy0+ZmIueSA8PCAxNiwKLQkJCSAgICAg KHBhcmFtcy0+ZmIudyAvIDIpIDw8IDE2LAotCQkJICAgICAocGFyYW1zLT5mYi5oIC8gMikgPDwg MTYpOwotCWlndF9hc3NlcnQocmMgPT0gMCk7CisJaWd0X2ZiX3NldF9zaXplKCZuZXdfZmIsIHJl Zy0+cGxhbmUsIHJlZy0+dyAvIDIsIHJlZy0+aCAvIDIpOworCWlndF9kaXNwbGF5X2NvbW1pdDIo JmRybS5kaXNwbGF5LCBDT01NSVRfVU5JVkVSU0FMKTsKIAlkb19hc3NlcnRpb25zKERPTlRfQVNT RVJUX0NSQyk7CiAKIAkvKiBEZXN0aW5hdGlvbiBkb2Vzbid0IGZpbGwgdGhlIGVudGlyZSBDUlRD LCBubyBzY2FsaW5nLiAqLwotCXJjID0gZHJtTW9kZVNldFBsYW5lKGRybS5mZCwgcGxhbmVfaWQs IHBhcmFtcy0+Y3J0Y19pZCwKLQkJCSAgICAgbmV3X2ZiLmZiX2lkLCAwLAotCQkJICAgICBwYXJh bXMtPm1vZGUtPmhkaXNwbGF5IC8gNCwKLQkJCSAgICAgcGFyYW1zLT5tb2RlLT52ZGlzcGxheSAv IDQsCi0JCQkgICAgIHBhcmFtcy0+bW9kZS0+aGRpc3BsYXkgLyAyLAotCQkJICAgICBwYXJhbXMt Pm1vZGUtPnZkaXNwbGF5IC8gMiwKLQkJCSAgICAgcGFyYW1zLT5mYi54IDw8IDE2LCBwYXJhbXMt PmZiLnkgPDwgMTYsCi0JCQkgICAgIChwYXJhbXMtPmZiLncgLyAyKSA8PCAxNiwKLQkJCSAgICAg KHBhcmFtcy0+ZmIuaCAvIDIpIDw8IDE2KTsKLQlpZ3RfYXNzZXJ0KHJjID09IDApOworCWlndF9m Yl9zZXRfc2l6ZSgmbmV3X2ZiLCByZWctPnBsYW5lLCByZWctPncgLyAyLCByZWctPmggLyAyKTsK KwlpZ3RfcGxhbmVfc2V0X3Bvc2l0aW9uKHJlZy0+cGxhbmUsCisJCQkgICAgICAgcGFyYW1zLT5t b2RlLT5oZGlzcGxheSAvIDQsCisJCQkgICAgICAgcGFyYW1zLT5tb2RlLT52ZGlzcGxheSAvIDQp OworCWlndF9wbGFuZV9zZXRfc2l6ZShyZWctPnBsYW5lLAorCQkJICAgcGFyYW1zLT5tb2RlLT5o ZGlzcGxheSAvIDIsCisJCQkgICBwYXJhbXMtPm1vZGUtPnZkaXNwbGF5IC8gMik7CisJaWd0X2Rp c3BsYXlfY29tbWl0MigmZHJtLmRpc3BsYXksIENPTU1JVF9VTklWRVJTQUwpOwogCWRvX2Fzc2Vy dGlvbnMoRE9OVF9BU1NFUlRfQ1JDKTsKIAogCS8qIERlc3RpbmF0aW9uIGRvZXNuJ3QgZmlsbCB0 aGUgZW50aXJlIENSVEMsIHVwc2NhbGluZy4gKi8KLQlyYyA9IGRybU1vZGVTZXRQbGFuZShkcm0u ZmQsIHBsYW5lX2lkLCBwYXJhbXMtPmNydGNfaWQsCi0JCQkgICAgIG5ld19mYi5mYl9pZCwgMCwK LQkJCSAgICAgcGFyYW1zLT5tb2RlLT5oZGlzcGxheSAvIDQsCi0JCQkgICAgIHBhcmFtcy0+bW9k ZS0+dmRpc3BsYXkgLyA0LAotCQkJICAgICBwYXJhbXMtPm1vZGUtPmhkaXNwbGF5IC8gMiwKLQkJ CSAgICAgcGFyYW1zLT5tb2RlLT52ZGlzcGxheSAvIDIsCi0JCQkgICAgIChwYXJhbXMtPmZiLngg KyBwYXJhbXMtPmZiLncgLyAyKSA8PCAxNiwKLQkJCSAgICAgKHBhcmFtcy0+ZmIueSArIHBhcmFt cy0+ZmIuaCAvIDIpIDw8IDE2LAotCQkJICAgICAocGFyYW1zLT5mYi53IC8gNCkgPDwgMTYsCi0J CQkgICAgIChwYXJhbXMtPmZiLmggLyA0KSA8PCAxNik7Ci0JaWd0X2Fzc2VydChyYyA9PSAwKTsK KwlpZ3RfZmJfc2V0X3Bvc2l0aW9uKCZuZXdfZmIsIHJlZy0+cGxhbmUsCisJCQkgICAgcmVnLT54 ICsgcmVnLT53IC8gNCwgcmVnLT55ICsgcmVnLT5oIC8gNCk7CisJaWd0X2ZiX3NldF9zaXplKCZu ZXdfZmIsIHJlZy0+cGxhbmUsIHJlZy0+dyAvIDIsIHJlZy0+aCAvIDIpOworCWlndF9kaXNwbGF5 X2NvbW1pdDIoJmRybS5kaXNwbGF5LCBDT01NSVRfVU5JVkVSU0FMKTsKIAlkb19hc3NlcnRpb25z KERPTlRfQVNTRVJUX0NSQyk7CiAKIAkvKiBCYWNrIHRvIHRoZSBnb29kIGFuZCBvbGQgYmx1ZSBm Yi4gKi8KLQlyYyA9IGRybU1vZGVTZXRQbGFuZShkcm0uZmQsIHBsYW5lX2lkLCBwYXJhbXMtPmNy dGNfaWQsCi0JCQkgICAgIG9sZF9mYi0+ZmJfaWQsIDAsCi0JCQkgICAgIDAsIDAsCi0JCQkgICAg IHBhcmFtcy0+bW9kZS0+aGRpc3BsYXksIHBhcmFtcy0+bW9kZS0+dmRpc3BsYXksCi0JCQkgICAg IHBhcmFtcy0+ZmIueCA8PCAxNiwgcGFyYW1zLT5mYi55IDw8IDE2LAotCQkJICAgICBwYXJhbXMt PmZiLncgPDwgMTYsIHBhcmFtcy0+ZmIuaCA8PCAxNik7Ci0JaWd0X2Fzc2VydChyYyA9PSAwKTsK KwlpZ3RfcGxhbmVfc2V0X2ZiKHJlZy0+cGxhbmUsIG9sZF9mYik7CisJaWd0X3BsYW5lX3NldF9w b3NpdGlvbihwYXJhbXMtPnByaW1hcnkucGxhbmUsIDAsIDApOworCWlndF9wbGFuZV9zZXRfc2l6 ZShyZWctPnBsYW5lLCBwYXJhbXMtPm1vZGUtPmhkaXNwbGF5LCBwYXJhbXMtPm1vZGUtPnZkaXNw bGF5KTsKKwlpZ3RfZmJfc2V0X3Bvc2l0aW9uKHJlZy0+ZmIsIHJlZy0+cGxhbmUsIHJlZy0+eCwg cmVnLT55KTsKKwlpZ3RfZmJfc2V0X3NpemUocmVnLT5mYiwgcmVnLT5wbGFuZSwgcmVnLT53LCBy ZWctPmgpOworCWlndF9kaXNwbGF5X2NvbW1pdDIoJmRybS5kaXNwbGF5LCBDT01NSVRfVU5JVkVS U0FMKTsKIAlkb19hc3NlcnRpb25zKDApOwogCiAJaWd0X3JlbW92ZV9mYihkcm0uZmQsICZuZXdf ZmIpOwpAQCAtMjk5OSwxNSArMjc1NywxNSBAQCBzdGF0aWMgdm9pZCBtb2Rlc2V0ZnJvbWJ1c3lf c3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogCiAJcHJlcGFyZV9zdWJ0ZXN0KHQs IE5VTEwpOwogCi0JY3JlYXRlX2ZiKHQtPmZvcm1hdCwgcGFyYW1zLT5mYi5mYi0+d2lkdGgsIHBh cmFtcy0+ZmIuZmItPmhlaWdodCwKKwljcmVhdGVfZmIodC0+Zm9ybWF0LCBwYXJhbXMtPnByaW1h cnkuZmItPndpZHRoLCBwYXJhbXMtPnByaW1hcnkuZmItPmhlaWdodCwKIAkJICBvcHQudGlsaW5n LCB0LT5wbGFuZSwgJmZiMik7CiAJZmlsbF9mYigmZmIyLCBDT0xPUl9QUklNX0JHKTsKIAotCXN0 YXJ0X2J1c3lfdGhyZWFkKHBhcmFtcy0+ZmIuZmIpOworCXN0YXJ0X2J1c3lfdGhyZWFkKHBhcmFt cy0+cHJpbWFyeS5mYik7CiAJdXNsZWVwKDEwMDAwKTsKIAogCXVuc2V0X2FsbF9jcnRjcygpOwot CXBhcmFtcy0+ZmIuZmIgPSAmZmIyOworCXBhcmFtcy0+cHJpbWFyeS5mYiA9ICZmYjI7CiAJc2V0 X21vZGVfZm9yX3BhcmFtcyhwYXJhbXMpOwogCiAJZG9fYXNzZXJ0aW9ucygwKTsKQEAgLTMxMDks OSArMjg2Nyw5IEBAIHN0YXRpYyB2b2lkIGZhcmZyb21mZW5jZV9zdWJ0ZXN0KGNvbnN0IHN0cnVj dCB0ZXN0X21vZGUgKnQpCiAKIAlmaWxsX2ZiKCZ0YWxsX2ZiLCBDT0xPUl9QUklNX0JHKTsKIAot CXBhcmFtcy0+ZmIuZmIgPSAmdGFsbF9mYjsKLQlwYXJhbXMtPmZiLnggPSAwOwotCXBhcmFtcy0+ ZmIueSA9IG1heF9oZWlnaHQgLSBwYXJhbXMtPm1vZGUtPnZkaXNwbGF5OworCXBhcmFtcy0+cHJp bWFyeS5mYiA9ICZ0YWxsX2ZiOworCXBhcmFtcy0+cHJpbWFyeS54ID0gMDsKKwlwYXJhbXMtPnBy aW1hcnkueSA9IG1heF9oZWlnaHQgLSBwYXJhbXMtPm1vZGUtPnZkaXNwbGF5OwogCXNldF9tb2Rl X2Zvcl9wYXJhbXMocGFyYW1zKTsKIAlkb19hc3NlcnRpb25zKGFzc2VydGlvbnMpOwogCkBAIC0z MTc3LDMwICsyOTM1LDMwIEBAIHN0YXRpYyB2b2lkIGJhZHN0cmlkZV9zdWJ0ZXN0KGNvbnN0IHN0 cnVjdCB0ZXN0X21vZGUgKnQpCiAKIAlwcmVwYXJlX3N1YnRlc3QodCwgTlVMTCk7CiAKLQlvbGRf ZmIgPSBwYXJhbXMtPmZiLmZiOworCW9sZF9mYiA9IHBhcmFtcy0+cHJpbWFyeS5mYjsKIAotCWNy ZWF0ZV9mYih0LT5mb3JtYXQsIHBhcmFtcy0+ZmIuZmItPndpZHRoICsgNDA5NiwgcGFyYW1zLT5m Yi5mYi0+aGVpZ2h0LAorCWNyZWF0ZV9mYih0LT5mb3JtYXQsIHBhcmFtcy0+cHJpbWFyeS5mYi0+ d2lkdGggKyA0MDk2LCBwYXJhbXMtPnByaW1hcnkuZmItPmhlaWdodCwKIAkJICBvcHQudGlsaW5n LCB0LT5wbGFuZSwgJndpZGVfZmIpOwogCWlndF9hc3NlcnQod2lkZV9mYi5zdHJpZGUgPiAxNjM4 NCk7CiAKIAlmaWxsX2ZiKCZ3aWRlX2ZiLCBDT0xPUl9QUklNX0JHKTsKIAogCS8qIFRyeSBhIHNp bXBsZSBtb2Rlc2V0IHdpdGggdGhlIG5ldyBmYi4gKi8KLQlwYXJhbXMtPmZiLmZiID0gJndpZGVf ZmI7CisJcGFyYW1zLT5wcmltYXJ5LmZiID0gJndpZGVfZmI7CiAJc2V0X21vZGVfZm9yX3BhcmFt cyhwYXJhbXMpOwogCWRvX2Fzc2VydGlvbnMoQVNTRVJUX0ZCQ19ESVNBQkxFRCk7CiAKIAkvKiBH byBiYWNrIHRvIHRoZSBvbGQgZmIgc28gRkJDIHdvcmtzIGFnYWluLiAqLwotCXBhcmFtcy0+ZmIu ZmIgPSBvbGRfZmI7CisJcGFyYW1zLT5wcmltYXJ5LmZiID0gb2xkX2ZiOwogCXNldF9tb2RlX2Zv cl9wYXJhbXMocGFyYW1zKTsKIAlkb19hc3NlcnRpb25zKDApOwogCiAJLyogV2UncmUgZG9pbmcg dGhlIGVxdWl2YWxlbnQgb2YgYSBtb2Rlc2V0LCBidXQgd2l0aCB0aGUgcGxhbmVzIEFQSS4gKi8K LQlwYXJhbXMtPmZiLmZiID0gJndpZGVfZmI7CisJcGFyYW1zLT5wcmltYXJ5LmZiID0gJndpZGVf ZmI7CiAJc2V0X3ByaW1fcGxhbmVfZm9yX3BhcmFtcyhwYXJhbXMpOwogCWRvX2Fzc2VydGlvbnMo QVNTRVJUX0ZCQ19ESVNBQkxFRCk7CiAKLQlwYXJhbXMtPmZiLmZiID0gb2xkX2ZiOworCXBhcmFt cy0+cHJpbWFyeS5mYiA9IG9sZF9mYjsKIAlzZXRfbW9kZV9mb3JfcGFyYW1zKHBhcmFtcyk7CiAJ ZG9fYXNzZXJ0aW9ucygwKTsKIApAQCAtMzIwOSw3ICsyOTY3LDcgQEAgc3RhdGljIHZvaWQgYmFk c3RyaWRlX3N1YnRlc3QoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIAkgKiB3aXRoIGEgZGlm ZmVyZW50IHN0cmlkZS4gV2l0aCB0aGUgYXRvbWljIHBhZ2UgZmxpcCBoZWxwZXIgd2UgY2FuLAog CSAqIHNvIGFsbG93IHBhZ2UgZmxpcCB0byBmYWlsIGFuZCBzdWNjZWVkLgogCSAqLwotCXJjID0g ZHJtTW9kZVBhZ2VGbGlwKGRybS5mZCwgcGFyYW1zLT5jcnRjX2lkLCB3aWRlX2ZiLmZiX2lkLCAw LCBOVUxMKTsKKwlyYyA9IGRybU1vZGVQYWdlRmxpcChkcm0uZmQsIGRybS5kaXNwbGF5LnBpcGVz W3BhcmFtcy0+cGlwZV0uY3J0Y19pZCwgd2lkZV9mYi5mYl9pZCwgMCwgTlVMTCk7CiAJaWd0X2Fz c2VydChyYyA9PSAtRUlOVkFMIHx8IHJjID09IDApOwogCWRvX2Fzc2VydGlvbnMocmMgPT0gMCA/ IEFTU0VSVF9GQkNfRElTQUJMRUQgOiAwKTsKIApAQCAtMzI0NCw5ICszMDAyLDkgQEAgc3RhdGlj IHZvaWQgc3RyaWRlY2hhbmdlX3N1YnRlc3QoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIAog CXByZXBhcmVfc3VidGVzdCh0LCBOVUxMKTsKIAotCW9sZF9mYiA9IHBhcmFtcy0+ZmIuZmI7CisJ b2xkX2ZiID0gcGFyYW1zLT5wcmltYXJ5LmZiOwogCi0JY3JlYXRlX2ZiKHQtPmZvcm1hdCwgcGFy YW1zLT5mYi5mYi0+d2lkdGggKyA1MTIsIHBhcmFtcy0+ZmIuZmItPmhlaWdodCwKKwljcmVhdGVf ZmIodC0+Zm9ybWF0LCBwYXJhbXMtPnByaW1hcnkuZmItPndpZHRoICsgNTEyLCBwYXJhbXMtPnBy aW1hcnkuZmItPmhlaWdodCwKIAkJICBvcHQudGlsaW5nLCB0LT5wbGFuZSwgJm5ld19mYik7CiAJ ZmlsbF9mYigmbmV3X2ZiLCBDT0xPUl9QUklNX0JHKTsKIApAQCAtMzI1NCwyMSArMzAxMiwyMSBA QCBzdGF0aWMgdm9pZCBzdHJpZGVjaGFuZ2Vfc3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2Rl ICp0KQogCiAJLyogV2UgY2FuJ3QgYXNzZXJ0IHRoYXQgRkJDIHdpbGwgYmUgZW5hYmxlZCBzaW5j ZSB0aGVyZSBtYXkgbm90IGJlCiAJICogZW5vdWdoIHNwYWNlIGZvciB0aGUgQ0ZCLCBidXQgd2Ug Y2FuIGNoZWNrIHRoZSBDUkMuICovCi0JcGFyYW1zLT5mYi5mYiA9ICZuZXdfZmI7CisJcGFyYW1z LT5wcmltYXJ5LmZiID0gJm5ld19mYjsKIAlzZXRfbW9kZV9mb3JfcGFyYW1zKHBhcmFtcyk7CiAJ ZG9fYXNzZXJ0aW9ucyhET05UX0FTU0VSVF9GRUFUVVJFX1NUQVRVUyk7CiAKIAkvKiBHbyBiYWNr IHRvIHRoZSBmYiB0aGF0IGNhbiBoYXZlIEZCQy4gKi8KLQlwYXJhbXMtPmZiLmZiID0gb2xkX2Zi OworCXBhcmFtcy0+cHJpbWFyeS5mYiA9IG9sZF9mYjsKIAlzZXRfbW9kZV9mb3JfcGFyYW1zKHBh cmFtcyk7CiAJZG9fYXNzZXJ0aW9ucygwKTsKIAogCS8qIFRoaXMgb3BlcmF0aW9uIGlzIHRoZSBz YW1lIGFzIGFib3ZlLCBidXQgd2l0aCB0aGUgcGxhbmVzIEFQSS4gKi8KLQlwYXJhbXMtPmZiLmZi ID0gJm5ld19mYjsKKwlwYXJhbXMtPnByaW1hcnkuZmIgPSAmbmV3X2ZiOwogCXNldF9wcmltX3Bs YW5lX2Zvcl9wYXJhbXMocGFyYW1zKTsKIAlkb19hc3NlcnRpb25zKERPTlRfQVNTRVJUX0ZFQVRV UkVfU1RBVFVTKTsKIAotCXBhcmFtcy0+ZmIuZmIgPSBvbGRfZmI7CisJcGFyYW1zLT5wcmltYXJ5 LmZiID0gb2xkX2ZiOwogCXNldF9wcmltX3BsYW5lX2Zvcl9wYXJhbXMocGFyYW1zKTsKIAlkb19h c3NlcnRpb25zKDApOwogCkBAIC0zMjc2LDcgKzMwMzQsNyBAQCBzdGF0aWMgdm9pZCBzdHJpZGVj aGFuZ2Vfc3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogCSAqIFRyeSB0byBzZXQg YSBuZXcgc3RyaWRlLiB3aXRoIHRoZSBwYWdlIGZsaXAgYXBpLiBUaGlzIGlzIGFsbG93ZWQKIAkg KiB3aXRoIHRoZSBhdG9taWMgcGFnZSBmbGlwIGhlbHBlciwgYnV0IG5vdCB3aXRoIHRoZSBsZWdh Y3kgcGFnZSBmbGlwLgogCSAqLwotCXJjID0gZHJtTW9kZVBhZ2VGbGlwKGRybS5mZCwgcGFyYW1z LT5jcnRjX2lkLCBuZXdfZmIuZmJfaWQsIDAsIE5VTEwpOworCXJjID0gZHJtTW9kZVBhZ2VGbGlw KGRybS5mZCwgZHJtLmRpc3BsYXkucGlwZXNbcGFyYW1zLT5waXBlXS5jcnRjX2lkLCBuZXdfZmIu ZmJfaWQsIDAsIE5VTEwpOwogCWlndF9hc3NlcnQocmMgPT0gLUVJTlZBTCB8fCByYyA9PSAwKTsK IAlkb19hc3NlcnRpb25zKDApOwogCkBAIC0zMzA3LDkgKzMwNjUsOSBAQCBzdGF0aWMgdm9pZCB0 aWxpbmdjaGFuZ2Vfc3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogCiAJcHJlcGFy ZV9zdWJ0ZXN0KHQsIE5VTEwpOwogCi0Jb2xkX2ZiID0gcGFyYW1zLT5mYi5mYjsKKwlvbGRfZmIg PSBwYXJhbXMtPnByaW1hcnkuZmI7CiAKLQljcmVhdGVfZmIodC0+Zm9ybWF0LCBwYXJhbXMtPmZi LmZiLT53aWR0aCwgcGFyYW1zLT5mYi5mYi0+aGVpZ2h0LAorCWNyZWF0ZV9mYih0LT5mb3JtYXQs IHBhcmFtcy0+cHJpbWFyeS5mYi0+d2lkdGgsIHBhcmFtcy0+cHJpbWFyeS5mYi0+aGVpZ2h0LAog CQkgIExPQ0FMX0RSTV9GT1JNQVRfTU9EX05PTkUsIHQtPnBsYW5lLCAmbmV3X2ZiKTsKIAlmaWxs X2ZiKCZuZXdfZmIsIENPTE9SX1BSSU1fQkcpOwogCkBAIC0zMzE3LDEyICszMDc1LDEyIEBAIHN0 YXRpYyB2b2lkIHRpbGluZ2NoYW5nZV9zdWJ0ZXN0KGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQp CiAJCWlndF9kZWJ1ZygiRmxpcCB0eXBlOiAlZFxuIiwgZmxpcF90eXBlKTsKIAogCQkvKiBTZXQg YSBidWZmZXIgd2l0aCBubyB0aWxpbmcuICovCi0JCXBhcmFtcy0+ZmIuZmIgPSAmbmV3X2ZiOwor CQlwYXJhbXMtPnByaW1hcnkuZmIgPSAmbmV3X2ZiOwogCQlwYWdlX2ZsaXBfZm9yX3BhcmFtcyhw YXJhbXMsIGZsaXBfdHlwZSk7CiAJCWRvX2Fzc2VydGlvbnMoQVNTRVJUX0ZCQ19ESVNBQkxFRCk7 CiAKIAkJLyogUHV0IEZCQyBiYWNrIGluIGEgd29ya2luZyBzdGF0ZS4gKi8KLQkJcGFyYW1zLT5m Yi5mYiA9IG9sZF9mYjsKKwkJcGFyYW1zLT5wcmltYXJ5LmZiID0gb2xkX2ZiOwogCQlwYWdlX2Zs aXBfZm9yX3BhcmFtcyhwYXJhbXMsIGZsaXBfdHlwZSk7CiAJCWRvX2Fzc2VydGlvbnMoMCk7CiAJ fQpAQCAtMzM2NSwxNSArMzEyMywxNSBAQCBzdGF0aWMgdm9pZCBiYXNpY19zdWJ0ZXN0KGNvbnN0 IHN0cnVjdCB0ZXN0X21vZGUgKnQpCiAKIAlwcmVwYXJlX3N1YnRlc3QodCwgcGF0dGVybik7CiAK LQljcmVhdGVfZmIodC0+Zm9ybWF0LCBwYXJhbXMtPmZiLmZiLT53aWR0aCwgcGFyYW1zLT5mYi5m Yi0+aGVpZ2h0LAorCWNyZWF0ZV9mYih0LT5mb3JtYXQsIHBhcmFtcy0+cHJpbWFyeS5mYi0+d2lk dGgsIHBhcmFtcy0+cHJpbWFyeS5mYi0+aGVpZ2h0LAogCQkgIG9wdC50aWxpbmcsIHQtPnBsYW5l LCAmZmIyKTsKLQlmYjEgPSBwYXJhbXMtPmZiLmZiOworCWZiMSA9IHBhcmFtcy0+cHJpbWFyeS5m YjsKIAogCWZvciAociA9IDAsIG1ldGhvZCA9IDA7IG1ldGhvZCA8IElHVF9EUkFXX01FVEhPRF9D T1VOVDsgbWV0aG9kKyssIHIrKykgewogCQlpZiAociA9PSBwYXR0ZXJuLT5uX3JlY3RzKSB7Ci0J CQlwYXJhbXMtPmZiLmZiID0gKHBhcmFtcy0+ZmIuZmIgPT0gZmIxKSA/ICZmYjIgOiBmYjE7CisJ CQlwYXJhbXMtPnByaW1hcnkuZmIgPSAocGFyYW1zLT5wcmltYXJ5LmZiID09IGZiMSkgPyAmZmIy IDogZmIxOwogCi0JCQlmaWxsX2ZiX3JlZ2lvbigmcGFyYW1zLT5mYiwgQ09MT1JfUFJJTV9CRyk7 CisJCQlmaWxsX2ZiX3JlZ2lvbigmcGFyYW1zLT5wcmltYXJ5LCBDT0xPUl9QUklNX0JHKTsKIAkJ CXVwZGF0ZV93YW50ZWRfY3JjKHQsICZibHVlX2NyY3NbdC0+Zm9ybWF0XS5jcmMpOwogCiAJCQlw YWdlX2ZsaXBfZm9yX3BhcmFtcyhwYXJhbXMsIHQtPmZsaXApOwpAQCAtMzM4Miw3ICszMTQwLDcg QEAgc3RhdGljIHZvaWQgYmFzaWNfc3VidGVzdChjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQog CQkJciA9IDA7CiAJCX0KIAotCQlkcmF3X3JlY3QocGF0dGVybiwgJnBhcmFtcy0+ZmIsIG1ldGhv ZCwgcik7CisJCWRyYXdfcmVjdChwYXR0ZXJuLCAmcGFyYW1zLT5wcmltYXJ5LCBtZXRob2QsIHIp OwogCQl1cGRhdGVfd2FudGVkX2NyYyh0LCAmcGF0dGVybi0+Y3Jjc1t0LT5mb3JtYXRdW3JdKTsK IAkJZG9fYXNzZXJ0aW9ucyhhc3NlcnRpb25zKTsKIAl9Ci0tIAoyLjE2LjIKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0 CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldgo=