207279 2020-02-05 11:26:26 -0800 [iOS] Do not create sandbox reports when the UI process cannot issue extensions to diagnostics service 2020-02-05 16:06:29 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan benjamin bfulgham cdumez cmarcelo commit-queue dbates ews-watchlist webkit-bug-importer oldest_to_newest 1615149 0 pvollan 2020-02-05 11:26:26 -0800 Do not create sandbox reports when the UI process cannot issue mach extensions to the diagnostics service. The majority of clients are capable of doing this. 1615151 1 pvollan 2020-02-05 11:26:51 -0800 rdar://problem/59030957 1615169 2 389838 pvollan 2020-02-05 11:52:47 -0800 Created attachment 389838 Patch 1615187 3 389838 bfulgham 2020-02-05 12:30:11 -0800 Comment on attachment 389838 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=389838&action=review > Source/WebKit/Shared/SandboxExtension.h:59 > + }; You could maybe do: enum class Flags : uint32_t { Default = 0, NoReport = SANDBOX_EXTENSION_NO_REPORT }; Then I think that OptionSet<Flags> would map to unit32_t, and do the |-ing for you. But you would need to add SandboxSPI.h header, which might be undesirable. > Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm:91 > + extensionFlags |= SANDBOX_EXTENSION_NO_REPORT; I don't think you need this code, if you make the OptionSet<Flags> as I suggested. > Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm:97 > + return sandbox_extension_issue_file(APP_SANDBOX_READ_WRITE, path, extensionFlags); I wonder if we should consider adding SANDBOX_EXTENSION_CANONICAL to our file paths (if we ensure we always work with fully-resolved paths). 1615227 4 pvollan 2020-02-05 13:20:09 -0800 (In reply to Brent Fulgham from comment #3) > Comment on attachment 389838 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=389838&action=review > > > Source/WebKit/Shared/SandboxExtension.h:59 > > + }; > > You could maybe do: > > enum class Flags : uint32_t { > Default = 0, > NoReport = SANDBOX_EXTENSION_NO_REPORT > }; > > > Then I think that OptionSet<Flags> would map to unit32_t, and do the |-ing > for you. > > But you would need to add SandboxSPI.h header, which might be undesirable. > Good idea! However, I don't think this will compile on other platforms. Are you OK with keeping as is? > > Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm:91 > > + extensionFlags |= SANDBOX_EXTENSION_NO_REPORT; > > I don't think you need this code, if you make the OptionSet<Flags> as I > suggested. > > > Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm:97 > > + return sandbox_extension_issue_file(APP_SANDBOX_READ_WRITE, path, extensionFlags); > > I wonder if we should consider adding SANDBOX_EXTENSION_CANONICAL to our > file paths (if we ensure we always work with fully-resolved paths). I think that would be good enhancement! Perhaps we could do this in a follow-up patch? Thanks for reviewing! 1615364 5 389838 bfulgham 2020-02-05 16:00:03 -0800 Comment on attachment 389838 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=389838&action=review >>> Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm:91 >>> + extensionFlags |= SANDBOX_EXTENSION_NO_REPORT; >> >> I don't think you need this code, if you make the OptionSet<Flags> as I suggested. > > I think that would be good enhancement! Perhaps we could do this in a follow-up patch? > > Thanks for reviewing! Sure -- no need to do now. 1615368 6 389838 commit-queue 2020-02-05 16:06:27 -0800 Comment on attachment 389838 Patch Clearing flags on attachment: 389838 Committed r255874: <https://trac.webkit.org/changeset/255874> 1615369 7 commit-queue 2020-02-05 16:06:29 -0800 All reviewed patches have been landed. Closing bug. 389838 2020-02-05 11:52:47 -0800 2020-02-05 16:06:27 -0800 Patch bug-207279-20200205115246.patch text/plain 10117 pvollan SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNTU0MzcpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTAyLTA1ICBQZXIgQXJuZSBWb2xsYW4gIDxw dm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBEbyBub3QgY3JlYXRlIHNhbmRib3gg cmVwb3J0cyB3aGVuIHRoZSBVSSBwcm9jZXNzIGNhbm5vdCBpc3N1ZSBleHRlbnNpb25zIHRvIGRp YWdub3N0aWNzIHNlcnZpY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwNzI3OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTkwMzA5NTc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGZsYWcgd2hp Y2ggYXZvaWRzIGdlbmVyYXRpbmcgc2FuZGJveCByZXBvcnRzLgorCisgICAgICAgICogd3RmL3Nw aS9kYXJ3aW4vU2FuZGJveFNQSS5oOgorCiAyMDIwLTAxLTI4ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBTaG91bGQgdXNlIGxpZ2h0 IHRoZW1lIHVubGVzcyB3ZWJzaXRlIGRlY2xhcmVzIHN1cHBvcnQgZm9yIGRhcmsgdGhlbWVzIGlu IGNvbG9yLXNjaGVtZXMgcHJvcGVydHkKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL3NwaS9kYXJ3aW4v U2FuZGJveFNQSS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3NwaS9kYXJ3aW4vU2Fu ZGJveFNQSS5oCShyZXZpc2lvbiAyNTU0MzcpCisrKyBTb3VyY2UvV1RGL3d0Zi9zcGkvZGFyd2lu L1NhbmRib3hTUEkuaAkod29ya2luZyBjb3B5KQpAQCAtNTksNiArNTksOCBAQCBleHRlcm4gY29u c3QgY2hhciAqY29uc3QgQVBQX1NBTkRCT1hfUkVBCiBleHRlcm4gY29uc3QgY2hhciAqY29uc3Qg QVBQX1NBTkRCT1hfUkVBRF9XUklURTsKIGV4dGVybiBjb25zdCBlbnVtIHNhbmRib3hfZmlsdGVy X3R5cGUgU0FOREJPWF9DSEVDS19OT19SRVBPUlQ7CiAKK2V4dGVybiBjb25zdCB1aW50MzJfdCBT QU5EQk9YX0VYVEVOU0lPTl9OT19SRVBPUlQ7CisKIGNoYXIgKnNhbmRib3hfZXh0ZW5zaW9uX2lz c3VlX2ZpbGUoY29uc3QgY2hhciAqZXh0ZW5zaW9uX2NsYXNzLCBjb25zdCBjaGFyICpwYXRoLCB1 aW50MzJfdCBmbGFncyk7CiBjaGFyICpzYW5kYm94X2V4dGVuc2lvbl9pc3N1ZV9nZW5lcmljKGNv bnN0IGNoYXIgKmV4dGVuc2lvbl9jbGFzcywgdWludDMyX3QgZmxhZ3MpOwogI2lmIEhBVkUoU0FO REJPWF9JU1NVRV9SRUFEX0VYVEVOU0lPTl9UT19QUk9DRVNTX0JZX0FVRElUX1RPS0VOKQpJbmRl eDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9D aGFuZ2VMb2cJKHJldmlzaW9uIDI1NTgzNykKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjAtMDItMDUgIFBlciBBcm5lIFZvbGxh biAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIERvIG5vdCBjcmVhdGUgc2Fu ZGJveCByZXBvcnRzIHdoZW4gdGhlIFVJIHByb2Nlc3MgY2Fubm90IGlzc3VlIGV4dGVuc2lvbnMg dG8gZGlhZ25vc3RpY3Mgc2VydmljZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjA3Mjc5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81OTAzMDk1Nz4K KyAgICAgICAgCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IERvIG5vdCBjcmVhdGUgc2FuZGJveCByZXBvcnRzIHdoZW4gdGhlIFVJIHByb2Nlc3MgY2Fubm90 IGlzc3VlIG1hY2ggZXh0ZW5zaW9ucyB0byB0aGUgZGlhZ25vc3RpY3Mgc2VydmljZS4KKyAgICAg ICAgVGhlIG1ham9yaXR5IG9mIGNsaWVudHMgYXJlIGNhcGFibGUgb2YgZG9pbmcgdGhpcy4KKwor ICAgICAgICBObyBuZXcgdGVzdHMsIHNpbmNlIGl0IGlzIG5vdCB0cml2aWFsIHRvIHRlc3QgaWYg bm8gc2FuZGJveCByZXBvcnRzIGFyZSBnZW5lcmF0ZWQgZm9yIGEgdmlvbGF0aW9uLgorCisgICAg ICAgICogU2hhcmVkL0NvY29hL1NhbmRib3hFeHRlbnNpb25Db2NvYS5tbToKKyAgICAgICAgKFdl YktpdDo6U2FuZGJveEV4dGVuc2lvbkltcGw6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlNh bmRib3hFeHRlbnNpb25JbXBsOjpzYW5kYm94RXh0ZW5zaW9uRm9yVHlwZSk6CisgICAgICAgIChX ZWJLaXQ6OlNhbmRib3hFeHRlbnNpb25JbXBsOjpTYW5kYm94RXh0ZW5zaW9uSW1wbCk6CisgICAg ICAgIChXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAp OgorICAgICAgICAqIFNoYXJlZC9TYW5kYm94RXh0ZW5zaW9uLmg6CisgICAgICAgICogVUlQcm9j ZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKwogMjAyMC0wMi0wNSAg V2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjQ2F0 YWx5c3RdIElCZWFtIGN1cnNvciBkb2Vzbid0IHNob3cgdXAgd2hlbiBob3ZlcmluZyBvdmVyIHRl eHQgZm9ybSBjb250cm9scyBwcmlvciB0byBlZGl0aW5nCkluZGV4OiBTb3VyY2UvV2ViS2l0L1No YXJlZC9TYW5kYm94RXh0ZW5zaW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFy ZWQvU2FuZGJveEV4dGVuc2lvbi5oCShyZXZpc2lvbiAyNTU0MzcpCisrKyBTb3VyY2UvV2ViS2l0 L1NoYXJlZC9TYW5kYm94RXh0ZW5zaW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcg QEAKIAogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxl Lmg+CisjaW5jbHVkZSA8d3RmL09wdGlvblNldC5oPgogI2luY2x1ZGUgPHd0Zi9Qcm9jZXNzSUQu aD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4K QEAgLTUyLDYgKzUzLDExIEBAIHB1YmxpYzoKICAgICAgICAgUmVhZEJ5UHJvY2VzcwogICAgIH07 CiAKKyAgICBlbnVtIGNsYXNzIEZsYWdzIDogdWludDhfdCB7CisgICAgICAgIERlZmF1bHQsCisg ICAgICAgIE5vUmVwb3J0CisgICAgfTsKKyAgICAKICAgICBjbGFzcyBIYW5kbGUgewogICAgICAg ICBXVEZfTUFLRV9OT05DT1BZQUJMRShIYW5kbGUpOwogICAgIHB1YmxpYzoKQEAgLTEwNSw3ICsx MTEsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFN0cmluZyBjcmVhdGVIYW5kbGVGb3JUZW1wb3Jh cnlGaWxlKGNvbnN0IFN0cmluZyYgcHJlZml4LCBUeXBlLCBIYW5kbGUmKTsKICAgICBzdGF0aWMg Ym9vbCBjcmVhdGVIYW5kbGVGb3JHZW5lcmljRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5z aW9uQ2xhc3MsIEhhbmRsZSYpOwogI2lmIEhBVkUoQVVESVRfVE9LRU4pCi0gICAgc3RhdGljIGJv b2wgY3JlYXRlSGFuZGxlRm9yTWFjaExvb2t1cChjb25zdCBTdHJpbmcmIHNlcnZpY2UsIE9wdGlv bmFsPGF1ZGl0X3Rva2VuX3Q+LCBIYW5kbGUmKTsKKyAgICBzdGF0aWMgYm9vbCBjcmVhdGVIYW5k bGVGb3JNYWNoTG9va3VwKGNvbnN0IFN0cmluZyYgc2VydmljZSwgT3B0aW9uYWw8YXVkaXRfdG9r ZW5fdD4sIEhhbmRsZSYsIE9wdGlvblNldDxGbGFncz4gPSBGbGFnczo6RGVmYXVsdCk7CiAgICAg c3RhdGljIGJvb2wgY3JlYXRlSGFuZGxlRm9yUmVhZEJ5QXVkaXRUb2tlbihjb25zdCBTdHJpbmcm IHBhdGgsIGF1ZGl0X3Rva2VuX3QsIEhhbmRsZSYpOwogI2VuZGlmCiAgICAgflNhbmRib3hFeHRl bnNpb24oKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1NhbmRib3hFeHRlbnNp b25Db2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9TYW5k Ym94RXh0ZW5zaW9uQ29jb2EubW0JKHJldmlzaW9uIDI1NTQzNykKKysrIFNvdXJjZS9XZWJLaXQv U2hhcmVkL0NvY29hL1NhbmRib3hFeHRlbnNpb25Db2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAt NDAsOSArNDAsOSBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIFNhbmRib3hFeHRlbnNpb25J bXBsIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBzdGF0aWMg c3RkOjp1bmlxdWVfcHRyPFNhbmRib3hFeHRlbnNpb25JbXBsPiBjcmVhdGUoY29uc3QgY2hhciog cGF0aCwgU2FuZGJveEV4dGVuc2lvbjo6VHlwZSB0eXBlLCBPcHRpb25hbDxhdWRpdF90b2tlbl90 PiBhdWRpdFRva2VuID0gV1RGOjpudWxsb3B0KQorICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8 U2FuZGJveEV4dGVuc2lvbkltcGw+IGNyZWF0ZShjb25zdCBjaGFyKiBwYXRoLCBTYW5kYm94RXh0 ZW5zaW9uOjpUeXBlIHR5cGUsIE9wdGlvbmFsPGF1ZGl0X3Rva2VuX3Q+IGF1ZGl0VG9rZW4gPSBX VEY6Om51bGxvcHQsIE9wdGlvblNldDxTYW5kYm94RXh0ZW5zaW9uOjpGbGFncz4gZmxhZ3MgPSBT YW5kYm94RXh0ZW5zaW9uOjpGbGFnczo6RGVmYXVsdCkKICAgICB7Ci0gICAgICAgIHN0ZDo6dW5p cXVlX3B0cjxTYW5kYm94RXh0ZW5zaW9uSW1wbD4gaW1wbCB7IG5ldyBTYW5kYm94RXh0ZW5zaW9u SW1wbChwYXRoLCB0eXBlLCBhdWRpdFRva2VuKSB9OworICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8 U2FuZGJveEV4dGVuc2lvbkltcGw+IGltcGwgeyBuZXcgU2FuZGJveEV4dGVuc2lvbkltcGwocGF0 aCwgdHlwZSwgYXVkaXRUb2tlbiwgZmxhZ3MpIH07CiAgICAgICAgIGlmICghaW1wbC0+bV90b2tl bikKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICByZXR1cm4gaW1wbDsKQEAg LTg0LDMwICs4NCwzNCBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2YXRlOgotICAgIGNoYXIqIHNh bmRib3hFeHRlbnNpb25Gb3JUeXBlKGNvbnN0IGNoYXIqIHBhdGgsIFNhbmRib3hFeHRlbnNpb246 OlR5cGUgdHlwZSwgT3B0aW9uYWw8YXVkaXRfdG9rZW5fdD4gYXVkaXRUb2tlbikKKyAgICBjaGFy KiBzYW5kYm94RXh0ZW5zaW9uRm9yVHlwZShjb25zdCBjaGFyKiBwYXRoLCBTYW5kYm94RXh0ZW5z aW9uOjpUeXBlIHR5cGUsIE9wdGlvbmFsPGF1ZGl0X3Rva2VuX3Q+IGF1ZGl0VG9rZW4sIE9wdGlv blNldDxTYW5kYm94RXh0ZW5zaW9uOjpGbGFncz4gZmxhZ3MpCiAgICAgeworICAgICAgICB1aW50 MzJfdCBleHRlbnNpb25GbGFncyA9IDA7CisgICAgICAgIGlmIChmbGFncyAmIFNhbmRib3hFeHRl bnNpb246OkZsYWdzOjpOb1JlcG9ydCkKKyAgICAgICAgICAgIGV4dGVuc2lvbkZsYWdzIHw9IFNB TkRCT1hfRVhURU5TSU9OX05PX1JFUE9SVDsKKwogICAgICAgICBzd2l0Y2ggKHR5cGUpIHsKICAg ICAgICAgY2FzZSBTYW5kYm94RXh0ZW5zaW9uOjpUeXBlOjpSZWFkT25seToKLSAgICAgICAgICAg IHJldHVybiBzYW5kYm94X2V4dGVuc2lvbl9pc3N1ZV9maWxlKEFQUF9TQU5EQk9YX1JFQUQsIHBh dGgsIDApOworICAgICAgICAgICAgcmV0dXJuIHNhbmRib3hfZXh0ZW5zaW9uX2lzc3VlX2ZpbGUo QVBQX1NBTkRCT1hfUkVBRCwgcGF0aCwgZXh0ZW5zaW9uRmxhZ3MpOwogICAgICAgICBjYXNlIFNh bmRib3hFeHRlbnNpb246OlR5cGU6OlJlYWRXcml0ZToKLSAgICAgICAgICAgIHJldHVybiBzYW5k Ym94X2V4dGVuc2lvbl9pc3N1ZV9maWxlKEFQUF9TQU5EQk9YX1JFQURfV1JJVEUsIHBhdGgsIDAp OworICAgICAgICAgICAgcmV0dXJuIHNhbmRib3hfZXh0ZW5zaW9uX2lzc3VlX2ZpbGUoQVBQX1NB TkRCT1hfUkVBRF9XUklURSwgcGF0aCwgZXh0ZW5zaW9uRmxhZ3MpOwogICAgICAgICBjYXNlIFNh bmRib3hFeHRlbnNpb246OlR5cGU6Ok1hY2g6CiAgICAgICAgICAgICBpZiAoIWF1ZGl0VG9rZW4p Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHNhbmRib3hfZXh0ZW5zaW9uX2lzc3VlX21hY2goImNv bS5hcHBsZS53ZWJraXQuZXh0ZW5zaW9uLm1hY2giX3MsIHBhdGgsIDApOworICAgICAgICAgICAg ICAgIHJldHVybiBzYW5kYm94X2V4dGVuc2lvbl9pc3N1ZV9tYWNoKCJjb20uYXBwbGUud2Via2l0 LmV4dGVuc2lvbi5tYWNoIl9zLCBwYXRoLCBleHRlbnNpb25GbGFncyk7CiAjaWYgSEFWRShTQU5E Qk9YX0lTU1VFX01BQ0hfRVhURU5TSU9OX1RPX1BST0NFU1NfQllfQVVESVRfVE9LRU4pCi0gICAg ICAgICAgICByZXR1cm4gc2FuZGJveF9leHRlbnNpb25faXNzdWVfbWFjaF90b19wcm9jZXNzKCJj b20uYXBwbGUud2Via2l0LmV4dGVuc2lvbi5tYWNoIl9zLCBwYXRoLCAwLCAqYXVkaXRUb2tlbik7 CisgICAgICAgICAgICByZXR1cm4gc2FuZGJveF9leHRlbnNpb25faXNzdWVfbWFjaF90b19wcm9j ZXNzKCJjb20uYXBwbGUud2Via2l0LmV4dGVuc2lvbi5tYWNoIl9zLCBwYXRoLCBleHRlbnNpb25G bGFncywgKmF1ZGl0VG9rZW4pOwogI2Vsc2UKICAgICAgICAgICAgIFVOVVNFRF9QQVJBTShhdWRp dFRva2VuKTsKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICAgICAg cmV0dXJuIG51bGxwdHI7CiAjZW5kaWYKICAgICAgICAgY2FzZSBTYW5kYm94RXh0ZW5zaW9uOjpU eXBlOjpHZW5lcmljOgotICAgICAgICAgICAgcmV0dXJuIHNhbmRib3hfZXh0ZW5zaW9uX2lzc3Vl X2dlbmVyaWMocGF0aCwgMCk7CisgICAgICAgICAgICByZXR1cm4gc2FuZGJveF9leHRlbnNpb25f aXNzdWVfZ2VuZXJpYyhwYXRoLCBleHRlbnNpb25GbGFncyk7CiAgICAgICAgIGNhc2UgU2FuZGJv eEV4dGVuc2lvbjo6VHlwZTo6UmVhZEJ5UHJvY2VzczoKICNpZiBIQVZFKFNBTkRCT1hfSVNTVUVf UkVBRF9FWFRFTlNJT05fVE9fUFJPQ0VTU19CWV9BVURJVF9UT0tFTikKICAgICAgICAgICAgIGlm ICghYXVkaXRUb2tlbikKICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICAgICAg ICAgIHJldHVybiBzYW5kYm94X2V4dGVuc2lvbl9pc3N1ZV9maWxlX3RvX3Byb2Nlc3MoQVBQX1NB TkRCT1hfUkVBRCwgcGF0aCwgMCwgKmF1ZGl0VG9rZW4pOworICAgICAgICAgICAgcmV0dXJuIHNh bmRib3hfZXh0ZW5zaW9uX2lzc3VlX2ZpbGVfdG9fcHJvY2VzcyhBUFBfU0FOREJPWF9SRUFELCBw YXRoLCBleHRlbnNpb25GbGFncywgKmF1ZGl0VG9rZW4pOwogI2Vsc2UKICAgICAgICAgICAgIFVO VVNFRF9QQVJBTShhdWRpdFRva2VuKTsKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwpAQCAtMTE2LDggKzEyMCw4IEBAIHByaXZhdGU6CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBT YW5kYm94RXh0ZW5zaW9uSW1wbChjb25zdCBjaGFyKiBwYXRoLCBTYW5kYm94RXh0ZW5zaW9uOjpU eXBlIHR5cGUsIE9wdGlvbmFsPGF1ZGl0X3Rva2VuX3Q+IGF1ZGl0VG9rZW4pCi0gICAgICAgIDog bV90b2tlbiB7IHNhbmRib3hFeHRlbnNpb25Gb3JUeXBlKHBhdGgsIHR5cGUsIGF1ZGl0VG9rZW4p IH0KKyAgICBTYW5kYm94RXh0ZW5zaW9uSW1wbChjb25zdCBjaGFyKiBwYXRoLCBTYW5kYm94RXh0 ZW5zaW9uOjpUeXBlIHR5cGUsIE9wdGlvbmFsPGF1ZGl0X3Rva2VuX3Q+IGF1ZGl0VG9rZW4sIE9w dGlvblNldDxTYW5kYm94RXh0ZW5zaW9uOjpGbGFncz4gZmxhZ3MpCisgICAgICAgIDogbV90b2tl biB7IHNhbmRib3hFeHRlbnNpb25Gb3JUeXBlKHBhdGgsIHR5cGUsIGF1ZGl0VG9rZW4sIGZsYWdz KSB9CiAgICAgewogICAgIH0KIApAQCAtMzM2LDExICszNDAsMTEgQEAgYm9vbCBTYW5kYm94RXh0 ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JHZQogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIFNh bmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAoY29uc3QgU3RyaW5nJiBz ZXJ2aWNlLCBPcHRpb25hbDxhdWRpdF90b2tlbl90PiBhdWRpdFRva2VuLCBIYW5kbGUmIGhhbmRs ZSkKK2Jvb2wgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yTWFjaExvb2t1cChjb25z dCBTdHJpbmcmIHNlcnZpY2UsIE9wdGlvbmFsPGF1ZGl0X3Rva2VuX3Q+IGF1ZGl0VG9rZW4sIEhh bmRsZSYgaGFuZGxlLCBPcHRpb25TZXQ8RmxhZ3M+IGZsYWdzKQogewogICAgIEFTU0VSVCghaGFu ZGxlLm1fc2FuZGJveEV4dGVuc2lvbik7CiAgICAgCi0gICAgaGFuZGxlLm1fc2FuZGJveEV4dGVu c2lvbiA9IFNhbmRib3hFeHRlbnNpb25JbXBsOjpjcmVhdGUoc2VydmljZS51dGY4KCkuZGF0YSgp LCBUeXBlOjpNYWNoLCBhdWRpdFRva2VuKTsKKyAgICBoYW5kbGUubV9zYW5kYm94RXh0ZW5zaW9u ID0gU2FuZGJveEV4dGVuc2lvbkltcGw6OmNyZWF0ZShzZXJ2aWNlLnV0ZjgoKS5kYXRhKCksIFR5 cGU6Ok1hY2gsIGF1ZGl0VG9rZW4sIGZsYWdzKTsKICAgICBpZiAoIWhhbmRsZS5tX3NhbmRib3hF eHRlbnNpb24pIHsKICAgICAgICAgV1RGTG9nQWx3YXlzKCJDb3VsZCBub3QgY3JlYXRlIGEgJyVz JyBzYW5kYm94IGV4dGVuc2lvbiIsIHNlcnZpY2UudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJl dHVybiBmYWxzZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nl c3NQb29sQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQkocmV2aXNpb24gMjU1NDM3KQorKysgU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQkod29ya2luZyBjb3B5 KQpAQCAtNTAsNiArNTAsNyBAQAogI2ltcG9ydCA8V2ViQ29yZS9NSU1FVHlwZVJlZ2lzdHJ5Lmg+ CiAjaW1wb3J0IDxXZWJDb3JlL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oPgogI2ltcG9ydCA8V2Vi Q29yZS9Ob3RJbXBsZW1lbnRlZC5oPgorI2ltcG9ydCA8V2ViQ29yZS9QaWN0dXJlSW5QaWN0dXJl U3VwcG9ydC5oPgogI2ltcG9ydCA8V2ViQ29yZS9QbGF0Zm9ybVBhc3RlYm9hcmQuaD4KICNpbXBv cnQgPFdlYkNvcmUvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmg+CiAjaW1wb3J0IDxXZWJDb3Jl L1NoYXJlZEJ1ZmZlci5oPgpAQCAtNjEsNiArNjIsNyBAQAogI2ltcG9ydCA8d3RmL1Byb2Nlc3NQ cml2aWxlZ2UuaD4KICNpbXBvcnQgPHd0Zi9Tb2Z0TGlua2luZy5oPgogI2ltcG9ydCA8d3RmL2Nv Y29hL0VudGl0bGVtZW50cy5oPgorI2ltcG9ydCA8d3RmL3NwaS9kYXJ3aW4vU2FuZGJveFNQSS5o PgogI2ltcG9ydCA8d3RmL3NwaS9kYXJ3aW4vZHlsZFNQSS5oPgogCiAjaWYgUExBVEZPUk0oTUFD KQpAQCAtMzI4LDcgKzMzMCw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlh bGl6ZVcKICAgICAKICAgICBpZiAoaXNJbnRlcm5hbEluc3RhbGwoKSkgewogICAgICAgICBTYW5k Ym94RXh0ZW5zaW9uOjpIYW5kbGUgZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGU7Ci0gICAgICAg IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAoImNvbS5hcHBsZS5k aWFnbm9zdGljZCIsIFdURjo6bnVsbG9wdCwgZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGUpOwor ICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwKCJjb20u YXBwbGUuZGlhZ25vc3RpY2QiLCBXVEY6Om51bGxvcHQsIGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFu ZGxlLCBTYW5kYm94RXh0ZW5zaW9uOjpGbGFnczo6Tm9SZXBvcnQpOwogICAgICAgICBwYXJhbWV0 ZXJzLmRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZShkaWFnbm9zdGljc0V4dGVu c2lvbkhhbmRsZSk7CiAgICAgfQogI2VuZGlmCg==