From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Pavel Cahyna To: git-commits@fedoraproject.org Subject: [rpms/tar] rawhide: Fix a regression with --one-top-level=/absolute Date: Wed, 09 Sep 2026 13:22:11 GMT Message-ID: <178896013175.1.7949333408890992745.rpms-tar-c3916850e192@fedoraproject.org> List-ID: X-Git-Repo: rpms/tar X-Git-Branch: rawhide X-Git-Rev: c3916850e1929b296a385f31fc2f91dcd31f0b7f ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvdGFyCiAgICAgICAgICAgIEJyYW5jaCA6IHJhd2hpZGUKICAgICAgICAgICAg Q29tbWl0IDogYzM5MTY4NTBlMTkyOWIyOTZhMzg1ZjMxZmMyZjkxZGNkMzFmMGI3ZgogICAgICAg ICAgICBBdXRob3IgOiBQYXZlbCBDYWh5bmEgPHBjYWh5bmFAcmVkaGF0LmNvbT4KICAgICAgICAg ICAgRGF0ZSAgIDogMjAyNi0wOS0wN1QxNzowOToxMyswMjowMAogICAgICAgICAgICBTdGF0cyAg OiArODA3Ly0wIGluIDIgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczovL3NyYy5m ZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL3Rhci9jL2MzOTE2ODUwZTE5MjliMjk2YTM4NWYzMWZjMmY5 MWRjZDMxZjBiN2Y/YnJhbmNoPXJhd2hpZGUKCiAgICAgICAgICAgIExvZzoKICAgICAgICAgICAg Rml4IGEgcmVncmVzc2lvbiB3aXRoIC0tb25lLXRvcC1sZXZlbD0vYWJzb2x1dGUKCkludHJvZHVj ZWQgd2l0aCB0aGUgZml4IG9mIGJ6MjM4MDAwNyAoQ1ZFLTIwMjUtNDU1ODIpCgpBbHNvLCBmaXgg Q1ZFLTIwMjYtMTg1MDguCgpSZXNvbHZlczogZmVkb3JhIzI0OTgwNjEKUmVzb2x2ZXM6IENWRS0y MDI2LTE4NTA4ClJlc29sdmVzOiBmZWRvcmEjMjUwOTg0NQoKLS0tCmRpZmYgLS1naXQgYS90YXIt MS4zNS1maXgtYWJzb2x1dGUtb25lLXRvcC1sZXZlbC5wYXRjaCBiL3Rhci0xLjM1LWZpeC1hYnNv bHV0ZS1vbmUtdG9wLWxldmVsLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLmRhMjFhOTIKLS0tIC9kZXYvbnVsbAorKysgYi90YXItMS4zNS1maXgtYWJzb2x1dGUtb25l LXRvcC1sZXZlbC5wYXRjaApAQCAtMCwwICsxLDc5MyBAQAorZGlmZiAtLWdpdCBhL05FV1MgYi9O RVdTCitpbmRleCBmZmI0ZjU0Zi4uNDVmZWRiZjUgMTAwNjQ0CistLS0gYS9ORVdTCisrKysgYi9O RVdTCitAQCAtMSwxMiArMSwxMiBAQAorLUdOVSB0YXIgTkVXUyAtIFVzZXIgdmlzaWJsZSBjaGFu Z2VzLiAyMDI2LTAxLTMwCisrR05VIHRhciBORVdTIC0gVXNlciB2aXNpYmxlIGNoYW5nZXMuIDIw MjYtMDctMjIKKyBQbGVhc2Ugc2VuZCBHTlUgdGFyIGJ1ZyByZXBvcnRzIHRvIDxidWctdGFyQGdu dS5vcmc+CisgDAorIHZlcnNpb24gMS4zNS45MCAoZ2l0KQorIAorICogQ2hhbmdlcyB0byBiZWhh dmlvcgorIAorLSoqIC0tb25lLXRvcC1sZXZlbD1ESVIgbm93IHJlcXVpcmVzIERJUiB0byBiZSBy ZWxhdGl2ZS4KKy0gICBQcmV2aW91c2x5IHRoaXMgcmVzdHJpY3Rpb24gd2FzIGFsbHVkZWQgdG8g aW4gdGhlIG1hbnVhbCBidXQgbm90IGVuZm9yY2VkLgorKyoqIFRoZSAtLW9uZS10b3AtbGV2ZWwg b3B0aW9uIG5vdyByZXF1aXJlcyBlaXRoZXIgLXggb3IgLWQgbW9kZS4KKysgICBQcmV2aW91c2x5 IHRoZSBiZWhhdmlvciB3YXMgdW5zcGVjaWZpZWQgaW4gb3RoZXIgb3BlcmF0aW9uIG1vZGVzLgor IAorICogQnVnIGZpeGVzCisgCitkaWZmIC0tZ2l0IGEvZG9jL3Rhci50ZXhpIGIvZG9jL3Rhci50 ZXhpCitpbmRleCA5YjA0Yjk0Yi4uOTEzMDJmMDUgMTAwNjQ0CistLS0gYS9kb2MvdGFyLnRleGkK KysrKyBiL2RvYy90YXIudGV4aQorQEAgLTMyNzEsMTQgKzMyNzEsMTQgQEAgZGlyZWN0b3J5Lgor IAorIEBvcHN1bW1hcnl7b25lLXRvcC1sZXZlbH0KKyBAaXRlbSAtLW9uZS10b3AtbGV2ZWxbPUB2 YXJ7ZGlyfV0KKy1UZWxscyBAY29tbWFuZHt0YXJ9IHRvIGNyZWF0ZSBhIG5ldyBkaXJlY3Rvcnkg YmVuZWF0aCB0aGUgZXh0cmFjdGlvbiBkaXJlY3RvcnkKKy0ob3IgdGhlIG9uZSBwYXNzZWQgdG8g QG9wdGlvbnstQ30pIGFuZCB1c2UgaXQgdG8gcHJldmVudCBAY29tbWFuZHt0YXJ9CistZnJvbSBt b2RpZnlpbmcgZmlsZXMgb3V0c2lkZSB0aGF0IGRpcmVjdG9yeS4KKy1JZiBAdmFye2Rpcn0gaXMg cHJlc2VudCwgaXQgbXVzdCBiZSBhIHJlbGF0aXZlIGZpbGUgbmFtZS4KKy1JZiBpdCBpcyBhYnNl bnQsIHRoZSBuYW1lIG9mIHRoZSBuZXcgZGlyZWN0b3J5CisrVGVsbHMgQGNvbW1hbmR7dGFyfSB0 byB1c2UgYSBkaXJlY3RvcnkgYmVuZWF0aCB0aGUgZXh0cmFjdGlvbiBkaXJlY3RvcnkKKysob3Ig dGhlIG9uZSBwYXNzZWQgdG8gQG9wdGlvbnstQ30pIHRvIHByZXZlbnQgQGNvbW1hbmR7dGFyfQor K2Zyb20gYWNjZXNzaW5nIGZpbGVzIG91dHNpZGUgdGhhdCBkaXJlY3RvcnkuCisrSWYgQHZhcntk aXJ9IGlzIGFic2VudCwgdGhlIG5hbWUgb2YgdGhlIGRpcmVjdG9yeQorIGlzIHRoZSBiYXNlIG5h bWUgb2YgdGhlIGFyY2hpdmUgbWludXMgYW55IHJlY29nbml6ZWQgYXJjaGl2ZSBzdWZmaXguCist SWYgbXVsdGlwbGUgQG9wdGlvbnstQ30gb3B0aW9ucyBhcmUgcHJlc2VudCwKKy1lYWNoIGhhcyBp dHMgb3duIHN1YmRpcmVjdG9yeSB3aXRoIHRoZSBzYW1lIG5hbWUuCisrSWYgQHZhcntkaXJ9IGlz IGFuIGFic29sdXRlIGZpbGUgbmFtZSwgdGhhdCBpcyB0aGUgb25seSBzdWNoIGRpcmVjdG9yeTsK KytvdGhlcndpc2UsIHRoZSB3b3JraW5nIGRpcmVjdG9yeSBhbmQgdGhlIGRpcmVjdG9yaWVzIHNw ZWNpZmllZCBieQorK2FueSBAb3B0aW9uey1DfSBvcHRpb25zIGVhY2ggaGF2ZSB0aGUgbmFtZWQg c3ViZGlyZWN0b3J5LgorIEFueSBtZW1iZXIgbmFtZXMgdGhhdCBkbyBub3QgYmVnaW4KKyB3aXRo IHRoYXQgZGlyZWN0b3J5IG5hbWUgKGFmdGVyCisgdHJhbnNmb3JtYXRpb25zIGZyb20gQG9wdGlv bnstLXRyYW5zZm9ybX0gYW5kCitAQCAtMzI4Niw2ICszMjg2LDkgQEAgdHJhbnNmb3JtYXRpb25z IGZyb20gQG9wdGlvbnstLXRyYW5zZm9ybX0gYW5kCisgZmlsZSBuYW1lIHN1ZmZpeGVzIGFyZSBA c2FtcHsudGFyfSwgYW5kIGFueSBjb21wcmVzc2lvbiBzdWZmaXhlcworIHJlY29nbml6YWJsZSBi eSBAeHJlZnstLWF1dG8tY29tcHJlc3N9LgorIAorK1RoaXMgb3B0aW9uIGNhbiBiZSB1c2VkIG9u bHkgd2hlbiBleHRyYWN0aW5nLCBjb21wYXJpbmcsIG9yIHJlYWRpbmcKKytmcm9tIHRoZSBhcmNo aXZlLgorKworIEBvcHN1bW1hcnl7b3ZlcndyaXRlfQorIEBpdGVtIC0tb3ZlcndyaXRlCisgCitk aWZmIC0tZ2l0IGEvc3JjL2NvbW1vbi5oIGIvc3JjL2NvbW1vbi5oCitpbmRleCBhYzBlN2VlZi4u ZmI3MzJmMGIgMTAwNjQ0CistLS0gYS9zcmMvY29tbW9uLmgKKysrKyBiL3NyYy9jb21tb24uaAor QEAgLTI0Niw3ICsyNDYsNiBAQCBHTE9CQUwgYm9vbCBudW1lcmljX293bmVyX29wdGlvbjsKKyBH TE9CQUwgYm9vbCBvbmVfZmlsZV9zeXN0ZW1fb3B0aW9uOworIAorIC8qIENyZWF0ZSBhIHRvcC1s ZXZlbCBkaXJlY3RvcnkgZm9yIGV4dHJhY3RpbmcgYmFzZWQgb24gdGhlIGFyY2hpdmUgbmFtZS4g ICovCistR0xPQkFMIGJvb2wgb25lX3RvcF9sZXZlbF9vcHRpb247CisgR0xPQkFMIGNoYXIgKm9u ZV90b3BfbGV2ZWxfZGlyOworIAorIC8qIFNwZWNpZmllZCB2YWx1ZSB0byBiZSBwdXQgaW50byB0 YXIgZmlsZSBpbiBwbGFjZSBvZiBzdGF0ICgpIHJlc3VsdHMsIG9yCitAQCAtNTQ1LDYgKzU0NCw3 IEBAIHZvaWQgdmVyaWZ5X3ZvbHVtZSAodm9pZCk7CisgLyogTW9kdWxlIGV4dHJhY3QuYy4gICov CisgCisgdm9pZCBleHRyX2luaXQgKHZvaWQpOworK2ludCBtYWtlX2RpcmVjdG9yaWVzIChjaGFy ICpmaWxlX25hbWUsIGJvb2wgKmludGVyZGlyX21hZGUpOworIHZvaWQgZXh0cmFjdF9hcmNoaXZl ICh2b2lkKTsKKyB2b2lkIGV4dHJhY3RfZmluaXNoICh2b2lkKTsKKyBib29sIHJlbmFtZV9kaXJl Y3RvcnkgKGNoYXIgKnNyYywgY2hhciAqZHN0KTsKK0BAIC02MzUsNiArNjM1LDIwIEBAIHZvaWQg c2tpbV9tZW1iZXIgKGJvb2wgbXVzdF9jb3B5KTsKKyAjZGVmaW5lIG1pbihhLCBiKSAoKGEpIDwg KGIpID8gKGEpIDogKGIpKQorICNkZWZpbmUgbWF4KGEsIGIpICgoYSkgPCAoYikgPyAoYikgOiAo YSkpCisgCisrLyogQSBkaXJlY3RvcnkgRkQsIGFuZCBhIGZpbGUgbmFtZSBCQVNFIHRoYXQgbWF0 Y2hlcyB0aGUgcmVnZXhwICJbXi9dKlsvXSoiLgorKyAgIElmIEJBU0UgaXMgYWJzb2x1dGUgKGku ZS4sIG1hdGNoZXMgIi8rIiksIEZEIGlzIHZhbGlkIGJ1dCBpcnJlbGV2YW50LgorKyAgIE90aGVy d2lzZSBpZiBGRCA9PSBBVF9GRENXRCwgQkFTRSBpcyByZWxhdGl2ZSB0byB0aGUgY3VycmVudCBk aXJlY3RvcnkuCisrICAgT3RoZXJ3aXNlIGlmIEZEID09IEJBREZELCB0aGUgcGFyZW50IGRpcmVj dG9yeSBjb3VsZCBub3QgYmUgb3BlbmVkCisrICAgYW5kIEJBU0UgaXMgbWVyZWx5IHRoZSBvcmln aW5hbCBmaWxlIG5hbWUncyBiYXNlbmFtZS4KKysgICBPdGhlcndpc2UsIEZEIGlzIG9wZW4gdG8g YSBwYXJlbnQgZGlyZWN0b3J5LAorKyAgIGFuZCBCQVNFIGlzIHJlbGF0aXZlIHRvIHRoYXQgZGly ZWN0b3J5LgorKyAgIEJBU0UgcG9pbnRzIHRvIHN0b3JhZ2UgbWFuYWdlZCBlbHNld2hlcmU7IGRv IG5vdCBmcmVlIGl0IGRpcmVjdGx5LiAgKi8KKytzdHJ1Y3QgZmRiYXNlCisrICB7CisrICAgIGlu dCBmZDsKKysgICAgY2hhciBjb25zdCAqYmFzZTsKKysgIH07CisrCisgY2hhciBjb25zdCAqcXVv dGVfbl9jb2xvbiAoaW50IG4sIGNoYXIgY29uc3QgKmFyZyk7Cisgdm9pZCBhc3NpZ25fc3RyaW5n X29yX251bGwgKGNoYXIgKipkZXN0LCBjb25zdCBjaGFyICpzcmMpCisgICBBVFRSSUJVVEVfTk9O TlVMTCAoKDEpKTsKK0BAIC02NTcsNiArNjcxLDggQEAgdm9pZCBuYW1lYnVmX2ZyZWUgKG5hbWVi dWZfdCBidWYpOworIGNoYXIgKm5hbWVidWZfbmFtZSAobmFtZWJ1Zl90IGJ1ZiwgY29uc3QgY2hh ciAqbmFtZSk7CisgCisgY29uc3QgY2hhciAqdGFyX2Rpcm5hbWUgKHZvaWQpOworK2NoYXIgKnRy YW5zZm9ybV90b3BfbGV2ZWwgKGNvbnN0IGNoYXIgKm5hbWUpCisrICBfR0xfQVRUUklCVVRFX01B TExPQyBfR0xfQVRUUklCVVRFX0RFQUxMT0NfRlJFRTsKKyAKKyAvKiBSZXByZXNlbnQgTiB1c2lu ZyBhIHNpZ25lZCBpbnRlZ2VyIEkgc3VjaCB0aGF0ICh1aW50bWF4X3QpIEkgPT0gTi4KKyAgICBX aXRoIGEgZ29vZCBvcHRpbWl6aW5nIGNvbXBpbGVyLCB0aGlzIGlzIGVxdWl2YWxlbnQgdG8gKGlu dG1heF90KSBpCitAQCAtNzI4LDEwICs3NDQsMTAgQEAgc2l6ZV90IGJsb2NraW5nX3dyaXRlIChp bnQgZmQsIHZvaWQgY29uc3QgKmJ1Ziwgc2l6ZV90IGNvdW50KTsKKyBlbnVtIHsgQkFERkQgPSBB VF9GRENXRCA9PSAtMSA/IC0yIDogLTEgfTsKKyAKKyBleHRlcm4gaW50IGNoZGlyX2N1cnJlbnQ7 CistaW50IGNoZGlyX2FyZyAoY2hhciBjb25zdCAqZGlyKTsKKy12b2lkIGNoZGlyX2RvIChpbnQg ZGlyKTsKKytpbnQgY2hkaXJfYXJnIChjaGFyIGNvbnN0ICpkaXIsIGJvb2wgb25lX3RvcF9sZXZl bCk7Cisrdm9pZCBjaGRpcl9kbyAoaW50IGRpciwgYm9vbCBjcmVhdGUpOworIHN0cnVjdCBjaGRp cl9pZCB7IGludCBlcnI7IGRldl90IHN0X2RldjsgaW5vX3Qgc3RfaW5vOyB9IGNoZGlyX2lkICh2 b2lkKTsKKy1zdHJ1Y3QgZmRiYXNlIHsgaW50IGZkOyBjaGFyIGNvbnN0ICpiYXNlOyB9IGZkYmFz ZSAoY2hhciBjb25zdCAqKTsKKytzdHJ1Y3QgZmRiYXNlIGZkYmFzZSAoY2hhciBjb25zdCAqKTsK KyBzdHJ1Y3QgZmRiYXNlIGZkYmFzZTEgKGNoYXIgY29uc3QgKik7Cisgdm9pZCBmZGJhc2VfY2xl YXIgKHZvaWQpOworIGludCBjaGRpcl9jb3VudCAodm9pZCk7CitkaWZmIC0tZ2l0IGEvc3JjL2Ny ZWF0ZS5jIGIvc3JjL2NyZWF0ZS5jCitpbmRleCA1MWMzZjIxMy4uNTgyY2E0YzYgMTAwNjQ0Cist LS0gYS9zcmMvY3JlYXRlLmMKKysrKyBiL3NyYy9jcmVhdGUuYworQEAgLTEyNjYsNyArMTI2Niw3 IEBAIGVuc3VyZV9zbGFzaCAoY2hhciAqKnBzdHIpCisgLyogSWYgd2UganVzdCByYW4gb3V0IG9m IGZpbGUgZGVzY3JpcHRvcnMsIHJlbGVhc2UgYSBmaWxlIGRlc2NyaXB0b3IKKyAgICBpbiB0aGUg ZGlyZWN0b3J5IGNoYWluIHNvbWV3aGVyZSBsZWFkaW5nIGZyb20gRElSLT5wYXJlbnQtPnBhcmVu dAorICAgIHVwIHRocm91Z2ggdGhlIHJvb3QuICBSZXR1cm4gdHJ1ZSBpZiBzdWNjZXNzZnVsLCBm YWxzZSAocHJlc2VydmluZworLSAgIGVycm5vID09IEVNRklMRSkgb3RoZXJ3aXNlLgorKyAgIGVy cm5vKSBvdGhlcndpc2UuCisgCisgICAgRG8gbm90IHJlbGVhc2UgRElSJ3MgZmlsZSBkZXNjcmlw dG9yLCBvciBESVIncyBwYXJlbnQsIGFzIG90aGVyCisgICAgY29kZSBhc3N1bWVzIHRoYXQgdGhl eSB3b3JrLiAgT24gc29tZSBvcGVyYXRpbmcgc3lzdGVtcywgYW5vdGhlcgorQEAgLTEyNzcsNyAr MTI3Nyw4IEBAIGVuc3VyZV9zbGFzaCAoY2hhciAqKnBzdHIpCisgc3RhdGljIGJvb2wKKyBvcGVu X2ZhaWx1cmVfcmVjb3ZlciAoc3RydWN0IHRhcl9zdGF0X2luZm8gY29uc3QgKmRpcikKKyB7Cist ICBpZiAoZXJybm8gPT0gRU1GSUxFICYmIGRpciAmJiBkaXItPnBhcmVudCkKKysgIGludCBlcnIg PSBlcnJubzsKKysgIGlmICgoZXJyID09IEVNRklMRSB8fCBlcnIgPT0gRU5GSUxFKSAmJiBkaXIg JiYgZGlyLT5wYXJlbnQpCisgICAgIHsKKyAgICAgICBzdHJ1Y3QgdGFyX3N0YXRfaW5mbyAqcDsK KyAgICAgICBmb3IgKHAgPSBkaXItPnBhcmVudC0+cGFyZW50OyBwOyBwID0gcC0+cGFyZW50KQor QEAgLTEyODYsNyArMTI4Nyw3IEBAIG9wZW5fZmFpbHVyZV9yZWNvdmVyIChzdHJ1Y3QgdGFyX3N0 YXRfaW5mbyBjb25zdCAqZGlyKQorIAkgICAgdGFyX3N0YXRfY2xvc2UgKHApOworIAkgICAgcmV0 dXJuIHRydWU7CisgCSAgfQorLSAgICAgIGVycm5vID0gRU1GSUxFOworKyAgICAgIGVycm5vID0g ZXJyOworICAgICB9CisgCisgICByZXR1cm4gZmFsc2U7CitkaWZmIC0tZ2l0IGEvc3JjL2V4dHJh Y3QuYyBiL3NyYy9leHRyYWN0LmMKK2luZGV4IDQ2ODVmODNjLi5hMzFmNTYwYiAxMDA2NDQKKy0t LSBhL3NyYy9leHRyYWN0LmMKKysrKyBiL3NyYy9leHRyYWN0LmMKK0BAIC02OTgsNyArNjk4LDcg QEAgZml4dXBfZGVsYXllZF9zZXRfc3RhdCAoY2hhciBjb25zdCAqc3JjLCBjaGFyIGNvbnN0ICpk c3QpCisgICAgY3JlYXRlIGFsbCByZXF1aXJlZCBkaXJlY3Rvcmllcy4gIFJldHVybiB6ZXJvIGlm IGFsbCB0aGUgcmVxdWlyZWQKKyAgICBkaXJlY3RvcmllcyB3ZXJlIGNyZWF0ZWQsIG5vbnplcm8g KGlzc3VpbmcgYSBkaWFnbm9zdGljKSBvdGhlcndpc2UuCisgICAgU2V0ICpJTlRFUkRJUl9NQURF ICh1bmxlc3MgTlVMTCkgaWYgYXQgbGVhc3Qgb25lIGRpcmVjdG9yeSB3YXMgY3JlYXRlZC4gKi8K Ky1zdGF0aWMgaW50CisraW50CisgbWFrZV9kaXJlY3RvcmllcyAoY2hhciAqZmlsZV9uYW1lLCBi b29sICppbnRlcmRpcl9tYWRlKQorIHsKKyAgIGNoYXIgKmN1cnNvcjAgPSBmaWxlX25hbWUgKyBG SUxFX1NZU1RFTV9QUkVGSVhfTEVOIChmaWxlX25hbWUpOworQEAgLTc0MSw3ICs3NDEsNyBAQCBt YWtlX2RpcmVjdG9yaWVzIChjaGFyICpmaWxlX25hbWUsIGJvb2wgKmludGVyZGlyX21hZGUpCisg CSAgICAgcmVwYWlyX2RlbGF5ZWRfc2V0X3N0YXQgbWF5IG5lZWQgdG8gdXBkYXRlIHRoZSBzdHJ1 Y3QuICAqLworIAkgIGRlbGF5X3NldF9zdGF0IChmaWxlX25hbWUsCisgCQkJICAwLCBtb2RlICYg fiBjdXJyZW50X3VtYXNrLCBNT0RFX1JXWCwKKy0JCQkgIGRlc2lyZWRfbW9kZSwgQVRfU1lNTElO S19OT0ZPTExPVyk7CisrCQkJICAgIGRlc2lyZWRfbW9kZSwgQVRfU1lNTElOS19OT0ZPTExPVyk7 CisgCSAgaWYgKGludGVyZGlyX21hZGUpCisgCSAgICAqaW50ZXJkaXJfbWFkZSA9IHRydWU7Cisg CSAgcHJpbnRfZm9yX21rZGlyIChmaWxlX25hbWUsIGRlc2lyZWRfbW9kZSk7CitAQCAtOTc0LDcg Kzk3NCw3IEBAIGFwcGx5X25vbmFuY2VzdG9yX2RlbGF5ZWRfc2V0X3N0YXQgKGNoYXIgY29uc3Qg KmZpbGVfbmFtZSwgYm9vbCBhZnRlcl9saW5rcykKKyAJICAgICAgJiYgbWVtY21wIChmaWxlX25h bWUsIGRhdGEtPmZpbGVfbmFtZSwgZGF0YS0+ZmlsZV9uYW1lX2xlbikgPT0gMCkpCisgCWJyZWFr OworIAorLSAgICAgIGNoZGlyX2RvIChkYXRhLT5jaGFuZ2VfZGlyKTsKKysgICAgICBjaGRpcl9k byAoZGF0YS0+Y2hhbmdlX2RpciwgZmFsc2UpOworIAorICAgICAgIGlmIChjaGVja19mb3JfcmVu YW1lZF9kaXJlY3RvcmllcykKKyAJeworQEAgLTE4NDQsNyArMTg0NCw3IEBAIGV4dHJhY3RfYXJj aGl2ZSAodm9pZCkKKyAgICAgeworICAgICAgIGludCBkaXIgPSBjaGRpcl9jdXJyZW50OworICAg ICAgIGFwcGx5X25vbmFuY2VzdG9yX2RlbGF5ZWRfc2V0X3N0YXQgKGN1cnJlbnRfc3RhdF9pbmZv LmZpbGVfbmFtZSwgMCk7CistICAgICAgY2hkaXJfZG8gKGRpcik7CisrICAgICAgY2hkaXJfZG8g KGRpciwgZmFsc2UpOworICAgICB9CisgCisgICAvKiBUYWtlIGEgc2FmZXR5IGJhY2t1cCBvZiBh IHByZXZpb3VzbHkgZXhpc3RpbmcgZmlsZS4gICovCitAQCAtMTg2NCw4ICsxODY0LDM1IEBAIGV4 dHJhY3RfYXJjaGl2ZSAodm9pZCkKKyAgIHR5cGVmbGFnID0gc3BhcnNlX21lbWJlcl9wICgmY3Vy cmVudF9zdGF0X2luZm8pID8KKyAgICAgICAgICAgICAgICAgICBHTlVUWVBFX1NQQVJTRSA6IGN1 cnJlbnRfaGVhZGVyLT5oZWFkZXIudHlwZWZsYWc7CisgCistICBib29sIG9rID0gcHJlcGFyZV90 b19leHRyYWN0IChjdXJyZW50X3N0YXRfaW5mby5maWxlX25hbWUsIHR5cGVmbGFnLCAmZnVuKQor LSAgICAgICAgICAgICYmIGZ1biAoY3VycmVudF9zdGF0X2luZm8uZmlsZV9uYW1lLCB0eXBlZmxh ZykgPT0gMDsKKysgIGJvb2wgb2sgPSBmYWxzZTsKKysgIGlmIChwcmVwYXJlX3RvX2V4dHJhY3Qg KGN1cnJlbnRfc3RhdF9pbmZvLmZpbGVfbmFtZSwgdHlwZWZsYWcsICZmdW4pKQorKyAgICB7Cisr ICAgICAgaWYgKG9uZV90b3BfbGV2ZWxfZGlyKQorKwl7CisrCSAgLyogQ3JlYXRlIG9uZV90b3Bf bGV2ZWwgZGlyIGlmIGl0IGRvZXMgbm90IGV4aXN0LiAgKi8KKysJICBjaGRpcl9kbyAoY2hkaXJf Y3VycmVudCwgdHJ1ZSk7CisrCSAgLyogRmx1c2ggZGVsYXllZCBzdGF0IHRvIG1pcnJvciB0aGUg Y29kZSBhYm92ZSB0aGF0IGRvZXMgaXQKKysJICAgICBiZWZvcmUgZXh0cmFjdGluZyBhIG5ldyBl bnRyeS4gQ3JlYXRpbmcgdGhlIG9uZV90b3BfbGV2ZWwKKysJICAgICBkaXIgbWF5IGhhdmUgY3Jl YXRlZCBuZXcgZGVsYXllZF9zZXRfc3RhdCBpbnRlcmRpcgorKwkgICAgIGVudHJpZXMsIHNvIHJl cGVhdCB0aGUgb3BlcmF0aW9uLiBJZGVhbGx5IHRoaXMgc2hvdWxkIG5vdAorKwkgICAgIGJlIG5l ZWRlZCwgYnV0IHRoZSBuZXdseS1jcmVhdGVkIGludGVyZGlyIGVudHJpZXMgaGF2ZQorKwkgICAg IHN0X2Rldi9zdF9pbm8gdW5pbml0aWFsaXplZCwgd2hpY2ggd291bGQgYmUgYSBwcm9ibGVtIGlm CisrCSAgICAgdGhlcmUgaXMgYSAiLiIgZW50cnkgYWZ0ZXJ3YXJkczoKKysJICAgICBhcHBseV9u b25hbmNlc3Rvcl9kZWxheWVkX3NldF9zdGF0IHdvdWxkIHVzZSB0aGUKKysJICAgICB1bmluaXRp YWxpemVkIHZhbHVlcy4gSWRlYWxseSwgc3RfZGV2L3N0X2lubyB3b3VsZCBiZQorKwkgICAgIGlu aXRpYWxpemVkIGJ5IG1hcmtfbWV0YWRhdGFfc2V0LCBidXQgdGhpcyBvbmUgZG9lcyBub3QKKysJ ICAgICB0YWtlIGNoZGlyIGludG8gYWNjb3VudCwgc28gaXQgc3RhdHMgYSB3cm9uZyBmaWxlLiAq LworKwkgIGlmICghZGVsYXlfZGlyZWN0b3J5X3Jlc3RvcmVfb3B0aW9uKQorKwkgICAgeworKwkg ICAgICBpbnQgZGlyID0gY2hkaXJfY3VycmVudDsKKysJICAgICAgYXBwbHlfbm9uYW5jZXN0b3Jf ZGVsYXllZF9zZXRfc3RhdCAoY3VycmVudF9zdGF0X2luZm8uZmlsZV9uYW1lLAorKwkJCQkJCSAg ZmFsc2UpOworKwkgICAgICBjaGRpcl9kbyAoZGlyLCBmYWxzZSk7CisrCSAgICB9CisrCX0KKysg ICAgICBpZiAoZnVuIChjdXJyZW50X3N0YXRfaW5mby5maWxlX25hbWUsIHR5cGVmbGFnKSA9PSAw KQorKwlvayA9IHRydWU7CisrICAgIH0KKyAgIHNraXBfbWVtYmVyICgpOworICAgaWYgKCFvayAm JiBiYWNrdXBfb3B0aW9uKQorICAgICB1bmRvX2xhc3RfYmFja3VwICgpOworQEAgLTE4NzgsNyAr MTkwNSw3IEBAIGFwcGx5X2RlbGF5ZWRfbGluayAoc3RydWN0IGRlbGF5ZWRfbGluayAqZHMpCisg ICBzdHJ1Y3Qgc3RyaW5nX2xpc3QgKnNvdXJjZXMgPSBkcy0+c291cmNlczsKKyAgIGNoYXIgY29u c3QgKnZhbGlkX3NvdXJjZSA9IE5VTEw7CisgCistICBjaGRpcl9kbyAoZHMtPmNoYW5nZV9kaXIp OworKyAgY2hkaXJfZG8gKGRzLT5jaGFuZ2VfZGlyLCBmYWxzZSk7CisgCisgICBmb3IgKHNvdXJj ZXMgPSBkcy0+c291cmNlczsgc291cmNlczsgc291cmNlcyA9IHNvdXJjZXMtPm5leHQpCisgICAg IHsKK2RpZmYgLS1naXQgYS9zcmMvbGlzdC5jIGIvc3JjL2xpc3QuYworaW5kZXggN2Q3Y2RlNWEu LjA2OGNhNWZiIDEwMDY0NAorLS0tIGEvc3JjL2xpc3QuYworKysrIGIvc3JjL2xpc3QuYworQEAg LTEyOCwxNiArMTI4LDI4IEBAIGVuZm9yY2Vfb25lX3RvcF9sZXZlbCAoY2hhciAqKnBmaWxlX25h bWUpCisgICAgICAgaW50IHBvcyA9IHN0cmxlbiAob25lX3RvcF9sZXZlbF9kaXIpOworICAgICAg IGlmIChzdHJuY21wIChwLCBvbmVfdG9wX2xldmVsX2RpciwgcG9zKSA9PSAwKQorIAl7CistCSAg aWYgKElTU0xBU0ggKHBbcG9zXSkgfHwgcFtwb3NdID09IDApCistCSAgICByZXR1cm47CisrCSAg LyogUmVtb3ZlIHRoZSBvbmVfdG9wX2xldmVsX2RpciBwcmVmaXggaWYgaXQgZW5kcyBhdAorKwkg ICAgIGNvbXBvbmVudCBib3VuZGFyeS4gICovCisrCSAgaWYgKElTU0xBU0ggKHBbcG9zXSkpCisr CSAgICB7CisrCSAgICAgICpwZmlsZV9uYW1lID0geHN0cmR1cCAocFtwb3MrMV0gPyAmcFtwb3Mr MV0gOiAiLiIpOworKwkgICAgICBmcmVlIChmaWxlX25hbWUpOworKwkgICAgICByZXR1cm47Cisr CSAgICB9CisrCSAgZWxzZSBpZiAocFtwb3NdID09IDApCisrCSAgICB7CisrCSAgICAgICpwZmls ZV9uYW1lID0geHN0cmR1cCAoIi4iKTsKKysJICAgICAgZnJlZSAoZmlsZV9uYW1lKTsKKysJICAg ICAgcmV0dXJuOworKwkgICAgfQorIAl9CistCistICAgICAgKnBmaWxlX25hbWUgPSBtYWtlX2Zp bGVfbmFtZSAob25lX3RvcF9sZXZlbF9kaXIsIGZpbGVfbmFtZSk7CistICAgICAgbm9ybWFsaXpl X2ZpbGVuYW1lX3ggKCpwZmlsZV9uYW1lKTsKKysgICAgICAvKiBJZiB0aGUgcHJlZml4IGRvZXMg bm90IG1hdGNoLCBkbyBub3RoaW5nLiAgKi8KKyAgICAgfQorICAgZWxzZQorLSAgICAqcGZpbGVf bmFtZSA9IHhzdHJkdXAgKG9uZV90b3BfbGV2ZWxfZGlyKTsKKy0gIGZyZWUgKGZpbGVfbmFtZSk7 CisrICAgIHsKKysgICAgICAqcGZpbGVfbmFtZSA9IHhzdHJkdXAgKCIuIik7CisrICAgICAgZnJl ZSAoZmlsZV9uYW1lKTsKKysgICAgfQorIH0KKyAKKyB2b2lkCitAQCAtMTU4LDggKzE3MCwxNSBA QCB0cmFuc2Zvcm1fc3RhdF9pbmZvIChpbnQgdHlwZWZsYWcsIHN0cnVjdCB0YXJfc3RhdF9pbmZv ICpzdGF0X2luZm8pCisgICAgICAgdHJhbnNmb3JtX21lbWJlcl9uYW1lICgmc3RhdF9pbmZvLT5s aW5rX25hbWUsIFhGT1JNX0xJTkspOworICAgICB9CisgCistICBpZiAob25lX3RvcF9sZXZlbF9v cHRpb24pCistICAgIGVuZm9yY2Vfb25lX3RvcF9sZXZlbCAoJmN1cnJlbnRfc3RhdF9pbmZvLmZp bGVfbmFtZSk7CisrICBpZiAob25lX3RvcF9sZXZlbF9kaXIpCisrICAgIHsKKysgICAgICBlbmZv cmNlX29uZV90b3BfbGV2ZWwgKCZzdGF0X2luZm8tPmZpbGVfbmFtZSk7CisrICAgICAgLyogSGFy ZCBsaW5rcyBhcmUgaW50ZXJwcmV0ZWQgcmVsYXRpdmUgdG8gY3dkLCBhbmQgLS1vbmUtdG9wLWxl dmVsCisrCSB3b3JrcyBieSBtZWFucyBvZiBhIGhpZGRlbiBjaGFuZ2Ugb2YgY3dkIHRvIHRoZSBy ZXF1ZXN0ZWQgZGlyZWN0b3J5LgorKwkgQWRqdXN0IGhhcmQgbGluayB0YXJnZXRzIGFzIHdlbGwu ICAqLworKyAgICAgIGlmICh0eXBlZmxhZyA9PSBMTktUWVBFKQorKwllbmZvcmNlX29uZV90b3Bf bGV2ZWwgKCZzdGF0X2luZm8tPmxpbmtfbmFtZSk7CisrICAgIH0KKyB9CisgCisgLyogTWFpbiBs b29wIGZvciByZWFkaW5nIGFuIGFyY2hpdmUuICAqLworQEAgLTExNTksOSArMTE3OCw5IEBAIHNp bXBsZV9wcmludF9oZWFkZXIgKHN0cnVjdCB0YXJfc3RhdF9pbmZvICpzdCwgdW5pb24gYmxvY2sg KmJsaywKKyAgIGludCBzaXplbGVuOworIAorICAgaWYgKHNob3dfdHJhbnNmb3JtZWRfbmFtZXNf b3B0aW9uKQorLSAgICB0ZW1wX25hbWUgPSBzdC0+ZmlsZV9uYW1lID8gc3QtPmZpbGVfbmFtZSA6 IHN0LT5vcmlnX2ZpbGVfbmFtZTsKKysgICAgdGVtcF9uYW1lID0gdHJhbnNmb3JtX3RvcF9sZXZl bCAoc3QtPmZpbGVfbmFtZSA/IHN0LT5maWxlX25hbWUgOiBzdC0+b3JpZ19maWxlX25hbWUpOwor ICAgZWxzZQorLSAgICB0ZW1wX25hbWUgPSBzdC0+b3JpZ19maWxlX25hbWUgPyBzdC0+b3JpZ19m aWxlX25hbWUgOiBzdC0+ZmlsZV9uYW1lOworKyAgICB0ZW1wX25hbWUgPSB4c3RyZHVwIChzdC0+ b3JpZ19maWxlX25hbWUgPyBzdC0+b3JpZ19maWxlX25hbWUgOiBzdC0+ZmlsZV9uYW1lKTsKKyAK KyAgIGlmIChibG9ja19udW1iZXJfb3B0aW9uKQorICAgICB7CitAQCAtMTM1NCw2ICsxMzczLDcg QEAgc2ltcGxlX3ByaW50X2hlYWRlciAoc3RydWN0IHRhcl9zdGF0X2luZm8gKnN0LCB1bmlvbiBi bG9jayAqYmxrLAorICAgICB9CisgICBmZmx1c2ggKHN0ZGxpcyk7CisgICB4YXR0cnNfcHJpbnQg KHN0KTsKKysgIGZyZWUgKHRlbXBfbmFtZSk7CisgfQorIAorIAorZGlmZiAtLWdpdCBhL3NyYy9t aXNjLmMgYi9zcmMvbWlzYy5jCitpbmRleCA1NzVkMTNkOS4uZjZjOWE4MTkgMTAwNjQ0CistLS0g YS9zcmMvbWlzYy5jCisrKysgYi9zcmMvbWlzYy5jCitAQCAtMjMsNiArMjMsNyBAQAorICNpbmNs dWRlIDx4Z2V0Y3dkLmg+CisgI2luY2x1ZGUgPHVubGlua2Rpci5oPgorICNpbmNsdWRlIDx1dGlt ZW5zLmg+CisrI2luY2x1ZGUgPGFzc2VydC5oPgorIAorICNpZm5kZWYgRE9VQkxFX1NMQVNIX0lT X0RJU1RJTkNUX1JPT1QKKyAjIGRlZmluZSBET1VCTEVfU0xBU0hfSVNfRElTVElOQ1RfUk9PVCAw CitAQCAtOTQ2LDYgKzk0Nyw3IEBAIHN0cnVjdCB3ZAorICAgICAgdG8gYmUgdXNlZC4gICovCisg ICBpbnQgZmQ7CisgCisrICBib29sIG9uZV90b3BfbGV2ZWw7CisgICAvKiBJZiBJRC5lcnIgaXMg emVybywgdGhlIGRpcmVjdG9yeSdzIGlkZW50aXR5OworICAgICAgaWYgcG9zaXRpdmUsIGEgZmFp bHVyZSBpbmRpY2F0aW9uIHdpdGggZXJybm8gPSBJRC5lcnI7CisgICAgICBpZiBuZWdhdGl2ZSwg bm8gYXR0ZW1wdCBoYXMgYmVlbiBtYWRlIHlldCB0byBnZXQgdGhlIGlkZW50aXR5LiAgKi8KK0BA IC05NzcsOSArOTc5LDE3IEBAIHN0YXRpYyBzaXplX3Qgd2RjYWNoZV9jb3VudDsKKyBpbnQKKyBj aGRpcl9jb3VudCAodm9pZCkKKyB7CistICBpZiAod2RfY291bnQgPT0gMCkKKy0gICAgcmV0dXJu IHdkX2NvdW50OworLSAgcmV0dXJuIHdkX2NvdW50IC0gMTsKKysgIGludCBjb3VudCA9IDA7Cisr ICBpZiAod2RfY291bnQpCisrICAgIHsKKysgICAgICAvKiBEbyBub3QgY291bnQgdGhlIGluaXRp YWwgQ1dEIGVudHJ5IC0+IHN0YXJ0IGF0IDEuICAqLworKyAgICAgIGZvciAoaW50IGkgPSAxOyBp IDwgd2RfY291bnQ7IGkrKykKKysJeworKwkgIGlmICghIHdkW2ldLm9uZV90b3BfbGV2ZWwpCisr CSAgICBjb3VudCsrOworKwl9CisrICAgIH0KKysgIHJldHVybiBjb3VudDsKKyB9CisgCisgLyog R3JvdyB0aGUgV0QgdGFibGUgYnkgYXQgbGVhc3Qgb25lIGVudHJ5LiAgKi8KK0BAIC05OTYsMTUg KzEwMDYsMjcgQEAgZ3Jvd193ZCAodm9pZCkKKyAgICAgICB3ZFt3ZF9jb3VudF0uYWJzcGF0aCA9 IE5VTEw7CisgICAgICAgd2Rbd2RfY291bnRdLmZkID0gQVRfRkRDV0Q7CisgICAgICAgd2Rbd2Rf Y291bnRdLmlkLmVyciA9IC0xOworKyAgICAgIHdkW3dkX2NvdW50XS5vbmVfdG9wX2xldmVsID0g ZmFsc2U7CisgICAgICAgd2RfY291bnQrKzsKKysgICAgICBpZiAob25lX3RvcF9sZXZlbF9kaXIp CisrCXsKKysJICB3ZFt3ZF9jb3VudF0ubmFtZSA9IG9uZV90b3BfbGV2ZWxfZGlyOworKwkgIHdk W3dkX2NvdW50XS5hYnNwYXRoID0gTlVMTDsKKysJICB3ZFt3ZF9jb3VudF0uZmQgPSAwOworKwkg IHdkW3dkX2NvdW50XS5pZC5lcnIgPSAtMTsKKysJICB3ZFt3ZF9jb3VudF0ub25lX3RvcF9sZXZl bCA9IHRydWU7CisrCSAgd2RfY291bnQrKzsKKysJfQorICAgICB9CisgfQorIAorIC8qIERJUiBp cyB0aGUgb3BlcmFuZCBvZiBhIC1DIG9wdGlvbjsgYWRkIGl0IHRvIHZlY3RvciBvZiBjaGRpciB0 YXJnZXRzLAorICAgIGFuZCByZXR1cm4gdGhlIGluZGV4IG9mIGl0cyBsb2NhdGlvbi4gICovCisg aW50CistY2hkaXJfYXJnIChjaGFyIGNvbnN0ICpkaXIpCisrY2hkaXJfYXJnIChjaGFyIGNvbnN0 ICpkaXIsIGJvb2wgb25lX3RvcF9sZXZlbCkKKyB7CisrICBpZiAob25lX3RvcF9sZXZlbCkKKysg ICAgY2hkaXJfYXJnIChkaXIsIGZhbHNlKTsKKyAgIGlmICh3ZF9jb3VudCA9PSB3ZF9hbGxvYykK KyAgICAgZ3Jvd193ZCAoKTsKKyAKK0BAIC0xMDE0LDEzICsxMDM2LDIyIEBAIGNoZGlyX2FyZyAo Y2hhciBjb25zdCAqZGlyKQorICAgICB7CisgICAgICAgZGlyICs9IGRvdHNsYXNobGVuIChkaXIp OworICAgICAgIGlmICghIGRpcltkaXJbMF0gPT0gJy4nXSkKKy0JcmV0dXJuIHdkX2NvdW50IC0g MTsKKysJeworKwkgIGlmICh3ZFt3ZF9jb3VudCAtIDFdLm9uZV90b3BfbGV2ZWwgPT0gb25lX3Rv cF9sZXZlbCkKKysJICAgIHJldHVybiB3ZF9jb3VudCAtIDE7CisrCSAgZWxzZQorKwkgICAgcmV0 dXJuIHdkX2NvdW50IC0gMjsKKysJfQorICAgICB9CisgCisrICBpZiAob25lX3RvcF9sZXZlbCkK KysgICAgZGlyID0gb25lX3RvcF9sZXZlbF9kaXI7CisrCisgICB3ZFt3ZF9jb3VudF0ubmFtZSA9 IGRpcjsKKyAgIHdkW3dkX2NvdW50XS5hYnNwYXRoID0gTlVMTDsKKyAgIHdkW3dkX2NvdW50XS5m ZCA9IDA7CisgICB3ZFt3ZF9jb3VudF0uaWQuZXJyID0gLTE7CisrICB3ZFt3ZF9jb3VudF0ub25l X3RvcF9sZXZlbCA9IG9uZV90b3BfbGV2ZWw7CisgICByZXR1cm4gd2RfY291bnQrKzsKKyB9Cisg CitAQCAtMTAzOSwyMSArMTA3MCw3NCBAQCBzdGF0aWMgaW50IGNoZGlyX2ZkID0gQVRfRkRDV0Q7 CisgICAgd29ya2luZyBkaXJlY3Rvcnk7IG90aGVyd2lzZSwgSSBtdXN0IGJlIGEgdmFsdWUgcmV0 dXJuZWQgYnkKKyAgICBjaGRpcl9hcmcuICAqLworIHZvaWQKKy1jaGRpcl9kbyAoaW50IGkpCisr Y2hkaXJfZG8gKGludCBpLCBib29sIGNyZWF0ZSkKKyB7CistICBpZiAoY2hkaXJfY3VycmVudCAh PSBpKQorLSAgICB7CistICAgICAgc3RydWN0IHdkICpjdXJyID0gJndkW2ldOworLSAgICAgIGlu dCBmZCA9IGN1cnItPmZkOworKyAgc3RydWN0IHdkICpjdXJyID0gJndkW2ldOworKyAgaW50IGZk ID0gY3Vyci0+ZmQ7CisgCistICAgICAgaWYgKCEgZmQpCisrICAvKiBOb3RoaW5nIHRvIGNyZWF0 ZSB1bmxlc3Mgd2UgYXJlIGF0IHRoZSBvbmVfdG9wX2xldmVsIGRpciB0aGF0IGhhcworKyAgICAg bm90IGJlZW4gY3JlYXRlZCB5ZXQuICAqLworKyAgY3JlYXRlID0gY3JlYXRlICYmIGN1cnItPm9u ZV90b3BfbGV2ZWwgJiYgKGZkID09IEJBREZEIHx8IGZkID09IDApOworKworKyAgaWYgKGNoZGly X2N1cnJlbnQgIT0gaSB8fCBjcmVhdGUpCisrICAgIHsKKysgICAgICBpZiAoISBmZCB8fCBjcmVh dGUpCisgCXsKKyAJICBpZiAoISBJU19BQlNPTFVURV9GSUxFX05BTUUgKGN1cnItPm5hbWUpKQor LQkgICAgY2hkaXJfZG8gKGkgLSAxKTsKKysJICAgIHsKKysJICAgICAgaW50IGogPSBpIC0gMTsK KysJICAgICAgaWYgKHdkW2pdLm9uZV90b3BfbGV2ZWwpCisrCQl7CisrCQkgIGotLTsKKysJCSAg YXNzZXJ0ICghIHdkW2pdLm9uZV90b3BfbGV2ZWwpOworKwkJfQorKwkgICAgICBjaGRpcl9kbyAo aiwgZmFsc2UpOworKwkgICAgfQorIAkgIGZkID0gb3BlbmF0IChjaGRpcl9mZCwgY3Vyci0+bmFt ZSwKKyAJCSAgICAgICBvcGVuX3NlYXJjaGRpcl9ob3cuZmxhZ3MgJiB+T19OT0ZPTExPVyk7Cisg CSAgaWYgKGZkIDwgMCkKKy0JICAgIG9wZW5fZmF0YWwgKGN1cnItPm5hbWUpOworKwkgICAgewor KwkgICAgICBpZiAoY3JlYXRlKQorKwkJeworKwkJICBjaGFyICpkaXJfd2l0aF9kb3Q7CisrCQkg IHN0cnVjdCBvcGVuX2hvdyBzYXZlZF9vcGVuX3NlYXJjaGRpcl9ob3cgPSBvcGVuX3NlYXJjaGRp cl9ob3c7CisrCQkgIC8qIERvbid0IHVzZSBPX0JFTkVBVEggZHVyaW5nIGNyZWF0aW9uIG9mIHRo ZQorKwkJICAgICBkaXJlY3RvcnkuIFRoZSBvbmUtdG9wLWxldmVsIGRpcmVjdG9yeSBpcworKwkJ ICAgICBhbGxvd2VkIHRvIGJlIGdpdmVuIGFzIGFuIGFic29sdXRlIHBhdGguICAqLworKwkJICBv cGVuX3NlYXJjaGRpcl9ob3cucmVzb2x2ZSA9IDA7CisrCQkgIC8qIEFwcGVuZCBhIGRvdC4gbWFr ZV9kaXJlY3RvcmllcyBjcmVhdGVzCisrCQkgICAgIGRpcmVjdG9yaWVzIHVwIHRvIGFuZCBleGNs dWRpbmcgdGhlIGxhc3QKKysJCSAgICAgY29tcG9uZW50IG9mIHRoZSBwYXRoLiBTbywgaW4gb3Jk ZXIgdG8gY3JlYXRlCisrCQkgICAgICJhL2IiLCB3ZSBuZWVkIHRvIHBhc3MgImEvYi8uIiB0byBp dC4gKi8KKysJCSAgeworKwkJICAgIG5hbWVidWZfdCBuYnVmID0gbmFtZWJ1Zl9jcmVhdGUgKGN1 cnItPm5hbWUpOworKwkJICAgIG5hbWVidWZfYWRkX2RpciAobmJ1ZiwgIi4iKTsKKysJCSAgICBk aXJfd2l0aF9kb3QgPSBuYW1lYnVmX2ZpbmlzaCAobmJ1Zik7CisrCQkgIH0KKysJCSAgaWYgKG1h a2VfZGlyZWN0b3JpZXMgKGRpcl93aXRoX2RvdCwgTlVMTCkgPT0gMCkKKysJCSAgICAvKiBEaXJl Y3RvcnkgY3JlYXRlZCwgcmV0cnkgKi8KKysJCSAgICBmZCA9IG9wZW5hdCAoY2hkaXJfZmQsIGN1 cnItPm5hbWUsCisrCQkJCSBvcGVuX3NlYXJjaGRpcl9ob3cuZmxhZ3MgJiB+T19OT0ZPTExPVyk7 CisrCQkgIG9wZW5fc2VhcmNoZGlyX2hvdyA9IHNhdmVkX29wZW5fc2VhcmNoZGlyX2hvdzsKKysJ CSAgZnJlZSAoZGlyX3dpdGhfZG90KTsKKysJCSAgLyogRWl0aGVyIHRoZSBjcmVhdGlvbiBvciBv cGVuIGZhaWxlZCAqLworKwkJICBpZiAoZmQgPCAwKQorKwkJICAgIG9wZW5fZmF0YWwgKGN1cnIt Pm5hbWUpOworKwkJfQorKwkgICAgICBlbHNlIGlmIChlcnJubyA9PSBFTk9FTlQgJiYgY3Vyci0+ b25lX3RvcF9sZXZlbCkKKysJCXsKKysJCSAgLyogV2UgYXJlIHJlcXVlc3RlZCB0byBub3QgY3Jl YXRlIHRoZSBkaXJlY3Rvcnkgbm93LiBNYXJrIGl0CisrCQkgICAgIGFzIHRvIGJlIGNyZWF0ZWQg bGF0ZXIgd2hlbiBjYWxsZWQgd2l0aCBjcmVhdGUgPT0gdHJ1ZS4gKi8KKysJCSAgY2hkaXJfZmQg PSBjdXJyLT5mZCA9IEJBREZEOworKwkJICBjaGRpcl9jdXJyZW50ID0gaTsKKysJCSAgLyogRG8g bm90IGFkZCBpdCB0byB0aGUgY2FjaGUgKi8KKysJCSAgcmV0dXJuOworKwkJfQorKwkgICAgICBl bHNlCisrCQl7CisrCQkgIG9wZW5fZmF0YWwgKGN1cnItPm5hbWUpOworKwkJfQorKwkgICAgfQor IAorIAkgIGN1cnItPmZkID0gZmQ7CisgCitAQCAtMTA3MSw3ICsxMTU1LDcgQEAgY2hkaXJfZG8g KGludCBpKQorIAkgICAgfQorIAl9CisgCistICAgICAgaWYgKDAgPCBmZCkKKysgICAgICBpZiAo MCA8IGZkICYmIC8qIG5vIGFzc3VtcHRpb24gYWJvdXQgc2lnbiBvZiBCQURGRCAqLyBmZCAhPSBC QURGRCkKKyAJeworIAkgIC8qIE1vdmUgdGhlIGkgdmFsdWUgdG8gdGhlIGZyb250IG9mIHRoZSBj YWNoZS4gIFRoaXMgaXMKKyAJICAgICBPKENIRElSX0NBQ0hFX1NJWkUpLCBidXQgdGhlIGNhY2hl IGlzIHNtYWxsLiAgKi8KK0BAIC0xMTc1LDYgKzEyNTksMTQgQEAgZmRiYXNlX29wZW5kaXIgKGNo YXIgY29uc3QgKmZpbGVfbmFtZSwgYm9vbCBhbHRlcm5hdGUpCisgeworICAgY2hhciBjb25zdCAq bmFtZSA9IGZpbGVfbmFtZTsKKyAKKysgIGlmIChjaGRpcl9mZCA9PSBCQURGRCAmJiAhIElTX0FC U09MVVRFX0ZJTEVfTkFNRSAoZmlsZV9uYW1lKSkKKysgICAgeworKyAgICAgIC8qIEJBREZEIGlz IGEgc2VudGluZWwgdmFsdWUgbWVhbmluZyB0aGF0IHRoZSBjaGRpciBkaXJlY3RvcnkKKysJIG5l ZWRzIHRvIGJlIGNyZWF0ZWQgbGF6aWx5LCB0aGVyZWZvcmUgaWYgd2UgZW5jb3VudGVyIGl0LCB0 aGUKKysJIGRpcmVjdG9yeSBkb2VzIG5vdCBleGlzdCB5ZXQuICovCisrICAgICAgZXJybm8gPSBF Tk9FTlQ7CisrICAgICAgcmV0dXJuIChzdHJ1Y3QgZmRiYXNlKSB7IC5mZCA9IGNoZGlyX2ZkLCAu YmFzZSA9IG5hbWUgfTsKKysgICAgfQorICAgLyogU2tpcCBwYXN0IGxlYWRpbmcgIi4vInMsCisg ICAgICBidXQgbm90IHBhc3QgdGhlIGxhc3QgIi4vIiBpZiB0aGF0IGVuZHMgdGhlIG5hbWUuICAq LworICAgaWR4X3QgZHNsZW4gPSBkb3RzbGFzaGxlbiAobmFtZSk7CitAQCAtMTIxOSwxMyArMTMx MSwxMyBAQCBmZGJhc2Vfb3BlbmRpciAoY2hhciBjb25zdCAqZmlsZV9uYW1lLCBib29sIGFsdGVy bmF0ZSkKKyAJICBpZiAoc3ViZmQgPCAwKQorIAkgICAgeworIAkgICAgICAvKiBLZWVwIHRoZSBv bGQgZGlyZWN0b3J5IGNhY2hlZCBhbmQgcmVwb3J0IG9wZW4gZmFpbHVyZSwKKy0JCSB1bmxlc3Mg RU1GSUxFIG1lYW5zIGl0J3MgcG9zc2libGUgdGhhdCBmYWxsaW5nCisrCQkgdW5sZXNzIEVNRklM RS9FTkZJTEUgbWVhbnMgaXQncyBwb3NzaWJsZSB0aGF0IGZhbGxpbmcKKyAJCSB0aHJvdWdoIHRv IGNsb3NlIHRoZSBvbGQgZGlyZWN0b3J5IHdvdWxkIG1lYW4gd2UKKyAJCSBjb3VsZCBzdWNjZXNz ZnVsbHkgcmV0cnkgZnJvbSB0aGUgY2hkaXJfZmQgbGV2ZWwuCisgCSAgICAgICAgIFdoZW4gcmVw b3J0aW5nIGZhaWx1cmUsIHRoZXJlIGlzIG5vIG5lZWQgdG8KKyAJICAgICAgICAgbnVsbC10ZXJt aW5hdGUgdGhlIG9sZCBkaXJlY3RvcnksIHNpbmNlIHRoZSBjb2RlIGRvZXMKKyAJICAgICAgICAg bm90IGFzc3VtZSBudWxsIHRlcm1pbmF0aW9uLiAgKi8KKy0JICAgICAgaWYgKGVycm5vICE9IEVN RklMRSkKKysJICAgICAgaWYgKGVycm5vICE9IEVNRklMRSAmJiBlcnJubyAhPSBFTkZJTEUpCisg CQlyZXR1cm4gKHN0cnVjdCBmZGJhc2UpIHsgLmZkID0gQkFERkQsIC5iYXNlID0gYmFzZSB9Owor IAkgICAgfQorIAkgIGVsc2UKK0BAIC0xMjc5LDYgKzEzNzEsMjkgQEAgdGFyX2Rpcm5hbWUgKHZv aWQpCisgICByZXR1cm4gd2RbY2hkaXJfY3VycmVudF0ubmFtZTsKKyB9CisgCisrLyogUmV0dXJu IGEgbmV3bHkgYWxsb2NhdGVkIHN0cmluZyB0aGF0IHNob3dzIE5BTUUgZnJvbSB0aGUgdXNlcidz CisrICAgdmlld3BvaW50LCBnaXZlbiB0aGF0IC0tb25lLXRvcC1sZXZlbCBtYXkgYmUgaW4gZWZm ZWN0LiAgKi8KKytjaGFyICoKKyt0cmFuc2Zvcm1fdG9wX2xldmVsIChjb25zdCBjaGFyICpuYW1l KQorK3sKKysgIGlmICh3ZFtjaGRpcl9jdXJyZW50XS5vbmVfdG9wX2xldmVsKQorKyAgICB7Cisr ICAgICAgaWYgKHN0cmNtcCAobmFtZSwgIi4iKSA9PSAwKQorKwl7CisrCSAgLyogbm90aGluZyB0 byBhcHBlbmQgLSAuLi4vLiBpcyB0aGUgc2FtZSBhcyAuLi4gKi8KKysJICByZXR1cm4geHN0cmR1 cCAod2RbY2hkaXJfY3VycmVudF0ubmFtZSk7CisrCX0KKysgICAgICBlbHNlCisrCXsKKysJICBu YW1lYnVmX3QgbmJ1ZiA9IG5hbWVidWZfY3JlYXRlICh3ZFtjaGRpcl9jdXJyZW50XS5uYW1lKTsK KysJICBuYW1lYnVmX2FkZF9kaXIgKG5idWYsIG5hbWUpOworKwkgIHJldHVybiBuYW1lYnVmX2Zp bmlzaCAobmJ1Zik7CisrCX0KKysgICAgfQorKyAgZWxzZQorKyAgICByZXR1cm4geHN0cmR1cCAo bmFtZSk7CisrfQorKworIC8qIFJldHVybiB0aGUgYWJzb2x1dGUgcGF0aCB0aGF0IHJlcHJlc2Vu dHMgdGhlIHdvcmtpbmcKKyAgICBkaXJlY3RvcnkgcmVmZXJlbmNlZCBieSBJRFguCisgCitAQCAt MTMwNywxMiArMTQyMiwxMyBAQCB0YXJfZ2V0Y2RwYXRoIChpbnQgaWR4KQorICAgICAgIGludCBz YXZlX2N3ZGkgPSBjaGRpcl9jdXJyZW50OworIAorICAgICAgIGZvciAoaSA9IGlkeDsgaSA+PSAw OyBpLS0pCistCWlmICh3ZFtpXS5hYnNwYXRoKQorKwlpZiAod2RbaV0uYWJzcGF0aCAmJiAhd2Rb aV0ub25lX3RvcF9sZXZlbCkKKyAJICBicmVhazsKKyAKKyAgICAgICB3aGlsZSAoKytpIDw9IGlk eCkKKyAJeworLQkgIGNoZGlyX2RvIChpKTsKKysJICBpZiAoIXdkW2ldLm9uZV90b3BfbGV2ZWwp CisrCSAgICBjaGRpcl9kbyAoaSwgZmFsc2UpOworIAkgIGlmIChpID09IDApCisgCSAgICB7Cisg CSAgICAgIGlmICgod2RbaV0uYWJzcGF0aCA9IHhnZXRjd2QgKCkpID09IE5VTEwpCitAQCAtMTMy NSwxMyArMTQ0MSwxOCBAQCB0YXJfZ2V0Y2RwYXRoIChpbnQgaWR4KQorIAkgICAgd2RbaV0uYWJz cGF0aCA9IHhzdHJkdXAgKHdkW2ldLm5hbWUpOworIAkgIGVsc2UKKyAJICAgIHsKKy0JICAgICAg bmFtZWJ1Zl90IG5idWYgPSBuYW1lYnVmX2NyZWF0ZSAod2RbaSAtIDFdLmFic3BhdGgpOworKwkg ICAgICBpbnQgaiA9IGkgLSAxOworKwkgICAgICBpZiAod2Rbal0ub25lX3RvcF9sZXZlbCkKKysJ CXsKKysJCSAgai0tOworKwkJICBhc3NlcnQgKCEgd2Rbal0ub25lX3RvcF9sZXZlbCk7CisrCQl9 CisrCSAgICAgIG5hbWVidWZfdCBuYnVmID0gbmFtZWJ1Zl9jcmVhdGUgKHdkW2pdLmFic3BhdGgp OworIAkgICAgICBuYW1lYnVmX2FkZF9kaXIgKG5idWYsIHdkW2ldLm5hbWUpOworIAkgICAgICB3 ZFtpXS5hYnNwYXRoID0gbmFtZWJ1Zl9maW5pc2ggKG5idWYpOworIAkgICAgfQorIAl9CistCist ICAgICAgY2hkaXJfZG8gKHNhdmVfY3dkaSk7CisrICAgICAgY2hkaXJfZG8gKHNhdmVfY3dkaSwg ZmFsc2UpOworICAgICB9CisgCisgICByZXR1cm4gd2RbaWR4XS5hYnNwYXRoOworZGlmZiAtLWdp dCBhL3NyYy9uYW1lcy5jIGIvc3JjL25hbWVzLmMKK2luZGV4IDQwMzE5MmJlLi41NmNlZTYzYyAx MDA2NDQKKy0tLSBhL3NyYy9uYW1lcy5jCisrKysgYi9zcmMvbmFtZXMuYworQEAgLTg2Nyw2ICs4 NjcsNyBAQCBuYW1lX2luaXQgKHZvaWQpCisgeworICAgbmFtZV9idWZmZXIgPSB4bWFsbG9jIChO QU1FX0ZJRUxEX1NJWkUgKyAyKTsKKyAgIG5hbWVfYnVmZmVyX2xlbmd0aCA9IE5BTUVfRklFTERf U0laRTsKKysgIGNoZGlyX2RvIChjaGRpcl9hcmcgKCIuIiwgISFvbmVfdG9wX2xldmVsX2Rpciks IGZhbHNlKTsKKyAgIG5hbWVfbGlzdF9hZGp1c3QgKCk7CisgfQorIAorQEAgLTExMTksNyArMTEy MCw4IEBAIG5hbWVfbmV4dF9lbHQgKGludCBjaGFuZ2VfZGlycykKKyAJY2FzZSBORUxUX0NIRElS OgorIAkgIGlmIChjaGFuZ2VfZGlycykKKyAJICAgIHsKKy0JICAgICAgY2hkaXJfZG8gKGNoZGly X2FyZyAoeHN0cmR1cCAoZXAtPnYubmFtZSkpKTsKKysJICAgICAgY2hkaXJfZG8gKGNoZGlyX2Fy ZyAoeHN0cmR1cCAoZXAtPnYubmFtZSksICEhb25lX3RvcF9sZXZlbF9kaXIpLAorKwkJCWZhbHNl KTsKKyAJICAgICAgbmFtZV9saXN0X2FkdmFuY2UgKCk7CisgCSAgICAgIGJyZWFrOworIAkgICAg fQorQEAgLTExODIsNyArMTE4NCw3IEBAIG5hbWVfZ2F0aGVyICh2b2lkKQorICAgICAgIHN0YXRp YyBpbnQgY2hhbmdlX2RpcjsKKyAKKyAgICAgICB3aGlsZSAoKGVwID0gbmFtZV9uZXh0X2VsdCAo MCkpICYmIGVwLT50eXBlID09IE5FTFRfQ0hESVIpCistCWNoYW5nZV9kaXIgPSBjaGRpcl9hcmcg KHhzdHJkdXAgKGVwLT52Lm5hbWUpKTsKKysJY2hhbmdlX2RpciA9IGNoZGlyX2FyZyAoeHN0cmR1 cCAoZXAtPnYubmFtZSksICEhb25lX3RvcF9sZXZlbF9kaXIpOworIAorICAgICAgIGlmIChlcCkK KyAJeworQEAgLTEyMTEsNyArMTIxMyw3IEBAIG5hbWVfZ2F0aGVyICh2b2lkKQorIAl7CisgCSAg aW50IGNoYW5nZV9kaXIwID0gY2hhbmdlX2RpcjsKKyAJICB3aGlsZSAoKGVwID0gbmFtZV9uZXh0 X2VsdCAoMCkpICYmIGVwLT50eXBlID09IE5FTFRfQ0hESVIpCistCSAgICBjaGFuZ2VfZGlyID0g Y2hkaXJfYXJnICh4c3RyZHVwIChlcC0+di5uYW1lKSk7CisrCSAgICBjaGFuZ2VfZGlyID0gY2hk aXJfYXJnICh4c3RyZHVwIChlcC0+di5uYW1lKSwgISFvbmVfdG9wX2xldmVsX2Rpcik7CisgCisg CSAgaWYgKGVwKQorIAkgICAgYWRkbmFtZSAoZXAtPnYubmFtZSwgY2hhbmdlX2RpciwgdHJ1ZSwg TlVMTCk7CitAQCAtMTMyNiw3ICsxMzI4LDcgQEAgbmFtZV9tYXRjaCAoY29uc3QgY2hhciAqZmls ZV9uYW1lKQorIAorICAgICAgIGlmIChjdXJzb3ItPm5hbWVbMF0gPT0gMCkKKyAJeworLQkgIGNo ZGlyX2RvIChjdXJzb3ItPmNoYW5nZV9kaXIpOworKwkgIGNoZGlyX2RvIChjdXJzb3ItPmNoYW5n ZV9kaXIsIGZhbHNlKTsKKyAJICBuYW1lbGlzdCA9IE5VTEw7CisgCSAgbmFtZXRhaWwgPSBOVUxM OworIAkgIHJldHVybiB0cnVlOworQEAgLTEzNDgsNyArMTM1MCw3IEBAIG5hbWVfbWF0Y2ggKGNv bnN0IGNoYXIgKmZpbGVfbmFtZSkKKyAJICBpZiAoIShJU1NMQVNIIChmaWxlX25hbWVbY3Vyc29y LT5sZW5ndGhdKSAmJiByZWN1cnNpb25fb3B0aW9uKQorIAkgICAgICB8fCBjdXJzb3ItPmZvdW5k X2NvdW50ID09IDApCisgCSAgICBjdXJzb3ItPmZvdW5kX2NvdW50Kys7IC8qIHJlbWVtYmVyIGl0 IG1hdGNoZWQgKi8KKy0JICBjaGRpcl9kbyAoY3Vyc29yLT5jaGFuZ2VfZGlyKTsKKysJICBjaGRp cl9kbyAoY3Vyc29yLT5jaGFuZ2VfZGlyLCBmYWxzZSk7CisgCSAgLyogV2UgZ290IGEgbWF0Y2gu ICAqLworIAkgIHJldHVybiBJU0ZPVU5EIChjdXJzb3IpOworIAl9CitAQCAtMTc3OCw3ICsxNzgw LDcgQEAgY29sbGVjdF9hbmRfc29ydF9uYW1lcyAodm9pZCkKKyAgICAgICBpZiAobmFtZS0+Zm91 bmRfY291bnQgfHwgbmFtZS0+ZGlyZWN0b3J5KQorIAljb250aW51ZTsKKyAKKy0gICAgICBjaGRp cl9kbyAobmFtZS0+Y2hhbmdlX2Rpcik7CisrICAgICAgY2hkaXJfZG8gKG5hbWUtPmNoYW5nZV9k aXIsIGZhbHNlKTsKKyAKKyAgICAgICBpZiAobmFtZS0+bmFtZVswXSA9PSAwKQorIAljb250aW51 ZTsKK0BAIC0xOTI0LDcgKzE5MjYsNyBAQCBuYW1lX2Zyb21fbGlzdCAodm9pZCkKKyAgICAgewor ICAgICAgIGlmICghZ251X2xpc3RfbmFtZS0+aXNfd2lsZGNhcmQpCisgCWdudV9saXN0X25hbWUt PmZvdW5kX2NvdW50Kys7CistICAgICAgY2hkaXJfZG8gKGdudV9saXN0X25hbWUtPmNoYW5nZV9k aXIpOworKyAgICAgIGNoZGlyX2RvIChnbnVfbGlzdF9uYW1lLT5jaGFuZ2VfZGlyLCBmYWxzZSk7 CisgICAgICAgcmV0dXJuIGdudV9saXN0X25hbWU7CisgICAgIH0KKyAgIHJldHVybiBOVUxMOwor ZGlmZiAtLWdpdCBhL3NyYy90YXIuYyBiL3NyYy90YXIuYworaW5kZXggOWE1ZmJkMGIuLjU2Yzll ZDJhIDEwMDY0NAorLS0tIGEvc3JjL3Rhci5jCisrKysgYi9zcmMvdGFyLmMKK0BAIC0xNTcyLDcg KzE1NzIsNiBAQCBwYXJzZV9vcHQgKGludCBrZXksIGNoYXIgKmFyZywgc3RydWN0IGFyZ3Bfc3Rh dGUgKnN0YXRlKQorIAorICAgICBjYXNlIE9ORV9UT1BfTEVWRUxfT1BUSU9OOgorICAgICAgIG9w dGxvY19zYXZlIChPQ19PTkVfVE9QX0xFVkVMLCBhcmdzLT5sb2MpOworLSAgICAgIG9uZV90b3Bf bGV2ZWxfb3B0aW9uID0gdHJ1ZTsKKyAgICAgICBvbmVfdG9wX2xldmVsX2RpciA9IGFyZzsKKyAg ICAgICBicmVhazsKKyAKK0BAIC0yNTc2LDkgKzI1NzUsMTEgQEAgZGVjb2RlX29wdGlvbnMgKGlu dCBhcmdjLCBjaGFyICoqYXJndikKKyAJc2FtZV9vcmRlcl9vcHRpb24gPSBmYWxzZTsKKyAgICAg fQorIAorLSAgaWYgKG9uZV90b3BfbGV2ZWxfb3B0aW9uKQorKyAgaWYgKG9wdGxvY19sb29rdXAg KE9DX09ORV9UT1BfTEVWRUwpKQorICAgICB7CistICAgICAgY2hhciAqYmFzZTsKKysgICAgICBp ZiAoIUlTX1NVQkNPTU1BTkRfQ0xBU1MgKFNVQkNMX1JFQUQpKQorKwlvcHRpb25fY29uZmxpY3Rf ZXJyb3IgKCItLW9uZS10b3AtbGV2ZWwiLAorKwkJCSAgICAgICBzdWJjb21tYW5kX3N0cmluZyAo c3ViY29tbWFuZF9vcHRpb24pKTsKKyAKKyAgICAgICBpZiAoYWJzb2x1dGVfbmFtZXNfb3B0aW9u KQorIAl7CitAQCAtMjU4OSwxNyArMjU5MCwxOCBAQCBkZWNvZGVfb3B0aW9ucyAoaW50IGFyZ2Ms IGNoYXIgKiphcmd2KQorIAorIAkgIGlmIChvcHRsb2NfZXEgKG9uZV90b3BfbGV2ZWxfbG9jLCBh YnNvbHV0ZV9uYW1lc19sb2MpKQorIAkgICAgb3B0aW9uX2NvbmZsaWN0X2Vycm9yICgiLS1vbmUt dG9wLWxldmVsIiwgIi0tYWJzb2x1dGUtbmFtZXMiKTsKKy0JICBlbHNlIGlmIChvbmVfdG9wX2xl dmVsX2xvYy0+c291cmNlID09IE9QVFNfQ09NTUFORF9MSU5FKQorKwkgIGlmIChvbmVfdG9wX2xl dmVsX2xvYy0+c291cmNlID09IE9QVFNfQ09NTUFORF9MSU5FKQorIAkgICAgYWJzb2x1dGVfbmFt ZXNfb3B0aW9uID0gZmFsc2U7CisgCSAgZWxzZQorLQkgICAgb25lX3RvcF9sZXZlbF9vcHRpb24g PSBmYWxzZTsKKysJICAgIG9uZV90b3BfbGV2ZWxfZGlyID0gTlVMTDsKKyAJfQorIAorLSAgICAg IGlmICghb25lX3RvcF9sZXZlbF9kaXIgJiYgb25lX3RvcF9sZXZlbF9vcHRpb24pCisrICAgICAg aWYgKCFhYnNvbHV0ZV9uYW1lc19vcHRpb24gJiYgIW9uZV90b3BfbGV2ZWxfZGlyKQorIAl7Cist CSAgLyogSWYgdGhlIHVzZXIgd2FudHMgdG8gZ3VhcmFudGVlIHRoYXQgZXZlcnl0aGluZyBpcyB1 bmRlciBvbmUKKy0JICAgICBkaXJlY3RvcnksIGRldGVybWluZSBpdHMgbmFtZSBub3cgYW5kIGxl dCBpdCBiZSBjcmVhdGVkIGxhdGVyLiAgKi8KKy0JICBiYXNlID0gYmFzZV9uYW1lIChhcmNoaXZl X25hbWVfYXJyYXlbMF0pOworKwkgIC8qIERldGVybWluZSBuYW1lIG5vdzsgdGhlIGRpcmVjdG9y eSAob3IgZGlyZWN0b3JpZXMsIGlmIC1DCisrCSAgICAgbWVhbnMgdGhlcmUgYXJlIG11bHRpcGxl IHRvcC1sZXZlbCBkaXJlY3RvcmllcykgYXJlCisrCSAgICAgY3JlYXRlZCBsYXRlciBpZiBuZWVk ZWQuICAqLworKwkgIGNoYXIgKmJhc2UgPSBiYXNlX25hbWUgKGFyY2hpdmVfbmFtZV9hcnJheVsw XSk7CisgCSAgb25lX3RvcF9sZXZlbF9kaXIgPSBzdHJpcF9jb21wcmVzc2lvbl9zdWZmaXggKGJh c2UpOworIAkgIGZyZWUgKGJhc2UpOworIAorQEAgLTI2MDksOSArMjYxMSw3IEBAIGRlY29kZV9v cHRpb25zIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCisgCQkJICAgICJwbGVhc2Ugc2V0IGl0IGV4 cGxpY2l0bHkgd2l0aCAtLW9uZS10b3AtbGV2ZWw9RElSIikpKTsKKyAJfQorIAorLSAgICAgIGlm IChvbmVfdG9wX2xldmVsX2RpciAmJiAhSVNfUkVMQVRJVkVfRklMRV9OQU1FIChvbmVfdG9wX2xl dmVsX2RpcikpCistCVVTQUdFX0VSUk9SICgoMCwgMCwKKy0JCSAgICAgXygiLS1vbmUtdG9wLWxl dmVsPURJUiBtdXN0IHVzZSBhIHJlbGF0aXZlIGZpbGUgbmFtZSIpKSk7CisrICAgICAgbm9ybWFs aXplX2ZpbGVuYW1lX3ggKG9uZV90b3BfbGV2ZWxfZGlyKTsKKyAgICAgfQorIAorICAgLyogSWYg cmVhZHkgdG8gdW5saW5rIGhpZXJhcmNoaWVzLCBzbyB3ZSBhcmUgZm9yIHNpbXBsZXIgZmlsZXMu ICAqLworZGlmZiAtLWdpdCBhL3NyYy91bmxpbmsuYyBiL3NyYy91bmxpbmsuYworaW5kZXggMzNk MmNjZDEuLmUxOTliYWIzIDEwMDY0NAorLS0tIGEvc3JjL3VubGluay5jCisrKysgYi9zcmMvdW5s aW5rLmMKK0BAIC0xMDMsNyArMTAzLDcgQEAgZmx1c2hfZGVmZXJyZWRfdW5saW5rcyAoYm9vbCBm b3JjZSkKKyAgICAgICBpZiAoZm9yY2UKKyAJICB8fCByZWNvcmRzX3dyaXR0ZW4gPiBwLT5yZWNv cmRzX3dyaXR0ZW4gKyBkZWZlcnJlZF91bmxpbmtfZGVsYXkpCisgCXsKKy0JICBjaGRpcl9kbyAo cC0+ZGlyX2lkeCk7CisrCSAgY2hkaXJfZG8gKHAtPmRpcl9pZHgsIGZhbHNlKTsKKyAJICBpZiAo cC0+aXNfZGlyKQorIAkgICAgeworIAkgICAgICBjb25zdCBjaGFyICpmbmFtZTsKK0BAIC0xNzUs MTEgKzE3NSwxMSBAQCBmbHVzaF9kZWZlcnJlZF91bmxpbmtzIChib29sIGZvcmNlKQorIAkgIHN0 cnVjdCBkZWZlcnJlZF91bmxpbmsgKm5leHQgPSBwLT5uZXh0OworIAkgIGNvbnN0IGNoYXIgKmZu YW1lOworIAorLQkgIGNoZGlyX2RvIChwLT5kaXJfaWR4KTsKKysJICBjaGRpcl9kbyAocC0+ZGly X2lkeCwgZmFsc2UpOworIAkgIGlmIChwLT5kaXJfaWR4ICYmIElTX0NXRCAocCkpCisgCSAgICB7 CisgCSAgICAgIGZuYW1lID0gdGFyX2Rpcm5hbWUgKCk7CistCSAgICAgIGNoZGlyX2RvIChwLT5k aXJfaWR4IC0gMSk7CisrCSAgICAgIGNoZGlyX2RvIChwLT5kaXJfaWR4IC0gMSwgZmFsc2UpOwor IAkgICAgfQorIAkgIGVsc2UKKyAJICAgIGZuYW1lID0gcC0+ZmlsZV9uYW1lOworQEAgLTE5NSw5 ICsxOTUsOSBAQCBmbHVzaF9kZWZlcnJlZF91bmxpbmtzIChib29sIGZvcmNlKQorIAkgIHAgPSBu ZXh0OworIAl9CisgICAgICAgZHVubGlua19oZWFkID0gZHVubGlua190YWlsID0gTlVMTDsKKy0g ICAgfQkgIAorLQkgICAgCistICBjaGRpcl9kbyAoc2F2ZWRfY2hkaXIpOworKyAgICB9CisrCisr ICBjaGRpcl9kbyAoc2F2ZWRfY2hkaXIsIGZhbHNlKTsKKyB9CisgCisgdm9pZAorZGlmZiAtLWdp dCBhL3NyYy91cGRhdGUuYyBiL3NyYy91cGRhdGUuYworaW5kZXggMmJjMzgyMDcuLjI0MTY3Nzc4 IDEwMDY0NAorLS0tIGEvc3JjL3VwZGF0ZS5jCisrKysgYi9zcmMvdXBkYXRlLmMKK0BAIC0xNDEs NyArMTQxLDcgQEAgdXBkYXRlX2FyY2hpdmUgKHZvaWQpCisgCSAgICAgIHsKKyAJCXN0cnVjdCBz dGF0IHM7CisgCistCQljaGRpcl9kbyAobmFtZS0+Y2hhbmdlX2Rpcik7CisrCQljaGRpcl9kbyAo bmFtZS0+Y2hhbmdlX2RpciwgZmFsc2UpOworIAkJaWYgKGRlcmVmX3N0YXQgKGN1cnJlbnRfc3Rh dF9pbmZvLmZpbGVfbmFtZSwgJnMpID09IDApCisgCQkgIHsKKyAJCSAgICBpZiAoU19JU0RJUiAo cy5zdF9tb2RlKSkKCmRpZmYgLS1naXQgYS90YXIuc3BlYyBiL3Rhci5zcGVjCmluZGV4IDk1NTc1 MWQuLjY4YzJjMWMgMTAwNjQ0Ci0tLSBhL3Rhci5zcGVjCisrKyBiL3Rhci5zcGVjCkBAIC01OCw2 ICs1OCw3IEBAIFBhdGNoMjI6IHRhci0xLjM1LW5vLW92ZXJ3cml0ZS1kaXItbm8tb3ZlcndyaXRl LWV2ZW4tdGVtcG9yYXJpbHkucGF0Y2gKICMgZDFhZWI3Mzg4OTI2ZTA0NWJkZWMwZjc5MzRjNTUy MmM0NzQ1ZjAyYwogIyA0NWI2ZTY4OThkMWY5MzFiZmNhNDFkOTYxMjg5YmQ2YWMzMzIzOGU1CiBQ YXRjaDIzOiB0YXItMS4zNS1DVkUtMjAyNS00NTU4Mi5wYXRjaAorIyBtZXJlbHkgYSBwcmVwYXJh dGlvbiB0byBhcHBseSBQYXRjaDI3LCB0aGUgY2hhbmdlIGlzIG9ic29sZXRlZCBieSBpdAogUGF0 Y2gyNDogdGFyLTEuMzUtdGFyLW9uZS10b3AtbGV2ZWwtRElSLW11c3QtYmUtcmVsYXRpdmUucGF0 Y2gKICMgU291cmNlOiBodHRwczovL2NnaXQuZ2l0LnNhdmFubmFoLmdudS5vcmcvY2dpdC90YXIu Z2l0L2NvbW1pdC8/aWQ9MDhjM2ZjMmU5MzM3MDk0YWZmMDFhNTExMTcwZmQzNWZkYjhmMWVlMwog IyBGaXhlcyBidWlsZCB3aXRoIGFjbCAyLjQuMApAQCAtNjgsNiArNjksMTkgQEAgUGF0Y2gyNTog dGFyLTEuMzUtQXZvaWQtYWNsXy1wcmVmaXgtZm9yLWZ1bmN0aW9ucy5wYXRjaAogIyA2Nzk4MWJi YjE1ODc4MDNiYjFlMDI5MzkzZDIyMjg0OTJjZWY4YzRmCiAjIDE5YTNhNzNlOGM0OGJkM2M1OWNi ZWE5YjVlZDY3ODBmYzY4MzZjNmQKIFBhdGNoMjY6IHRhci0xLjM1LUNWRS0yMDI2LTU3MDQucGF0 Y2gKKyNVcHN0cmVhbSBjb21taXRzCisjIGJmYzMzNDYzOTQyMDYwMzE2ZjcwZjI3NTQ3MWVkMjAy YjAwNzY5NzIKKyMgYjRmYzljYTEzNjE3NDExYzVkYjU3Mjg2YTNmZjUzNGJkNDBhY2RjMQorIyA2 N2M4ZGZmNjk2OGFhZTU4ZmNkZmIwNTI2OGViMWI0YzA3MzA4ZjFhCisjIDU1ZTgyMzM0MzhiM2Mx MzI5NDEwOWRmNTAyYTliMjIwYTlhM2Y0ZjUKKyMgMDQ3MGMxMDljMDhmNDY2ZDgzMzJiYTMzMjYw NzA1NTRiNGQ4MWFhMQorIyAxYjkxZjVmNjZmOGU2YzQ5MGVlZjBmZGVlNTBmNjUyY2ZlMTU1ODQ0 CisjIDMyNWI4OTkyMTRhYzEzNTE5MTUzMzE4ZTY2Yzg4OWEzMWMxNTM0MmQKKyMgMTk4MGUwMzJh ZmU2MGM1ZmUwZTVkZjU3MzQ1Nzg4NWVjZTRlNjlkNQorIyBlMzM1ZTJjOGIxMDJmODNiNjNmZmQz NzNmMGI4ODQwMWRhM2ViZTZjCisjIHBhcnQgb2YgOTQxZjYyYjIKKyMgQWxzbyAiYnkgdGhlIHdh eSIgZml4ZXMgQ1ZFLTIwMjYtMTg1MDguCitQYXRjaDI3OiB0YXItMS4zNS1maXgtYWJzb2x1dGUt b25lLXRvcC1sZXZlbC5wYXRjaAogCiBCdWlsZFJlcXVpcmVzOiBhdXRvY29uZgogQnVpbGRSZXF1 aXJlczogYXV0b21ha2UK