From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=0.3 required=5.0 tests=ALL_TRUSTED,DKIM_ADSP_NXDOMAIN, TVD_RATWARE_MSGID_01 autolearn=no autolearn_force=no version=3.4.4 Received: (qmail 29905 invoked from network); 27 Oct 2023 13:44:59 -0000 Received: from localhost (HELO inbox.vuxu.org) (::1) by localhost with ESMTPUTF8; 27 Oct 2023 13:44:59 -0000 Content-Type: multipart/mixed; boundary="===============2487451770437836158==" MIME-Version: 1.0 Subject: =?utf8?q?=5BPR_PATCH=5D_open-vm-tools=3A_add_patch_for_CVE-2023-34058=2C_CVE-2023-34059?= To: ml@inbox.vuxu.org From: Piraty Reply-to: ml@inbox.vuxu.org Message-ID: Date: Fri, 27 Oct 2023 15:44:58 +0200 List-Id: GitHub notification mails are now in MIME to allow UTF8. --===============2487451770437836158== Content-Type: text/plain; charset="utf8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 VGhlcmUgaXMgYSBuZXcgcHVsbCByZXF1ZXN0IGJ5IFBpcmF0eSBhZ2FpbnN0IG1hc3RlciBvbiB0 aGUgdm9pZC1wYWNrYWdlcyByZXBvc2l0b3J5CgpodHRwczovL2dpdGh1Yi5jb20vUGlyYXR5L3Zv aWQtcGFja2FnZXMgb3Blbi12bS10b29scy1DVkUtMjAyMy0zNDA1OQpodHRwczovL2dpdGh1Yi5j b20vdm9pZC1saW51eC92b2lkLXBhY2thZ2VzL3B1bGwvNDY5MzIKCm9wZW4tdm0tdG9vbHM6IGFk ZCBwYXRjaCBmb3IgQ1ZFLTIwMjMtMzQwNTgsIENWRS0yMDIzLTM0MDU5Cmh0dHBzOi8vd3d3Lm9w ZW53YWxsLmNvbS9saXN0cy9vc3Mtc2VjdXJpdHkvMjAyMy8xMC8yNy8xDQpodHRwczovL3d3dy5v cGVud2FsbC5jb20vbGlzdHMvb3NzLXNlY3VyaXR5LzIwMjMvMTAvMjcvMg0KCgpBIHBhdGNoIGZp bGUgZnJvbSBodHRwczovL2dpdGh1Yi5jb20vdm9pZC1saW51eC92b2lkLXBhY2thZ2VzL3B1bGwv NDY5MzIucGF0Y2ggaXMgYXR0YWNoZWQ= --===============2487451770437836158== Content-Type: text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="github-pr-open-vm-tools-CVE-2023-34059-46932.patch" RnJvbSBiYmI0YThkYmE4NTY1YTVlMTgzZDJlZDM1Y2EyMjE2NmVkMDQyMmU5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaXJhdHkgPG1haWxAcGlyYXR5LmRldj4KRGF0ZTogRnJpLCAy NyBPY3QgMjAyMyAxNTo0MzowMCArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIG9wZW4tdm0tdG9vbHM6 IGFkZCBwYXRjaCBmb3IgQ1ZFLTIwMjMtMzQwNTgsIENWRS0yMDIzLTM0MDU5CgpodHRwczovL3d3 dy5vcGVud2FsbC5jb20vbGlzdHMvb3NzLXNlY3VyaXR5LzIwMjMvMTAvMjcvMQpodHRwczovL3d3 dy5vcGVud2FsbC5jb20vbGlzdHMvb3NzLXNlY3VyaXR5LzIwMjMvMTAvMjcvMgotLS0KIC4uLi9w YXRjaGVzL0NWRS0yMDIzLTM0MDU4LnBhdGNoICAgICAgICAgICAgICB8IDIzNyArKysrKysrKysr KysrKysrKysKIC4uLi9wYXRjaGVzL0NWRS0yMDIzLTM0MDU5LnBhdGNoICAgICAgICAgICAgICB8 IDE4MiArKysrKysrKysrKysrKwogc3JjcGtncy9vcGVuLXZtLXRvb2xzL3RlbXBsYXRlICAgICAg ICAgICAgICAgIHwgICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDQyMCBpbnNlcnRpb25zKCspLCAx IGRlbGV0aW9uKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgc3JjcGtncy9vcGVuLXZtLXRvb2xzL3Bh dGNoZXMvQ1ZFLTIwMjMtMzQwNTgucGF0Y2gKIGNyZWF0ZSBtb2RlIDEwMDY0NCBzcmNwa2dzL29w ZW4tdm0tdG9vbHMvcGF0Y2hlcy9DVkUtMjAyMy0zNDA1OS5wYXRjaAoKZGlmZiAtLWdpdCBhL3Ny Y3BrZ3Mvb3Blbi12bS10b29scy9wYXRjaGVzL0NWRS0yMDIzLTM0MDU4LnBhdGNoIGIvc3JjcGtn cy9vcGVuLXZtLXRvb2xzL3BhdGNoZXMvQ1ZFLTIwMjMtMzQwNTgucGF0Y2gKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMC4uMGZjMzRkNzE0OTA4YwotLS0gL2Rldi9udWxs CisrKyBiL3NyY3BrZ3Mvb3Blbi12bS10b29scy9wYXRjaGVzL0NWRS0yMDIzLTM0MDU4LnBhdGNo CkBAIC0wLDAgKzEsMjM3IEBACitGcm9tIDY4MjJiNWE4NGY4Y2ZhNjBkNDY0NzlkNmI4ZjFjNjNl Yjg1ZWFjODcgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBKb2huIFdvbGZlIDxqd29s ZmVAdm13YXJlLmNvbT4KK0RhdGU6IFdlZCwgMTggT2N0IDIwMjMgMDk6MDQ6MDcgLTA3MDAKK1N1 YmplY3Q6IFtQQVRDSF0gQWRkcmVzcyBDVkUtMjAyMy0zNDA1OAorCitWR0F1dGg6IGRvbid0IGFj Y2VwdCB0b2tlbnMgd2l0aCB1bnJlbGF0ZWQgY2VydHMuCisKKy0tLQorIG9wZW4tdm0tdG9vbHMv dmdhdXRoL2NvbW1vbi9jZXJ0dmVyaWZ5LmMgICAgICAgIHwgMTQ1ICsrKysrKysrKysrKysrKysr KysrKysrKworIG9wZW4tdm0tdG9vbHMvdmdhdXRoL2NvbW1vbi9jZXJ0dmVyaWZ5LmggICAgICAg IHwgICA0ICsKKyBvcGVuLXZtLXRvb2xzL3ZnYXV0aC9jb21tb24vcHJlZnMuaCAgICAgICAgICAg ICB8ICAgMiArCisgb3Blbi12bS10b29scy92Z2F1dGgvc2VydmljZUltcGwvc2FtbC14bWxzZWMx LmMgfCAgMTQgKysrCisgNCBmaWxlcyBjaGFuZ2VkLCAxNjUgaW5zZXJ0aW9ucygrKQorCitkaWZm IC0tZ2l0IGEvb3Blbi12bS10b29scy92Z2F1dGgvY29tbW9uL2NlcnR2ZXJpZnkuYyBiL29wZW4t dm0tdG9vbHMvdmdhdXRoL2NvbW1vbi9jZXJ0dmVyaWZ5LmMKK2luZGV4IDBlZDc4ZWQuLmUxZDdj YzYgMTAwNjQ0CistLS0gYS9vcGVuLXZtLXRvb2xzL3ZnYXV0aC9jb21tb24vY2VydHZlcmlmeS5j CisrKysgYi9vcGVuLXZtLXRvb2xzL3ZnYXV0aC9jb21tb24vY2VydHZlcmlmeS5jCitAQCAtOTE0 LDMgKzkxNCwxNDggQEAgZG9uZToKKyAKKyAgICByZXR1cm4gZXJyOworIH0KKysKKysKKysvKgor KyAqIEZpbmRzIGEgY2VydCB3aXRoIGEgc3ViamVjdCAoaWYgY2hlY2tTdWJqIGlzIHNldCkgb3Ig aXNzdWVyIChpZgorKyAqIGNoZWNrU1ViaiBpcyB1bnNldCksIG1hdGNoaW5nICd2YWwnIGluIHRo ZSBsaXN0CisrICogb2YgY2VydHMuICBSZXR1cm5zIGEgbWF0Y2ggb3IgTlVMTC4KKysgKi8KKysK KytzdGF0aWMgWDUwOSAqCisrRmluZENlcnQoR0xpc3QgKmNMaXN0LAorKyAgICAgICAgIFg1MDlf TkFNRSAqdmFsLAorKyAgICAgICAgIGludCBjaGVja1N1YmopCisreworKyAgIEdMaXN0ICpsOwor KyAgIFg1MDkgKmM7CisrICAgWDUwOV9OQU1FICp2OworKworKyAgIGwgPSBjTGlzdDsKKysgICB3 aGlsZSAobCAhPSBOVUxMKSB7CisrICAgICAgYyA9IChYNTA5ICopIGwtPmRhdGE7CisrICAgICAg aWYgKGNoZWNrU3ViaikgeworKyAgICAgICAgIHYgPSBYNTA5X2dldF9zdWJqZWN0X25hbWUoYyk7 CisrICAgICAgfSBlbHNlIHsKKysgICAgICAgICB2ID0gWDUwOV9nZXRfaXNzdWVyX25hbWUoYyk7 CisrICAgICAgfQorKyAgICAgIGlmIChYNTA5X05BTUVfY21wKHZhbCwgdikgPT0gMCkgeworKyAg ICAgICAgIHJldHVybiBjOworKyAgICAgIH0KKysgICAgICBsID0gbC0+bmV4dDsKKysgICB9Cisr ICAgcmV0dXJuIE5VTEw7CisrfQorKworKworKy8qCisrICoqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgor KyAqIENlcnRWZXJpZnlfQ2hlY2tGb3JVbnJlbGF0ZWRDZXJ0cyAtLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAqLyAvKioKKysgKgorKyAqIExvb2tzIG92ZXIgYSBsaXN0IG9mIGNl cnRzLiAgSWYgaXQgZmluZHMgdGhhdCB0aGV5IGFyZSBub3QgYWxsCisrICogcGFydCBvZiB0aGUg c2FtZSBjaGFpbiwgcmV0dXJucyBmYWlsdXJlLgorKyAqCisrICogQHBhcmFtW2luXSAgICAgbnVt Q2VydHMgICAgICBUaGUgbnVtYmVyIG9mIGNlcnRzIGluIHRoZSBjaGFpbi4KKysgKiBAcGFyYW1b aW5dICAgICBwZW1DZXJ0cyAgICAgIFRoZSBjaGFpbiBvZiBjZXJ0aWZpY2F0ZXMgdG8gdmVyaWZ5 LgorKyAqCisrICogQHJldHVybiBWR0FVVEhfRV9PSyBvbiBzdWNjZXNzLCBWR0FVVEhfRV9GQUlM IGlmIHVucmVsYXRlZCBjZXJ0cyBhcmUgZm91bmQuCisrICoKKysgKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqCisrICovCisrCisrVkdBdXRoRXJyb3IKKytDZXJ0VmVyaWZ5X0NoZWNrRm9yVW5yZWxhdGVk Q2VydHMoaW50IG51bUNlcnRzLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBjaGFyICoqcGVtQ2VydHMpCisreworKyAgIFZHQXV0aEVycm9yIGVyciA9IFZHQVVUSF9F X0ZBSUw7CisrICAgaW50IGNoYWluTGVuID0gMDsKKysgICBpbnQgaTsKKysgICBYNTA5ICoqY2Vy dHMgPSBOVUxMOworKyAgIEdMaXN0ICpyYXdMaXN0ID0gTlVMTDsKKysgICBYNTA5ICpiYXNlQ2Vy dDsKKysgICBYNTA5ICpjdXJDZXJ0OworKyAgIFg1MDlfTkFNRSAqc3ViamVjdDsKKysgICBYNTA5 X05BTUUgKmlzc3VlcjsKKysKKysgICAvKiBjb21tb24gc2luZ2xlIGNlcnQgY2FzZTsgbm90aGlu ZyB0byBkbyAqLworKyAgIGlmIChudW1DZXJ0cyA9PSAxKSB7CisrICAgICAgcmV0dXJuIFZHQVVU SF9FX09LOworKyAgIH0KKysKKysgICAvKiBjb252ZXJ0IGFsbCBQRU0gdG8gWDUwOSBvYmplY3Rz ICovCisrICAgY2VydHMgPSBnX21hbGxvYzAobnVtQ2VydHMgKiBzaXplb2YoWDUwOSAqKSk7Cisr ICAgZm9yIChpID0gMDsgaSA8IG51bUNlcnRzOyBpKyspIHsKKysgICAgICBjZXJ0c1tpXSA9IENl cnRTdHJpbmdUb1g1MDkocGVtQ2VydHNbaV0pOworKyAgICAgIGlmIChOVUxMID09IGNlcnRzW2ld KSB7CisrICAgICAgICAgZ193YXJuaW5nKCIlczogZmFpbGVkIHRvIGNvbnZlcnQgY2VydCB0byBY NTA5XG4iLCBfX0ZVTkNUSU9OX18pOworKyAgICAgICAgIGdvdG8gZG9uZTsKKysgICAgICB9Cisr ICAgfQorKworKyAgIC8qIGNob29zZSB0aGUgY2VydCB0byBzdGFydCB0aGUgY2hhaW4uICBzaG91 bGRuJ3QgbWF0dGVyIHdoaWNoICovCisrICAgYmFzZUNlcnQgPSBjZXJ0c1swXTsKKysKKysgICAv KiBwdXQgdGhlIHJlc3QgaW50byBhIGxpc3QgKi8KKysgICBmb3IgKGkgPSAxOyBpIDwgbnVtQ2Vy dHM7IGkrKykgeworKyAgICAgIHJhd0xpc3QgPSBnX2xpc3RfYXBwZW5kKHJhd0xpc3QsIGNlcnRz W2ldKTsKKysgICB9CisrCisrICAgLyogbm93IGNoYXNlIGRvd24gdG8gYSBsZWFmLCBsb29raW5n IGZvciBjZXJ0cyB0aGUgYmFzZUNlcnQgaXNzdWVkICovCisrICAgc3ViamVjdCA9IFg1MDlfZ2V0 X3N1YmplY3RfbmFtZShiYXNlQ2VydCk7CisrICAgd2hpbGUgKChjdXJDZXJ0ID0gRmluZENlcnQo cmF3TGlzdCwgc3ViamVjdCwgMCkpICE9IE5VTEwpIHsKKysgICAgICAvKiBwdWxsIGl0IGZyb20g dGhlIGxpc3QgKi8KKysgICAgICByYXdMaXN0ID0gZ19saXN0X3JlbW92ZShyYXdMaXN0LCBjdXJD ZXJ0KTsKKysgICAgICAvKiBzZXQgdXAgdGhlIG5leHQgZmluZCAqLworKyAgICAgIHN1YmplY3Qg PSBYNTA5X2dldF9zdWJqZWN0X25hbWUoY3VyQ2VydCk7CisrICAgfQorKworKyAgIC8qCisrICAg ICogd2FsayB1cCB0byB0aGUgcm9vdCBjZXJ0LCBieSBmaW5kaW5nIGEgY2VydCB3aGVyZSB0aGUK KysgICAgKiBpc3N1ZXIgZXF1YWxzIHRoZSBzdWJqZWN0IG9mIHRoZSBjdXJyZW50CisrICAgICov CisrICAgaXNzdWVyID0gWDUwOV9nZXRfaXNzdWVyX25hbWUoYmFzZUNlcnQpOworKyAgIHdoaWxl ICgoY3VyQ2VydCA9IEZpbmRDZXJ0KHJhd0xpc3QsIGlzc3VlciwgMSkpICE9IE5VTEwpIHsKKysg ICAgICAvKiBwdWxsIGl0IGZyb20gdGhlIGxpc3QgKi8KKysgICAgICByYXdMaXN0ID0gZ19saXN0 X3JlbW92ZShyYXdMaXN0LCBjdXJDZXJ0KTsKKysgICAgICAvKiBzZXQgdXAgdGhlIG5leHQgZmlu ZCAqLworKyAgICAgIGlzc3VlciA9IFg1MDlfZ2V0X2lzc3Vlcl9uYW1lKGN1ckNlcnQpOworKyAg IH0KKysKKysgICAvKgorKyAgICAqIEF0IHRoaXMgcG9pbnQsIGFueXRoaW5nIG9uIHRoZSBsaXN0 IHNob3VsZCBiZSBjZXJ0cyB0aGF0IGFyZSBub3QgcGFydAorKyAgICAqIG9mIHRoZSBjaGFpbiB0 aGF0IGluY2x1ZGVzIHRoZSBvcmlnaW5hbCAnYmFzZUNlcnQnLgorKyAgICAqCisrICAgICogRm9y IGEgdmFsaWQgdG9rZW4sIHRoZSBsaXN0IHNob3VsZCBiZSBlbXB0eS4KKysgICAgKi8KKysgICBj aGFpbkxlbiA9IGdfbGlzdF9sZW5ndGgocmF3TGlzdCk7CisrICAgaWYgKGNoYWluTGVuICE9IDAg KSB7CisrICAgICAgR0xpc3QgKmw7CisrCisrICAgICAgZ193YXJuaW5nKCIlczogJWQgdW5yZWxh dGVkIGNlcnRzIGZvdW5kIGluIGxpc3RcbiIsCisrICAgICAgICAgICAgICAgIF9fRlVOQ1RJT05f XywgY2hhaW5MZW4pOworKworKyAgICAgIC8qIGRlYnVnIGhlbHBlciAqLworKyAgICAgIGwgPSBy YXdMaXN0OworKyAgICAgIHdoaWxlIChsICE9IE5VTEwpIHsKKysgICAgICAgICBYNTA5KiBjID0g KFg1MDkgKikgbC0+ZGF0YTsKKysgICAgICAgICBjaGFyICpzID0gWDUwOV9OQU1FX29uZWxpbmUo WDUwOV9nZXRfc3ViamVjdF9uYW1lKGMpLCBOVUxMLCAwKTsKKysKKysgICAgICAgICBnX2RlYnVn KCIlczogdW5yZWxhdGVkIGNlcnQgc3ViamVjdDogJXNcbiIsIF9fRlVOQ1RJT05fXywgcyk7Cisr ICAgICAgICAgZnJlZShzKTsKKysgICAgICAgICBsID0gbC0+bmV4dDsKKysgICAgICB9CisrCisr ICAgICAgZ290byBkb25lOworKyAgIH0KKysKKysgICBnX2RlYnVnKCIlczogU3VjY2VzcyEgIG5v IHVucmVsYXRlZCBjZXJ0cyBmb3VuZFxuIiwgX19GVU5DVElPTl9fKTsKKysgICBlcnIgPSBWR0FV VEhfRV9PSzsKKysKKytkb25lOgorKyAgIGdfbGlzdF9mcmVlKHJhd0xpc3QpOworKyAgIGZvciAo aSA9IDA7IGkgPCBudW1DZXJ0czsgaSsrKSB7CisrICAgICAgWDUwOV9mcmVlKGNlcnRzW2ldKTsK KysgICB9CisrICAgZ19mcmVlKGNlcnRzKTsKKysgICByZXR1cm4gZXJyOworK30KK2RpZmYgLS1n aXQgYS9vcGVuLXZtLXRvb2xzL3ZnYXV0aC9jb21tb24vY2VydHZlcmlmeS5oIGIvb3Blbi12bS10 b29scy92Z2F1dGgvY29tbW9uL2NlcnR2ZXJpZnkuaAoraW5kZXggZDdjNjQxMC4uZjU4MmJiOCAx MDA2NDQKKy0tLSBhL29wZW4tdm0tdG9vbHMvdmdhdXRoL2NvbW1vbi9jZXJ0dmVyaWZ5LmgKKysr KyBiL29wZW4tdm0tdG9vbHMvdmdhdXRoL2NvbW1vbi9jZXJ0dmVyaWZ5LmgKK0BAIC02Nyw2ICs2 NywxMCBAQCBWR0F1dGhFcnJvciBDZXJ0VmVyaWZ5X0NoZWNrU2lnbmF0dXJlVXNpbmdDZXJ0KFZH QXV0aEhhc2hBbGcgaGFzaCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNpemVfdCBzaWduYXR1cmVMZW4sCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCB1bnNpZ25lZCBjaGFyICpzaWduYXR1cmUpOwor IAorKworK1ZHQXV0aEVycm9yIENlcnRWZXJpZnlfQ2hlY2tGb3JVbnJlbGF0ZWRDZXJ0cyhpbnQg bnVtQ2VydHMsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGNoYXIgKipwZW1DZXJ0cyk7CisrCisgZ2NoYXIgKiBDZXJ0VmVyaWZ5X1N0cmlwUEVN Q2VydChjb25zdCBnY2hhciAqcGVtQ2VydCk7CisgCisgZ2NoYXIgKiBDZXJ0VmVyaWZ5X0NlcnRU b1g1MDlTdHJpbmcoY29uc3QgZ2NoYXIgKnBlbUNlcnQpOworZGlmZiAtLWdpdCBhL29wZW4tdm0t dG9vbHMvdmdhdXRoL2NvbW1vbi9wcmVmcy5oIGIvb3Blbi12bS10b29scy92Z2F1dGgvY29tbW9u L3ByZWZzLmgKK2luZGV4IGZmMTE2OTIuLjg3Y2NjOWIgMTAwNjQ0CistLS0gYS9vcGVuLXZtLXRv b2xzL3ZnYXV0aC9jb21tb24vcHJlZnMuaAorKysrIGIvb3Blbi12bS10b29scy92Z2F1dGgvY29t bW9uL3ByZWZzLmgKK0BAIC0xMzYsNiArMTM2LDggQEAgbXNnQ2F0YWxvZyA9IC9ldGMvdm13YXJl LXRvb2xzL3ZnYXV0aC9tZXNzYWdlcworICNkZWZpbmUgVkdBVVRIX1BSRUZfQUxJQVNTVE9SRV9E SVIgICAgICAgICAiYWxpYXNTdG9yZURpciIKKyAvKiogVGhlIG51bWJlciBvZiBzZWNvbmRzIHNs YWNrIGFsbG93ZWQgaW4gZWl0aGVyIGRpcmVjdGlvbiBpbiBTQU1MIHRva2VuIGRhdGUgY2hlY2tz LiAqLworICNkZWZpbmUgVkdBVVRIX1BSRUZfQ0xPQ0tfU0tFV19TRUNTICAgICAgICAiY2xvY2tT a2V3QWRqdXN0bWVudCIKKysvKiogSWYgdW5yZWxhdGVkIGNlcnRpZmljYXRlcyBhcmUgYWxsb3dl ZCBpbiBhIFNBTUwgdG9rZW4gKi8KKysjZGVmaW5lIFZHQVVUSF9QUkVGX0FMTE9XX1VOUkVMQVRF RF9DRVJUUyAgImFsbG93VW5yZWxhdGVkQ2VydHMiCisgCisgLyoqIFRpY2tldCBncm91cCBuYW1l LiAqLworICNkZWZpbmUgVkdBVVRIX1BSRUZfR1JPVVBfTkFNRV9USUNLRVQgICAgICAidGlja2V0 IgorZGlmZiAtLWdpdCBhL29wZW4tdm0tdG9vbHMvdmdhdXRoL3NlcnZpY2VJbXBsL3NhbWwteG1s c2VjMS5jIGIvb3Blbi12bS10b29scy92Z2F1dGgvc2VydmljZUltcGwvc2FtbC14bWxzZWMxLmMK K2luZGV4IDE0Y2JhMWIuLjU3ZTkzMTYgMTAwNjQ0CistLS0gYS9vcGVuLXZtLXRvb2xzL3ZnYXV0 aC9zZXJ2aWNlSW1wbC9zYW1sLXhtbHNlYzEuYworKysrIGIvb3Blbi12bS10b29scy92Z2F1dGgv c2VydmljZUltcGwvc2FtbC14bWxzZWMxLmMKK0BAIC00OSw2ICs0OSw3IEBACisgI2luY2x1ZGUg InZteGxvZy5oIgorIAorIHN0YXRpYyBpbnQgZ0Nsb2NrU2tld0FkanVzdG1lbnQgPSBWR0FVVEhf UFJFRl9ERUZBVUxUX0NMT0NLX1NLRVdfU0VDUzsKKytzdGF0aWMgZ2Jvb2xlYW4gZ0FsbG93VW5y ZWxhdGVkQ2VydHMgPSBGQUxTRTsKKyBzdGF0aWMgeG1sU2NoZW1hUHRyIGdQYXJzZWRTY2hlbWFz ID0gTlVMTDsKKyBzdGF0aWMgeG1sU2NoZW1hVmFsaWRDdHh0UHRyIGdTY2hlbWFWYWxpZGF0ZUN0 eCA9IE5VTEw7CisgCitAQCAtMzY5LDYgKzM3MCwxMCBAQCBMb2FkUHJlZnModm9pZCkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZHQVVUSF9QUkVGX0RFRkFVTFRfQ0xP Q0tfU0tFV19TRUNTKTsKKyAgICAgTG9nKCIlczogQWxsb3dpbmcgJWQgb2YgY2xvY2sgc2tldyBm b3IgU0FNTCBkYXRlIHZhbGlkYXRpb25cbiIsCisgICAgICAgICBfX0ZVTkNUSU9OX18sIGdDbG9j a1NrZXdBZGp1c3RtZW50KTsKKysgICAgZ0FsbG93VW5yZWxhdGVkQ2VydHMgPSBQcmVmX0dldEJv b2woZ1ByZWZzLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBWR0FV VEhfUFJFRl9BTExPV19VTlJFTEFURURfQ0VSVFMsCisrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFZHQVVUSF9QUkVGX0dST1VQX05BTUVfU0VSVklDRSwKKysgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRkFMU0UpOworIH0KKyAKKyAKK0BAIC0x Njk3LDYgKzE3MDIsMTUgQEAgU0FNTF9WZXJpZnlCZWFyZXJUb2tlbkFuZENoYWluKGNvbnN0IGNo YXIgKnhtbFRleHQsCisgICAgICAgcmV0dXJuIFZHQVVUSF9FX0FVVEhFTlRJQ0FUSU9OX0RFTklF RDsKKyAgICB9CisgCisrICAgaWYgKCFnQWxsb3dVbnJlbGF0ZWRDZXJ0cykgeworKyAgICAgIGVy ciA9IENlcnRWZXJpZnlfQ2hlY2tGb3JVbnJlbGF0ZWRDZXJ0cyhudW0sIChjb25zdCBjaGFyICoq KSBjZXJ0Q2hhaW4pOworKyAgICAgIGlmIChlcnIgIT0gVkdBVVRIX0VfT0spIHsKKysgICAgICAg ICBWTVhMb2dfTG9nKFZNWExPR19MRVZFTF9XQVJOSU5HLAorKyAgICAgICAgICAgICAgICAgICAg IlVucmVsYXRlZCBjZXJ0cyBmb3VuZCBpbiBTQU1MIHRva2VuLCBmYWlsaW5nXG4iKTsKKysgICAg ICAgICByZXR1cm4gVkdBVVRIX0VfQVVUSEVOVElDQVRJT05fREVOSUVEOworKyAgICAgIH0KKysg ICB9CisrCisgICAgc3Viai50eXBlID0gU1VCSkVDVF9UWVBFX05BTUVEOworICAgIHN1YmoubmFt ZSA9ICpzdWJqTmFtZU91dDsKKyAgICBlcnIgPSBTZXJ2aWNlVmVyaWZ5QW5kQ2hlY2tUcnVzdENl cnRDaGFpbkZvclN1YmplY3QobnVtLAorLS0gCisyLjYuMgorCmRpZmYgLS1naXQgYS9zcmNwa2dz L29wZW4tdm0tdG9vbHMvcGF0Y2hlcy9DVkUtMjAyMy0zNDA1OS5wYXRjaCBiL3NyY3BrZ3Mvb3Bl bi12bS10b29scy9wYXRjaGVzL0NWRS0yMDIzLTM0MDU5LnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAuLjJhNjY3YWEwOGJkMGUKLS0tIC9kZXYvbnVsbAorKysg Yi9zcmNwa2dzL29wZW4tdm0tdG9vbHMvcGF0Y2hlcy9DVkUtMjAyMy0zNDA1OS5wYXRjaApAQCAt MCwwICsxLDE4MiBAQAorRnJvbSAyMDExMTgxY2JlNjBiMjU2Y2VkOGQyOGRhZjdiNzA0ZTg2MTM0 NjdjIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogSm9obiBXb2xmZSA8andvbGZlQHZt d2FyZS5jb20+CitEYXRlOiBXZWQsIDE4IE9jdCAyMDIzIDA5OjExOjU0IC0wNzAwCitTdWJqZWN0 OiBbUEFUQ0hdIEFkZHJlc3MgQ1ZFLTIwMjMtMzQwNTkKKworRml4IGZpbGUgZGVzY3JpcHRvciB2 dWxuZXJhYmlsaXR5IGluIHRoZSBvcGVuLXZtLXRvb2xzCisgICB2bXdhcmUtdXNlci1zdWlkLXdy YXBwZXIgb24gTGludXguCisgLSBNb3ZpbmcgdGhlIHByaXZpbGVnZSBkcm9wIGxvZ2ljIChkcm9w cGluZyBwcml2aWxlZ2UgdG8gdGhlIHJlYWwgdWlkCisgICBhbmQgZ2lkIG9mIHRoZSBwcm9jZXNz IGZvciB0aGUgdm11c3Igc2VydmljZSkgZnJvbSBzdWlkV3JhcHBlciB0bworICAgdm10b29sc2Qg Y29kZS4KKworLS0tCisgb3Blbi12bS10b29scy9zZXJ2aWNlcy92bXRvb2xzZC9tYWluUG9zaXgu YyAgIHwgNzYgKysrKysrKysrKysrKysrKysrKysrKysrKysrCisgb3Blbi12bS10b29scy92bXdh cmUtdXNlci1zdWlkLXdyYXBwZXIvbWFpbi5jIHwgMjYgKystLS0tLS0tCisgMiBmaWxlcyBjaGFu Z2VkLCA3OSBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL29w ZW4tdm0tdG9vbHMvc2VydmljZXMvdm10b29sc2QvbWFpblBvc2l4LmMgYi9vcGVuLXZtLXRvb2xz L3NlcnZpY2VzL3ZtdG9vbHNkL21haW5Qb3NpeC5jCitpbmRleCBmZDI2NjdjLi44YjQ2OTc5IDEw MDY0NAorLS0tIGEvb3Blbi12bS10b29scy9zZXJ2aWNlcy92bXRvb2xzZC9tYWluUG9zaXguYwor KysrIGIvb3Blbi12bS10b29scy9zZXJ2aWNlcy92bXRvb2xzZC9tYWluUG9zaXguYworQEAgLTI4 LDEwICsyOCwxMiBAQAorICNpbmNsdWRlIDxzaWduYWwuaD4KKyAjaW5jbHVkZSA8c3RyaW5nLmg+ CisgI2luY2x1ZGUgPHVuaXN0ZC5oPgorKyNpbmNsdWRlIDxmY250bC5oPgorICNpbmNsdWRlIDxn bGliL2dzdGRpby5oPgorICNpbmNsdWRlICJmaWxlLmgiCisgI2luY2x1ZGUgImd1ZXN0QXBwLmgi CisgI2luY2x1ZGUgImhvc3RpbmZvLmgiCisrI2luY2x1ZGUgInN1LmgiCisgI2luY2x1ZGUgInN5 c3RlbS5oIgorICNpbmNsdWRlICJ1bmljb2RlLmgiCisgI2luY2x1ZGUgInV0aWwuaCIKK0BAIC0x NTUsNiArMTU3LDU5IEBAIFRvb2xzQ29yZVdvcmtBcm91bmRMb29wKFRvb2xzU2VydmljZVN0YXRl ICpzdGF0ZSwKKyAKKyAKKyAvKioKKysgKiBUb29scyBmdW5jdGlvbiB0byBzZXQgY2xvc2Utb24t ZXhlYyBmbGcgZm9yIHRoZSBmZC4KKysgKgorKyAqIEBwYXJhbVtpbl0gZmQgICBvcGVuIGZpbGUg ZGVzY3JpcHRvci4KKysgKgorKyAqIEByZXR1cm4gVFJVRSBvbiBzdWNjZXNzLCBGQUxTRSBvdGhl cndpc2UuCisrICovCisrCisrc3RhdGljIGdib29sZWFuCisrVG9vbHNTZXRDbG9leGVjRmxhZyhp bnQgZmQpCisreworKyAgIGludCBmbGFnczsKKysKKysgICBpZiAoZmQgPT0gLTEpIHsKKysgICAg ICAvKiBmZCBpcyBub3QgcHJlc2VudCwgbm8gbmVlZCB0byBtYW5pcHVsYXRlICovCisrICAgICAg cmV0dXJuIFRSVUU7CisrICAgfQorKworKyAgIGZsYWdzID0gZmNudGwoZmQsIEZfR0VURkQsIDAp OworKyAgIGlmIChmbGFncyA8IDApIHsKKysgICAgICBnX3ByaW50ZXJyKCJDb3VsZG4ndCBnZXQg dGhlIGZsYWdzIHNldCBmb3IgZmQgJWQsIGVycm9yICV1LiIsIGZkLCBlcnJubyk7CisrICAgICAg cmV0dXJuIEZBTFNFOworKyAgIH0KKysgICBmbGFncyB8PSBGRF9DTE9FWEVDOworKyAgIGlmIChm Y250bChmZCwgRl9TRVRGRCwgZmxhZ3MpIDwgMCkgeworKyAgICAgIGdfcHJpbnRlcnIoIkNvdWxk bid0IHNldCBjbG9zZS1vbi1leGVjIGZvciBmZCAlZCwgZXJyb3IgJXUuIiwgZmQsIGVycm5vKTsK KysgICAgICByZXR1cm4gRkFMU0U7CisrICAgfQorKworKyAgIHJldHVybiBUUlVFOworK30KKysK KysKKysvKioKKysgKiBUb29scyBmdW5jdGlvbiB0byBjbG9zZSB0aGUgZmRzLgorKyAqLworKwor K3N0YXRpYyB2b2lkCisrVG9vbHNDbG9zZUZkcyh2b2lkKQorK3sKKysgICBpZiAoZ1N0YXRlLmN0 eC5ibG9ja0ZEICE9IC0xKSB7CisrICAgICAgY2xvc2UoZ1N0YXRlLmN0eC5ibG9ja0ZEKTsKKysg ICB9CisrCisrICAgLyoKKysgICAgKiB1aW5wdXRGRCB3aWxsIGJlIGF2YWlsYWJsZSBvbmx5IGZv ciB3YXlsYW5kLgorKyAgICAqLworKyAgIGlmIChnU3RhdGUuY3R4LnVpbnB1dEZEICE9IC0xKSB7 CisrICAgICAgY2xvc2UoZ1N0YXRlLmN0eC51aW5wdXRGRCk7CisrICAgfQorK30KKysKKysKKysv KioKKyAgKiBUb29scyBkYWVtb24gZW50cnkgZnVuY3Rpb24uCisgICoKKyAgKiBAcGFyYW1baW5d IGFyZ2MgICBBcmd1bWVudCBjb3VudC4KK0BAIC0yMTAsNiArMjY1LDI3IEBAIG1haW4oaW50IGFy Z2MsCisgICAgZ19mcmVlKGFyZ3ZDb3B5KTsKKyAgICBhcmd2Q29weSA9IE5VTEw7CisgCisrICAg LyoKKysgICAgKiBEcm9wcyBwcml2aWxlZ2UgdG8gdGhlIHJlYWwgdWlkIGFuZCBnaWQgb2YgdGhl IHByb2Nlc3MKKysgICAgKiBmb3IgdGhlICJ2bXVzciIgc2VydmljZS4KKysgICAgKi8KKysgICBp ZiAoVE9PTFNfSVNfVVNFUl9TRVJWSUNFKCZnU3RhdGUpKSB7CisrICAgICAgdWlkX3QgdWlkID0g Z2V0dWlkKCk7CisrICAgICAgZ2lkX3QgZ2lkID0gZ2V0Z2lkKCk7CisrCisrICAgICAgaWYgKChJ ZF9TZXRSRVVpZCh1aWQsIHVpZCkgIT0gMCkgfHwKKysgICAgICAgICAgKElkX1NldFJFR2lkKGdp ZCwgZ2lkKSAhPSAwKSkgeworKyAgICAgICAgIGdfcHJpbnRlcnIoImNvdWxkIG5vdCBkcm9wIHBy aXZpbGVnZXM6ICVzIiwgc3RyZXJyb3IoZXJybm8pKTsKKysgICAgICAgICBUb29sc0Nsb3NlRmRz KCk7CisrICAgICAgICAgZ290byBleGl0OworKyAgICAgIH0KKysgICAgICBpZiAoIVRvb2xzU2V0 Q2xvZXhlY0ZsYWcoZ1N0YXRlLmN0eC5ibG9ja0ZEKSB8fAorKyAgICAgICAgICAhVG9vbHNTZXRD bG9leGVjRmxhZyhnU3RhdGUuY3R4LnVpbnB1dEZEKSkgeworKyAgICAgICAgIFRvb2xzQ2xvc2VG ZHMoKTsKKysgICAgICAgICBnb3RvIGV4aXQ7CisrICAgICAgfQorKyAgIH0KKysKKyAgICBpZiAo Z1N0YXRlLnBpZEZpbGUgIT0gTlVMTCkgeworICAgICAgIC8qCisgICAgICAgICogSWYgYXJndlsw XSBpcyBub3QgYW4gYWJzb2x1dGUgcGF0aCwgbWFrZSBpdCBzbzsgYWxsIG90aGVyIHBhdGgKK2Rp ZmYgLS1naXQgYS9vcGVuLXZtLXRvb2xzL3Ztd2FyZS11c2VyLXN1aWQtd3JhcHBlci9tYWluLmMg Yi9vcGVuLXZtLXRvb2xzL3Ztd2FyZS11c2VyLXN1aWQtd3JhcHBlci9tYWluLmMKK2luZGV4IGU5 ZDdlNTAuLmExOWFmNTMgMTAwNjQ0CistLS0gYS9vcGVuLXZtLXRvb2xzL3Ztd2FyZS11c2VyLXN1 aWQtd3JhcHBlci9tYWluLmMKKysrKyBiL29wZW4tdm0tdG9vbHMvdm13YXJlLXVzZXItc3VpZC13 cmFwcGVyL21haW4uYworQEAgLTE1Niw4ICsxNTYsNyBAQCBNYXNrU2lnbmFscyh2b2lkKQorICAq CisgICogICAgT2J0YWlucyB0aGUgbGlicmFyeSBkaXJlY3RvcnkgZnJvbSB0aGUgVG9vbHMgbG9j YXRpb25zIGRhdGFiYXNlLCB0aGVuCisgICogICAgb3BlbnMgYSBmaWxlIGRlc2NyaXB0b3IgKHdo aWxlIHN0aWxsIHJvb3QpIHRvIGFkZCBhbmQgcmVtb3ZlIGJsb2NrcywKKy0gKiAgICBkcm9wcyBw cml2aWxlZ2UgdG8gdGhlIHJlYWwgdWlkIG9mIHRoaXMgcHJvY2VzcywgYW5kIGZpbmFsbHkgc3Rh cnRzCistICogICAgdm13YXJlLXVzZXIuCisrICogICAgYW5kIGZpbmFsbHkgc3RhcnRzIHZtd2Fy ZS11c2VyLgorICAqCisgICogUmVzdWx0czoKKyAgKiAgICBQYXJlbnQ6IFRSVUUgb24gc3VjY2Vz cywgRkFMU0Ugb24gZmFpbHVyZS4KK0BAIC0xNzMsOCArMTcyLDYgQEAgc3RhdGljIEJvb2wKKyBT dGFydFZNd2FyZVVzZXIoY2hhciAqY29uc3QgZW52cFtdKQorIHsKKyAgICBwaWRfdCBwaWQ7Cist ICAgdWlkX3QgdWlkOworLSAgIGdpZF90IGdpZDsKKyAgICBpbnQgYmxvY2tGZCA9IC0xOworICAg IGNoYXIgYmxvY2tGZFN0cls4XTsKKyAgICBpbnQgdWlucHV0RmQgPSAtMTsKK0BAIC0xOTEsOCAr MTg4LDggQEAgU3RhcnRWTXdhcmVVc2VyKGNoYXIgKmNvbnN0IGVudnBbXSkKKyAgICB9CisgCisg ICAgLyoKKy0gICAgKiBOb3cgY3JlYXRlIGEgY2hpbGQgcHJvY2Vzcywgb2J0YWluIGEgZmlsZSBk ZXNjcmlwdG9yIGFzIHJvb3QsIGRvd25ncmFkZQorLSAgICAqIHByaXZpbGVnZSwgYW5kIHJ1biB2 bXdhcmUtdXNlci4KKysgICAgKiBOb3cgY3JlYXRlIGEgY2hpbGQgcHJvY2Vzcywgb2J0YWluIGEg ZmlsZSBkZXNjcmlwdG9yIGFzIHJvb3QgYW5kCisrICAgICogcnVuIHZtd2FyZS11c2VyLgorICAg ICAqLworICAgIHBpZCA9IGZvcmsoKTsKKyAgICBpZiAocGlkID09IC0xKSB7CitAQCAtMjI5LDIz ICsyMjYsNiBAQCBTdGFydFZNd2FyZVVzZXIoY2hhciAqY29uc3QgZW52cFtdKQorICAgICAgIH0K KyAgICB9CisgCistICAgdWlkID0gZ2V0dWlkKCk7CistICAgZ2lkID0gZ2V0Z2lkKCk7CistCist ICAgaWYgKChzZXRyZXVpZCh1aWQsIHVpZCkgIT0gMCkgfHwKKy0gICAgICAgKHNldHJlZ2lkKGdp ZCwgZ2lkKSAhPSAwKSkgeworLSAgICAgIEVycm9yKCJjb3VsZCBub3QgZHJvcCBwcml2aWxlZ2Vz OiAlc1xuIiwgc3RyZXJyb3IoZXJybm8pKTsKKy0gICAgICBpZiAoYmxvY2tGZCAhPSAtMSkgewor LSAgICAgICAgIGNsb3NlKGJsb2NrRmQpOworLSAgICAgIH0KKy0gICAgICBpZiAodXNlV2F5bGFu ZCkgeworLSAgICAgICAgIGlmICh1aW5wdXRGZCAhPSAtMSkgeworLSAgICAgICAgICAgIGNsb3Nl KHVpbnB1dEZkKTsKKy0gICAgICAgICB9CistICAgICAgfQorLSAgICAgIHJldHVybiBGQUxTRTsK Ky0gICB9CistCisgICAgLyoKKyAgICAgKiBTaW5jZSB2bXdhcmUtdXNlciBwcm92aWRlcyBmZWF0 dXJlcyB0aGF0IGRvbid0IGRlcGVuZCBvbiB2bWJsb2NrLCB3ZQorICAgICAqIGludm9rZSB2bXdh cmUtdXNlciBldmVuIGlmIHdlIGNvdWxkbid0IG9idGFpbiBhIGZpbGUgZGVzY3JpcHRvciBvciB3 ZQorLS0gCisyLjYuMgorCmRpZmYgLS1naXQgYS9zcmNwa2dzL29wZW4tdm0tdG9vbHMvdGVtcGxh dGUgYi9zcmNwa2dzL29wZW4tdm0tdG9vbHMvdGVtcGxhdGUKaW5kZXggY2Q1MDdiNzI5YmY2Yi4u YzcyYWRlN2YwNmUxNiAxMDA2NDQKLS0tIGEvc3JjcGtncy9vcGVuLXZtLXRvb2xzL3RlbXBsYXRl CisrKyBiL3NyY3BrZ3Mvb3Blbi12bS10b29scy90ZW1wbGF0ZQpAQCAtMSw3ICsxLDcgQEAKICMg VGVtcGxhdGUgZmlsZSBmb3IgJ29wZW4tdm0tdG9vbHMnCiBwa2duYW1lPW9wZW4tdm0tdG9vbHMK IHZlcnNpb249MTIuMy4wCi1yZXZpc2lvbj0xCityZXZpc2lvbj0yCiBhcmNocz0ieDg2XzY0KiBp Njg2KiBhYXJjaDY0KiIKIGJ1aWxkX3dya3NyYz0ib3Blbi12bS10b29scyIKIGJ1aWxkX3N0eWxl PWdudS1jb25maWd1cmUK --===============2487451770437836158==--