212720 2020-06-03 15:19:47 -0700 Revise sandbox to support network stack telemetry without sandbox violation reports 2020-06-04 12:45:07 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham pvollan oldest_to_newest 1658890 0 bfulgham 2020-06-03 15:19:47 -0700 Telemetry captured for various networking configurations has revealed a handful of mach service connections that should be allowed in the Network Process to support troubleshooting and field diagnostics. This patch revises the sandbox to avoid logging these accesses during normal operation, and to silence the back-traces in cases where we expect these ports to be unavailable. 1658891 1 bfulgham 2020-06-03 15:23:09 -0700 <rdar://problem/63895783> 1658919 2 400980 bfulgham 2020-06-03 16:31:45 -0700 Created attachment 400980 Patch 1658922 3 400980 pvollan 2020-06-03 16:42:25 -0700 Comment on attachment 400980 Patch Great! R=me. 1658923 4 400980 pvollan 2020-06-03 16:43:23 -0700 Comment on attachment 400980 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400980&action=review > Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:953 > + "com.apple.osanalytics.osanalyticshelper" You also need to add this to the extension rule, I think. 1659082 5 400980 pvollan 2020-06-04 07:03:38 -0700 Comment on attachment 400980 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400980&action=review >> Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:953 >> + "com.apple.osanalytics.osanalyticshelper" > > You also need to add this to the extension rule, I think. Scratch that, this is the extension rule :) 1659090 6 400980 pvollan 2020-06-04 07:24:22 -0700 Comment on attachment 400980 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400980&action=review > Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:300 > + (global-name "com.apple.aggregated") Perhaps we could issue an extension for internal builds, since this was a service not allowed before? > Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb:513 > + (global-name "com.apple.aggregated") Ditto. 1659154 7 ews-feeder 2020-06-04 10:34:33 -0700 Tools/Scripts/svn-apply failed to apply attachment 400980 to trunk. Please resolve the conflicts and upload a new patch. 1659237 8 401060 bfulgham 2020-06-04 12:11:21 -0700 Created attachment 401060 Patch for landing 1659257 9 ews-feeder 2020-06-04 12:45:06 -0700 Committed r262560: <https://trac.webkit.org/changeset/262560> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401060. 400980 2020-06-03 16:31:45 -0700 2020-06-04 12:11:20 -0700 Patch bug-212720-20200603163144.patch text/plain 10179 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY1YTg4MDU0M2RhYjFkMTkz ODU0ODBiMjA0NTJhOTFmOGQzYTViYzIuLjQ2YWJlNzhkNDFlMjE0NDAxYWUyNTA4NTRiZGYwODBi YThhYWQ4NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjAtMDYtMDMgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aXNlIHNhbmRib3ggdG8g c3VwcG9ydCBuZXR3b3JrIHN0YWNrIHRlbGVtZXRyeSB3aXRob3V0IHNhbmRib3ggdmlvbGF0aW9u IHJlcG9ydHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMjcyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjM4OTU3ODM+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVsZW1ldHJ5IGNhcHR1cmVkIGZv ciB2YXJpb3VzIG5ldHdvcmtpbmcgY29uZmlndXJhdGlvbnMgaGFzIHJldmVhbGVkIGEgaGFuZGZ1 bCBvZiBtYWNoIHNlcnZpY2UKKyAgICAgICAgY29ubmVjdGlvbnMgdGhhdCBzaG91bGQgYmUgYWxs b3dlZCBpbiB0aGUgTmV0d29yayBQcm9jZXNzIHRvIHN1cHBvcnQgdHJvdWJsZXNob290aW5nIGFu ZCBmaWVsZCBkaWFnbm9zdGljcy4KKworICAgICAgICBUaGlzIHBhdGNoIHJldmlzZXMgdGhlIHNh bmRib3ggdG8gYXZvaWQgbG9nZ2luZyB0aGVzZSBhY2Nlc3NlcyBkdXJpbmcgbm9ybWFsIG9wZXJh dGlvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL21hYy9jb20uYXBwbGUuV2ViS2l0Lk5l dHdvcmtQcm9jZXNzLnNiLmluOiBEbyBub3QgZ2VuZXJhdGUgdHJhY2VzIGZvciAnY29tLmFwcGxl LmRpYWdub3N0aWNkJy4KKyAgICAgICAgKiBSZXNvdXJjZXMvU2FuZGJveFByb2ZpbGVzL2lvcy9j b20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmcuc2I6IERpdHRvLgorICAgICAgICAqIFJlc291cmNl cy9TYW5kYm94UHJvZmlsZXMvaW9zL2NvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudC5zYjogQWxs b3cgJ2NvbS5hcHBsZS5vc2FuYWx5dGljcy5vc2FuYWx5dGljc2hlbHBlcicgdG8KKyAgICAgICAg ICBiZSB1c2VkIG9uIGludGVybmFsIGRldmVsb3BtZW50IGJ1aWxkcy4KKyAgICAgICAgKiBTaGFy ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6IFVwZGF0ZSB0byBoYW5k bGUgYm90aCAnZGlhZ25vc3RpY2QnIGFuZCAnb3NhbmFseXRpY3NoZWxwZXInCisgICAgICAgIGFz IG9wdGlvbmFsIHNlcnZpY2VzIGZvciBpbnRlcm5hbCBidWlsZHMuCisgICAgICAgIChXZWJLaXQ6 OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6IERpdHRvLgorICAgICAgICAq IFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogVUlQcm9j ZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OmRpYWdu b3N0aWNTZXJ2aWNlcyk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6 cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6IERpdHRvLgorICAgICAgICAqIFdlYlByb2Nl c3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKTogRGl0dG8uCisKIDIwMjAtMDYtMDMgIEpl ciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gSGlkZSB0aGUg UGlQIGJ1dHRvbiBpbiBmdWxsc2NyZWVuIG1vZGUgaWYgUGlQIGlzIGRpc2FibGVkIGluIHByZWZl cmVuY2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL21hYy9jb20u YXBwbGUuV2ViS2l0Lk5ldHdvcmtQcm9jZXNzLnNiLmluIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5OZXR3b3JrUHJvY2Vzcy5zYi5pbgppbmRleCBm MTFlMGMzMTAxNGRmYWQwZjY0MjBmYTBhMmI4NmE4NjQzNmY3Mjk0Li40YjQ3NWY5OGY5NGQyODdm N2QxYjMwNjYxYzc4ZDMwNDBiYTQ1MzdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL21hYy9jb20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtQcm9jZXNzLnNiLmluCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvbWFjL2NvbS5hcHBsZS5XZWJLaXQuTmV0d29y a1Byb2Nlc3Muc2IuaW4KQEAgLTExNiw3ICsxMTYsNiBAQAogICAgICAgIChnbG9iYWwtbmFtZSAi Y29tLmFwcGxlLmJzZC5kaXJoZWxwZXIiKQogICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxl LmNmcHJlZnNkLmFnZW50IikKICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5jZnByZWZz ZC5kYWVtb24iKQotICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmRpYWdub3N0aWNkIikK ICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5lc3BkIikKICAgICAgICAoZ2xvYmFsLW5h bWUgImNvbS5hcHBsZS5sb2dkIikKICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5sb2dk LmV2ZW50cyIpCkBAIC0yOTgsMTAgKzI5NywxMiBAQAogICAgIChnbG9iYWwtbmFtZSAiY29tLmFw cGxlLkZpbGVDb29yZGluYXRpb24iKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLlBvd2Vy TWFuYWdlbWVudC5jb250cm9sIikKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5TeXN0ZW1D b25maWd1cmF0aW9uLmNvbmZpZ2QiKQorICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmFnZ3Jl Z2F0ZWQiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmFuYWx5dGljc2QiKQogICAgIChn bG9iYWwtbmFtZSAiY29tLmFwcGxlLmNvb2tpZWQiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFw cGxlLmNmbmV0d29yay5BdXRoQnJva2VyQWdlbnQiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFw cGxlLmNmbmV0d29yay5jZm5ldHdvcmthZ2VudCIpCisgICAgKGdsb2JhbC1uYW1lICJjb20uYXBw bGUuZGlhZ25vc3RpY2QiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmlzdC5kcy5hcHBs ZWNvbm5lY3QyLnNlcnZpY2Uua2RjdHVubmVsY29udHJvbGxlciIpCiAgICAgKGdsb2JhbC1uYW1l ICJjb20uYXBwbGUubHNkLm1hcGRiIikKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5uZXNl c3Npb25tYW5hZ2VyLmZsb3ctZGl2ZXJ0LXRva2VuIikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvUmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5OZXR3b3Jr aW5nLnNiIGIvU291cmNlL1dlYktpdC9SZXNvdXJjZXMvU2FuZGJveFByb2ZpbGVzL2lvcy9jb20u YXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmcuc2IKaW5kZXggMmNhNTY4YTUwYWM5YjMxYmM0NGIzZWM5 OThiNjAxNzdmNDhhZDk0Yi4uZWYxNjJjZjlhNGYzMDI4ZGFhYjUxOGEyZGNjOGNhNmM1MmI0YjRl MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9SZXNvdXJjZXMvU2FuZGJveFByb2ZpbGVzL2lv cy9jb20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmcuc2IKKysrIGIvU291cmNlL1dlYktpdC9SZXNv dXJjZXMvU2FuZGJveFByb2ZpbGVzL2lvcy9jb20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmcuc2IK QEAgLTUwNyw4ICs1MDcsMTEgQEAKIChhbGxvdyBtYWNoLWxvb2t1cCAod2l0aCByZXBvcnQpICh3 aXRoIHRlbGVtZXRyeSkKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5kaXN0cmlidXRlZF9u b3RpZmljYXRpb25zQDF2MyIpKQogCi0oYWxsb3cgbWFjaC1sb29rdXAgKHdpdGggcmVwb3J0KSAo d2l0aCB0ZWxlbWV0cnkpCi0gICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuZGlhZ25vc3RpY2Qi KSkKKzs7IFRoZXNlIGFyZSBhbHdheXMgbmVlZGVkIGluIHRoZSBOZXR3b3JrIHByb2Nlc3M6Ciso YWxsb3cgbWFjaC1sb29rdXAKKyAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5kaWFnbm9zdGlj ZCIpCisgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuYWdncmVnYXRlZCIpCispCiAKIChsb2dk LWRpYWdub3N0aWMtY2xpZW50KQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1Jlc291cmNl cy9TYW5kYm94UHJvZmlsZXMvaW9zL2NvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudC5zYiBiL1Nv dXJjZS9XZWJLaXQvUmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktp dC5XZWJDb250ZW50LnNiCmluZGV4IDc2Njk3NWQzZjhkZmNjZTFiMDgwMGE4OWIzOWFkOTliZDEw OTQzZGIuLjA0NTVmOTM3M2QxM2UxYzgzN2RlZjk4OWMzZGRkMjU2ZmE0Nzc2YTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvUmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxl LldlYktpdC5XZWJDb250ZW50LnNiCisrKyBiL1NvdXJjZS9XZWJLaXQvUmVzb3VyY2VzL1NhbmRi b3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50LnNiCkBAIC05NTAsNiAr OTUwLDcgQEAKICAgICAgICAgICAgICJjb20uYXBwbGUubW9iaWxlYXNzZXRkLnYyIgogICAgICAg ICAgICAgImNvbS5hcHBsZS5uZWhlbHBlciIKICAgICAgICAgICAgICJjb20uYXBwbGUubmVzZXNz aW9ubWFuYWdlci5jb250ZW50LWZpbHRlciIKKyAgICAgICAgICAgICJjb20uYXBwbGUub3NhbmFs eXRpY3Mub3NhbmFseXRpY3NoZWxwZXIiCiAgICAgICAgICAgICAiY29tLmFwcGxlLnRjY2QiCiAg ICAgICAgICAgICAiY29tLmFwcGxlLnVpa2l0LnZpZXdzZXJ2aWNlLmNvbS5hcHBsZS5XZWJDb250 ZW50RmlsdGVyLnJlbW90ZVVJIgogICAgICAgICAgICAgImNvbS5hcHBsZS53ZWJpbnNwZWN0b3Ii CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFt ZXRlcnMuY3BwCmluZGV4IDUyYTc4ODIwNjIwMmQyOGFiMzMwMWI4OTU1ZmQ5NTNjODFlMTA1OTcu LjExOTg4OGVjNGIyNWUwOWJkZGFiZjdmNjg2OGQxNzJkNmRjMDJkMzMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBA IC0xNjIsNyArMTYyLDcgQEAgdm9pZCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNv ZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogI2VuZGlmCiAKICNpZiBQTEFURk9STShJ T1NfRkFNSUxZKQotICAgIGVuY29kZXIgPDwgZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGU7Cisg ICAgZW5jb2RlciA8PCBkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXM7CiAgICAgZW5jb2RlciA8 PCBydW5uaW5nYm9hcmRFeHRlbnNpb25IYW5kbGU7CiAgICAgZW5jb2RlciA8PCBkeW5hbWljTWFj aEV4dGVuc2lvbkhhbmRsZXM7CiAgICAgZW5jb2RlciA8PCBkeW5hbWljSU9LaXRFeHRlbnNpb25I YW5kbGVzOwpAQCAtNDM3LDExICs0MzcsMTEgQEAgYm9vbCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBXZWJQcm9jZXNzQ3JlYXQKICNl bmRpZgogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBPcHRpb25hbDxPcHRpb25hbDxT YW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+PiBkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZTsKLSAg ICBkZWNvZGVyID4+IGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlOwotICAgIGlmICghZGlhZ25v c3RpY3NFeHRlbnNpb25IYW5kbGUpCisgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFu ZGxlQXJyYXk+IGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlczsKKyAgICBkZWNvZGVyID4+IGRp YWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlczsKKyAgICBpZiAoIWRpYWdub3N0aWNzRXh0ZW5zaW9u SGFuZGxlcykKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHBhcmFtZXRlcnMuZGlhZ25vc3Rp Y3NFeHRlbnNpb25IYW5kbGUgPSBXVEZNb3ZlKCpkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZSk7 CisgICAgcGFyYW1ldGVycy5kaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXMgPSBXVEZNb3ZlKCpk aWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXMpOwogCiAgICAgT3B0aW9uYWw8T3B0aW9uYWw8U2Fu ZGJveEV4dGVuc2lvbjo6SGFuZGxlPj4gcnVubmluZ2JvYXJkRXh0ZW5zaW9uSGFuZGxlOwogICAg IGRlY29kZXIgPj4gcnVubmluZ2JvYXJkRXh0ZW5zaW9uSGFuZGxlOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCmluZGV4IGY4OGIz Y2EyNzA2NzBjZjcxOTM5MDY3NWZmYjYwODNlNDdmNmI4NGUuLmRlYzM0NGJlYzVkODY3NTFmNTIy MmQyODY4OTk1MTA1YWE1MTRmNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dl YlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKQEAgLTIwMiw3ICsyMDIsNyBAQCBzdHJ1Y3Qg V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyB7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCi0gICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiBkaWFnbm9z dGljc0V4dGVuc2lvbkhhbmRsZTsKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSBk aWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXM7CiAgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lv bjo6SGFuZGxlPiBydW5uaW5nYm9hcmRFeHRlbnNpb25IYW5kbGU7CiAgICAgU2FuZGJveEV4dGVu c2lvbjo6SGFuZGxlQXJyYXkgZHluYW1pY01hY2hFeHRlbnNpb25IYW5kbGVzOwogICAgIFNhbmRi b3hFeHRlbnNpb246OkhhbmRsZUFycmF5IGR5bmFtaWNJT0tpdEV4dGVuc2lvbkhhbmRsZXM7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENv Y29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2Nv YS5tbQppbmRleCBjM2FlYWI5YjY5ZjcxYTUxNTk2MDYyMGQ0ZWNiOTlmNWU5NTZhMjAzLi5kZWM5 ZTllMzQ4YzgwODg5OWFkM2NiYjE3NTQ3NDcxODZhNjFjN2ZlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0KQEAgLTI2Miw2 ICsyNjIsMTYgQEAgc3RhdGljIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBub25Ccm93c2VyU2Vydmlj ZXMoKQogICAgIHJldHVybiBzZXJ2aWNlczsKIH0KIAorc3RhdGljIGNvbnN0IFZlY3RvcjxTdHJp bmc+JiBkaWFnbm9zdGljU2VydmljZXMoKQoreworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7 CisgICAgc3RhdGljIGNvbnN0IGF1dG8gc2VydmljZXMgPSBtYWtlTmV2ZXJEZXN0cm95ZWQoVmVj dG9yPFN0cmluZz4geworICAgICAgICAiY29tLmFwcGxlLmRpYWdub3N0aWNkIiwKKyAgICAgICAg ImNvbS5hcHBsZS5vc2FuYWx5dGljcy5vc2FuYWx5dGljc2hlbHBlciIKKyAgICB9KTsKKyAgICBy ZXR1cm4gc2VydmljZXM7Cit9CisKIHN0YXRpYyBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYWd4Q29t cGlsZXJDbGFzc2VzKCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwpAQCAtMjc5LDYg KzI4OSw3IEBAIHN0YXRpYyBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYWd4Q29tcGlsZXJDbGFzc2Vz KCkKICAgICB9KTsKICAgICByZXR1cm4gaW9raXRDbGFzc2VzOwogfQorCiAjZW5kaWYKIAogdm9p ZCBXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyhjb25zdCBXZWJQ cm9jZXNzUHJveHkmIHByb2Nlc3MsIFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFt ZXRlcnMpCkBAIC0zODksMTEgKzQwMCw4IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3Jt SW5pdGlhbGl6ZVdlYlByb2Nlc3MoY29uc3QgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzCiAgICAg aWYgKCFXZWJDb3JlOjpJT1NBcHBsaWNhdGlvbjo6aXNNb2JpbGVTYWZhcmkoKSkKICAgICAgICAg cGFyYW1ldGVycy5keW5hbWljTWFjaEV4dGVuc2lvbkhhbmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9u OjpjcmVhdGVIYW5kbGVzRm9yTWFjaExvb2t1cChub25Ccm93c2VyU2VydmljZXMoKSwgV1RGOjpu dWxsb3B0KTsKICAgICAKLSAgICBpZiAoaXNJbnRlcm5hbEluc3RhbGwoKSkgewotICAgICAgICBT YW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGU7Ci0gICAg ICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAoImNvbS5hcHBs ZS5kaWFnbm9zdGljZCIsIFdURjo6bnVsbG9wdCwgZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGUs IFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9ydCk7Ci0gICAgICAgIHBhcmFtZXRlcnMu ZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGUgPSBXVEZNb3ZlKGRpYWdub3N0aWNzRXh0ZW5zaW9u SGFuZGxlKTsKLSAgICB9CisgICAgaWYgKGlzSW50ZXJuYWxJbnN0YWxsKCkpCisgICAgICAgIHBh cmFtZXRlcnMuZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVzID0gU2FuZGJveEV4dGVuc2lvbjo6 Y3JlYXRlSGFuZGxlc0Zvck1hY2hMb29rdXAoZGlhZ25vc3RpY1NlcnZpY2VzKCksIFdURjo6bnVs bG9wdCwgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0KTsKIAogICAgIFNhbmRib3hF eHRlbnNpb246OkhhbmRsZSBydW5uaW5nYm9hcmRFeHRlbnNpb25IYW5kbGU7CiAgICAgaWYgKFNh bmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAoImNvbS5hcHBsZS5ydW5u aW5nYm9hcmQiLCBXVEY6Om51bGxvcHQsIHJ1bm5pbmdib2FyZEV4dGVuc2lvbkhhbmRsZSwgU2Fu ZGJveEV4dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCmluZGV4IGQ1NDE2MzI5ZGFhNjgwOTcy MjRlMzQ1Y2U1ODc5Y2FmNjQ0NGU5YmMuLmNlNGQ0ZDIyMDljZWI3ZWNiY2NkM2JjNjlkYmM2OTdh MzU4Mzg1NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQ cm9jZXNzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlBy b2Nlc3NDb2NvYS5tbQpAQCAtMzAxLDkgKzMwMSw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZv cm1Jbml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJh CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgaWYgKHBhcmFtZXRlcnMu ZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGUpCi0gICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNv bnN1bWVQZXJtYW5lbnRseSgqcGFyYW1ldGVycy5kaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZSk7 Ci0KKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5k aWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXMpOwogICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1 bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJzLmR5bmFtaWNNYWNoRXh0ZW5zaW9uSGFuZGxlcyk7CiAg ICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMuZHluYW1p Y0lPS2l0RXh0ZW5zaW9uSGFuZGxlcyk7CiAjZW5kaWYK 401060 2020-06-04 12:11:21 -0700 2020-06-04 12:45:06 -0700 Patch for landing bug-212720-20200604121121.patch text/plain 10176 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ2MGYwOTc3ODQ5ZWU2MjMz NmNlMzZlMDIzZjY5N2E5ODM1MTJiYTIuLjNkYmU0Zjc5ZTg0NjgyYzk1MzgyZDNkYmEwMmI5MTk0 YmE2MDgxZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjAtMDYtMDQgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aXNlIHNhbmRib3ggdG8g c3VwcG9ydCBuZXR3b3JrIHN0YWNrIHRlbGVtZXRyeSB3aXRob3V0IHNhbmRib3ggdmlvbGF0aW9u IHJlcG9ydHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMjcyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjM4OTU3ODM+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgUGVyIEFybmUgVm9sbGFuLgorCisgICAgICAgIFRlbGVtZXRyeSBjYXB0dXJlZCBm b3IgdmFyaW91cyBuZXR3b3JraW5nIGNvbmZpZ3VyYXRpb25zIGhhcyByZXZlYWxlZCBhIGhhbmRm dWwgb2YgbWFjaCBzZXJ2aWNlCisgICAgICAgIGNvbm5lY3Rpb25zIHRoYXQgc2hvdWxkIGJlIGFs bG93ZWQgaW4gdGhlIE5ldHdvcmsgUHJvY2VzcyB0byBzdXBwb3J0IHRyb3VibGVzaG9vdGluZyBh bmQgZmllbGQgZGlhZ25vc3RpY3MuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZXZpc2VzIHRoZSBz YW5kYm94IHRvIGF2b2lkIGxvZ2dpbmcgdGhlc2UgYWNjZXNzZXMgZHVyaW5nIG5vcm1hbCBvcGVy YXRpb24uCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5O ZXR3b3JrUHJvY2Vzcy5zYi5pbjogRG8gbm90IGdlbmVyYXRlIHRyYWNlcyBmb3IgJ2NvbS5hcHBs ZS5kaWFnbm9zdGljZCcuCisgICAgICAgICogUmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3Mv Y29tLmFwcGxlLldlYktpdC5OZXR3b3JraW5nLnNiOiBEaXR0by4KKyAgICAgICAgKiBSZXNvdXJj ZXMvU2FuZGJveFByb2ZpbGVzL2lvcy9jb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQuc2I6IEFs bG93ICdjb20uYXBwbGUub3NhbmFseXRpY3Mub3NhbmFseXRpY3NoZWxwZXInIHRvCisgICAgICAg ICAgYmUgdXNlZCBvbiBpbnRlcm5hbCBkZXZlbG9wbWVudCBidWlsZHMuCisgICAgICAgICogU2hh cmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUgY29uc3QpOiBVcGRhdGUgdG8gaGFu ZGxlIGJvdGggJ2RpYWdub3N0aWNkJyBhbmQgJ29zYW5hbHl0aWNzaGVscGVyJworICAgICAgICBh cyBvcHRpb25hbCBzZXJ2aWNlcyBmb3IgaW50ZXJuYWwgYnVpbGRzLgorICAgICAgICAoV2ViS2l0 OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOiBEaXR0by4KKyAgICAgICAg KiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpkaWFn bm9zdGljU2VydmljZXMpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6 OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOiBEaXR0by4KKyAgICAgICAgKiBXZWJQcm9j ZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz czo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6IERpdHRvLgorCiAyMDIwLTA2LTA0ICBQ ZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIEFk b3B0IHJlYWQtb25seSBtb2RlIGZvciBwcmVmZXJlbmNlcyBpbiB0aGUgV2ViQ29udGVudCBwcm9j ZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL21hYy9jb20uYXBw bGUuV2ViS2l0Lk5ldHdvcmtQcm9jZXNzLnNiLmluIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5OZXR3b3JrUHJvY2Vzcy5zYi5pbgppbmRleCBmMTFl MGMzMTAxNGRmYWQwZjY0MjBmYTBhMmI4NmE4NjQzNmY3Mjk0Li40YjQ3NWY5OGY5NGQyODdmN2Qx YjMwNjYxYzc4ZDMwNDBiYTQ1MzdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL21hYy9jb20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtQcm9jZXNzLnNiLmluCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvbWFjL2NvbS5hcHBsZS5XZWJLaXQuTmV0d29ya1By b2Nlc3Muc2IuaW4KQEAgLTExNiw3ICsxMTYsNiBAQAogICAgICAgIChnbG9iYWwtbmFtZSAiY29t LmFwcGxlLmJzZC5kaXJoZWxwZXIiKQogICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmNm cHJlZnNkLmFnZW50IikKICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5jZnByZWZzZC5k YWVtb24iKQotICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmRpYWdub3N0aWNkIikKICAg ICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5lc3BkIikKICAgICAgICAoZ2xvYmFsLW5hbWUg ImNvbS5hcHBsZS5sb2dkIikKICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5sb2dkLmV2 ZW50cyIpCkBAIC0yOTgsMTAgKzI5NywxMiBAQAogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxl LkZpbGVDb29yZGluYXRpb24iKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLlBvd2VyTWFu YWdlbWVudC5jb250cm9sIikKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5TeXN0ZW1Db25m aWd1cmF0aW9uLmNvbmZpZ2QiKQorICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmFnZ3JlZ2F0 ZWQiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmFuYWx5dGljc2QiKQogICAgIChnbG9i YWwtbmFtZSAiY29tLmFwcGxlLmNvb2tpZWQiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxl LmNmbmV0d29yay5BdXRoQnJva2VyQWdlbnQiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxl LmNmbmV0d29yay5jZm5ldHdvcmthZ2VudCIpCisgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUu ZGlhZ25vc3RpY2QiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmlzdC5kcy5hcHBsZWNv bm5lY3QyLnNlcnZpY2Uua2RjdHVubmVsY29udHJvbGxlciIpCiAgICAgKGdsb2JhbC1uYW1lICJj b20uYXBwbGUubHNkLm1hcGRiIikKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5uZXNlc3Np b25tYW5hZ2VyLmZsb3ctZGl2ZXJ0LXRva2VuIikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv UmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5OZXR3b3JraW5n LnNiIGIvU291cmNlL1dlYktpdC9SZXNvdXJjZXMvU2FuZGJveFByb2ZpbGVzL2lvcy9jb20uYXBw bGUuV2ViS2l0Lk5ldHdvcmtpbmcuc2IKaW5kZXggMmNhNTY4YTUwYWM5YjMxYmM0NGIzZWM5OThi NjAxNzdmNDhhZDk0Yi4uZWYxNjJjZjlhNGYzMDI4ZGFhYjUxOGEyZGNjOGNhNmM1MmI0YjRlMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9SZXNvdXJjZXMvU2FuZGJveFByb2ZpbGVzL2lvcy9j b20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmcuc2IKKysrIGIvU291cmNlL1dlYktpdC9SZXNvdXJj ZXMvU2FuZGJveFByb2ZpbGVzL2lvcy9jb20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmcuc2IKQEAg LTUwNyw4ICs1MDcsMTEgQEAKIChhbGxvdyBtYWNoLWxvb2t1cCAod2l0aCByZXBvcnQpICh3aXRo IHRlbGVtZXRyeSkKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5kaXN0cmlidXRlZF9ub3Rp ZmljYXRpb25zQDF2MyIpKQogCi0oYWxsb3cgbWFjaC1sb29rdXAgKHdpdGggcmVwb3J0KSAod2l0 aCB0ZWxlbWV0cnkpCi0gICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuZGlhZ25vc3RpY2QiKSkK Kzs7IFRoZXNlIGFyZSBhbHdheXMgbmVlZGVkIGluIHRoZSBOZXR3b3JrIHByb2Nlc3M6CisoYWxs b3cgbWFjaC1sb29rdXAKKyAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5kaWFnbm9zdGljZCIp CisgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuYWdncmVnYXRlZCIpCispCiAKIChsb2dkLWRp YWdub3N0aWMtY2xpZW50KQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1Jlc291cmNlcy9T YW5kYm94UHJvZmlsZXMvaW9zL2NvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudC5zYiBiL1NvdXJj ZS9XZWJLaXQvUmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5X ZWJDb250ZW50LnNiCmluZGV4IDVmYzcwYTQyOGMzMGI1YmI4ZWMxYjZjZTAwYjQ3MDA2OTYxNmU4 MTkuLjdiMzE1MTM3NTNlNDViM2IwNjNlNGZhYjM4ZDI2ZGNjYzQ0ZjY5ODQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvUmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldl YktpdC5XZWJDb250ZW50LnNiCisrKyBiL1NvdXJjZS9XZWJLaXQvUmVzb3VyY2VzL1NhbmRib3hQ cm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50LnNiCkBAIC05NTAsNiArOTUw LDcgQEAKICAgICAgICAgICAgICJjb20uYXBwbGUubW9iaWxlYXNzZXRkLnYyIgogICAgICAgICAg ICAgImNvbS5hcHBsZS5uZWhlbHBlciIKICAgICAgICAgICAgICJjb20uYXBwbGUubmVzZXNzaW9u bWFuYWdlci5jb250ZW50LWZpbHRlciIKKyAgICAgICAgICAgICJjb20uYXBwbGUub3NhbmFseXRp Y3Mub3NhbmFseXRpY3NoZWxwZXIiCiAgICAgICAgICAgICAiY29tLmFwcGxlLnJ1bm5pbmdib2Fy ZCIKICAgICAgICAgICAgICJjb20uYXBwbGUudGNjZCIKICAgICAgICAgICAgICJjb20uYXBwbGUu dWlraXQudmlld3NlcnZpY2UuY29tLmFwcGxlLldlYkNvbnRlbnRGaWx0ZXIucmVtb3RlVUkiCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMuY3BwCmluZGV4IDUyYTc4ODIwNjIwMmQyOGFiMzMwMWI4OTU1ZmQ5NTNjODFlMTA1OTcuLjEx OTg4OGVjNGIyNWUwOWJkZGFiZjdmNjg2OGQxNzJkNmRjMDJkMzMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBAIC0x NjIsNyArMTYyLDcgQEAgdm9pZCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUo SVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQotICAgIGVuY29kZXIgPDwgZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGU7CisgICAg ZW5jb2RlciA8PCBkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXM7CiAgICAgZW5jb2RlciA8PCBy dW5uaW5nYm9hcmRFeHRlbnNpb25IYW5kbGU7CiAgICAgZW5jb2RlciA8PCBkeW5hbWljTWFjaEV4 dGVuc2lvbkhhbmRsZXM7CiAgICAgZW5jb2RlciA8PCBkeW5hbWljSU9LaXRFeHRlbnNpb25IYW5k bGVzOwpAQCAtNDM3LDExICs0MzcsMTEgQEAgYm9vbCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBXZWJQcm9jZXNzQ3JlYXQKICNlbmRp ZgogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBPcHRpb25hbDxPcHRpb25hbDxTYW5k Ym94RXh0ZW5zaW9uOjpIYW5kbGU+PiBkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZTsKLSAgICBk ZWNvZGVyID4+IGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlOwotICAgIGlmICghZGlhZ25vc3Rp Y3NFeHRlbnNpb25IYW5kbGUpCisgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxl QXJyYXk+IGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlczsKKyAgICBkZWNvZGVyID4+IGRpYWdu b3N0aWNzRXh0ZW5zaW9uSGFuZGxlczsKKyAgICBpZiAoIWRpYWdub3N0aWNzRXh0ZW5zaW9uSGFu ZGxlcykKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHBhcmFtZXRlcnMuZGlhZ25vc3RpY3NF eHRlbnNpb25IYW5kbGUgPSBXVEZNb3ZlKCpkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZSk7Cisg ICAgcGFyYW1ldGVycy5kaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXMgPSBXVEZNb3ZlKCpkaWFn bm9zdGljc0V4dGVuc2lvbkhhbmRsZXMpOwogCiAgICAgT3B0aW9uYWw8T3B0aW9uYWw8U2FuZGJv eEV4dGVuc2lvbjo6SGFuZGxlPj4gcnVubmluZ2JvYXJkRXh0ZW5zaW9uSGFuZGxlOwogICAgIGRl Y29kZXIgPj4gcnVubmluZ2JvYXJkRXh0ZW5zaW9uSGFuZGxlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dl YktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCmluZGV4IGY4OGIzY2Ey NzA2NzBjZjcxOTM5MDY3NWZmYjYwODNlNDdmNmI4NGUuLmRlYzM0NGJlYzVkODY3NTFmNTIyMmQy ODY4OTk1MTA1YWE1MTRmNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKQEAgLTIwMiw3ICsyMDIsNyBAQCBzdHJ1Y3QgV2Vi UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyB7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPU19G QU1JTFkpCi0gICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiBkaWFnbm9zdGlj c0V4dGVuc2lvbkhhbmRsZTsKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSBkaWFn bm9zdGljc0V4dGVuc2lvbkhhbmRsZXM7CiAgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6 SGFuZGxlPiBydW5uaW5nYm9hcmRFeHRlbnNpb25IYW5kbGU7CiAgICAgU2FuZGJveEV4dGVuc2lv bjo6SGFuZGxlQXJyYXkgZHluYW1pY01hY2hFeHRlbnNpb25IYW5kbGVzOwogICAgIFNhbmRib3hF eHRlbnNpb246OkhhbmRsZUFycmF5IGR5bmFtaWNJT0tpdEV4dGVuc2lvbkhhbmRsZXM7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29h Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5t bQppbmRleCBjM2FlYWI5YjY5ZjcxYTUxNTk2MDYyMGQ0ZWNiOTlmNWU5NTZhMjAzLi5kZWM5ZTll MzQ4YzgwODg5OWFkM2NiYjE3NTQ3NDcxODZhNjFjN2ZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0KQEAgLTI2Miw2ICsy NjIsMTYgQEAgc3RhdGljIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBub25Ccm93c2VyU2VydmljZXMo KQogICAgIHJldHVybiBzZXJ2aWNlczsKIH0KIAorc3RhdGljIGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBkaWFnbm9zdGljU2VydmljZXMoKQoreworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Cisg ICAgc3RhdGljIGNvbnN0IGF1dG8gc2VydmljZXMgPSBtYWtlTmV2ZXJEZXN0cm95ZWQoVmVjdG9y PFN0cmluZz4geworICAgICAgICAiY29tLmFwcGxlLmRpYWdub3N0aWNkIiwKKyAgICAgICAgImNv bS5hcHBsZS5vc2FuYWx5dGljcy5vc2FuYWx5dGljc2hlbHBlciIKKyAgICB9KTsKKyAgICByZXR1 cm4gc2VydmljZXM7Cit9CisKIHN0YXRpYyBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYWd4Q29tcGls ZXJDbGFzc2VzKCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwpAQCAtMjc5LDYgKzI4 OSw3IEBAIHN0YXRpYyBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYWd4Q29tcGlsZXJDbGFzc2VzKCkK ICAgICB9KTsKICAgICByZXR1cm4gaW9raXRDbGFzc2VzOwogfQorCiAjZW5kaWYKIAogdm9pZCBX ZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyhjb25zdCBXZWJQcm9j ZXNzUHJveHkmIHByb2Nlc3MsIFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRl cnMpCkBAIC0zODksMTEgKzQwMCw4IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5p dGlhbGl6ZVdlYlByb2Nlc3MoY29uc3QgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzCiAgICAgaWYg KCFXZWJDb3JlOjpJT1NBcHBsaWNhdGlvbjo6aXNNb2JpbGVTYWZhcmkoKSkKICAgICAgICAgcGFy YW1ldGVycy5keW5hbWljTWFjaEV4dGVuc2lvbkhhbmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9uOjpj cmVhdGVIYW5kbGVzRm9yTWFjaExvb2t1cChub25Ccm93c2VyU2VydmljZXMoKSwgV1RGOjpudWxs b3B0KTsKICAgICAKLSAgICBpZiAoaXNJbnRlcm5hbEluc3RhbGwoKSkgewotICAgICAgICBTYW5k Ym94RXh0ZW5zaW9uOjpIYW5kbGUgZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGU7Ci0gICAgICAg IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAoImNvbS5hcHBsZS5k aWFnbm9zdGljZCIsIFdURjo6bnVsbG9wdCwgZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGUsIFNh bmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9ydCk7Ci0gICAgICAgIHBhcmFtZXRlcnMuZGlh Z25vc3RpY3NFeHRlbnNpb25IYW5kbGUgPSBXVEZNb3ZlKGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFu ZGxlKTsKLSAgICB9CisgICAgaWYgKGlzSW50ZXJuYWxJbnN0YWxsKCkpCisgICAgICAgIHBhcmFt ZXRlcnMuZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVzID0gU2FuZGJveEV4dGVuc2lvbjo6Y3Jl YXRlSGFuZGxlc0Zvck1hY2hMb29rdXAoZGlhZ25vc3RpY1NlcnZpY2VzKCksIFdURjo6bnVsbG9w dCwgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0KTsKIAogICAgIFNhbmRib3hFeHRl bnNpb246OkhhbmRsZSBydW5uaW5nYm9hcmRFeHRlbnNpb25IYW5kbGU7CiAgICAgaWYgKFNhbmRi b3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAoImNvbS5hcHBsZS5ydW5uaW5n Ym9hcmQiLCBXVEY6Om51bGxvcHQsIHJ1bm5pbmdib2FyZEV4dGVuc2lvbkhhbmRsZSwgU2FuZGJv eEV4dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCmluZGV4IGQ1NDE2MzI5ZGFhNjgwOTcyMjRl MzQ1Y2U1ODc5Y2FmNjQ0NGU5YmMuLmNlNGQ0ZDIyMDljZWI3ZWNiY2NkM2JjNjlkYmM2OTdhMzU4 Mzg1NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9j ZXNzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nl c3NDb2NvYS5tbQpAQCAtMzAxLDkgKzMwMSw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1J bml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhCiAj ZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgaWYgKHBhcmFtZXRlcnMuZGlh Z25vc3RpY3NFeHRlbnNpb25IYW5kbGUpCi0gICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1 bWVQZXJtYW5lbnRseSgqcGFyYW1ldGVycy5kaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZSk7Ci0K KyAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5kaWFn bm9zdGljc0V4dGVuc2lvbkhhbmRsZXMpOwogICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQ ZXJtYW5lbnRseShwYXJhbWV0ZXJzLmR5bmFtaWNNYWNoRXh0ZW5zaW9uSGFuZGxlcyk7CiAgICAg U2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMuZHluYW1pY0lP S2l0RXh0ZW5zaW9uSGFuZGxlcyk7CiAjZW5kaWYK