From: Harry Wentland Subject: [PATCH 028/120] drm/amd/display: Roll core_surface into dc_surface Date: Wed, 9 Aug 2017 11:01:14 -0400 Message-ID: <20170809150246.8835-29-harry.wentland@amd.com> References: <20170809150246.8835-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170809150246.8835-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Harry Wentland Q2hhbmdlLUlkOiBJZDRiZTVlNzg1ZmM2ZjAzMDg1MTg4MmQ2YTExYzhmNTViZjJkYmRmYwpTaWdu ZWQtb2ZmLWJ5OiBIYXJyeSBXZW50bGFuZCA8aGFycnkud2VudGxhbmRAYW1kLmNvbT4KUmV2aWV3 ZWQtYnk6IFRvbnkgQ2hlbmcgPFRvbnkuQ2hlbmdAYW1kLmNvbT4KQWNrZWQtYnk6IEhhcnJ5IFdl bnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQuY29tPgotLS0KIC4uLi9kcm0vYW1kL2Rpc3BsYXkv YW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jICAgIHwgICA4ICstCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvY2FsY3MvZGNlX2NhbGNzLmMgICB8ICAxNiArKy0tCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvY2FsY3MvZGNuX2NhbGNzLmMgICB8ICAyNiArKystLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMgICAgICAgICAgIHwgIDczICsr KysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfcmVz b3VyY2UuYyAgfCAgNDIgKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv Y29yZS9kY19zdHJlYW0uYyAgICB8ICAgNCArLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2NvcmUvZGNfc3VyZmFjZS5jICAgfCAgNDQgKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZGMuaCAgICAgICAgICAgICAgICB8ICA0NSArKysrKy0tLS0KIGRyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2h3c2VxLmMgICAgIHwgICA0ICstCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9od3NlcS5oICAgICB8ICAgMiAr LQogLi4uL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfaHdfc2VxdWVuY2VyLmMgICAgfCAx MDIgKysrKysrKysrKy0tLS0tLS0tLS0tCiAuLi4vZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9k Y2UxMTBfcmVzb3VyY2UuYyAgICB8ICAgMiArLQogLi4uL2RybS9hbWQvZGlzcGxheS9kYy9kY24x MC9kY24xMF9od19zZXF1ZW5jZXIuYyAgfCAgNzYgKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2NvcmVfdHlwZXMuaCAgICB8ICAxNiArLS0tCiBkcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3X3NlcXVlbmNlci5oICB8ICAgNCArLQog ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9yZXNvdXJjZS5oICAgICAgfCAgIDIg Ky0KIDE2IGZpbGVzIGNoYW5nZWQsIDIyNiBpbnNlcnRpb25zKCspLCAyNDAgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRn cHVfZG1fdHlwZXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1k Z3B1X2RtX3R5cGVzLmMKaW5kZXggMzA4OTk5NzM2NWU4Li5jOGVhMTAxMGVhMjAgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVz LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1f dHlwZXMuYwpAQCAtMjQ5Nyw3ICsyNDk3LDcgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2RtX2NvbW1p dF9zdXJmYWNlcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJc3RydWN0IGRybV9w bGFuZSAqcGxhbmU7CiAJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlOwog CWNvbnN0IHN0cnVjdCBkY19zdHJlYW0gKmRjX3N0cmVhbV9hdHRhY2g7Ci0JY29uc3Qgc3RydWN0 IGRjX3N1cmZhY2UgKmRjX3N1cmZhY2VzX2NvbnN0cnVjdGVkW01BWF9TVVJGQUNFU107CisJc3Ry dWN0IGRjX3N1cmZhY2UgKmRjX3N1cmZhY2VzX2NvbnN0cnVjdGVkW01BWF9TVVJGQUNFU107CiAJ c3RydWN0IGFtZGdwdV9jcnRjICphY3J0Y19hdHRhY2ggPSB0b19hbWRncHVfY3J0YyhwY3J0Yyk7 CiAJc3RydWN0IGRtX2NydGNfc3RhdGUgKmFjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShw Y3J0Yy0+c3RhdGUpOwogCWludCBwbGFuZXNfY291bnQgPSAwOwpAQCAtMjc3Nyw3ICsyNzc3LDcg QEAgdm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKAogCQlzdHJ1Y3QgZG1fY29ubmVj dG9yX3N0YXRlICpjb25fb2xkX3N0YXRlID0KIAkJCQl0b19kbV9jb25uZWN0b3Jfc3RhdGUob2xk X2Nvbm5fc3RhdGUpOwogCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2Ny dGMoY29uX25ld19zdGF0ZS0+YmFzZS5jcnRjKTsKLQkJY29uc3Qgc3RydWN0IGRjX3N0cmVhbV9z dGF0dXMgKnN0YXR1cyA9IE5VTEw7CisJCXN0cnVjdCBkY19zdHJlYW1fc3RhdHVzICpzdGF0dXMg PSBOVUxMOwogCiAJCS8qIFNraXAgYW55IG1vZGVzZXRzL3Jlc2V0cyAqLwogCQlpZiAoIWFjcnRj IHx8IGRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KGFjcnRjLT5iYXNlLnN0YXRlKSkKQEAg LTI4MDIsNyArMjgwMiw3IEBAIHZvaWQgYW1kZ3B1X2RtX2F0b21pY19jb21taXRfdGFpbCgKIAkJ LypUT0RPIEhvdyBpdCB3b3JrcyB3aXRoIE1QTyA/Ki8KIAkJaWYgKCFkY19jb21taXRfc3VyZmFj ZXNfdG9fc3RyZWFtKAogCQkJCWRtLT5kYywKLQkJCQkoY29uc3Qgc3RydWN0IGRjX3N1cmZhY2Ug Kiopc3RhdHVzLT5zdXJmYWNlcywKKwkJCQlzdGF0dXMtPnN1cmZhY2VzLAogCQkJCXN0YXR1cy0+ c3VyZmFjZV9jb3VudCwKIAkJCQluZXdfYWNydGNfc3RhdGUtPnN0cmVhbSkpCiAJCQlkbV9lcnJv cigiJXM6IEZhaWxlZCB0byB1cGRhdGUgc3RyZWFtIHNjYWxpbmchXG4iLCBfX2Z1bmNfXyk7CkBA IC0yOTQ2LDcgKzI5NDYsNyBAQCBzdGF0aWMgdWludDMyX3QgYWRkX3ZhbF9zZXRzX3N1cmZhY2Uo CiAJc3RydWN0IGRjX3ZhbGlkYXRpb25fc2V0ICp2YWxfc2V0cywKIAl1aW50MzJfdCBzZXRfY291 bnQsCiAJY29uc3Qgc3RydWN0IGRjX3N0cmVhbSAqc3RyZWFtLAotCWNvbnN0IHN0cnVjdCBkY19z dXJmYWNlICpzdXJmYWNlKQorCXN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlKQogewogCXVpbnQz Ml90IGkgPSAwLCBqID0gMDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2RjL2NhbGNzL2RjZV9jYWxjcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2NhbGNzL2RjZV9jYWxjcy5jCmluZGV4IDg3NjY2OTg3NDI5ZS4uNWVmNDRmZjRiY2Y4IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY2FsY3MvZGNlX2NhbGNzLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NhbGNzL2RjZV9jYWxjcy5jCkBA IC0yNTk3LDEyICsyNTk3LDEyIEBAIHN0YXRpYyB2b2lkIHBvcHVsYXRlX2luaXRpYWxfZGF0YSgK IAkJQVNTRVJUKHBpcGVbaV0uc3VyZmFjZSk7CiAKIAkJaWYgKG51bV9kaXNwbGF5cyA9PSAwKSB7 Ci0JCQlpZiAoIXBpcGVbaV0uc3VyZmFjZS0+cHVibGljLnZpc2libGUpCisJCQlpZiAoIXBpcGVb aV0uc3VyZmFjZS0+dmlzaWJsZSkKIAkJCQlkYXRhLT5kMF91bmRlcmxheV9tb2RlID0gYndfZGVm X3VuZGVybGF5X29ubHk7CiAJCQllbHNlCiAJCQkJZGF0YS0+ZDBfdW5kZXJsYXlfbW9kZSA9IGJ3 X2RlZl9ibGVuZDsKIAkJfSBlbHNlIHsKLQkJCWlmICghcGlwZVtpXS5zdXJmYWNlLT5wdWJsaWMu dmlzaWJsZSkKKwkJCWlmICghcGlwZVtpXS5zdXJmYWNlLT52aXNpYmxlKQogCQkJCWRhdGEtPmQx X3VuZGVybGF5X21vZGUgPSBid19kZWZfdW5kZXJsYXlfb25seTsKIAkJCWVsc2UKIAkJCQlkYXRh LT5kMV91bmRlcmxheV9tb2RlID0gYndfZGVmX2JsZW5kOwpAQCAtMjYyMCw3ICsyNjIwLDcgQEAg c3RhdGljIHZvaWQgcG9wdWxhdGVfaW5pdGlhbF9kYXRhKAogCQlkYXRhLT52X3RhcHNbbnVtX2Rp c3BsYXlzICsgNF0gPSBid19pbnRfdG9fZml4ZWQocGlwZVtpXS5zY2xfZGF0YS50YXBzLnZfdGFw cyk7CiAJCWRhdGEtPmhfc2NhbGVfcmF0aW9bbnVtX2Rpc3BsYXlzICsgNF0gPSBmaXhlZDMxXzMy X3RvX2J3X2ZpeGVkKHBpcGVbaV0uc2NsX2RhdGEucmF0aW9zLmhvcnoudmFsdWUpOwogCQlkYXRh LT52X3NjYWxlX3JhdGlvW251bV9kaXNwbGF5cyArIDRdID0gZml4ZWQzMV8zMl90b19id19maXhl ZChwaXBlW2ldLnNjbF9kYXRhLnJhdGlvcy52ZXJ0LnZhbHVlKTsKLQkJc3dpdGNoIChwaXBlW2ld LnN1cmZhY2UtPnB1YmxpYy5yb3RhdGlvbikgeworCQlzd2l0Y2ggKHBpcGVbaV0uc3VyZmFjZS0+ cm90YXRpb24pIHsKIAkJY2FzZSBST1RBVElPTl9BTkdMRV8wOgogCQkJZGF0YS0+cm90YXRpb25f YW5nbGVbbnVtX2Rpc3BsYXlzICsgNF0gPSBid19pbnRfdG9fZml4ZWQoMCk7CiAJCQlicmVhazsK QEAgLTI2MzYsNyArMjYzNiw3IEBAIHN0YXRpYyB2b2lkIHBvcHVsYXRlX2luaXRpYWxfZGF0YSgK IAkJZGVmYXVsdDoKIAkJCWJyZWFrOwogCQl9Ci0JCXN3aXRjaCAocGlwZVtpXS5zdXJmYWNlLT5w dWJsaWMuZm9ybWF0KSB7CisJCXN3aXRjaCAocGlwZVtpXS5zdXJmYWNlLT5mb3JtYXQpIHsKIAkJ Y2FzZSBTVVJGQUNFX1BJWEVMX0ZPUk1BVF9WSURFT180MjBfWUNiQ3I6CiAJCWNhc2UgU1VSRkFD RV9QSVhFTF9GT1JNQVRfR1JQSF9BUkdCMTU1NToKIAkJY2FzZSBTVVJGQUNFX1BJWEVMX0ZPUk1B VF9HUlBIX1JHQjU2NToKQEAgLTI2NzAsMTQgKzI2NzAsMTQgQEAgc3RhdGljIHZvaWQgcG9wdWxh dGVfaW5pdGlhbF9kYXRhKAogCQkJZGF0YS0+c3JjX2hlaWdodFtudW1fZGlzcGxheXMgKiAyICsg al0gPSBid19pbnRfdG9fZml4ZWQocGlwZVtpXS5ib3R0b21fcGlwZS0+c2NsX2RhdGEudmlld3Bv cnQuaGVpZ2h0KTsKIAkJCWRhdGEtPnNyY193aWR0aFtudW1fZGlzcGxheXMgKiAyICsgal0gPSBi d19pbnRfdG9fZml4ZWQocGlwZVtpXS5ib3R0b21fcGlwZS0+c2NsX2RhdGEudmlld3BvcnQud2lk dGgpOwogCQkJZGF0YS0+cGl0Y2hfaW5fcGl4ZWxzW251bV9kaXNwbGF5cyAqIDIgKyBqXSA9IGJ3 X2ludF90b19maXhlZCgKLQkJCQkJcGlwZVtpXS5ib3R0b21fcGlwZS0+c3VyZmFjZS0+cHVibGlj LnBsYW5lX3NpemUuZ3JwaC5zdXJmYWNlX3BpdGNoKTsKKwkJCQkJcGlwZVtpXS5ib3R0b21fcGlw ZS0+c3VyZmFjZS0+cGxhbmVfc2l6ZS5ncnBoLnN1cmZhY2VfcGl0Y2gpOwogCQkJZGF0YS0+aF90 YXBzW251bV9kaXNwbGF5cyAqIDIgKyBqXSA9IGJ3X2ludF90b19maXhlZChwaXBlW2ldLmJvdHRv bV9waXBlLT5zY2xfZGF0YS50YXBzLmhfdGFwcyk7CiAJCQlkYXRhLT52X3RhcHNbbnVtX2Rpc3Bs YXlzICogMiArIGpdID0gYndfaW50X3RvX2ZpeGVkKHBpcGVbaV0uYm90dG9tX3BpcGUtPnNjbF9k YXRhLnRhcHMudl90YXBzKTsKIAkJCWRhdGEtPmhfc2NhbGVfcmF0aW9bbnVtX2Rpc3BsYXlzICog MiArIGpdID0gZml4ZWQzMV8zMl90b19id19maXhlZCgKIAkJCQkJcGlwZVtpXS5ib3R0b21fcGlw ZS0+c2NsX2RhdGEucmF0aW9zLmhvcnoudmFsdWUpOwogCQkJZGF0YS0+dl9zY2FsZV9yYXRpb1tu dW1fZGlzcGxheXMgKiAyICsgal0gPSBmaXhlZDMxXzMyX3RvX2J3X2ZpeGVkKAogCQkJCQlwaXBl W2ldLmJvdHRvbV9waXBlLT5zY2xfZGF0YS5yYXRpb3MudmVydC52YWx1ZSk7Ci0JCQlzd2l0Y2gg KHBpcGVbaV0uYm90dG9tX3BpcGUtPnN1cmZhY2UtPnB1YmxpYy5yb3RhdGlvbikgeworCQkJc3dp dGNoIChwaXBlW2ldLmJvdHRvbV9waXBlLT5zdXJmYWNlLT5yb3RhdGlvbikgewogCQkJY2FzZSBS T1RBVElPTl9BTkdMRV8wOgogCQkJCWRhdGEtPnJvdGF0aW9uX2FuZ2xlW251bV9kaXNwbGF5cyAq IDIgKyBqXSA9IGJ3X2ludF90b19maXhlZCgwKTsKIAkJCQlicmVhazsKQEAgLTI3MTgsNyArMjcx OCw3IEBAIHN0YXRpYyB2b2lkIHBvcHVsYXRlX2luaXRpYWxfZGF0YSgKIAkJCWRhdGEtPnZfdGFw c1tudW1fZGlzcGxheXMgKyA0XSA9IGJ3X2ludF90b19maXhlZChwaXBlW2ldLnNjbF9kYXRhLnRh cHMudl90YXBzKTsKIAkJCWRhdGEtPmhfc2NhbGVfcmF0aW9bbnVtX2Rpc3BsYXlzICsgNF0gPSBm aXhlZDMxXzMyX3RvX2J3X2ZpeGVkKHBpcGVbaV0uc2NsX2RhdGEucmF0aW9zLmhvcnoudmFsdWUp OwogCQkJZGF0YS0+dl9zY2FsZV9yYXRpb1tudW1fZGlzcGxheXMgKyA0XSA9IGZpeGVkMzFfMzJf dG9fYndfZml4ZWQocGlwZVtpXS5zY2xfZGF0YS5yYXRpb3MudmVydC52YWx1ZSk7Ci0JCQlzd2l0 Y2ggKHBpcGVbaV0uc3VyZmFjZS0+cHVibGljLnJvdGF0aW9uKSB7CisJCQlzd2l0Y2ggKHBpcGVb aV0uc3VyZmFjZS0+cm90YXRpb24pIHsKIAkJCWNhc2UgUk9UQVRJT05fQU5HTEVfMDoKIAkJCQlk YXRhLT5yb3RhdGlvbl9hbmdsZVtudW1fZGlzcGxheXMgKyA0XSA9IGJ3X2ludF90b19maXhlZCgw KTsKIAkJCQlicmVhazsKQEAgLTI3MzQsNyArMjczNCw3IEBAIHN0YXRpYyB2b2lkIHBvcHVsYXRl X2luaXRpYWxfZGF0YSgKIAkJCWRlZmF1bHQ6CiAJCQkJYnJlYWs7CiAJCQl9Ci0JCQlzd2l0Y2gg KHBpcGVbaV0uc3VyZmFjZS0+cHVibGljLmZvcm1hdCkgeworCQkJc3dpdGNoIChwaXBlW2ldLnN1 cmZhY2UtPmZvcm1hdCkgewogCQkJY2FzZSBTVVJGQUNFX1BJWEVMX0ZPUk1BVF9WSURFT180MjBf WUNiQ3I6CiAJCQljYXNlIFNVUkZBQ0VfUElYRUxfRk9STUFUX1ZJREVPXzQyMF9ZQ3JDYjoKIAkJ CWNhc2UgU1VSRkFDRV9QSVhFTF9GT1JNQVRfR1JQSF9BUkdCMTU1NToKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jYWxjcy9kY25fY2FsY3MuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9jYWxjcy9kY25fY2FsY3MuYwppbmRleCAxN2IyODI4MDIz NmYuLjE2NTFiNzU0OGQ0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2NhbGNzL2Rjbl9jYWxjcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9jYWxjcy9kY25fY2FsY3MuYwpAQCAtMjM4LDExICsyMzgsMTEgQEAgc3RhdGljIHZvaWQgcGlw ZV9jdHhfdG9fZTJlX3BpcGVfcGFyYW1zICgKIAllbHNlIGlmIChwaXBlLT5ib3R0b21fcGlwZSAh PSBOVUxMICYmIHBpcGUtPmJvdHRvbV9waXBlLT5zdXJmYWNlID09IHBpcGUtPnN1cmZhY2UpCiAJ CWlucHV0LT5zcmMuaXNfaHNwbGl0ID0gdHJ1ZTsKIAotCWlucHV0LT5zcmMuZGNjICAgICAgICAg ICAgICAgICA9IHBpcGUtPnN1cmZhY2UtPnB1YmxpYy5kY2MuZW5hYmxlOworCWlucHV0LT5zcmMu ZGNjICAgICAgICAgICAgICAgICA9IHBpcGUtPnN1cmZhY2UtPmRjYy5lbmFibGU7CiAJaW5wdXQt PnNyYy5kY2NfcmF0ZSAgICAgICAgICAgID0gMTsKLQlpbnB1dC0+c3JjLm1ldGFfcGl0Y2ggICAg ICAgICAgPSBwaXBlLT5zdXJmYWNlLT5wdWJsaWMuZGNjLmdycGgubWV0YV9waXRjaDsKKwlpbnB1 dC0+c3JjLm1ldGFfcGl0Y2ggICAgICAgICAgPSBwaXBlLT5zdXJmYWNlLT5kY2MuZ3JwaC5tZXRh X3BpdGNoOwogCWlucHV0LT5zcmMuc291cmNlX3NjYW4gICAgICAgICA9IGRtX2hvcno7Ci0JaW5w dXQtPnNyYy5zd19tb2RlICAgICAgICAgICAgID0gcGlwZS0+c3VyZmFjZS0+cHVibGljLnRpbGlu Z19pbmZvLmdmeDkuc3dpenpsZTsKKwlpbnB1dC0+c3JjLnN3X21vZGUgICAgICAgICAgICAgPSBw aXBlLT5zdXJmYWNlLT50aWxpbmdfaW5mby5nZng5LnN3aXp6bGU7CiAKIAlpbnB1dC0+c3JjLnZp ZXdwb3J0X3dpZHRoICAgICAgPSBwaXBlLT5zY2xfZGF0YS52aWV3cG9ydC53aWR0aDsKIAlpbnB1 dC0+c3JjLnZpZXdwb3J0X2hlaWdodCAgICAgPSBwaXBlLT5zY2xfZGF0YS52aWV3cG9ydC5oZWln aHQ7CkBAIC0yNTEsNyArMjUxLDcgQEAgc3RhdGljIHZvaWQgcGlwZV9jdHhfdG9fZTJlX3BpcGVf cGFyYW1zICgKIAlpbnB1dC0+c3JjLmN1cjBfc3JjX3dpZHRoICAgICAgPSAxMjg7IC8qIFRPRE86 IEN1cnNvciBjYWxjcywgbm90IGN1cmVudGx5IHN0b3JlZCAqLwogCWlucHV0LT5zcmMuY3VyMF9i cHAgICAgICAgICAgICA9IDMyOwogCi0Jc3dpdGNoIChwaXBlLT5zdXJmYWNlLT5wdWJsaWMudGls aW5nX2luZm8uZ2Z4OS5zd2l6emxlKSB7CisJc3dpdGNoIChwaXBlLT5zdXJmYWNlLT50aWxpbmdf aW5mby5nZng5LnN3aXp6bGUpIHsKIAkvKiBmb3IgNC84LzE2IGhpZ2ggdGlsZXMgKi8KIAljYXNl IERDX1NXX0xJTkVBUjoKIAkJaW5wdXQtPnNyYy5pc19kaXNwbGF5X3N3ID0gMTsKQEAgLTI5OSw3 ICsyOTksNyBAQCBzdGF0aWMgdm9pZCBwaXBlX2N0eF90b19lMmVfcGlwZV9wYXJhbXMgKAogCQli cmVhazsKIAl9CiAKLQlzd2l0Y2ggKHBpcGUtPnN1cmZhY2UtPnB1YmxpYy5yb3RhdGlvbikgewor CXN3aXRjaCAocGlwZS0+c3VyZmFjZS0+cm90YXRpb24pIHsKIAljYXNlIFJPVEFUSU9OX0FOR0xF XzA6CiAJY2FzZSBST1RBVElPTl9BTkdMRV8xODA6CiAJCWlucHV0LT5zcmMuc291cmNlX3NjYW4g PSBkbV9ob3J6OwpAQCAtMzE0LDcgKzMxNCw3IEBAIHN0YXRpYyB2b2lkIHBpcGVfY3R4X3RvX2Uy ZV9waXBlX3BhcmFtcyAoCiAJfQogCiAJLyogVE9ETzogRml4IHBpeGVsIGZvcm1hdCBtYXBwaW5n cyAqLwotCXN3aXRjaCAocGlwZS0+c3VyZmFjZS0+cHVibGljLmZvcm1hdCkgeworCXN3aXRjaCAo cGlwZS0+c3VyZmFjZS0+Zm9ybWF0KSB7CiAJY2FzZSBTVVJGQUNFX1BJWEVMX0ZPUk1BVF9WSURF T180MjBfWUNiQ3I6CiAJY2FzZSBTVVJGQUNFX1BJWEVMX0ZPUk1BVF9WSURFT180MjBfWUNyQ2I6 CiAJCWlucHV0LT5zcmMuc291cmNlX2Zvcm1hdCA9IGRtXzQyMF84OwpAQCAtNDU1LDcgKzQ1NSw3 IEBAIHN0YXRpYyB2b2lkIGRjbl9id19jYWxjX3JxX2RsZ190dHUoCiAJCQl0cnVlLAogCQkJdHJ1 ZSwKIAkJCXYtPnB0ZV9lbmFibGUgPT0gZGNuX2J3X3llcywKLQkJCXBpcGUtPnN1cmZhY2UtPnB1 YmxpYy5mbGlwX2ltbWVkaWF0ZSk7CisJCQlwaXBlLT5zdXJmYWNlLT5mbGlwX2ltbWVkaWF0ZSk7 CiB9CiAKIHN0YXRpYyB2b2lkIGRjbl9kbWxfd21fb3ZlcnJpZGUoCkBAIC01MjcsNyArNTI3LDcg QEAgc3RhdGljIHZvaWQgZGNuX2RtbF93bV9vdmVycmlkZSgKIAkJCXRydWUsCiAJCQl0cnVlLAog CQkJdi0+cHRlX2VuYWJsZSA9PSBkY25fYndfeWVzLAotCQkJcGlwZS0+c3VyZmFjZS0+cHVibGlj LmZsaXBfaW1tZWRpYXRlKTsKKwkJCXBpcGUtPnN1cmZhY2UtPmZsaXBfaW1tZWRpYXRlKTsKIAkJ aW5faWR4Kys7CiAJfQogCWRtX2ZyZWUoaW5wdXQpOwpAQCAtODgzLDcgKzg4Myw3IEBAIGJvb2wg ZGNuX3ZhbGlkYXRlX2JhbmR3aWR0aCgKIAkJCXYtPnNjYWxlcl9yZWNfb3V0X3dpZHRoW2lucHV0 X2lkeF0gPSBwaXBlLT5zY2xfZGF0YS5yZWNvdXQud2lkdGg7CiAJCQl2LT5zY2FsZXJfcmVjb3V0 X2hlaWdodFtpbnB1dF9pZHhdID0gcGlwZS0+c2NsX2RhdGEucmVjb3V0LmhlaWdodDsKIAkJCWlm IChwaXBlLT5ib3R0b21fcGlwZSAmJiBwaXBlLT5ib3R0b21fcGlwZS0+c3VyZmFjZSA9PSBwaXBl LT5zdXJmYWNlKSB7Ci0JCQkJaWYgKHBpcGUtPnN1cmZhY2UtPnB1YmxpYy5yb3RhdGlvbiAlIDIg PT0gMCkgeworCQkJCWlmIChwaXBlLT5zdXJmYWNlLT5yb3RhdGlvbiAlIDIgPT0gMCkgewogCQkJ CQlpbnQgdmlld3BvcnRfZW5kID0gcGlwZS0+c2NsX2RhdGEudmlld3BvcnQud2lkdGgKIAkJCQkJ CQkrIHBpcGUtPnNjbF9kYXRhLnZpZXdwb3J0Lng7CiAJCQkJCWludCB2aWV3cG9ydF9iX2VuZCA9 IHBpcGUtPmJvdHRvbV9waXBlLT5zY2xfZGF0YS52aWV3cG9ydC53aWR0aApAQCAtOTEyLDE3ICs5 MTIsMTcgQEAgYm9vbCBkY25fdmFsaWRhdGVfYmFuZHdpZHRoKAogCQkJCQkJKyBwaXBlLT5ib3R0 b21fcGlwZS0+c2NsX2RhdGEucmVjb3V0LndpZHRoOwogCQkJfQogCi0JCQl2LT5kY2NfZW5hYmxl W2lucHV0X2lkeF0gPSBwaXBlLT5zdXJmYWNlLT5wdWJsaWMuZGNjLmVuYWJsZSA/IGRjbl9id195 ZXMgOiBkY25fYndfbm87CisJCQl2LT5kY2NfZW5hYmxlW2lucHV0X2lkeF0gPSBwaXBlLT5zdXJm YWNlLT5kY2MuZW5hYmxlID8gZGNuX2J3X3llcyA6IGRjbl9id19ubzsKIAkJCXYtPnNvdXJjZV9w aXhlbF9mb3JtYXRbaW5wdXRfaWR4XSA9IHRsX3BpeGVsX2Zvcm1hdF90b19id19kZWZzKAotCQkJ CQlwaXBlLT5zdXJmYWNlLT5wdWJsaWMuZm9ybWF0KTsKKwkJCQkJcGlwZS0+c3VyZmFjZS0+Zm9y bWF0KTsKIAkJCXYtPnNvdXJjZV9zdXJmYWNlX21vZGVbaW5wdXRfaWR4XSA9IHRsX3N3X21vZGVf dG9fYndfZGVmcygKLQkJCQkJcGlwZS0+c3VyZmFjZS0+cHVibGljLnRpbGluZ19pbmZvLmdmeDku c3dpenpsZSk7CisJCQkJCXBpcGUtPnN1cmZhY2UtPnRpbGluZ19pbmZvLmdmeDkuc3dpenpsZSk7 CiAJCQl2LT5sYl9iaXRfcGVyX3BpeGVsW2lucHV0X2lkeF0gPSB0bF9sYl9icHBfdG9faW50KHBp cGUtPnNjbF9kYXRhLmxiX3BhcmFtcy5kZXB0aCk7CiAJCQl2LT5vdmVycmlkZV9odGFfcHNbaW5w dXRfaWR4XSA9IHBpcGUtPnNjbF9kYXRhLnRhcHMuaF90YXBzOwogCQkJdi0+b3ZlcnJpZGVfdnRh X3BzW2lucHV0X2lkeF0gPSBwaXBlLT5zY2xfZGF0YS50YXBzLnZfdGFwczsKIAkJCXYtPm92ZXJy aWRlX2h0YV9wc2Nocm9tYVtpbnB1dF9pZHhdID0gcGlwZS0+c2NsX2RhdGEudGFwcy5oX3RhcHNf YzsKIAkJCXYtPm92ZXJyaWRlX3Z0YV9wc2Nocm9tYVtpbnB1dF9pZHhdID0gcGlwZS0+c2NsX2Rh dGEudGFwcy52X3RhcHNfYzsKLQkJCXYtPnNvdXJjZV9zY2FuW2lucHV0X2lkeF0gPSAocGlwZS0+ c3VyZmFjZS0+cHVibGljLnJvdGF0aW9uICUgMikgPyBkY25fYndfdmVydCA6IGRjbl9id19ob3I7 CisJCQl2LT5zb3VyY2Vfc2NhbltpbnB1dF9pZHhdID0gKHBpcGUtPnN1cmZhY2UtPnJvdGF0aW9u ICUgMikgPyBkY25fYndfdmVydCA6IGRjbl9id19ob3I7CiAJCX0KIAkJaWYgKHYtPmlzX2xpbmVf YnVmZmVyX2JwcF9maXhlZCA9PSBkY25fYndfeWVzKQogCQkJdi0+bGJfYml0X3Blcl9waXhlbFtp bnB1dF9pZHhdID0gdi0+bGluZV9idWZmZXJfZml4ZWRfYnBwOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9jb3JlL2RjLmMKaW5kZXggZTg5YTJlNWM4OTAyLi41NjkzMTBhYjExNmQgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYwpAQCAtOTQ2LDggKzk0Niw4 IEBAIHN0YXRpYyBib29sIGRjX2NvbW1pdF9jb250ZXh0X25vX2NoZWNrKHN0cnVjdCBkYyAqZGMs IHN0cnVjdCB2YWxpZGF0ZV9jb250ZXh0ICpjCiAJCWNvbnN0IHN0cnVjdCBjb3JlX3NpbmsgKnNp bmsgPSBjb250ZXh0LT5zdHJlYW1zW2ldLT5zaW5rOwogCiAJCWZvciAoaiA9IDA7IGogPCBjb250 ZXh0LT5zdHJlYW1fc3RhdHVzW2ldLnN1cmZhY2VfY291bnQ7IGorKykgewotCQkJc3RydWN0IGNv cmVfc3VyZmFjZSAqc3VyZmFjZSA9Ci0JCQkJCURDX1NVUkZBQ0VfVE9fQ09SRShjb250ZXh0LT5z dHJlYW1fc3RhdHVzW2ldLnN1cmZhY2VzW2pdKTsKKwkJCWNvbnN0IHN0cnVjdCBkY19zdXJmYWNl ICpzdXJmYWNlID0KKwkJCQkJY29udGV4dC0+c3RyZWFtX3N0YXR1c1tpXS5zdXJmYWNlc1tqXTsK IAogCQkJY29yZV9kYy0+aHdzcy5hcHBseV9jdHhfZm9yX3N1cmZhY2UoY29yZV9kYywgc3VyZmFj ZSwgY29udGV4dCk7CiAKQEAgLTEwOTgsNyArMTA5OCw3IEBAIGJvb2wgZGNfcG9zdF91cGRhdGVf c3VyZmFjZXNfdG9fc3RyZWFtKHN0cnVjdCBkYyAqZGMpCiAKIGJvb2wgZGNfY29tbWl0X3N1cmZh Y2VzX3RvX3N0cmVhbSgKIAkJc3RydWN0IGRjICpkYywKLQkJY29uc3Qgc3RydWN0IGRjX3N1cmZh Y2UgKipuZXdfc3VyZmFjZXMsCisJCXN0cnVjdCBkY19zdXJmYWNlICoqbmV3X3N1cmZhY2VzLAog CQl1aW50OF90IG5ld19zdXJmYWNlX2NvdW50LAogCQljb25zdCBzdHJ1Y3QgZGNfc3RyZWFtICpk Y19zdHJlYW0pCiB7CkBAIC0xMTg5LDcgKzExODksNyBAQCBzdGF0aWMgYm9vbCBpc19zdXJmYWNl X2luX2NvbnRleHQoCiAJZm9yIChqID0gMDsgaiA8IE1BWF9QSVBFUzsgaisrKSB7CiAJCWNvbnN0 IHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHggPSAmY29udGV4dC0+cmVzX2N0eC5waXBlX2N0eFtq XTsKIAotCQlpZiAoc3VyZmFjZSA9PSAmcGlwZV9jdHgtPnN1cmZhY2UtPnB1YmxpYykgeworCQlp ZiAoc3VyZmFjZSA9PSBwaXBlX2N0eC0+c3VyZmFjZSkgewogCQkJcmV0dXJuIHRydWU7CiAJCX0K IAl9CkBAIC0xNDIyLDcgKzE0MjIsNyBAQCB2b2lkIGRjX3VwZGF0ZV9zdXJmYWNlc19hbmRfc3Ry ZWFtKHN0cnVjdCBkYyAqZGMsCiAJCXVwZGF0ZV9zdXJmYWNlX3RyYWNlKGRjLCBzcmZfdXBkYXRl cywgc3VyZmFjZV9jb3VudCk7CiAKIAlpZiAodXBkYXRlX3R5cGUgPj0gVVBEQVRFX1RZUEVfRlVM TCkgewotCQljb25zdCBzdHJ1Y3QgZGNfc3VyZmFjZSAqbmV3X3N1cmZhY2VzW01BWF9TVVJGQUNF U10gPSB7MH07CisJCXN0cnVjdCBkY19zdXJmYWNlICpuZXdfc3VyZmFjZXNbTUFYX1NVUkZBQ0VT XSA9IHswfTsKIAogCQlmb3IgKGkgPSAwOyBpIDwgc3VyZmFjZV9jb3VudDsgaSsrKQogCQkJbmV3 X3N1cmZhY2VzW2ldID0gc3JmX3VwZGF0ZXNbaV0uc3VyZmFjZTsKQEAgLTE0NDgsNDYgKzE0NDgs NDUgQEAgdm9pZCBkY191cGRhdGVfc3VyZmFjZXNfYW5kX3N0cmVhbShzdHJ1Y3QgZGMgKmRjLAog CiAJLyogc2F2ZSB1cGRhdGUgcGFyYW1ldGVycyBpbnRvIHN1cmZhY2UgKi8KIAlmb3IgKGkgPSAw OyBpIDwgc3VyZmFjZV9jb3VudDsgaSsrKSB7Ci0JCXN0cnVjdCBjb3JlX3N1cmZhY2UgKnN1cmZh Y2UgPQotCQkJCURDX1NVUkZBQ0VfVE9fQ09SRShzcmZfdXBkYXRlc1tpXS5zdXJmYWNlKTsKKwkJ c3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2UgPSBzcmZfdXBkYXRlc1tpXS5zdXJmYWNlOwogCiAJ CWlmIChzcmZfdXBkYXRlc1tpXS5mbGlwX2FkZHIpIHsKLQkJCXN1cmZhY2UtPnB1YmxpYy5hZGRy ZXNzID0gc3JmX3VwZGF0ZXNbaV0uZmxpcF9hZGRyLT5hZGRyZXNzOwotCQkJc3VyZmFjZS0+cHVi bGljLmZsaXBfaW1tZWRpYXRlID0KKwkJCXN1cmZhY2UtPmFkZHJlc3MgPSBzcmZfdXBkYXRlc1tp XS5mbGlwX2FkZHItPmFkZHJlc3M7CisJCQlzdXJmYWNlLT5mbGlwX2ltbWVkaWF0ZSA9CiAJCQkJ CXNyZl91cGRhdGVzW2ldLmZsaXBfYWRkci0+ZmxpcF9pbW1lZGlhdGU7CiAJCX0KIAogCQlpZiAo c3JmX3VwZGF0ZXNbaV0uc2NhbGluZ19pbmZvKSB7Ci0JCQlzdXJmYWNlLT5wdWJsaWMuc2NhbGlu Z19xdWFsaXR5ID0KKwkJCXN1cmZhY2UtPnNjYWxpbmdfcXVhbGl0eSA9CiAJCQkJCXNyZl91cGRh dGVzW2ldLnNjYWxpbmdfaW5mby0+c2NhbGluZ19xdWFsaXR5OwotCQkJc3VyZmFjZS0+cHVibGlj LmRzdF9yZWN0ID0KKwkJCXN1cmZhY2UtPmRzdF9yZWN0ID0KIAkJCQkJc3JmX3VwZGF0ZXNbaV0u c2NhbGluZ19pbmZvLT5kc3RfcmVjdDsKLQkJCXN1cmZhY2UtPnB1YmxpYy5zcmNfcmVjdCA9CisJ CQlzdXJmYWNlLT5zcmNfcmVjdCA9CiAJCQkJCXNyZl91cGRhdGVzW2ldLnNjYWxpbmdfaW5mby0+ c3JjX3JlY3Q7Ci0JCQlzdXJmYWNlLT5wdWJsaWMuY2xpcF9yZWN0ID0KKwkJCXN1cmZhY2UtPmNs aXBfcmVjdCA9CiAJCQkJCXNyZl91cGRhdGVzW2ldLnNjYWxpbmdfaW5mby0+Y2xpcF9yZWN0Owog CQl9CiAKIAkJaWYgKHNyZl91cGRhdGVzW2ldLnBsYW5lX2luZm8pIHsKLQkJCXN1cmZhY2UtPnB1 YmxpYy5jb2xvcl9zcGFjZSA9CisJCQlzdXJmYWNlLT5jb2xvcl9zcGFjZSA9CiAJCQkJCXNyZl91 cGRhdGVzW2ldLnBsYW5lX2luZm8tPmNvbG9yX3NwYWNlOwotCQkJc3VyZmFjZS0+cHVibGljLmZv cm1hdCA9CisJCQlzdXJmYWNlLT5mb3JtYXQgPQogCQkJCQlzcmZfdXBkYXRlc1tpXS5wbGFuZV9p bmZvLT5mb3JtYXQ7Ci0JCQlzdXJmYWNlLT5wdWJsaWMucGxhbmVfc2l6ZSA9CisJCQlzdXJmYWNl LT5wbGFuZV9zaXplID0KIAkJCQkJc3JmX3VwZGF0ZXNbaV0ucGxhbmVfaW5mby0+cGxhbmVfc2l6 ZTsKLQkJCXN1cmZhY2UtPnB1YmxpYy5yb3RhdGlvbiA9CisJCQlzdXJmYWNlLT5yb3RhdGlvbiA9 CiAJCQkJCXNyZl91cGRhdGVzW2ldLnBsYW5lX2luZm8tPnJvdGF0aW9uOwotCQkJc3VyZmFjZS0+ cHVibGljLmhvcml6b250YWxfbWlycm9yID0KKwkJCXN1cmZhY2UtPmhvcml6b250YWxfbWlycm9y ID0KIAkJCQkJc3JmX3VwZGF0ZXNbaV0ucGxhbmVfaW5mby0+aG9yaXpvbnRhbF9taXJyb3I7Ci0J CQlzdXJmYWNlLT5wdWJsaWMuc3RlcmVvX2Zvcm1hdCA9CisJCQlzdXJmYWNlLT5zdGVyZW9fZm9y bWF0ID0KIAkJCQkJc3JmX3VwZGF0ZXNbaV0ucGxhbmVfaW5mby0+c3RlcmVvX2Zvcm1hdDsKLQkJ CXN1cmZhY2UtPnB1YmxpYy50aWxpbmdfaW5mbyA9CisJCQlzdXJmYWNlLT50aWxpbmdfaW5mbyA9 CiAJCQkJCXNyZl91cGRhdGVzW2ldLnBsYW5lX2luZm8tPnRpbGluZ19pbmZvOwotCQkJc3VyZmFj ZS0+cHVibGljLnZpc2libGUgPQorCQkJc3VyZmFjZS0+dmlzaWJsZSA9CiAJCQkJCXNyZl91cGRh dGVzW2ldLnBsYW5lX2luZm8tPnZpc2libGU7Ci0JCQlzdXJmYWNlLT5wdWJsaWMucGVyX3BpeGVs X2FscGhhID0KKwkJCXN1cmZhY2UtPnBlcl9waXhlbF9hbHBoYSA9CiAJCQkJCXNyZl91cGRhdGVz W2ldLnBsYW5lX2luZm8tPnBlcl9waXhlbF9hbHBoYTsKLQkJCXN1cmZhY2UtPnB1YmxpYy5kY2Mg PQorCQkJc3VyZmFjZS0+ZGNjID0KIAkJCQkJc3JmX3VwZGF0ZXNbaV0ucGxhbmVfaW5mby0+ZGNj OwogCQl9CiAKQEAgLTE1MDMsMzEgKzE1MDIsMzEgQEAgdm9pZCBkY191cGRhdGVfc3VyZmFjZXNf YW5kX3N0cmVhbShzdHJ1Y3QgZGMgKmRjLAogCQl9CiAKIAkJaWYgKHNyZl91cGRhdGVzW2ldLmdh bW1hICYmCi0JCQlzcmZfdXBkYXRlc1tpXS5nYW1tYSAhPSBzdXJmYWNlLT5wdWJsaWMuZ2FtbWFf Y29ycmVjdGlvbikgewotCQkJaWYgKHN1cmZhY2UtPnB1YmxpYy5nYW1tYV9jb3JyZWN0aW9uICE9 IE5VTEwpCi0JCQkJZGNfZ2FtbWFfcmVsZWFzZSgmc3VyZmFjZS0+cHVibGljLgorCQkJc3JmX3Vw ZGF0ZXNbaV0uZ2FtbWEgIT0gc3VyZmFjZS0+Z2FtbWFfY29ycmVjdGlvbikgeworCQkJaWYgKHN1 cmZhY2UtPmdhbW1hX2NvcnJlY3Rpb24gIT0gTlVMTCkKKwkJCQlkY19nYW1tYV9yZWxlYXNlKCZz dXJmYWNlLT4KIAkJCQkJCWdhbW1hX2NvcnJlY3Rpb24pOwogCiAJCQlkY19nYW1tYV9yZXRhaW4o c3JmX3VwZGF0ZXNbaV0uZ2FtbWEpOwotCQkJc3VyZmFjZS0+cHVibGljLmdhbW1hX2NvcnJlY3Rp b24gPQorCQkJc3VyZmFjZS0+Z2FtbWFfY29ycmVjdGlvbiA9CiAJCQkJCQlzcmZfdXBkYXRlc1tp XS5nYW1tYTsKIAkJfQogCiAJCWlmIChzcmZfdXBkYXRlc1tpXS5pbl90cmFuc2Zlcl9mdW5jICYm Ci0JCQlzcmZfdXBkYXRlc1tpXS5pbl90cmFuc2Zlcl9mdW5jICE9IHN1cmZhY2UtPnB1YmxpYy5p bl90cmFuc2Zlcl9mdW5jKSB7Ci0JCQlpZiAoc3VyZmFjZS0+cHVibGljLmluX3RyYW5zZmVyX2Z1 bmMgIT0gTlVMTCkKKwkJCXNyZl91cGRhdGVzW2ldLmluX3RyYW5zZmVyX2Z1bmMgIT0gc3VyZmFj ZS0+aW5fdHJhbnNmZXJfZnVuYykgeworCQkJaWYgKHN1cmZhY2UtPmluX3RyYW5zZmVyX2Z1bmMg IT0gTlVMTCkKIAkJCQlkY190cmFuc2Zlcl9mdW5jX3JlbGVhc2UoCi0JCQkJCQlzdXJmYWNlLT5w dWJsaWMuCisJCQkJCQlzdXJmYWNlLT4KIAkJCQkJCWluX3RyYW5zZmVyX2Z1bmMpOwogCiAJCQlk Y190cmFuc2Zlcl9mdW5jX3JldGFpbigKIAkJCQkJc3JmX3VwZGF0ZXNbaV0uaW5fdHJhbnNmZXJf ZnVuYyk7Ci0JCQlzdXJmYWNlLT5wdWJsaWMuaW5fdHJhbnNmZXJfZnVuYyA9CisJCQlzdXJmYWNl LT5pbl90cmFuc2Zlcl9mdW5jID0KIAkJCQkJc3JmX3VwZGF0ZXNbaV0uaW5fdHJhbnNmZXJfZnVu YzsKIAkJfQogCiAJCWlmIChzcmZfdXBkYXRlc1tpXS5oZHJfc3RhdGljX21ldGFkYXRhKQotCQkJ c3VyZmFjZS0+cHVibGljLmhkcl9zdGF0aWNfY3R4ID0KKwkJCXN1cmZhY2UtPmhkcl9zdGF0aWNf Y3R4ID0KIAkJCQkqKHNyZl91cGRhdGVzW2ldLmhkcl9zdGF0aWNfbWV0YWRhdGEpOwogCX0KIApA QCAtMTU0MywxMiArMTU0MiwxMCBAQCB2b2lkIGRjX3VwZGF0ZV9zdXJmYWNlc19hbmRfc3RyZWFt KHN0cnVjdCBkYyAqZGMsCiAKIAlpZiAodXBkYXRlX3R5cGUgPiBVUERBVEVfVFlQRV9GQVNUKSB7 CiAJCWZvciAoaSA9IDA7IGkgPCBzdXJmYWNlX2NvdW50OyBpKyspIHsKLQkJCXN0cnVjdCBjb3Jl X3N1cmZhY2UgKnN1cmZhY2UgPSBEQ19TVVJGQUNFX1RPX0NPUkUoc3JmX3VwZGF0ZXNbaV0uc3Vy ZmFjZSk7Ci0KIAkJCWZvciAoaiA9IDA7IGogPCBjb3JlX2RjLT5yZXNfcG9vbC0+cGlwZV9jb3Vu dDsgaisrKSB7CiAJCQkJc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCA9ICZjb250ZXh0LT5yZXNf Y3R4LnBpcGVfY3R4W2pdOwogCi0JCQkJaWYgKHBpcGVfY3R4LT5zdXJmYWNlICE9IHN1cmZhY2Up CisJCQkJaWYgKHBpcGVfY3R4LT5zdXJmYWNlICE9IHNyZl91cGRhdGVzW2ldLnN1cmZhY2UpCiAJ CQkJCWNvbnRpbnVlOwogCiAJCQkJY29yZV9kYy0+aHdzcy53YWl0X2Zvcl9tcGNjX2Rpc2Nvbm5l Y3QoY29yZV9kYy0+cmVzX3Bvb2wsIHBpcGVfY3R4KTsKQEAgLTE1NjEsNyArMTU1OCw3IEBAIHZv aWQgZGNfdXBkYXRlX3N1cmZhY2VzX2FuZF9zdHJlYW0oc3RydWN0IGRjICpkYywKIAogCS8qIExv Y2sgcGlwZXMgZm9yIHByb3ZpZGVkIHN1cmZhY2VzLCBvciBhbGwgYWN0aXZlIGlmIGZ1bGwgdXBk YXRlKi8KIAlmb3IgKGkgPSAwOyBpIDwgc3VyZmFjZV9jb3VudDsgaSsrKSB7Ci0JCXN0cnVjdCBj b3JlX3N1cmZhY2UgKnN1cmZhY2UgPSBEQ19TVVJGQUNFX1RPX0NPUkUoc3JmX3VwZGF0ZXNbaV0u c3VyZmFjZSk7CisJCXN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlID0gc3JmX3VwZGF0ZXNbaV0u c3VyZmFjZTsKIAogCQlmb3IgKGogPSAwOyBqIDwgY29yZV9kYy0+cmVzX3Bvb2wtPnBpcGVfY291 bnQ7IGorKykgewogCQkJc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCA9ICZjb250ZXh0LT5yZXNf Y3R4LnBpcGVfY3R4W2pdOwpAQCAtMTYxMyw3ICsxNjEwLDcgQEAgdm9pZCBkY191cGRhdGVfc3Vy ZmFjZXNfYW5kX3N0cmVhbShzdHJ1Y3QgZGMgKmRjLAogCiAJLyogUGVyZm9ybSByZXF1ZXN0ZWQg VXBkYXRlcyAqLwogCWZvciAoaSA9IDA7IGkgPCBzdXJmYWNlX2NvdW50OyBpKyspIHsKLQkJc3Ry dWN0IGNvcmVfc3VyZmFjZSAqc3VyZmFjZSA9IERDX1NVUkZBQ0VfVE9fQ09SRShzcmZfdXBkYXRl c1tpXS5zdXJmYWNlKTsKKwkJc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2UgPSBzcmZfdXBkYXRl c1tpXS5zdXJmYWNlOwogCiAJCWlmICh1cGRhdGVfdHlwZSA9PSBVUERBVEVfVFlQRV9NRUQpCiAJ CQljb3JlX2RjLT5od3NzLmFwcGx5X2N0eF9mb3Jfc3VyZmFjZSgKQEAgLTE2NTQsNyArMTY1MSw3 IEBAIHZvaWQgZGNfdXBkYXRlX3N1cmZhY2VzX2FuZF9zdHJlYW0oc3RydWN0IGRjICpkYywKIAog CQlmb3IgKGogPSAwOyBqIDwgc3VyZmFjZV9jb3VudDsgaisrKSB7CiAJCQlpZiAodXBkYXRlX3R5 cGUgIT0gVVBEQVRFX1RZUEVfRlVMTCAmJgotCQkJCQlzcmZfdXBkYXRlc1tqXS5zdXJmYWNlICE9 ICZwaXBlX2N0eC0+c3VyZmFjZS0+cHVibGljKQorCQkJICAgIHNyZl91cGRhdGVzW2pdLnN1cmZh Y2UgIT0gcGlwZV9jdHgtPnN1cmZhY2UpCiAJCQkJY29udGludWU7CiAJCQlpZiAoIXBpcGVfY3R4 LT5zdXJmYWNlIHx8IHBpcGVfY3R4LT50b3BfcGlwZSkKIAkJCQljb250aW51ZTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNlLmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJjZS5jCmluZGV4IDc0 MzdjM2Q5NDgwMC4uODU3YTJhMzk1YzFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJjZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNlLmMKQEAgLTQyOCw3ICs0MjgsNyBAQCBzdGF0aWMg dm9pZCByZWN0X3N3YXBfaGVscGVyKHN0cnVjdCByZWN0ICpyZWN0KQogCiBzdGF0aWMgdm9pZCBj YWxjdWxhdGVfdmlld3BvcnQoc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCkKIHsKLQljb25zdCBz dHJ1Y3QgZGNfc3VyZmFjZSAqc3VyZmFjZSA9ICZwaXBlX2N0eC0+c3VyZmFjZS0+cHVibGljOwor CWNvbnN0IHN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlID0gcGlwZV9jdHgtPnN1cmZhY2U7CiAJ Y29uc3Qgc3RydWN0IGRjX3N0cmVhbSAqc3RyZWFtID0gJnBpcGVfY3R4LT5zdHJlYW0tPnB1Ymxp YzsKIAlzdHJ1Y3Qgc2NhbGVyX2RhdGEgKmRhdGEgPSAmcGlwZV9jdHgtPnNjbF9kYXRhOwogCXN0 cnVjdCByZWN0IHN1cmZfc3JjID0gc3VyZmFjZS0+c3JjX3JlY3Q7CkBAIC00NDYsOCArNDQ2LDgg QEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlX3ZpZXdwb3J0KHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9j dHgpCiAJCXNlY19zcGxpdCA9IGZhbHNlOwogCX0KIAotCWlmIChwaXBlX2N0eC0+c3VyZmFjZS0+ cHVibGljLnJvdGF0aW9uID09IFJPVEFUSU9OX0FOR0xFXzkwIHx8Ci0JCQlwaXBlX2N0eC0+c3Vy ZmFjZS0+cHVibGljLnJvdGF0aW9uID09IFJPVEFUSU9OX0FOR0xFXzI3MCkKKwlpZiAocGlwZV9j dHgtPnN1cmZhY2UtPnJvdGF0aW9uID09IFJPVEFUSU9OX0FOR0xFXzkwIHx8CisJCQlwaXBlX2N0 eC0+c3VyZmFjZS0+cm90YXRpb24gPT0gUk9UQVRJT05fQU5HTEVfMjcwKQogCQlyZWN0X3N3YXBf aGVscGVyKCZzdXJmX3NyYyk7CiAKIAkvKiBUaGUgYWN0dWFsIGNsaXAgaXMgYW4gaW50ZXJzZWN0 aW9uIGJldHdlZW4gc3RyZWFtCkBAIC01MjcsMTQgKzUyNywxNCBAQCBzdGF0aWMgdm9pZCBjYWxj dWxhdGVfdmlld3BvcnQoc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCkKIAogc3RhdGljIHZvaWQg Y2FsY3VsYXRlX3JlY291dChzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4LCBzdHJ1Y3QgdmlldyAq cmVjb3V0X3NraXApCiB7Ci0JY29uc3Qgc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2UgPSAmcGlw ZV9jdHgtPnN1cmZhY2UtPnB1YmxpYzsKKwljb25zdCBzdHJ1Y3QgZGNfc3VyZmFjZSAqc3VyZmFj ZSA9IHBpcGVfY3R4LT5zdXJmYWNlOwogCXN0cnVjdCBjb3JlX3N0cmVhbSAqc3RyZWFtID0gcGlw ZV9jdHgtPnN0cmVhbTsKIAlzdHJ1Y3QgcmVjdCBzdXJmX3NyYyA9IHN1cmZhY2UtPnNyY19yZWN0 OwogCXN0cnVjdCByZWN0IHN1cmZfY2xpcCA9IHN1cmZhY2UtPmNsaXBfcmVjdDsKIAlpbnQgcmVj b3V0X2Z1bGxfeCwgcmVjb3V0X2Z1bGxfeTsKIAotCWlmIChwaXBlX2N0eC0+c3VyZmFjZS0+cHVi bGljLnJvdGF0aW9uID09IFJPVEFUSU9OX0FOR0xFXzkwIHx8Ci0JCQlwaXBlX2N0eC0+c3VyZmFj ZS0+cHVibGljLnJvdGF0aW9uID09IFJPVEFUSU9OX0FOR0xFXzI3MCkKKwlpZiAocGlwZV9jdHgt PnN1cmZhY2UtPnJvdGF0aW9uID09IFJPVEFUSU9OX0FOR0xFXzkwIHx8CisJCQlwaXBlX2N0eC0+ c3VyZmFjZS0+cm90YXRpb24gPT0gUk9UQVRJT05fQU5HTEVfMjcwKQogCQlyZWN0X3N3YXBfaGVs cGVyKCZzdXJmX3NyYyk7CiAKIAlwaXBlX2N0eC0+c2NsX2RhdGEucmVjb3V0LnggPSBzdHJlYW0t PnB1YmxpYy5kc3QueDsKQEAgLTYwNSw3ICs2MDUsNyBAQCBzdGF0aWMgdm9pZCBjYWxjdWxhdGVf cmVjb3V0KHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHgsIHN0cnVjdCB2aWV3ICpyZWNvdXRfc2tp cAogCiBzdGF0aWMgdm9pZCBjYWxjdWxhdGVfc2NhbGluZ19yYXRpb3Moc3RydWN0IHBpcGVfY3R4 ICpwaXBlX2N0eCkKIHsKLQljb25zdCBzdHJ1Y3QgZGNfc3VyZmFjZSAqc3VyZmFjZSA9ICZwaXBl X2N0eC0+c3VyZmFjZS0+cHVibGljOworCWNvbnN0IHN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNl ID0gcGlwZV9jdHgtPnN1cmZhY2U7CiAJc3RydWN0IGNvcmVfc3RyZWFtICpzdHJlYW0gPSBwaXBl X2N0eC0+c3RyZWFtOwogCXN0cnVjdCByZWN0IHN1cmZfc3JjID0gc3VyZmFjZS0+c3JjX3JlY3Q7 CiAJY29uc3QgaW50IGluX3cgPSBzdHJlYW0tPnB1YmxpYy5zcmMud2lkdGg7CkBAIC02MTMsOCAr NjEzLDggQEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlX3NjYWxpbmdfcmF0aW9zKHN0cnVjdCBwaXBl X2N0eCAqcGlwZV9jdHgpCiAJY29uc3QgaW50IG91dF93ID0gc3RyZWFtLT5wdWJsaWMuZHN0Lndp ZHRoOwogCWNvbnN0IGludCBvdXRfaCA9IHN0cmVhbS0+cHVibGljLmRzdC5oZWlnaHQ7CiAKLQlp ZiAocGlwZV9jdHgtPnN1cmZhY2UtPnB1YmxpYy5yb3RhdGlvbiA9PSBST1RBVElPTl9BTkdMRV85 MCB8fAotCQkJcGlwZV9jdHgtPnN1cmZhY2UtPnB1YmxpYy5yb3RhdGlvbiA9PSBST1RBVElPTl9B TkdMRV8yNzApCisJaWYgKHBpcGVfY3R4LT5zdXJmYWNlLT5yb3RhdGlvbiA9PSBST1RBVElPTl9B TkdMRV85MCB8fAorCQkJcGlwZV9jdHgtPnN1cmZhY2UtPnJvdGF0aW9uID09IFJPVEFUSU9OX0FO R0xFXzI3MCkKIAkJcmVjdF9zd2FwX2hlbHBlcigmc3VyZl9zcmMpOwogCiAJcGlwZV9jdHgtPnNj bF9kYXRhLnJhdGlvcy5ob3J6ID0gZGFsX2ZpeGVkMzFfMzJfZnJvbV9mcmFjdGlvbigKQEAgLTY0 NywxMyArNjQ3LDEzIEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZV9zY2FsaW5nX3JhdGlvcyhzdHJ1 Y3QgcGlwZV9jdHggKnBpcGVfY3R4KQogc3RhdGljIHZvaWQgY2FsY3VsYXRlX2luaXRzX2FuZF9h ZGpfdnAoc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCwgc3RydWN0IHZpZXcgKnJlY291dF9za2lw KQogewogCXN0cnVjdCBzY2FsZXJfZGF0YSAqZGF0YSA9ICZwaXBlX2N0eC0+c2NsX2RhdGE7Ci0J c3RydWN0IHJlY3Qgc3JjID0gcGlwZV9jdHgtPnN1cmZhY2UtPnB1YmxpYy5zcmNfcmVjdDsKKwlz dHJ1Y3QgcmVjdCBzcmMgPSBwaXBlX2N0eC0+c3VyZmFjZS0+c3JjX3JlY3Q7CiAJaW50IHZwY19k aXYgPSAoZGF0YS0+Zm9ybWF0ID09IFBJWEVMX0ZPUk1BVF80MjBCUFA4CiAJCQl8fCBkYXRhLT5m b3JtYXQgPT0gUElYRUxfRk9STUFUXzQyMEJQUDEwKSA/IDIgOiAxOwogCiAKLQlpZiAocGlwZV9j dHgtPnN1cmZhY2UtPnB1YmxpYy5yb3RhdGlvbiA9PSBST1RBVElPTl9BTkdMRV85MCB8fAotCQkJ cGlwZV9jdHgtPnN1cmZhY2UtPnB1YmxpYy5yb3RhdGlvbiA9PSBST1RBVElPTl9BTkdMRV8yNzAp IHsKKwlpZiAocGlwZV9jdHgtPnN1cmZhY2UtPnJvdGF0aW9uID09IFJPVEFUSU9OX0FOR0xFXzkw IHx8CisJCQlwaXBlX2N0eC0+c3VyZmFjZS0+cm90YXRpb24gPT0gUk9UQVRJT05fQU5HTEVfMjcw KSB7CiAJCXJlY3Rfc3dhcF9oZWxwZXIoJnNyYyk7CiAJCXJlY3Rfc3dhcF9oZWxwZXIoJmRhdGEt PnZpZXdwb3J0X2MpOwogCQlyZWN0X3N3YXBfaGVscGVyKCZkYXRhLT52aWV3cG9ydCk7CkBAIC04 MDMsOCArODAzLDggQEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlX2luaXRzX2FuZF9hZGpfdnAoc3Ry dWN0IHBpcGVfY3R4ICpwaXBlX2N0eCwgc3RydWN0IHZpZXcgKnIKIAlkYXRhLT5pbml0cy52X2Jv dCA9IGRhbF9maXhlZDMxXzMyX2FkZChkYXRhLT5pbml0cy52LCBkYXRhLT5yYXRpb3MudmVydCk7 CiAJZGF0YS0+aW5pdHMudl9jX2JvdCA9IGRhbF9maXhlZDMxXzMyX2FkZChkYXRhLT5pbml0cy52 X2MsIGRhdGEtPnJhdGlvcy52ZXJ0X2MpOwogCi0JaWYgKHBpcGVfY3R4LT5zdXJmYWNlLT5wdWJs aWMucm90YXRpb24gPT0gUk9UQVRJT05fQU5HTEVfOTAgfHwKLQkJCXBpcGVfY3R4LT5zdXJmYWNl LT5wdWJsaWMucm90YXRpb24gPT0gUk9UQVRJT05fQU5HTEVfMjcwKSB7CisJaWYgKHBpcGVfY3R4 LT5zdXJmYWNlLT5yb3RhdGlvbiA9PSBST1RBVElPTl9BTkdMRV85MCB8fAorCQkJcGlwZV9jdHgt PnN1cmZhY2UtPnJvdGF0aW9uID09IFJPVEFUSU9OX0FOR0xFXzI3MCkgewogCQlyZWN0X3N3YXBf aGVscGVyKCZkYXRhLT52aWV3cG9ydF9jKTsKIAkJcmVjdF9zd2FwX2hlbHBlcigmZGF0YS0+dmll d3BvcnQpOwogCX0KQEAgLTgxMiw3ICs4MTIsNyBAQCBzdGF0aWMgdm9pZCBjYWxjdWxhdGVfaW5p dHNfYW5kX2Fkal92cChzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4LCBzdHJ1Y3QgdmlldyAqcgog CiBib29sIHJlc291cmNlX2J1aWxkX3NjYWxpbmdfcGFyYW1zKHN0cnVjdCBwaXBlX2N0eCAqcGlw ZV9jdHgpCiB7Ci0JY29uc3Qgc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2UgPSAmcGlwZV9jdHgt PnN1cmZhY2UtPnB1YmxpYzsKKwljb25zdCBzdHJ1Y3QgZGNfc3VyZmFjZSAqc3VyZmFjZSA9IHBp cGVfY3R4LT5zdXJmYWNlOwogCXN0cnVjdCBkY19jcnRjX3RpbWluZyAqdGltaW5nID0gJnBpcGVf Y3R4LT5zdHJlYW0tPnB1YmxpYy50aW1pbmc7CiAJc3RydWN0IHZpZXcgcmVjb3V0X3NraXAgPSB7 IDAgfTsKIAlib29sIHJlcyA9IGZhbHNlOwpAQCAtODIyLDcgKzgyMiw3IEBAIGJvb2wgcmVzb3Vy Y2VfYnVpbGRfc2NhbGluZ19wYXJhbXMoc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCkKIAkgKiBJ bml0cyByZXF1aXJlIHZpZXdwb3J0LCB0YXBzLCByYXRpb3MgYW5kIHJlY291dCBvZiBzcGxpdCBw aXBlCiAJICovCiAJcGlwZV9jdHgtPnNjbF9kYXRhLmZvcm1hdCA9IGNvbnZlcnRfcGl4ZWxfZm9y bWF0X3RvX2RhbHN1cmZhY2UoCi0JCQlwaXBlX2N0eC0+c3VyZmFjZS0+cHVibGljLmZvcm1hdCk7 CisJCQlwaXBlX2N0eC0+c3VyZmFjZS0+Zm9ybWF0KTsKIAogCWNhbGN1bGF0ZV9zY2FsaW5nX3Jh dGlvcyhwaXBlX2N0eCk7CiAKQEAgLTEwMjksNyArMTAyOSw3IEBAIHN0YXRpYyBpbnQgYWNxdWly ZV9maXJzdF9zcGxpdF9waXBlKAogI2VuZGlmCiAKIGJvb2wgcmVzb3VyY2VfYXR0YWNoX3N1cmZh Y2VzX3RvX2NvbnRleHQoCi0JCWNvbnN0IHN0cnVjdCBkY19zdXJmYWNlICogY29uc3QgKnN1cmZh Y2VzLAorCQlzdHJ1Y3QgZGNfc3VyZmFjZSAqIGNvbnN0ICpzdXJmYWNlcywKIAkJaW50IHN1cmZh Y2VfY291bnQsCiAJCWNvbnN0IHN0cnVjdCBkY19zdHJlYW0gKmRjX3N0cmVhbSwKIAkJc3RydWN0 IHZhbGlkYXRlX2NvbnRleHQgKmNvbnRleHQsCkBAIC0xMDc3LDcgKzEwNzcsNyBAQCBib29sIHJl c291cmNlX2F0dGFjaF9zdXJmYWNlc190b19jb250ZXh0KAogCiAJdGFpbF9waXBlID0gTlVMTDsK IAlmb3IgKGkgPSAwOyBpIDwgc3VyZmFjZV9jb3VudDsgaSsrKSB7Ci0JCXN0cnVjdCBjb3JlX3N1 cmZhY2UgKnN1cmZhY2UgPSBEQ19TVVJGQUNFX1RPX0NPUkUoc3VyZmFjZXNbaV0pOworCQlzdHJ1 Y3QgZGNfc3VyZmFjZSAqc3VyZmFjZSA9IHN1cmZhY2VzW2ldOwogCQlzdHJ1Y3QgcGlwZV9jdHgg KmZyZWVfcGlwZSA9IGFjcXVpcmVfZnJlZV9waXBlX2Zvcl9zdHJlYW0oCiAJCQkJY29udGV4dCwg cG9vbCwgZGNfc3RyZWFtKTsKIApAQCAtMTM1OCw3ICsxMzU4LDcgQEAgYm9vbCByZXNvdXJjZV9p c19zdHJlYW1fdW5jaGFuZ2VkKAogc3RhdGljIHZvaWQgY29weV9waXBlX2N0eCgKIAljb25zdCBz dHJ1Y3QgcGlwZV9jdHggKmZyb21fcGlwZV9jdHgsIHN0cnVjdCBwaXBlX2N0eCAqdG9fcGlwZV9j dHgpCiB7Ci0Jc3RydWN0IGNvcmVfc3VyZmFjZSAqc3VyZmFjZSA9IHRvX3BpcGVfY3R4LT5zdXJm YWNlOworCXN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlID0gdG9fcGlwZV9jdHgtPnN1cmZhY2U7 CiAJc3RydWN0IGNvcmVfc3RyZWFtICpzdHJlYW0gPSB0b19waXBlX2N0eC0+c3RyZWFtOwogCiAJ KnRvX3BpcGVfY3R4ID0gKmZyb21fcGlwZV9jdHg7CkBAIC0yMDcyLDcgKzIwNzIsNyBAQCBzdGF0 aWMgdm9pZCBzZXRfc3BkX2luZm9fcGFja2V0KAogCiBzdGF0aWMgdm9pZCBzZXRfaGRyX3N0YXRp Y19pbmZvX3BhY2tldCgKIAkJc3RydWN0IGVuY29kZXJfaW5mb19wYWNrZXQgKmluZm9fcGFja2V0 LAotCQlzdHJ1Y3QgY29yZV9zdXJmYWNlICpzdXJmYWNlLAorCQlzdHJ1Y3QgZGNfc3VyZmFjZSAq c3VyZmFjZSwKIAkJc3RydWN0IGNvcmVfc3RyZWFtICpzdHJlYW0pCiB7CiAJdWludDE2X3QgaSA9 IDA7CkBAIC0yMDgzLDcgKzIwODMsNyBAQCBzdGF0aWMgdm9pZCBzZXRfaGRyX3N0YXRpY19pbmZv X3BhY2tldCgKIAlpZiAoIXN1cmZhY2UpCiAJCXJldHVybjsKIAotCWhkcl9tZXRhZGF0YSA9IHN1 cmZhY2UtPnB1YmxpYy5oZHJfc3RhdGljX2N0eDsKKwloZHJfbWV0YWRhdGEgPSBzdXJmYWNlLT5o ZHJfc3RhdGljX2N0eDsKIAogCWlmICghaGRyX21ldGFkYXRhLmhkcl9zdXBwb3J0ZWQpCiAJCXJl dHVybjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2Rj X3N0cmVhbS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfc3RyZWFt LmMKaW5kZXggZWFkN2I2M2NhYWI3Li43MzcxMmZkNmY2NGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N0cmVhbS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N0cmVhbS5jCkBAIC0xNTcsNyArMTU3LDcgQEAg c3RydWN0IGRjX3N0cmVhbSAqZGNfY3JlYXRlX3N0cmVhbV9mb3Jfc2luaygKIAlyZXR1cm4gTlVM TDsKIH0KIAotY29uc3Qgc3RydWN0IGRjX3N0cmVhbV9zdGF0dXMgKmRjX3N0cmVhbV9nZXRfc3Rh dHVzKAorc3RydWN0IGRjX3N0cmVhbV9zdGF0dXMgKmRjX3N0cmVhbV9nZXRfc3RhdHVzKAogCWNv bnN0IHN0cnVjdCBkY19zdHJlYW0gKmRjX3N0cmVhbSkKIHsKIAl1aW50OF90IGk7CkBAIC0yNTIs NyArMjUyLDcgQEAgYm9vbCBkY19zdHJlYW1fc2V0X2N1cnNvcl9wb3NpdGlvbigKIAkJCQkhcGlw ZV9jdHgtPmlwcCB8fCAhcGlwZV9jdHgtPnN1cmZhY2UpCiAJCQljb250aW51ZTsKIAotCQlpZiAo cGlwZV9jdHgtPnN1cmZhY2UtPnB1YmxpYy5hZGRyZXNzLnR5cGUKKwkJaWYgKHBpcGVfY3R4LT5z dXJmYWNlLT5hZGRyZXNzLnR5cGUKIAkJCQk9PSBQTE5fQUREUl9UWVBFX1ZJREVPX1BST0dSRVNT SVZFKQogCQkJcG9zX2NweS5lbmFibGUgPSBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfc3VyZmFjZS5jIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfc3VyZmFjZS5jCmluZGV4IDM3ODQzNThkMzVlZi4uOWEy MWVhNzFmNGIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29y ZS9kY19zdXJmYWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUv ZGNfc3VyZmFjZS5jCkBAIC00NywzMyArNDcsMzIgQEAgc3RydWN0IGdhbW1hIHsKIC8qKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqCiAgKiBQcml2YXRlIGZ1bmN0aW9ucwogICoqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKi8KLXN0YXRpYyBib29sIGNvbnN0cnVjdChzdHJ1Y3QgZGNfY29udGV4dCAqY3R4LCBzdHJ1 Y3QgY29yZV9zdXJmYWNlICpzdXJmYWNlKQorc3RhdGljIGJvb2wgY29uc3RydWN0KHN0cnVjdCBk Y19jb250ZXh0ICpjdHgsIHN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlKQogewogCXN1cmZhY2Ut PmN0eCA9IGN0eDsKLQltZW1zZXQoJnN1cmZhY2UtPnB1YmxpYy5oZHJfc3RhdGljX2N0eCwKKwlt ZW1zZXQoJnN1cmZhY2UtPmhkcl9zdGF0aWNfY3R4LAogCQkJMCwgc2l6ZW9mKHN0cnVjdCBkY19o ZHJfc3RhdGljX21ldGFkYXRhKSk7CiAJcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyB2b2lkIGRl c3RydWN0KHN0cnVjdCBjb3JlX3N1cmZhY2UgKnN1cmZhY2UpCitzdGF0aWMgdm9pZCBkZXN0cnVj dChzdHJ1Y3QgZGNfc3VyZmFjZSAqc3VyZmFjZSkKIHsKLQlpZiAoc3VyZmFjZS0+cHVibGljLmdh bW1hX2NvcnJlY3Rpb24gIT0gTlVMTCkgewotCQlkY19nYW1tYV9yZWxlYXNlKCZzdXJmYWNlLT5w dWJsaWMuZ2FtbWFfY29ycmVjdGlvbik7CisJaWYgKHN1cmZhY2UtPmdhbW1hX2NvcnJlY3Rpb24g IT0gTlVMTCkgeworCQlkY19nYW1tYV9yZWxlYXNlKCZzdXJmYWNlLT5nYW1tYV9jb3JyZWN0aW9u KTsKIAl9Ci0JaWYgKHN1cmZhY2UtPnB1YmxpYy5pbl90cmFuc2Zlcl9mdW5jICE9IE5VTEwpIHsK KwlpZiAoc3VyZmFjZS0+aW5fdHJhbnNmZXJfZnVuYyAhPSBOVUxMKSB7CiAJCWRjX3RyYW5zZmVy X2Z1bmNfcmVsZWFzZSgKLQkJCQlzdXJmYWNlLT5wdWJsaWMuaW5fdHJhbnNmZXJfZnVuYyk7Ci0J CXN1cmZhY2UtPnB1YmxpYy5pbl90cmFuc2Zlcl9mdW5jID0gTlVMTDsKKwkJCQlzdXJmYWNlLT5p bl90cmFuc2Zlcl9mdW5jKTsKKwkJc3VyZmFjZS0+aW5fdHJhbnNmZXJfZnVuYyA9IE5VTEw7CiAJ fQogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgogICogUHVibGljIGZ1bmN0aW9ucwogICoq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKi8KLXZvaWQgZW5hYmxlX3N1cmZhY2VfZmxpcF9yZXBvcnRpbmco c3RydWN0IGRjX3N1cmZhY2UgKmRjX3N1cmZhY2UsCit2b2lkIGVuYWJsZV9zdXJmYWNlX2ZsaXBf cmVwb3J0aW5nKHN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlLAogCQl1aW50MzJfdCBjb250cm9s bGVyX2lkKQogewotCXN0cnVjdCBjb3JlX3N1cmZhY2UgKnN1cmZhY2UgPSBEQ19TVVJGQUNFX1RP X0NPUkUoZGNfc3VyZmFjZSk7CiAJc3VyZmFjZS0+aXJxX3NvdXJjZSA9IGNvbnRyb2xsZXJfaWQg KyBEQ19JUlFfU09VUkNFX1BGTElQMSAtIDE7CiAJLypyZWdpc3Rlcl9mbGlwX2ludGVycnVwdChz dXJmYWNlKTsqLwogfQpAQCAtODIsNyArODEsNyBAQCBzdHJ1Y3QgZGNfc3VyZmFjZSAqZGNfY3Jl YXRlX3N1cmZhY2UoY29uc3Qgc3RydWN0IGRjICpkYykKIHsKIAlzdHJ1Y3QgY29yZV9kYyAqY29y ZV9kYyA9IERDX1RPX0NPUkUoZGMpOwogCi0Jc3RydWN0IGNvcmVfc3VyZmFjZSAqc3VyZmFjZSA9 IGRtX2FsbG9jKHNpemVvZigqc3VyZmFjZSkpOworCXN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNl ID0gZG1fYWxsb2Moc2l6ZW9mKCpzdXJmYWNlKSk7CiAKIAlpZiAoTlVMTCA9PSBzdXJmYWNlKQog CQlnb3RvIGFsbG9jX2ZhaWw7CkBAIC05Miw3ICs5MSw3IEBAIHN0cnVjdCBkY19zdXJmYWNlICpk Y19jcmVhdGVfc3VyZmFjZShjb25zdCBzdHJ1Y3QgZGMgKmRjKQogCiAJKytzdXJmYWNlLT5yZWZf Y291bnQ7CiAKLQlyZXR1cm4gJnN1cmZhY2UtPnB1YmxpYzsKKwlyZXR1cm4gc3VyZmFjZTsKIAog Y29uc3RydWN0X2ZhaWw6CiAJZG1fZnJlZShzdXJmYWNlKTsKQEAgLTEwNCwyMCArMTAzLDE5IEBA IHN0cnVjdCBkY19zdXJmYWNlICpkY19jcmVhdGVfc3VyZmFjZShjb25zdCBzdHJ1Y3QgZGMgKmRj KQogY29uc3Qgc3RydWN0IGRjX3N1cmZhY2Vfc3RhdHVzICpkY19zdXJmYWNlX2dldF9zdGF0dXMo CiAJCWNvbnN0IHN0cnVjdCBkY19zdXJmYWNlICpkY19zdXJmYWNlKQogewotCXN0cnVjdCBkY19z dXJmYWNlX3N0YXR1cyAqc3VyZmFjZV9zdGF0dXM7Ci0Jc3RydWN0IGNvcmVfc3VyZmFjZSAqY29y ZV9zdXJmYWNlID0gRENfU1VSRkFDRV9UT19DT1JFKGRjX3N1cmZhY2UpOworCWNvbnN0IHN0cnVj dCBkY19zdXJmYWNlX3N0YXR1cyAqc3VyZmFjZV9zdGF0dXM7CiAJc3RydWN0IGNvcmVfZGMgKmNv cmVfZGM7CiAJaW50IGk7CiAKIAlpZiAoIWRjX3N1cmZhY2UgfHwKLQkJIWNvcmVfc3VyZmFjZS0+ Y3R4IHx8Ci0JCSFjb3JlX3N1cmZhY2UtPmN0eC0+ZGMpIHsKKwkJIWRjX3N1cmZhY2UtPmN0eCB8 fAorCQkhZGNfc3VyZmFjZS0+Y3R4LT5kYykgewogCQlBU1NFUlQoMCk7CiAJCXJldHVybiBOVUxM OyAvKiByZW1vdmUgdGhpcyBpZiBhYm92ZSBhc3NlcnQgbmV2ZXIgaGl0ICovCiAJfQogCi0Jc3Vy ZmFjZV9zdGF0dXMgPSAmY29yZV9zdXJmYWNlLT5zdGF0dXM7Ci0JY29yZV9kYyA9IERDX1RPX0NP UkUoY29yZV9zdXJmYWNlLT5jdHgtPmRjKTsKKwlzdXJmYWNlX3N0YXR1cyA9ICZkY19zdXJmYWNl LT5zdGF0dXM7CisJY29yZV9kYyA9IERDX1RPX0NPUkUoZGNfc3VyZmFjZS0+Y3R4LT5kYyk7CiAK IAlpZiAoY29yZV9kYy0+Y3VycmVudF9jb250ZXh0ID09IE5VTEwpCiAJCXJldHVybiBOVUxMOwpA QCAtMTI2LDcgKzEyNCw3IEBAIGNvbnN0IHN0cnVjdCBkY19zdXJmYWNlX3N0YXR1cyAqZGNfc3Vy ZmFjZV9nZXRfc3RhdHVzKAogCQlzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4ID0KIAkJCQkmY29y ZV9kYy0+Y3VycmVudF9jb250ZXh0LT5yZXNfY3R4LnBpcGVfY3R4W2ldOwogCi0JCWlmIChwaXBl X2N0eC0+c3VyZmFjZSAhPSBjb3JlX3N1cmZhY2UpCisJCWlmIChwaXBlX2N0eC0+c3VyZmFjZSAh PSBkY19zdXJmYWNlKQogCQkJY29udGludWU7CiAKIAkJY29yZV9kYy0+aHdzcy51cGRhdGVfcGVu ZGluZ19zdGF0dXMocGlwZV9jdHgpOwpAQCAtMTM1LDE4ICsxMzMsMTQgQEAgY29uc3Qgc3RydWN0 IGRjX3N1cmZhY2Vfc3RhdHVzICpkY19zdXJmYWNlX2dldF9zdGF0dXMoCiAJcmV0dXJuIHN1cmZh Y2Vfc3RhdHVzOwogfQogCi12b2lkIGRjX3N1cmZhY2VfcmV0YWluKGNvbnN0IHN0cnVjdCBkY19z dXJmYWNlICpkY19zdXJmYWNlKQordm9pZCBkY19zdXJmYWNlX3JldGFpbihzdHJ1Y3QgZGNfc3Vy ZmFjZSAqc3VyZmFjZSkKIHsKLQlzdHJ1Y3QgY29yZV9zdXJmYWNlICpzdXJmYWNlID0gRENfU1VS RkFDRV9UT19DT1JFKGRjX3N1cmZhY2UpOwotCiAJQVNTRVJUKHN1cmZhY2UtPnJlZl9jb3VudCA+ IDApOwogCSsrc3VyZmFjZS0+cmVmX2NvdW50OwogfQogCi12b2lkIGRjX3N1cmZhY2VfcmVsZWFz ZShjb25zdCBzdHJ1Y3QgZGNfc3VyZmFjZSAqZGNfc3VyZmFjZSkKK3ZvaWQgZGNfc3VyZmFjZV9y ZWxlYXNlKHN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlKQogewotCXN0cnVjdCBjb3JlX3N1cmZh Y2UgKnN1cmZhY2UgPSBEQ19TVVJGQUNFX1RPX0NPUkUoZGNfc3VyZmFjZSk7Ci0KIAlBU1NFUlQo c3VyZmFjZS0+cmVmX2NvdW50ID4gMCk7CiAJLS1zdXJmYWNlLT5yZWZfY291bnQ7CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kYy5oIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2RjL2RjLmgKaW5kZXggZWUwNGMzNTYyMDgxLi5iMTRiYWQxMGRiOTcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kYy5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kYy5oCkBAIC0yOTksNiArMjk5LDE4IEBAIHN0 cnVjdCBkY190cmFuc2Zlcl9mdW5jIHsKIAlpbnQgcmVmX2NvdW50OwogfTsKIAorLyoKKyAqIFRo aXMgc3RydWN0dXJlIGlzIGZpbGxlZCBpbiBieSBkY19zdXJmYWNlX2dldF9zdGF0dXMgYW5kIGNv bnRhaW5zCisgKiB0aGUgbGFzdCByZXF1ZXN0ZWQgYWRkcmVzcyBhbmQgdGhlIGN1cnJlbnRseSBh Y3RpdmUgYWRkcmVzcyBzbyB0aGUgY2FsbGVkCisgKiBjYW4gZGV0ZXJtaW5lIGlmIHRoZXJlIGFy ZSBhbnkgb3V0c3RhbmRpbmcgZmxpcHMKKyAqLworc3RydWN0IGRjX3N1cmZhY2Vfc3RhdHVzIHsK KwlzdHJ1Y3QgZGNfcGxhbmVfYWRkcmVzcyByZXF1ZXN0ZWRfYWRkcmVzczsKKwlzdHJ1Y3QgZGNf cGxhbmVfYWRkcmVzcyBjdXJyZW50X2FkZHJlc3M7CisJYm9vbCBpc19mbGlwX3BlbmRpbmc7CisJ Ym9vbCBpc19yaWdodF9leWU7Cit9OworCiBzdHJ1Y3QgZGNfc3VyZmFjZSB7CiAJc3RydWN0IGRj X3BsYW5lX2FkZHJlc3MgYWRkcmVzczsKIApAQCAtMzI1LDYgKzMzNywxNCBAQCBzdHJ1Y3QgZGNf c3VyZmFjZSB7CiAJYm9vbCB2aXNpYmxlOwogCWJvb2wgZmxpcF9pbW1lZGlhdGU7CiAJYm9vbCBo b3Jpem9udGFsX21pcnJvcjsKKworCS8qIHByaXZhdGUgdG8gREMgY29yZSAqLworCXN0cnVjdCBk Y19zdXJmYWNlX3N0YXR1cyBzdGF0dXM7CisJc3RydWN0IGRjX2NvbnRleHQgKmN0eDsKKworCS8q IHByaXZhdGUgdG8gZGNfc3VyZmFjZS5jICovCisJZW51bSBkY19pcnFfc291cmNlIGlycV9zb3Vy Y2U7CisJaW50IHJlZl9jb3VudDsKIH07CiAKIHN0cnVjdCBkY19wbGFuZV9pbmZvIHsKQEAgLTM0 OCw3ICszNjgsNyBAQCBzdHJ1Y3QgZGNfc2NhbGluZ19pbmZvIHsKIH07CiAKIHN0cnVjdCBkY19z dXJmYWNlX3VwZGF0ZSB7Ci0JY29uc3Qgc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2U7CisJc3Ry dWN0IGRjX3N1cmZhY2UgKnN1cmZhY2U7CiAKIAkvKiBpc3Igc2FmZSB1cGRhdGUgcGFyYW1ldGVy cy4gIG51bGwgbWVhbnMgbm8gdXBkYXRlcyAqLwogCXN0cnVjdCBkY19mbGlwX2FkZHJzICpmbGlw X2FkZHI7CkBAIC0zNjIsMTcgKzM4Miw2IEBAIHN0cnVjdCBkY19zdXJmYWNlX3VwZGF0ZSB7CiAJ c3RydWN0IGRjX3RyYW5zZmVyX2Z1bmMgKmluX3RyYW5zZmVyX2Z1bmM7CiAJc3RydWN0IGRjX2hk cl9zdGF0aWNfbWV0YWRhdGEgKmhkcl9zdGF0aWNfbWV0YWRhdGE7CiB9OwotLyoKLSAqIFRoaXMg c3RydWN0dXJlIGlzIGZpbGxlZCBpbiBieSBkY19zdXJmYWNlX2dldF9zdGF0dXMgYW5kIGNvbnRh aW5zCi0gKiB0aGUgbGFzdCByZXF1ZXN0ZWQgYWRkcmVzcyBhbmQgdGhlIGN1cnJlbnRseSBhY3Rp dmUgYWRkcmVzcyBzbyB0aGUgY2FsbGVkCi0gKiBjYW4gZGV0ZXJtaW5lIGlmIHRoZXJlIGFyZSBh bnkgb3V0c3RhbmRpbmcgZmxpcHMKLSAqLwotc3RydWN0IGRjX3N1cmZhY2Vfc3RhdHVzIHsKLQlz dHJ1Y3QgZGNfcGxhbmVfYWRkcmVzcyByZXF1ZXN0ZWRfYWRkcmVzczsKLQlzdHJ1Y3QgZGNfcGxh bmVfYWRkcmVzcyBjdXJyZW50X2FkZHJlc3M7Ci0JYm9vbCBpc19mbGlwX3BlbmRpbmc7Ci0JYm9v bCBpc19yaWdodF9leWU7Ci19OwogCiAvKgogICogQ3JlYXRlIGEgbmV3IHN1cmZhY2Ugd2l0aCBk ZWZhdWx0IHBhcmFtZXRlcnM7CkBAIC0zODEsOCArMzkwLDggQEAgc3RydWN0IGRjX3N1cmZhY2Ug KmRjX2NyZWF0ZV9zdXJmYWNlKGNvbnN0IHN0cnVjdCBkYyAqZGMpOwogY29uc3Qgc3RydWN0IGRj X3N1cmZhY2Vfc3RhdHVzICpkY19zdXJmYWNlX2dldF9zdGF0dXMoCiAJCWNvbnN0IHN0cnVjdCBk Y19zdXJmYWNlICpkY19zdXJmYWNlKTsKIAotdm9pZCBkY19zdXJmYWNlX3JldGFpbihjb25zdCBz dHJ1Y3QgZGNfc3VyZmFjZSAqZGNfc3VyZmFjZSk7Ci12b2lkIGRjX3N1cmZhY2VfcmVsZWFzZShj b25zdCBzdHJ1Y3QgZGNfc3VyZmFjZSAqZGNfc3VyZmFjZSk7Cit2b2lkIGRjX3N1cmZhY2VfcmV0 YWluKHN0cnVjdCBkY19zdXJmYWNlICpkY19zdXJmYWNlKTsKK3ZvaWQgZGNfc3VyZmFjZV9yZWxl YXNlKHN0cnVjdCBkY19zdXJmYWNlICpkY19zdXJmYWNlKTsKIAogdm9pZCBkY19nYW1tYV9yZXRh aW4oY29uc3Qgc3RydWN0IGRjX2dhbW1hICpkY19nYW1tYSk7CiB2b2lkIGRjX2dhbW1hX3JlbGVh c2UoY29uc3Qgc3RydWN0IGRjX2dhbW1hICoqZGNfZ2FtbWEpOwpAQCAtNDE2LDcgKzQyNSw3IEBA IHN0cnVjdCBkY19mbGlwX2FkZHJzIHsKIAogYm9vbCBkY19jb21taXRfc3VyZmFjZXNfdG9fc3Ry ZWFtKAogCQlzdHJ1Y3QgZGMgKmRjLAotCQljb25zdCBzdHJ1Y3QgZGNfc3VyZmFjZSAqKmRjX3N1 cmZhY2VzLAorCQlzdHJ1Y3QgZGNfc3VyZmFjZSAqKmRjX3N1cmZhY2VzLAogCQl1aW50OF90IHN1 cmZhY2VfY291bnQsCiAJCWNvbnN0IHN0cnVjdCBkY19zdHJlYW0gKnN0cmVhbSk7CiAKQEAgLTU0 NSw3ICs1NTQsNyBAQCBib29sIGRjX3N0cmVhbV9nZXRfc2Nhbm91dHBvcyhjb25zdCBzdHJ1Y3Qg ZGNfc3RyZWFtICpzdHJlYW0sCiAgKi8KIHN0cnVjdCBkY192YWxpZGF0aW9uX3NldCB7CiAJY29u c3Qgc3RydWN0IGRjX3N0cmVhbSAqc3RyZWFtOwotCWNvbnN0IHN0cnVjdCBkY19zdXJmYWNlICpz dXJmYWNlc1tNQVhfU1VSRkFDRVNdOworCXN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlc1tNQVhf U1VSRkFDRVNdOwogCXVpbnQ4X3Qgc3VyZmFjZV9jb3VudDsKIH07CiAKQEAgLTYyNyw3ICs2MzYs NyBAQCB2b2lkIGRjX3N0cmVhbV9yZWxlYXNlKGNvbnN0IHN0cnVjdCBkY19zdHJlYW0gKmRjX3N0 cmVhbSk7CiBzdHJ1Y3QgZGNfc3RyZWFtX3N0YXR1cyB7CiAJaW50IHByaW1hcnlfb3RnX2luc3Q7 CiAJaW50IHN1cmZhY2VfY291bnQ7Ci0JY29uc3Qgc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2Vz W01BWF9TVVJGQUNFX05VTV07CisJc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2VzW01BWF9TVVJG QUNFX05VTV07CiAKIAkvKgogCSAqIGxpbmsgdGhpcyBzdHJlYW0gcGFzc2VzIHRocm91Z2gKQEAg LTYzNSw3ICs2NDQsNyBAQCBzdHJ1Y3QgZGNfc3RyZWFtX3N0YXR1cyB7CiAJY29uc3Qgc3RydWN0 IGRjX2xpbmsgKmxpbms7CiB9OwogCi1jb25zdCBzdHJ1Y3QgZGNfc3RyZWFtX3N0YXR1cyAqZGNf c3RyZWFtX2dldF9zdGF0dXMoCitzdHJ1Y3QgZGNfc3RyZWFtX3N0YXR1cyAqZGNfc3RyZWFtX2dl dF9zdGF0dXMoCiAJY29uc3Qgc3RydWN0IGRjX3N0cmVhbSAqZGNfc3RyZWFtKTsKIAogZW51bSBz dXJmYWNlX3VwZGF0ZV90eXBlIGRjX2NoZWNrX3VwZGF0ZV9zdXJmYWNlc19mb3Jfc3RyZWFtKApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfaHdzZXEu YyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2h3c2VxLmMKaW5kZXgg Y2MzMTc4YWNmYzU0Li5hOGMyNTRmNjZjOTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kY2UvZGNlX2h3c2VxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2RjZS9kY2VfaHdzZXEuYwpAQCAtMTkzLDkgKzE5Myw5IEBAIHZvaWQgZGNlX2Ny dGNfc3dpdGNoX3RvX2Nsa19zcmMoc3RydWN0IGRjZV9od3NlcSAqaHdzLAogfQogCiAvKiBPbmx5 IHVzZSBMVVQgZm9yIDggYml0IGZvcm1hdHMgKi8KLWJvb2wgZGNlX3VzZV9sdXQoY29uc3Qgc3Ry dWN0IGNvcmVfc3VyZmFjZSAqc3VyZmFjZSkKK2Jvb2wgZGNlX3VzZV9sdXQoY29uc3Qgc3RydWN0 IGRjX3N1cmZhY2UgKnN1cmZhY2UpCiB7Ci0Jc3dpdGNoIChzdXJmYWNlLT5wdWJsaWMuZm9ybWF0 KSB7CisJc3dpdGNoIChzdXJmYWNlLT5mb3JtYXQpIHsKIAljYXNlIFNVUkZBQ0VfUElYRUxfRk9S TUFUX0dSUEhfQVJHQjg4ODg6CiAJY2FzZSBTVVJGQUNFX1BJWEVMX0ZPUk1BVF9HUlBIX0FCR1I4 ODg4OgogCQlyZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9kYy9kY2UvZGNlX2h3c2VxLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv ZGNlL2RjZV9od3NlcS5oCmluZGV4IGE4YTU1NjljZjNmNy4uNDkwY2ExMjhkYWRhIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9od3NlcS5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2h3c2VxLmgKQEAgLTU1OCw1 ICs1NTgsNSBAQCB2b2lkIGRjZV9jcnRjX3N3aXRjaF90b19jbGtfc3JjKHN0cnVjdCBkY2VfaHdz ZXEgKmh3cywKIAkJc3RydWN0IGNsb2NrX3NvdXJjZSAqY2xrX3NyYywKIAkJdW5zaWduZWQgaW50 IHRnX2luc3QpOwogCi1ib29sIGRjZV91c2VfbHV0KGNvbnN0IHN0cnVjdCBjb3JlX3N1cmZhY2Ug KnN1cmZhY2UpOworYm9vbCBkY2VfdXNlX2x1dChjb25zdCBzdHJ1Y3QgZGNfc3VyZmFjZSAqc3Vy ZmFjZSk7CiAjZW5kaWYgICAvKl9fRENFX0hXU0VRX0hfXyovCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9od19zZXF1ZW5jZXIuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX2h3X3NlcXVlbmNlci5j CmluZGV4IGVmYmE4ZDc5NjRlYi4uY2Y2YmYyMDk4YjdjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9od19zZXF1ZW5jZXIuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9od19zZXF1ZW5jZXIu YwpAQCAtMjE1LDExICsyMTUsMTEgQEAgc3RhdGljIGJvb2wgZGNlMTEwX2VuYWJsZV9kaXNwbGF5 X3Bvd2VyX2dhdGluZygKIH0KIAogc3RhdGljIHZvaWQgYnVpbGRfcHJlc2NhbGVfcGFyYW1zKHN0 cnVjdCBpcHBfcHJlc2NhbGVfcGFyYW1zICpwcmVzY2FsZV9wYXJhbXMsCi0JCWNvbnN0IHN0cnVj dCBjb3JlX3N1cmZhY2UgKnN1cmZhY2UpCisJCWNvbnN0IHN0cnVjdCBkY19zdXJmYWNlICpzdXJm YWNlKQogewogCXByZXNjYWxlX3BhcmFtcy0+bW9kZSA9IElQUF9QUkVTQ0FMRV9NT0RFX0ZJWEVE X1VOU0lHTkVEOwogCi0Jc3dpdGNoIChzdXJmYWNlLT5wdWJsaWMuZm9ybWF0KSB7CisJc3dpdGNo IChzdXJmYWNlLT5mb3JtYXQpIHsKIAljYXNlIFNVUkZBQ0VfUElYRUxfRk9STUFUX0dSUEhfQVJH Qjg4ODg6CiAJY2FzZSBTVVJGQUNFX1BJWEVMX0ZPUk1BVF9HUlBIX0FCR1I4ODg4OgogCQlwcmVz Y2FsZV9wYXJhbXMtPnNjYWxlID0gMHgyMDIwOwpAQCAtMjQwLDcgKzI0MCw3IEBAIHN0YXRpYyB2 b2lkIGJ1aWxkX3ByZXNjYWxlX3BhcmFtcyhzdHJ1Y3QgaXBwX3ByZXNjYWxlX3BhcmFtcyAqcHJl c2NhbGVfcGFyYW1zLAogCiBzdGF0aWMgYm9vbCBkY2UxMTBfc2V0X2lucHV0X3RyYW5zZmVyX2Z1 bmMoCiAJc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCwKLQljb25zdCBzdHJ1Y3QgY29yZV9zdXJm YWNlICpzdXJmYWNlKQorCWNvbnN0IHN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlKQogewogCXN0 cnVjdCBpbnB1dF9waXhlbF9wcm9jZXNzb3IgKmlwcCA9IHBpcGVfY3R4LT5pcHA7CiAJY29uc3Qg c3RydWN0IGRjX3RyYW5zZmVyX2Z1bmMgKnRmID0gTlVMTDsKQEAgLTI1MCwxNCArMjUwLDE0IEBA IHN0YXRpYyBib29sIGRjZTExMF9zZXRfaW5wdXRfdHJhbnNmZXJfZnVuYygKIAlpZiAoaXBwID09 IE5VTEwpCiAJCXJldHVybiBmYWxzZTsKIAotCWlmIChzdXJmYWNlLT5wdWJsaWMuaW5fdHJhbnNm ZXJfZnVuYykKLQkJdGYgPSBzdXJmYWNlLT5wdWJsaWMuaW5fdHJhbnNmZXJfZnVuYzsKKwlpZiAo c3VyZmFjZS0+aW5fdHJhbnNmZXJfZnVuYykKKwkJdGYgPSBzdXJmYWNlLT5pbl90cmFuc2Zlcl9m dW5jOwogCiAJYnVpbGRfcHJlc2NhbGVfcGFyYW1zKCZwcmVzY2FsZV9wYXJhbXMsIHN1cmZhY2Up OwogCWlwcC0+ZnVuY3MtPmlwcF9wcm9ncmFtX3ByZXNjYWxlKGlwcCwgJnByZXNjYWxlX3BhcmFt cyk7CiAKLQlpZiAoc3VyZmFjZS0+cHVibGljLmdhbW1hX2NvcnJlY3Rpb24gJiYgZGNlX3VzZV9s dXQoc3VyZmFjZSkpCi0JCWlwcC0+ZnVuY3MtPmlwcF9wcm9ncmFtX2lucHV0X2x1dChpcHAsIHN1 cmZhY2UtPnB1YmxpYy5nYW1tYV9jb3JyZWN0aW9uKTsKKwlpZiAoc3VyZmFjZS0+Z2FtbWFfY29y cmVjdGlvbiAmJiBkY2VfdXNlX2x1dChzdXJmYWNlKSkKKwkJaXBwLT5mdW5jcy0+aXBwX3Byb2dy YW1faW5wdXRfbHV0KGlwcCwgc3VyZmFjZS0+Z2FtbWFfY29ycmVjdGlvbik7CiAKIAlpZiAodGYg PT0gTlVMTCkgewogCQkvKiBEZWZhdWx0IGNhc2UgaWYgbm8gaW5wdXQgdHJhbnNmZXIgZnVuY3Rp b24gc3BlY2lmaWVkICovCkBAIC0xODU3LDcgKzE4NTcsNyBAQCBzdGF0aWMgdm9pZCBzZXRfZGVm YXVsdF9jb2xvcnMoc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCkKIAkJZGVmYXVsdF9hZGp1c3Qu aW5fY29sb3Jfc3BhY2UgPSBDT0xPUl9TUEFDRV9TUkdCOwogCWVsc2UKIAkJZGVmYXVsdF9hZGp1 c3QuaW5fY29sb3Jfc3BhY2UgPQotCQkJCXBpcGVfY3R4LT5zdXJmYWNlLT5wdWJsaWMuY29sb3Jf c3BhY2U7CisJCQkJcGlwZV9jdHgtPnN1cmZhY2UtPmNvbG9yX3NwYWNlOwogCWlmIChwaXBlX2N0 eC0+c3RyZWFtID09IE5VTEwpCiAJCWRlZmF1bHRfYWRqdXN0Lm91dF9jb2xvcl9zcGFjZSA9IENP TE9SX1NQQUNFX1NSR0I7CiAJZWxzZQpAQCAtMTkwOCwxNiArMTkwOCwxNiBAQCBzdGF0aWMgdm9p ZCBwcm9ncmFtX3N1cmZhY2VfdmlzaWJpbGl0eShjb25zdCBzdHJ1Y3QgY29yZV9kYyAqZGMsCiAJ CS8qIEZvciBub3cgd2UgYXJlIHN1cHBvcnRpbmcgb25seSB0d28gcGlwZXMgKi8KIAkJQVNTRVJU KHBpcGVfY3R4LT5ib3R0b21fcGlwZS0+Ym90dG9tX3BpcGUgPT0gTlVMTCk7CiAKLQkJaWYgKHBp cGVfY3R4LT5ib3R0b21fcGlwZS0+c3VyZmFjZS0+cHVibGljLnZpc2libGUpIHsKLQkJCWlmIChw aXBlX2N0eC0+c3VyZmFjZS0+cHVibGljLnZpc2libGUpCisJCWlmIChwaXBlX2N0eC0+Ym90dG9t X3BpcGUtPnN1cmZhY2UtPnZpc2libGUpIHsKKwkJCWlmIChwaXBlX2N0eC0+c3VyZmFjZS0+dmlz aWJsZSkKIAkJCQlibGVuZGVyX21vZGUgPSBCTE5EX01PREVfQkxFTkRJTkc7CiAJCQllbHNlCiAJ CQkJYmxlbmRlcl9tb2RlID0gQkxORF9NT0RFX09USEVSX1BJUEU7CiAKLQkJfSBlbHNlIGlmICgh cGlwZV9jdHgtPnN1cmZhY2UtPnB1YmxpYy52aXNpYmxlKQorCQl9IGVsc2UgaWYgKCFwaXBlX2N0 eC0+c3VyZmFjZS0+dmlzaWJsZSkKIAkJCWJsYW5rX3RhcmdldCA9IHRydWU7CiAKLQl9IGVsc2Ug aWYgKCFwaXBlX2N0eC0+c3VyZmFjZS0+cHVibGljLnZpc2libGUpCisJfSBlbHNlIGlmICghcGlw ZV9jdHgtPnN1cmZhY2UtPnZpc2libGUpCiAJCWJsYW5rX3RhcmdldCA9IHRydWU7CiAKIAlkY2Vf c2V0X2JsZW5kZXJfbW9kZShkYy0+aHdzZXEsIHBpcGVfY3R4LT5waXBlX2lkeCwgYmxlbmRlcl9t b2RlKTsKQEAgLTE5NzUsNyArMTk3NSw3IEBAIHN0YXRpYyB2b2lkIHNldF9wbGFuZV9jb25maWco CiAJc3RydWN0IHJlc291cmNlX2NvbnRleHQgKnJlc19jdHgpCiB7CiAJc3RydWN0IG1lbV9pbnB1 dCAqbWkgPSBwaXBlX2N0eC0+bWk7Ci0Jc3RydWN0IGNvcmVfc3VyZmFjZSAqc3VyZmFjZSA9IHBp cGVfY3R4LT5zdXJmYWNlOworCXN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlID0gcGlwZV9jdHgt PnN1cmZhY2U7CiAJc3RydWN0IHhmbV9ncnBoX2NzY19hZGp1c3RtZW50IGFkanVzdDsKIAlzdHJ1 Y3Qgb3V0X2NzY19jb2xvcl9tYXRyaXggdGJsX2VudHJ5OwogCXVuc2lnbmVkIGludCBpOwpAQCAt MjA0MCw0MiArMjA0MCw0MiBAQCBzdGF0aWMgdm9pZCBzZXRfcGxhbmVfY29uZmlnKAogCiAJbWkt PmZ1bmNzLT5tZW1faW5wdXRfcHJvZ3JhbV9zdXJmYWNlX2NvbmZpZygKIAkJCW1pLAotCQkJc3Vy ZmFjZS0+cHVibGljLmZvcm1hdCwKLQkJCSZzdXJmYWNlLT5wdWJsaWMudGlsaW5nX2luZm8sCi0J CQkmc3VyZmFjZS0+cHVibGljLnBsYW5lX3NpemUsCi0JCQlzdXJmYWNlLT5wdWJsaWMucm90YXRp b24sCisJCQlzdXJmYWNlLT5mb3JtYXQsCisJCQkmc3VyZmFjZS0+dGlsaW5nX2luZm8sCisJCQkm c3VyZmFjZS0+cGxhbmVfc2l6ZSwKKwkJCXN1cmZhY2UtPnJvdGF0aW9uLAogCQkJTlVMTCwKIAkJ CWZhbHNlKTsKIAlpZiAobWktPmZ1bmNzLT5zZXRfYmxhbmspCi0JCW1pLT5mdW5jcy0+c2V0X2Js YW5rKG1pLCBwaXBlX2N0eC0+c3VyZmFjZS0+cHVibGljLnZpc2libGUpOworCQltaS0+ZnVuY3Mt PnNldF9ibGFuayhtaSwgcGlwZV9jdHgtPnN1cmZhY2UtPnZpc2libGUpOwogCiAJaWYgKGRjLT5w dWJsaWMuY29uZmlnLmdwdV92bV9zdXBwb3J0KQogCQltaS0+ZnVuY3MtPm1lbV9pbnB1dF9wcm9n cmFtX3B0ZV92bSgKIAkJCQlwaXBlX2N0eC0+bWksCi0JCQkJc3VyZmFjZS0+cHVibGljLmZvcm1h dCwKLQkJCQkmc3VyZmFjZS0+cHVibGljLnRpbGluZ19pbmZvLAotCQkJCXN1cmZhY2UtPnB1Ymxp Yy5yb3RhdGlvbik7CisJCQkJc3VyZmFjZS0+Zm9ybWF0LAorCQkJCSZzdXJmYWNlLT50aWxpbmdf aW5mbywKKwkJCQlzdXJmYWNlLT5yb3RhdGlvbik7CiB9CiAKIHN0YXRpYyB2b2lkIHVwZGF0ZV9w bGFuZV9hZGRyKGNvbnN0IHN0cnVjdCBjb3JlX2RjICpkYywKIAkJc3RydWN0IHBpcGVfY3R4ICpw aXBlX2N0eCkKIHsKLQlzdHJ1Y3QgY29yZV9zdXJmYWNlICpzdXJmYWNlID0gcGlwZV9jdHgtPnN1 cmZhY2U7CisJc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2UgPSBwaXBlX2N0eC0+c3VyZmFjZTsK IAogCWlmIChzdXJmYWNlID09IE5VTEwpCiAJCXJldHVybjsKIAogCXBpcGVfY3R4LT5taS0+ZnVu Y3MtPm1lbV9pbnB1dF9wcm9ncmFtX3N1cmZhY2VfZmxpcF9hbmRfYWRkcigKIAkJCXBpcGVfY3R4 LT5taSwKLQkJCSZzdXJmYWNlLT5wdWJsaWMuYWRkcmVzcywKLQkJCXN1cmZhY2UtPnB1YmxpYy5m bGlwX2ltbWVkaWF0ZSk7CisJCQkmc3VyZmFjZS0+YWRkcmVzcywKKwkJCXN1cmZhY2UtPmZsaXBf aW1tZWRpYXRlKTsKIAotCXN1cmZhY2UtPnN0YXR1cy5yZXF1ZXN0ZWRfYWRkcmVzcyA9IHN1cmZh Y2UtPnB1YmxpYy5hZGRyZXNzOworCXN1cmZhY2UtPnN0YXR1cy5yZXF1ZXN0ZWRfYWRkcmVzcyA9 IHN1cmZhY2UtPmFkZHJlc3M7CiB9CiAKIHZvaWQgZGNlMTEwX3VwZGF0ZV9wZW5kaW5nX3N0YXR1 cyhzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4KQogewotCXN0cnVjdCBjb3JlX3N1cmZhY2UgKnN1 cmZhY2UgPSBwaXBlX2N0eC0+c3VyZmFjZTsKKwlzdHJ1Y3QgZGNfc3VyZmFjZSAqc3VyZmFjZSA9 IHBpcGVfY3R4LT5zdXJmYWNlOwogCiAJaWYgKHN1cmZhY2UgPT0gTlVMTCkKIAkJcmV0dXJuOwpA QCAtMjA4NCw3ICsyMDg0LDcgQEAgdm9pZCBkY2UxMTBfdXBkYXRlX3BlbmRpbmdfc3RhdHVzKHN0 cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHgpCiAJCQlwaXBlX2N0eC0+bWktPmZ1bmNzLT5tZW1faW5w dXRfaXNfZmxpcF9wZW5kaW5nKAogCQkJCQlwaXBlX2N0eC0+bWkpOwogCi0JaWYgKHN1cmZhY2Ut PnN0YXR1cy5pc19mbGlwX3BlbmRpbmcgJiYgIXN1cmZhY2UtPnB1YmxpYy52aXNpYmxlKQorCWlm IChzdXJmYWNlLT5zdGF0dXMuaXNfZmxpcF9wZW5kaW5nICYmICFzdXJmYWNlLT52aXNpYmxlKQog CQlwaXBlX2N0eC0+bWktPmN1cnJlbnRfYWRkcmVzcyA9IHBpcGVfY3R4LT5taS0+cmVxdWVzdF9h ZGRyZXNzOwogCiAJc3VyZmFjZS0+c3RhdHVzLmN1cnJlbnRfYWRkcmVzcyA9IHBpcGVfY3R4LT5t aS0+Y3VycmVudF9hZGRyZXNzOwpAQCAtMjQyNSw3ICsyNDI1LDcgQEAgc3RhdGljIHZvaWQgZGNl MTEwX3Byb2dyYW1fZnJvbnRfZW5kX2Zvcl9waXBlKAogewogCXN0cnVjdCBtZW1faW5wdXQgKm1p ID0gcGlwZV9jdHgtPm1pOwogCXN0cnVjdCBwaXBlX2N0eCAqb2xkX3BpcGUgPSBOVUxMOwotCXN0 cnVjdCBjb3JlX3N1cmZhY2UgKnN1cmZhY2UgPSBwaXBlX2N0eC0+c3VyZmFjZTsKKwlzdHJ1Y3Qg ZGNfc3VyZmFjZSAqc3VyZmFjZSA9IHBpcGVfY3R4LT5zdXJmYWNlOwogCXN0cnVjdCB4Zm1fZ3Jw aF9jc2NfYWRqdXN0bWVudCBhZGp1c3Q7CiAJc3RydWN0IG91dF9jc2NfY29sb3JfbWF0cml4IHRi bF9lbnRyeTsKIAl1bnNpZ25lZCBpbnQgaTsKQEAgLTI0OTMsMjEgKzI0OTMsMjEgQEAgc3RhdGlj IHZvaWQgZGNlMTEwX3Byb2dyYW1fZnJvbnRfZW5kX2Zvcl9waXBlKAogCiAJbWktPmZ1bmNzLT5t ZW1faW5wdXRfcHJvZ3JhbV9zdXJmYWNlX2NvbmZpZygKIAkJCW1pLAotCQkJc3VyZmFjZS0+cHVi bGljLmZvcm1hdCwKLQkJCSZzdXJmYWNlLT5wdWJsaWMudGlsaW5nX2luZm8sCi0JCQkmc3VyZmFj ZS0+cHVibGljLnBsYW5lX3NpemUsCi0JCQlzdXJmYWNlLT5wdWJsaWMucm90YXRpb24sCisJCQlz dXJmYWNlLT5mb3JtYXQsCisJCQkmc3VyZmFjZS0+dGlsaW5nX2luZm8sCisJCQkmc3VyZmFjZS0+ cGxhbmVfc2l6ZSwKKwkJCXN1cmZhY2UtPnJvdGF0aW9uLAogCQkJTlVMTCwKIAkJCWZhbHNlKTsK IAlpZiAobWktPmZ1bmNzLT5zZXRfYmxhbmspCi0JCW1pLT5mdW5jcy0+c2V0X2JsYW5rKG1pLCBw aXBlX2N0eC0+c3VyZmFjZS0+cHVibGljLnZpc2libGUpOworCQltaS0+ZnVuY3MtPnNldF9ibGFu ayhtaSwgcGlwZV9jdHgtPnN1cmZhY2UtPnZpc2libGUpOwogCiAJaWYgKGRjLT5wdWJsaWMuY29u ZmlnLmdwdV92bV9zdXBwb3J0KQogCQltaS0+ZnVuY3MtPm1lbV9pbnB1dF9wcm9ncmFtX3B0ZV92 bSgKIAkJCQlwaXBlX2N0eC0+bWksCi0JCQkJc3VyZmFjZS0+cHVibGljLmZvcm1hdCwKLQkJCQkm c3VyZmFjZS0+cHVibGljLnRpbGluZ19pbmZvLAotCQkJCXN1cmZhY2UtPnB1YmxpYy5yb3RhdGlv bik7CisJCQkJc3VyZmFjZS0+Zm9ybWF0LAorCQkJCSZzdXJmYWNlLT50aWxpbmdfaW5mbywKKwkJ CQlzdXJmYWNlLT5yb3RhdGlvbik7CiAKIAlkbV9sb2dnZXJfd3JpdGUoZGMtPmN0eC0+bG9nZ2Vy LCBMT0dfU1VSRkFDRSwKIAkJCSJQaXBlOiVkIDB4JXg6IGFkZHIgaGk6MHgleCwgIgpAQCAtMjUx NywyMCArMjUxNywyMCBAQCBzdGF0aWMgdm9pZCBkY2UxMTBfcHJvZ3JhbV9mcm9udF9lbmRfZm9y X3BpcGUoCiAJCQkiY2xpcDogJWQsICVkLCAlZCwgJWRcbiIsCiAJCQlwaXBlX2N0eC0+cGlwZV9p ZHgsCiAJCQlwaXBlX2N0eC0+c3VyZmFjZSwKLQkJCXBpcGVfY3R4LT5zdXJmYWNlLT5wdWJsaWMu YWRkcmVzcy5ncnBoLmFkZHIuaGlnaF9wYXJ0LAotCQkJcGlwZV9jdHgtPnN1cmZhY2UtPnB1Ymxp Yy5hZGRyZXNzLmdycGguYWRkci5sb3dfcGFydCwKLQkJCXBpcGVfY3R4LT5zdXJmYWNlLT5wdWJs aWMuc3JjX3JlY3QueCwKLQkJCXBpcGVfY3R4LT5zdXJmYWNlLT5wdWJsaWMuc3JjX3JlY3QueSwK LQkJCXBpcGVfY3R4LT5zdXJmYWNlLT5wdWJsaWMuc3JjX3JlY3Qud2lkdGgsCi0JCQlwaXBlX2N0 eC0+c3VyZmFjZS0+cHVibGljLnNyY19yZWN0LmhlaWdodCwKLQkJCXBpcGVfY3R4LT5zdXJmYWNl LT5wdWJsaWMuZHN0X3JlY3QueCwKLQkJCXBpcGVfY3R4LT5zdXJmYWNlLT5wdWJsaWMuZHN0X3Jl Y3QueSwKLQkJCXBpcGVfY3R4LT5zdXJmYWNlLT5wdWJsaWMuZHN0X3JlY3Qud2lkdGgsCi0JCQlw aXBlX2N0eC0+c3VyZmFjZS0+cHVibGljLmRzdF9yZWN0LmhlaWdodCwKLQkJCXBpcGVfY3R4LT5z dXJmYWNlLT5wdWJsaWMuY2xpcF9yZWN0LngsCi0JCQlwaXBlX2N0eC0+c3VyZmFjZS0+cHVibGlj LmNsaXBfcmVjdC55LAotCQkJcGlwZV9jdHgtPnN1cmZhY2UtPnB1YmxpYy5jbGlwX3JlY3Qud2lk dGgsCi0JCQlwaXBlX2N0eC0+c3VyZmFjZS0+cHVibGljLmNsaXBfcmVjdC5oZWlnaHQpOworCQkJ cGlwZV9jdHgtPnN1cmZhY2UtPmFkZHJlc3MuZ3JwaC5hZGRyLmhpZ2hfcGFydCwKKwkJCXBpcGVf Y3R4LT5zdXJmYWNlLT5hZGRyZXNzLmdycGguYWRkci5sb3dfcGFydCwKKwkJCXBpcGVfY3R4LT5z dXJmYWNlLT5zcmNfcmVjdC54LAorCQkJcGlwZV9jdHgtPnN1cmZhY2UtPnNyY19yZWN0LnksCisJ CQlwaXBlX2N0eC0+c3VyZmFjZS0+c3JjX3JlY3Qud2lkdGgsCisJCQlwaXBlX2N0eC0+c3VyZmFj ZS0+c3JjX3JlY3QuaGVpZ2h0LAorCQkJcGlwZV9jdHgtPnN1cmZhY2UtPmRzdF9yZWN0LngsCisJ CQlwaXBlX2N0eC0+c3VyZmFjZS0+ZHN0X3JlY3QueSwKKwkJCXBpcGVfY3R4LT5zdXJmYWNlLT5k c3RfcmVjdC53aWR0aCwKKwkJCXBpcGVfY3R4LT5zdXJmYWNlLT5kc3RfcmVjdC5oZWlnaHQsCisJ CQlwaXBlX2N0eC0+c3VyZmFjZS0+Y2xpcF9yZWN0LngsCisJCQlwaXBlX2N0eC0+c3VyZmFjZS0+ Y2xpcF9yZWN0LnksCisJCQlwaXBlX2N0eC0+c3VyZmFjZS0+Y2xpcF9yZWN0LndpZHRoLAorCQkJ cGlwZV9jdHgtPnN1cmZhY2UtPmNsaXBfcmVjdC5oZWlnaHQpOwogCiAJZG1fbG9nZ2VyX3dyaXRl KGRjLT5jdHgtPmxvZ2dlciwgTE9HX1NVUkZBQ0UsCiAJCQkiUGlwZSAlZDogd2lkdGgsIGhlaWdo dCwgeCwgeVxuIgpAQCAtMjU0OSw3ICsyNTQ5LDcgQEAgc3RhdGljIHZvaWQgZGNlMTEwX3Byb2dy YW1fZnJvbnRfZW5kX2Zvcl9waXBlKAogCiBzdGF0aWMgdm9pZCBkY2UxMTBfYXBwbHlfY3R4X2Zv cl9zdXJmYWNlKAogCQlzdHJ1Y3QgY29yZV9kYyAqZGMsCi0JCXN0cnVjdCBjb3JlX3N1cmZhY2Ug KnN1cmZhY2UsCisJCWNvbnN0IHN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlLAogCQlzdHJ1Y3Qg dmFsaWRhdGVfY29udGV4dCAqY29udGV4dCkKIHsKIAlpbnQgaTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3Jlc291cmNlLmMgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9yZXNvdXJjZS5jCmluZGV4 IDhiN2JjMWNjMmI3Yi4uMGZjYjFjZjRiNGNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9yZXNvdXJjZS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3Jlc291cmNlLmMKQEAgLTc2Niw3ICs3 NjYsNyBAQCBzdGF0aWMgYm9vbCBpc19zdXJmYWNlX3BpeGVsX2Zvcm1hdF9zdXBwb3J0ZWQoc3Ry dWN0IHBpcGVfY3R4ICpwaXBlX2N0eCwgdW5zaWduZQogCQlyZXR1cm4gdHJ1ZTsKIAlpZiAoIXBp cGVfY3R4LT5zdXJmYWNlKQogCQlyZXR1cm4gZmFsc2U7Ci0JaWYgKHBpcGVfY3R4LT5zdXJmYWNl LT5wdWJsaWMuZm9ybWF0IDwgU1VSRkFDRV9QSVhFTF9GT1JNQVRfVklERU9fQkVHSU4pCisJaWYg KHBpcGVfY3R4LT5zdXJmYWNlLT5mb3JtYXQgPCBTVVJGQUNFX1BJWEVMX0ZPUk1BVF9WSURFT19C RUdJTikKIAkJcmV0dXJuIGZhbHNlOwogCXJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5j CmluZGV4IGI3OTQwODc2Yzc2MS4uNDM5MDAyM2NhNmRjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfaHdfc2VxdWVuY2VyLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jCkBA IC05NDUsMjQgKzk0NSwyNCBAQCBzdGF0aWMgdm9pZCByZXNldF9od19jdHhfd3JhcCgKIHN0YXRp YyBib29sIHBhdGNoX2FkZHJlc3NfZm9yX3Nic190Yl9zdGVyZW8oCiAJCXN0cnVjdCBwaXBlX2N0 eCAqcGlwZV9jdHgsIFBIWVNJQ0FMX0FERFJFU1NfTE9DICphZGRyKQogewotCXN0cnVjdCBjb3Jl X3N1cmZhY2UgKnN1cmZhY2UgPSBwaXBlX2N0eC0+c3VyZmFjZTsKKwlzdHJ1Y3QgZGNfc3VyZmFj ZSAqc3VyZmFjZSA9IHBpcGVfY3R4LT5zdXJmYWNlOwogCWJvb2wgc2VjX3NwbGl0ID0gcGlwZV9j dHgtPnRvcF9waXBlICYmCiAJCQlwaXBlX2N0eC0+dG9wX3BpcGUtPnN1cmZhY2UgPT0gcGlwZV9j dHgtPnN1cmZhY2U7Ci0JaWYgKHNlY19zcGxpdCAmJiBzdXJmYWNlLT5wdWJsaWMuYWRkcmVzcy50 eXBlID09IFBMTl9BRERSX1RZUEVfR1JQSF9TVEVSRU8gJiYKKwlpZiAoc2VjX3NwbGl0ICYmIHN1 cmZhY2UtPmFkZHJlc3MudHlwZSA9PSBQTE5fQUREUl9UWVBFX0dSUEhfU1RFUkVPICYmCiAJCShw aXBlX2N0eC0+c3RyZWFtLT5wdWJsaWMudGltaW5nLnRpbWluZ18zZF9mb3JtYXQgPT0KIAkJIFRJ TUlOR18zRF9GT1JNQVRfU0lERV9CWV9TSURFIHx8CiAJCSBwaXBlX2N0eC0+c3RyZWFtLT5wdWJs aWMudGltaW5nLnRpbWluZ18zZF9mb3JtYXQgPT0KIAkJIFRJTUlOR18zRF9GT1JNQVRfVE9QX0FO RF9CT1RUT00pKSB7Ci0JCSphZGRyID0gc3VyZmFjZS0+cHVibGljLmFkZHJlc3MuZ3JwaF9zdGVy ZW8ubGVmdF9hZGRyOwotCQlzdXJmYWNlLT5wdWJsaWMuYWRkcmVzcy5ncnBoX3N0ZXJlby5sZWZ0 X2FkZHIgPQotCQlzdXJmYWNlLT5wdWJsaWMuYWRkcmVzcy5ncnBoX3N0ZXJlby5yaWdodF9hZGRy OworCQkqYWRkciA9IHN1cmZhY2UtPmFkZHJlc3MuZ3JwaF9zdGVyZW8ubGVmdF9hZGRyOworCQlz dXJmYWNlLT5hZGRyZXNzLmdycGhfc3RlcmVvLmxlZnRfYWRkciA9CisJCXN1cmZhY2UtPmFkZHJl c3MuZ3JwaF9zdGVyZW8ucmlnaHRfYWRkcjsKIAkJcmV0dXJuIHRydWU7CiAJfSBlbHNlIHsKIAkJ aWYgKHBpcGVfY3R4LT5zdHJlYW0tPnB1YmxpYy52aWV3X2Zvcm1hdCAhPSBWSUVXXzNEX0ZPUk1B VF9OT05FICYmCi0JCQlzdXJmYWNlLT5wdWJsaWMuYWRkcmVzcy50eXBlICE9IFBMTl9BRERSX1RZ UEVfR1JQSF9TVEVSRU8pIHsKLQkJCXN1cmZhY2UtPnB1YmxpYy5hZGRyZXNzLnR5cGUgPSBQTE5f QUREUl9UWVBFX0dSUEhfU1RFUkVPOwotCQkJc3VyZmFjZS0+cHVibGljLmFkZHJlc3MuZ3JwaF9z dGVyZW8ucmlnaHRfYWRkciA9Ci0JCQlzdXJmYWNlLT5wdWJsaWMuYWRkcmVzcy5ncnBoX3N0ZXJl by5sZWZ0X2FkZHI7CisJCQlzdXJmYWNlLT5hZGRyZXNzLnR5cGUgIT0gUExOX0FERFJfVFlQRV9H UlBIX1NURVJFTykgeworCQkJc3VyZmFjZS0+YWRkcmVzcy50eXBlID0gUExOX0FERFJfVFlQRV9H UlBIX1NURVJFTzsKKwkJCXN1cmZhY2UtPmFkZHJlc3MuZ3JwaF9zdGVyZW8ucmlnaHRfYWRkciA9 CisJCQlzdXJmYWNlLT5hZGRyZXNzLmdycGhfc3RlcmVvLmxlZnRfYWRkcjsKIAkJfQogCX0KIAly ZXR1cm4gZmFsc2U7CkBAIC05NzIsMjIgKzk3MiwyMiBAQCBzdGF0aWMgdm9pZCB1cGRhdGVfcGxh bmVfYWRkcihjb25zdCBzdHJ1Y3QgY29yZV9kYyAqZGMsIHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9j dAogewogCWJvb2wgYWRkcl9wYXRjaGVkID0gZmFsc2U7CiAJUEhZU0lDQUxfQUREUkVTU19MT0Mg YWRkcjsKLQlzdHJ1Y3QgY29yZV9zdXJmYWNlICpzdXJmYWNlID0gcGlwZV9jdHgtPnN1cmZhY2U7 CisJc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2UgPSBwaXBlX2N0eC0+c3VyZmFjZTsKIAogCWlm IChzdXJmYWNlID09IE5VTEwpCiAJCXJldHVybjsKIAlhZGRyX3BhdGNoZWQgPSBwYXRjaF9hZGRy ZXNzX2Zvcl9zYnNfdGJfc3RlcmVvKHBpcGVfY3R4LCAmYWRkcik7CiAJcGlwZV9jdHgtPm1pLT5m dW5jcy0+bWVtX2lucHV0X3Byb2dyYW1fc3VyZmFjZV9mbGlwX2FuZF9hZGRyKAogCQkJcGlwZV9j dHgtPm1pLAotCQkJJnN1cmZhY2UtPnB1YmxpYy5hZGRyZXNzLAotCQkJc3VyZmFjZS0+cHVibGlj LmZsaXBfaW1tZWRpYXRlKTsKLQlzdXJmYWNlLT5zdGF0dXMucmVxdWVzdGVkX2FkZHJlc3MgPSBz dXJmYWNlLT5wdWJsaWMuYWRkcmVzczsKKwkJCSZzdXJmYWNlLT5hZGRyZXNzLAorCQkJc3VyZmFj ZS0+ZmxpcF9pbW1lZGlhdGUpOworCXN1cmZhY2UtPnN0YXR1cy5yZXF1ZXN0ZWRfYWRkcmVzcyA9 IHN1cmZhY2UtPmFkZHJlc3M7CiAJaWYgKGFkZHJfcGF0Y2hlZCkKLQkJcGlwZV9jdHgtPnN1cmZh Y2UtPnB1YmxpYy5hZGRyZXNzLmdycGhfc3RlcmVvLmxlZnRfYWRkciA9IGFkZHI7CisJCXBpcGVf Y3R4LT5zdXJmYWNlLT5hZGRyZXNzLmdycGhfc3RlcmVvLmxlZnRfYWRkciA9IGFkZHI7CiB9CiAK IHN0YXRpYyBib29sIGRjbjEwX3NldF9pbnB1dF90cmFuc2Zlcl9mdW5jKAotCXN0cnVjdCBwaXBl X2N0eCAqcGlwZV9jdHgsIGNvbnN0IHN0cnVjdCBjb3JlX3N1cmZhY2UgKnN1cmZhY2UpCisJc3Ry dWN0IHBpcGVfY3R4ICpwaXBlX2N0eCwgY29uc3Qgc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2Up CiB7CiAJc3RydWN0IGlucHV0X3BpeGVsX3Byb2Nlc3NvciAqaXBwID0gcGlwZV9jdHgtPmlwcDsK IAljb25zdCBzdHJ1Y3QgZGNfdHJhbnNmZXJfZnVuYyAqdGYgPSBOVUxMOwpAQCAtOTk2LDEyICs5 OTYsMTIgQEAgc3RhdGljIGJvb2wgZGNuMTBfc2V0X2lucHV0X3RyYW5zZmVyX2Z1bmMoCiAJaWYg KGlwcCA9PSBOVUxMKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlpZiAoc3VyZmFjZS0+cHVibGljLmlu X3RyYW5zZmVyX2Z1bmMpCi0JCXRmID0gc3VyZmFjZS0+cHVibGljLmluX3RyYW5zZmVyX2Z1bmM7 CisJaWYgKHN1cmZhY2UtPmluX3RyYW5zZmVyX2Z1bmMpCisJCXRmID0gc3VyZmFjZS0+aW5fdHJh bnNmZXJfZnVuYzsKIAotCWlmIChzdXJmYWNlLT5wdWJsaWMuZ2FtbWFfY29ycmVjdGlvbiAmJiBk Y2VfdXNlX2x1dChzdXJmYWNlKSkKKwlpZiAoc3VyZmFjZS0+Z2FtbWFfY29ycmVjdGlvbiAmJiBk Y2VfdXNlX2x1dChzdXJmYWNlKSkKIAkJaXBwLT5mdW5jcy0+aXBwX3Byb2dyYW1faW5wdXRfbHV0 KGlwcCwKLQkJCQlzdXJmYWNlLT5wdWJsaWMuZ2FtbWFfY29ycmVjdGlvbik7CisJCQkJc3VyZmFj ZS0+Z2FtbWFfY29ycmVjdGlvbik7CiAKIAlpZiAodGYgPT0gTlVMTCkKIAkJaXBwLT5mdW5jcy0+ aXBwX3NldF9kZWdhbW1hKGlwcCwgSVBQX0RFR0FNTUFfTU9ERV9CWVBBU1MpOwpAQCAtMTU5NCw3 ICsxNTk0LDcgQEAgc3RhdGljIHZvaWQgZGNuMTBfcG93ZXJfb25fZmUoCiAJc3RydWN0IHBpcGVf Y3R4ICpwaXBlX2N0eCwKIAlzdHJ1Y3QgdmFsaWRhdGVfY29udGV4dCAqY29udGV4dCkKIHsKLQlz dHJ1Y3QgZGNfc3VyZmFjZSAqZGNfc3VyZmFjZSA9ICZwaXBlX2N0eC0+c3VyZmFjZS0+cHVibGlj OworCXN0cnVjdCBkY19zdXJmYWNlICpkY19zdXJmYWNlID0gcGlwZV9jdHgtPnN1cmZhY2U7CiAJ c3RydWN0IGRjZV9od3NlcSAqaHdzID0gZGMtPmh3c2VxOwogCiAJcG93ZXJfb25fcGxhbmUoZGMt Pmh3c2VxLApAQCAtMTcxMCw3ICsxNzEwLDcgQEAgc3RhdGljIHZvaWQgcHJvZ3JhbV9jc2NfbWF0 cml4KHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHgsCiB9CiBzdGF0aWMgYm9vbCBpc19sb3dlcl9w aXBlX3RyZWVfdmlzaWJsZShzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4KQogewotCWlmIChwaXBl X2N0eC0+c3VyZmFjZS0+cHVibGljLnZpc2libGUpCisJaWYgKHBpcGVfY3R4LT5zdXJmYWNlLT52 aXNpYmxlKQogCQlyZXR1cm4gdHJ1ZTsKIAlpZiAocGlwZV9jdHgtPmJvdHRvbV9waXBlICYmIGlz X2xvd2VyX3BpcGVfdHJlZV92aXNpYmxlKHBpcGVfY3R4LT5ib3R0b21fcGlwZSkpCiAJCXJldHVy biB0cnVlOwpAQCAtMTcxOSw3ICsxNzE5LDcgQEAgc3RhdGljIGJvb2wgaXNfbG93ZXJfcGlwZV90 cmVlX3Zpc2libGUoc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCkKIAogc3RhdGljIGJvb2wgaXNf dXBwZXJfcGlwZV90cmVlX3Zpc2libGUoc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCkKIHsKLQlp ZiAocGlwZV9jdHgtPnN1cmZhY2UtPnB1YmxpYy52aXNpYmxlKQorCWlmIChwaXBlX2N0eC0+c3Vy ZmFjZS0+dmlzaWJsZSkKIAkJcmV0dXJuIHRydWU7CiAJaWYgKHBpcGVfY3R4LT50b3BfcGlwZSAm JiBpc191cHBlcl9waXBlX3RyZWVfdmlzaWJsZShwaXBlX2N0eC0+dG9wX3BpcGUpKQogCQlyZXR1 cm4gdHJ1ZTsKQEAgLTE3MjgsNyArMTcyOCw3IEBAIHN0YXRpYyBib29sIGlzX3VwcGVyX3BpcGVf dHJlZV92aXNpYmxlKHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHgpCiAKIHN0YXRpYyBib29sIGlz X3BpcGVfdHJlZV92aXNpYmxlKHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHgpCiB7Ci0JaWYgKHBp cGVfY3R4LT5zdXJmYWNlLT5wdWJsaWMudmlzaWJsZSkKKwlpZiAocGlwZV9jdHgtPnN1cmZhY2Ut PnZpc2libGUpCiAJCXJldHVybiB0cnVlOwogCWlmIChwaXBlX2N0eC0+dG9wX3BpcGUgJiYgaXNf dXBwZXJfcGlwZV90cmVlX3Zpc2libGUocGlwZV9jdHgtPnRvcF9waXBlKSkKIAkJcmV0dXJuIHRy dWU7CkBAIC0xODAzLDEyICsxODAzLDEyIEBAIHN0YXRpYyB2b2lkIHVwZGF0ZV9kY2h1YnBfZHBw KAogCXN0cnVjdCBkY2VfaHdzZXEgKmh3cyA9IGRjLT5od3NlcTsKIAlzdHJ1Y3QgbWVtX2lucHV0 ICptaSA9IHBpcGVfY3R4LT5taTsKIAlzdHJ1Y3QgaW5wdXRfcGl4ZWxfcHJvY2Vzc29yICppcHAg PSBwaXBlX2N0eC0+aXBwOwotCXN0cnVjdCBjb3JlX3N1cmZhY2UgKnN1cmZhY2UgPSBwaXBlX2N0 eC0+c3VyZmFjZTsKLQl1bmlvbiBwbGFuZV9zaXplIHNpemUgPSBzdXJmYWNlLT5wdWJsaWMucGxh bmVfc2l6ZTsKKwlzdHJ1Y3QgZGNfc3VyZmFjZSAqc3VyZmFjZSA9IHBpcGVfY3R4LT5zdXJmYWNl OworCXVuaW9uIHBsYW5lX3NpemUgc2l6ZSA9IHN1cmZhY2UtPnBsYW5lX3NpemU7CiAJc3RydWN0 IGRlZmF1bHRfYWRqdXN0bWVudCBvY3NjID0gezB9OwogCXN0cnVjdCB0Z19jb2xvciBibGFja19j b2xvciA9IHswfTsKIAlzdHJ1Y3QgbXBjY19jZmcgbXBjY19jZmc7Ci0JYm9vbCBwZXJfcGl4ZWxf YWxwaGEgPSBzdXJmYWNlLT5wdWJsaWMucGVyX3BpeGVsX2FscGhhICYmIHBpcGVfY3R4LT5ib3R0 b21fcGlwZTsKKwlib29sIHBlcl9waXhlbF9hbHBoYSA9IHN1cmZhY2UtPnBlcl9waXhlbF9hbHBo YSAmJiBwaXBlX2N0eC0+Ym90dG9tX3BpcGU7CiAKIAkvKiBUT0RPOiBwcm9wZXIgZml4IG9uY2Ug ZnBnYSB3b3JrcyAqLwogCS8qIGRlcGVuZHMgb24gRE1MIGNhbGN1bGF0aW9uLCBEUFAgY2xvY2sg dmFsdWUgbWF5IGNoYW5nZSBkeW5hbWljYWxseSAqLwpAQCAtMTg0MSwxMiArMTg0MSwxMiBAQCBz dGF0aWMgdm9pZCB1cGRhdGVfZGNodWJwX2RwcCgKIAlpZiAoZGMtPnB1YmxpYy5jb25maWcuZ3B1 X3ZtX3N1cHBvcnQpCiAJCW1pLT5mdW5jcy0+bWVtX2lucHV0X3Byb2dyYW1fcHRlX3ZtKAogCQkJ CXBpcGVfY3R4LT5taSwKLQkJCQlzdXJmYWNlLT5wdWJsaWMuZm9ybWF0LAotCQkJCSZzdXJmYWNl LT5wdWJsaWMudGlsaW5nX2luZm8sCi0JCQkJc3VyZmFjZS0+cHVibGljLnJvdGF0aW9uKTsKKwkJ CQlzdXJmYWNlLT5mb3JtYXQsCisJCQkJJnN1cmZhY2UtPnRpbGluZ19pbmZvLAorCQkJCXN1cmZh Y2UtPnJvdGF0aW9uKTsKIAogCWlwcC0+ZnVuY3MtPmlwcF9zZXR1cChpcHAsCi0JCQlzdXJmYWNl LT5wdWJsaWMuZm9ybWF0LAorCQkJc3VyZmFjZS0+Zm9ybWF0LAogCQkJMSwKIAkJCUlQUF9PVVRQ VVRfRk9STUFUXzEyX0JJVF9GSVgpOwogCkBAIC0xODkyLDEyICsxODkyLDEyIEBAIHN0YXRpYyB2 b2lkIHVwZGF0ZV9kY2h1YnBfZHBwKAogCiAJbWktPmZ1bmNzLT5tZW1faW5wdXRfcHJvZ3JhbV9z dXJmYWNlX2NvbmZpZygKIAkJbWksCi0JCXN1cmZhY2UtPnB1YmxpYy5mb3JtYXQsCi0JCSZzdXJm YWNlLT5wdWJsaWMudGlsaW5nX2luZm8sCisJCXN1cmZhY2UtPmZvcm1hdCwKKwkJJnN1cmZhY2Ut PnRpbGluZ19pbmZvLAogCQkmc2l6ZSwKLQkJc3VyZmFjZS0+cHVibGljLnJvdGF0aW9uLAotCQkm c3VyZmFjZS0+cHVibGljLmRjYywKLQkJc3VyZmFjZS0+cHVibGljLmhvcml6b250YWxfbWlycm9y KTsKKwkJc3VyZmFjZS0+cm90YXRpb24sCisJCSZzdXJmYWNlLT5kY2MsCisJCXN1cmZhY2UtPmhv cml6b250YWxfbWlycm9yKTsKIAogCW1pLT5mdW5jcy0+c2V0X2JsYW5rKG1pLCAhaXNfcGlwZV90 cmVlX3Zpc2libGUocGlwZV9jdHgpKTsKIH0KQEAgLTE5NzgsNyArMTk3OCw3IEBAIHN0YXRpYyB2 b2lkIGRjbjEwX3BwbGliX2FwcGx5X2Rpc3BsYXlfcmVxdWlyZW1lbnRzKAogCiBzdGF0aWMgdm9p ZCBkY24xMF9hcHBseV9jdHhfZm9yX3N1cmZhY2UoCiAJCXN0cnVjdCBjb3JlX2RjICpkYywKLQkJ c3RydWN0IGNvcmVfc3VyZmFjZSAqc3VyZmFjZSwKKwkJY29uc3Qgc3RydWN0IGRjX3N1cmZhY2Ug KnN1cmZhY2UsCiAJCXN0cnVjdCB2YWxpZGF0ZV9jb250ZXh0ICpjb250ZXh0KQogewogCWludCBp LCBiZV9pZHg7CkBAIC0yMzM3LDcgKzIzMzcsNyBAQCBzdGF0aWMgYm9vbCBkY24xMF9kdW1teV9k aXNwbGF5X3Bvd2VyX2dhdGluZygKIAogdm9pZCBkY24xMF91cGRhdGVfcGVuZGluZ19zdGF0dXMo c3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCkKIHsKLQlzdHJ1Y3QgY29yZV9zdXJmYWNlICpzdXJm YWNlID0gcGlwZV9jdHgtPnN1cmZhY2U7CisJc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2UgPSBw aXBlX2N0eC0+c3VyZmFjZTsKIAlzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqdGcgPSBwaXBlX2N0 eC0+dGc7CiAKIAlpZiAoc3VyZmFjZS0+Y3R4LT5kYy0+ZGVidWcuc2FuaXR5X2NoZWNrcykgewpA QCAtMjM1NSw3ICsyMzU1LDcgQEAgdm9pZCBkY24xMF91cGRhdGVfcGVuZGluZ19zdGF0dXMoc3Ry dWN0IHBpcGVfY3R4ICpwaXBlX2N0eCkKIAogCS8qIERDTiB3ZSByZWFkIElOVVNFIGFkZHJlc3Mg aW4gTUksIGRvIHdlIHN0aWxsIG5lZWQgdGhpcyB3YT8gKi8KIAlpZiAoc3VyZmFjZS0+c3RhdHVz LmlzX2ZsaXBfcGVuZGluZyAmJgotCQkJIXN1cmZhY2UtPnB1YmxpYy52aXNpYmxlKSB7CisJCQkh c3VyZmFjZS0+dmlzaWJsZSkgewogCQlwaXBlX2N0eC0+bWktPmN1cnJlbnRfYWRkcmVzcyA9CiAJ CQkJcGlwZV9jdHgtPm1pLT5yZXF1ZXN0X2FkZHJlc3M7CiAJCUJSRUFLX1RPX0RFQlVHR0VSKCk7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2NvcmVfdHlw ZXMuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvY29yZV90eXBlcy5oCmlu ZGV4IGNjNjVjZmRlYTY2Zi4uMDdhMWFlYzVhMjhiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2NvcmVfdHlwZXMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvaW5jL2NvcmVfdHlwZXMuaApAQCAtNDAsMjMgKzQwLDkgQEAgc3RydWN0 IGNvcmVfc3RyZWFtOwogCiAjZGVmaW5lIE1BWF9DTE9DS19TT1VSQ0VTIDcKIAotLyoqKioqKioq KiBjb3JlX3N1cmZhY2UgKioqKioqKioqKi8KLSNkZWZpbmUgRENfU1VSRkFDRV9UT19DT1JFKGRj X3N1cmZhY2UpIFwKLQljb250YWluZXJfb2YoZGNfc3VyZmFjZSwgc3RydWN0IGNvcmVfc3VyZmFj ZSwgcHVibGljKQotCiAjZGVmaW5lIERDX0dBTU1BX1RPX0NPUkUoZGNfZ2FtbWEpIFwKIAljb250 YWluZXJfb2YoZGNfZ2FtbWEsIHN0cnVjdCBjb3JlX2dhbW1hLCBwdWJsaWMpCiAKLXN0cnVjdCBj b3JlX3N1cmZhY2UgewotCXN0cnVjdCBkY19zdXJmYWNlIHB1YmxpYzsKLQlzdHJ1Y3QgZGNfc3Vy ZmFjZV9zdGF0dXMgc3RhdHVzOwotCXN0cnVjdCBkY19jb250ZXh0ICpjdHg7Ci0KLQkvKiBwcml2 YXRlIHRvIGRjX3N1cmZhY2UuYyAqLwotCWVudW0gZGNfaXJxX3NvdXJjZSBpcnFfc291cmNlOwot CWludCByZWZfY291bnQ7Ci19OwotCiBzdHJ1Y3QgY29yZV9nYW1tYSB7CiAJc3RydWN0IGRjX2dh bW1hIHB1YmxpYzsKIAlzdHJ1Y3QgZGNfY29udGV4dCAqY3R4OwpAQCAtMjYzLDcgKzI0OSw3IEBA IHN0cnVjdCByZXNvdXJjZV9wb29sIHsKIH07CiAKIHN0cnVjdCBwaXBlX2N0eCB7Ci0Jc3RydWN0 IGNvcmVfc3VyZmFjZSAqc3VyZmFjZTsKKwlzdHJ1Y3QgZGNfc3VyZmFjZSAqc3VyZmFjZTsKIAlz dHJ1Y3QgY29yZV9zdHJlYW0gKnN0cmVhbTsKIAogCXN0cnVjdCBtZW1faW5wdXQgKm1pOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9od19zZXF1ZW5jZXIu aCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvaHdfc2VxdWVuY2VyLmgKaW5k ZXggZDg2NWRmODAyYzg4Li4yMzQzYmViNGVmODcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9pbmMvaHdfc2VxdWVuY2VyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2luYy9od19zZXF1ZW5jZXIuaApAQCAtNTksNyArNTksNyBAQCBzdHJ1 Y3QgaHdfc2VxdWVuY2VyX2Z1bmNzIHsKIAogCXZvaWQgKCphcHBseV9jdHhfZm9yX3N1cmZhY2Up KAogCQkJc3RydWN0IGNvcmVfZGMgKmRjLAotCQkJc3RydWN0IGNvcmVfc3VyZmFjZSAqc3VyZmFj ZSwKKwkJCWNvbnN0IHN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlLAogCQkJc3RydWN0IHZhbGlk YXRlX2NvbnRleHQgKmNvbnRleHQpOwogCiAJdm9pZCAoKnNldF9wbGFuZV9jb25maWcpKApAQCAt ODgsNyArODgsNyBAQCBzdHJ1Y3QgaHdfc2VxdWVuY2VyX2Z1bmNzIHsKIAogCWJvb2wgKCpzZXRf aW5wdXRfdHJhbnNmZXJfZnVuYykoCiAJCQkJc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCwKLQkJ CQljb25zdCBzdHJ1Y3QgY29yZV9zdXJmYWNlICpzdXJmYWNlKTsKKwkJCQljb25zdCBzdHJ1Y3Qg ZGNfc3VyZmFjZSAqc3VyZmFjZSk7CiAKIAlib29sICgqc2V0X291dHB1dF90cmFuc2Zlcl9mdW5j KSgKIAkJCQlzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9yZXNvdXJjZS5oIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2luYy9yZXNvdXJjZS5oCmluZGV4IDA0ZTVmZDFkOGM4OS4uZWQ5NGRmMTZh MmQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL3Jlc291 cmNlLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9yZXNvdXJjZS5o CkBAIC0xMTksNyArMTE5LDcgQEAgc3RydWN0IHBpcGVfY3R4ICpyZXNvdXJjZV9nZXRfaGVhZF9w aXBlX2Zvcl9zdHJlYW0oCiAJCWNvbnN0IHN0cnVjdCBjb3JlX3N0cmVhbSAqc3RyZWFtKTsKIAog Ym9vbCByZXNvdXJjZV9hdHRhY2hfc3VyZmFjZXNfdG9fY29udGV4dCgKLQkJY29uc3Qgc3RydWN0 IGRjX3N1cmZhY2UgKmNvbnN0ICpzdXJmYWNlcywKKwkJc3RydWN0IGRjX3N1cmZhY2UgKmNvbnN0 ICpzdXJmYWNlcywKIAkJaW50IHN1cmZhY2VfY291bnQsCiAJCWNvbnN0IHN0cnVjdCBkY19zdHJl YW0gKmRjX3N0cmVhbSwKIAkJc3RydWN0IHZhbGlkYXRlX2NvbnRleHQgKmNvbnRleHQsCi0tIAoy LjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFt ZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=