237380 2022-03-02 11:08:36 -0800 [WebAuthn] Completion handler is not called when WebAuthn invoked without proper entitlements 2022-05-19 10:57:08 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham cdumez kevin.flanagan pascoe webkit-bug-importer oldest_to_newest 1847519 0 bfulgham 2022-03-02 11:08:36 -0800 WebAuthn is not permitted outside of Web Browser applications. When an application that lacks the full web browser entitlement attempts to invoke WebAuthn flows, we do an early return. However, the completion handler for this flow is bypassed, preventing applications from being informed of this problem. 1847520 1 webkit-bug-importer 2022-03-02 11:08:57 -0800 <rdar://problem/89700242> 1847521 2 453640 bfulgham 2022-03-02 11:12:02 -0800 Created attachment 453640 Patch 1847540 3 453643 bfulgham 2022-03-02 11:33:26 -0800 Created attachment 453643 Patch 1847556 4 453646 bfulgham 2022-03-02 12:06:08 -0800 Created attachment 453646 Patch 1847567 5 453646 pascoe 2022-03-02 12:20:08 -0800 Comment on attachment 453646 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453646&action=review This looks good to me. > Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp:53 > +#define WEBAUTHN_RELEASE_LOG(fmt, ...) RELEASE_LOG(WebAuthn, "%p - [webPageID=%" PRIu64 ", webFrameID=%" PRIu64 "] WebAuthenticatorCoordinator::" fmt, this, PAGE_ID, FRAME_ID, ##__VA_ARGS__) Will fmt be concatenated to the format string here: "...WebAuthenticatorCoordinator::" fmt, this, PA..." ? 1847568 6 pascoe 2022-03-02 12:22:02 -0800 (In reply to j_pascoe@apple.com from comment #5) > Will fmt be concatenated to the format string here: > "...WebAuthenticatorCoordinator::" fmt, this, PA..." ? I've answered my own question here, it does. 1847596 7 453646 cdumez 2022-03-02 13:28:30 -0800 Comment on attachment 453646 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453646&action=review r=me > Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp:88 > + WEBAUTHN_RELEASE_LOG("makeCredential: The 'navigator.credentials.create' API is only permitted in applications with the 'com.apple.developer.web-browser' entitlement."); Is this an error? If so, could we add a WEBAUTHN_RELEASE_LOG_ERROR (which calls RELEASE_LOG_ERROR internally) and call that instead? If this is something we should pay attention to, making them stand out in the logs could be useful. Same comment for other logging you added in this file. > Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp:138 > + RELEASE_LOG(WebAuthn, "%p - [webPageID=%" PRIu64 "] WebAuthenticatorCoordinator::isUserVerifyingPlatformAuthenticatorAvailable: WebAuthn is only permitted in applications with the 'com.apple.developer.web-browser' entitlement.", this, PAGE_ID); Why is this one not using WEBAUTHN_RELEASE_LOG() ? 1847598 8 453646 bfulgham 2022-03-02 13:33:02 -0800 Comment on attachment 453646 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453646&action=review >> Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp:53 >> +#define WEBAUTHN_RELEASE_LOG(fmt, ...) RELEASE_LOG(WebAuthn, "%p - [webPageID=%" PRIu64 ", webFrameID=%" PRIu64 "] WebAuthenticatorCoordinator::" fmt, this, PAGE_ID, FRAME_ID, ##__VA_ARGS__) > > Will fmt be concatenated to the format string here: "...WebAuthenticatorCoordinator::" fmt, this, PA..." ? Yes! >> Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp:88 >> + WEBAUTHN_RELEASE_LOG("makeCredential: The 'navigator.credentials.create' API is only permitted in applications with the 'com.apple.developer.web-browser' entitlement."); > > Is this an error? If so, could we add a WEBAUTHN_RELEASE_LOG_ERROR (which calls RELEASE_LOG_ERROR internally) and call that instead? > > If this is something we should pay attention to, making them stand out in the logs could be useful. Same comment for other logging you added in this file. Sure -- all of these are ERROR-level, since they indicate misuse of the APIs and places where developer will be confused if we don't help surface things. I'll make that change. >> Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp:138 >> + RELEASE_LOG(WebAuthn, "%p - [webPageID=%" PRIu64 "] WebAuthenticatorCoordinator::isUserVerifyingPlatformAuthenticatorAvailable: WebAuthn is only permitted in applications with the 'com.apple.developer.web-browser' entitlement.", this, PAGE_ID); > > Why is this one not using WEBAUTHN_RELEASE_LOG() ? Oh! We don't have a calling frame here, since this is an implementation detail used outside of normal web flows. I can't use the same macro because that one expects a frame pointer. But, I will make it RELEASE_LOG_ERROR as well. And frankly, making a macro for it might be a little cleaner and more consistent, so I'll do that. 1847600 9 453655 bfulgham 2022-03-02 13:36:05 -0800 Created attachment 453655 Patch for landing 1847614 10 ews-feeder 2022-03-02 14:08:46 -0800 Committed r290755 (247999@main): <https://commits.webkit.org/247999@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453655. 1870458 11 pascoe 2022-05-19 10:57:08 -0700 *** Bug 240666 has been marked as a duplicate of this bug. *** 453640 2022-03-02 11:12:02 -0800 2022-03-02 11:33:40 -0800 Patch bug-237380-20220302111201.patch text/plain 4867 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYxMzA2NTAyMzhjZTY5NTVk YmY4YjViNjEzZWZlMWQ0NDhjNjA1ZDkuLjYyNTgxMGQxMTk1ZDUyYzY4YjFhZjRhZjNmOTUwNjBh MmIwZThmMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDMtMDIgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1dGhuXSBDb21wbGV0 aW9uIGhhbmRsZXIgaXMgbm90IGNhbGxlZCB3aGVuIFdlYkF1dGhuIGludm9rZWQgd2l0aG91dCBw cm9wZXIgZW50aXRsZW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzczODAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg5NzAwMjQyPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYkF1dGhuIGlz IG5vdCBwZXJtaXR0ZWQgb3V0c2lkZSBvZiBXZWIgQnJvd3NlciBhcHBsaWNhdGlvbnMuIFdoZW4g YW4gYXBwbGljYXRpb24gdGhhdCBsYWNrcworICAgICAgICB0aGUgZnVsbCB3ZWIgYnJvd3NlciBl bnRpdGxlbWVudCBhdHRlbXB0cyB0byBpbnZva2UgV2ViQXV0aG4gZmxvd3MsIHdlIGRvIGFuIGVh cmx5IHJldHVybi4gSG93ZXZlciwKKyAgICAgICAgdGhlIGNvbXBsZXRpb24gaGFuZGxlciBmb3Ig dGhpcyBmbG93IGlzIGJ5cGFzc2VkLCBwcmV2ZW50aW5nIGFwcGxpY2F0aW9ucyBmcm9tIGJlaW5n IGluZm9ybWVkIG9mCisgICAgICAgIHRoaXMgcHJvYmxlbS4KKworICAgICAgICAqIFdlYlByb2Nl c3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjptYWtlQ3JlZGVudGlh bCk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvcjo6Z2V0QXNz ZXJ0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjpp c1VzZXJWZXJpZnlpbmdQbGF0Zm9ybUF1dGhlbnRpY2F0b3JBdmFpbGFibGUpOgorCiAyMDIyLTAz LTAyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUg TWVkaWFTYW1wbGVBVkZPYmpDOjpjcmVhdGVJbWFnZVNhbXBsZSB0byBNZWRpYVNhbXBsZUFWRk9i akM6OmNyZWF0ZUZyb21QaXhlbEJ1ZmZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvci5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGlj YXRvckNvb3JkaW5hdG9yLmNwcAppbmRleCBiMWJhM2U0MTNkYjczMmY5MDVjNjhmYTcyMDQzNDZk N2RhNjgyY2QwLi40NmY2MjdlN2NlYmE4Y2FjZTQxNjZiNDgxMmQ3ZWMwNWNkOWExZTE0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0 aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcApAQCAtNDcs NiArNDcsMTIgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1NlY3VyaXR5T3JpZ2luLmg+CiAjaW5jbHVk ZSA8V2ViQ29yZS9Vc2VyR2VzdHVyZUluZGljYXRvci5oPgogCisjdW5kZWYgV0VCQVVUSE5fUkVM RUFTRV9MT0cKKyNkZWZpbmUgUEFHRV9JRCAodmFsdWVPckRlZmF1bHQobV93ZWJQYWdlLnBhZ2VJ RCgpKS50b1VJbnQ2NCgpKQorI2RlZmluZSBGUkFNRV9JRCAodmFsdWVPckRlZmF1bHQod2ViRnJh bWUtPmZyYW1lSUQoKSkudG9VSW50NjQoKSkKKyNkZWZpbmUgV0VCQVVUSE5fUkVMRUFTRV9MT0co Zm10LCAuLi4pIFJFTEVBU0VfTE9HKFdlYkF1dGhuLCAiJXAgLSBbd2ViUGFnZUlEPSUiIFBSSXU2 NSAiLCB3ZWJGcmFtZUlEPSUiIFBSSXU2NCAiXSBXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6 OiIgZm10LCB0aGlzLCBQQUdFX0lELCBGUkFNRV9JRCwgIyNfX1ZBX0FSR1NfXykKKyNlbmRpZgor CiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCkBAIC03OSw4 ICs4NSwxMSBAQCB2b2lkIFdlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvcjo6bWFrZUNyZWRlbnRp YWwoY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBTZWN1cgogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgaWYgKCFpc1dlYkJyb3dzZXIoKSkKKyAgICBpZiAoIWlzV2ViQnJvd3NlcigpKSB7 CisgICAgICAgIFdFQkFVVEhOX1JFTEVBU0VfTE9HKCJUaGUgJ25hdmlnYXRvci5jcmVkZW50aWFs cy5jcmVhdGUnIEFQSSBpcyBvbmx5IHBlcm1pdHRlZCBpbiBhcHBsaWNhdGlvbnMgd2l0aCB0aGUg J2NvbS5hcHBsZS5kZXZlbG9wZXIud2ViLWJyb3dzZXInIGVudGl0bGVtZW50LiIpOworICAgICAg ICBoYW5kbGVyKHsgfSwgc3RhdGljX2Nhc3Q8QXV0aGVudGljYXRvckF0dGFjaG1lbnQ+KDApLCBF eGNlcHRpb25EYXRhIHsgTm90QWxsb3dlZEVycm9yLCAiVGhlICduYXZpZ2F0b3IuY3JlZGVudGlh bHMuY3JlYXRlJyBBUEkgaXMgb25seSBwZXJtaXR0ZWQgaW4gYXBwbGljYXRpb25zIHdpdGggdGhl ICdjb20uYXBwbGUuZGV2ZWxvcGVyLndlYi1icm93c2VyJyBlbnRpdGxlbWVudC4iIH0pOwogICAg ICAgICByZXR1cm47CisgICAgfQogICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3VyZVdl YkF1dGhuUHJvY2Vzc0Nvbm5lY3Rpb24oKS5jb25uZWN0aW9uKCkuc2VuZFdpdGhBc3luY1JlcGx5 KE1lc3NhZ2VzOjpXZWJBdXRobkNvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6Ok1ha2VDcmVkZW50aWFs KGhhc2gsIG9wdGlvbnMsIGlzUHJvY2Vzc2luZ1VzZXJHZXN0dXJlKSwgV1RGTW92ZShoYW5kbGVy KSk7CiB9CiAKQEAgLTEwMSw4ICsxMTAsMTEgQEAgdm9pZCBXZWJBdXRoZW50aWNhdG9yQ29vcmRp bmF0b3I6OmdldEFzc2VydGlvbihjb25zdCBGcmFtZSYgZnJhbWUsIGNvbnN0IFNlY3VyaXQKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmICghaXNXZWJCcm93c2VyKCkpCisgICAgaWYg KCFpc1dlYkJyb3dzZXIoKSkgeworICAgICAgICBXRUJBVVRITl9SRUxFQVNFX0xPRygiVGhlICdu YXZpZ2F0b3IuY3JlZGVudGlhbHMuZ2V0JyBBUEkgaXMgb25seSBwZXJtaXR0ZWQgaW4gYXBwbGlj YXRpb25zIHdpdGggdGhlICdjb20uYXBwbGUuZGV2ZWxvcGVyLndlYi1icm93c2VyJyBlbnRpdGxl bWVudC4iKTsKKyAgICAgICAgaGFuZGxlcih7IH0sIHN0YXRpY19jYXN0PEF1dGhlbnRpY2F0b3JB dHRhY2htZW50PigwKSwgRXhjZXB0aW9uRGF0YSB7IE5vdEFsbG93ZWRFcnJvciwgIlRoZSAnbmF2 aWdhdG9yLmNyZWRlbnRpYWxzLmdldCcgQVBJIGlzIG9ubHkgcGVybWl0dGVkIGluIGFwcGxpY2F0 aW9ucyB3aXRoIHRoZSAnY29tLmFwcGxlLmRldmVsb3Blci53ZWItYnJvd3NlcicgZW50aXRsZW1l bnQuIiB9KTsKICAgICAgICAgcmV0dXJuOworICAgIH0KICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0 b24oKS5lbnN1cmVXZWJBdXRoblByb2Nlc3NDb25uZWN0aW9uKCkuY29ubmVjdGlvbigpLnNlbmRX aXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2ViQXV0aG5Db25uZWN0aW9uVG9XZWJQcm9jZXNzOjpH ZXRBc3NlcnRpb24oaGFzaCwgb3B0aW9ucywgaXNQcm9jZXNzaW5nVXNlckdlc3R1cmUpLCBXVEZN b3ZlKGhhbmRsZXIpKTsKIH0KIApAQCAtMTIzLDggKzEzNSwxMSBAQCB2b2lkIFdlYkF1dGhlbnRp Y2F0b3JDb29yZGluYXRvcjo6aXNVc2VyVmVyaWZ5aW5nUGxhdGZvcm1BdXRoZW50aWNhdG9yQXZh aWxhYmxlKAogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKCFpc1dlYkJyb3dzZXIo KSkKKyAgICBpZiAoIWlzV2ViQnJvd3NlcigpKSB7CisgICAgICAgIFdFQkFVVEhOX1JFTEVBU0Vf TE9HKCJXZWJBdXRobiBpcyBvbmx5IHBlcm1pdHRlZCBpbiBhcHBsaWNhdGlvbnMgd2l0aCB0aGUg J2NvbS5hcHBsZS5kZXZlbG9wZXIud2ViLWJyb3dzZXInIGVudGl0bGVtZW50LiIpOworICAgICAg ICBoYW5kbGVyKHsgfSwgc3RhdGljX2Nhc3Q8QXV0aGVudGljYXRvckF0dGFjaG1lbnQ+KDApLCBF eGNlcHRpb25EYXRhIHsgTm90QWxsb3dlZEVycm9yLCAiV2ViQXV0aG4gaXMgb25seSBwZXJtaXR0 ZWQgaW4gYXBwbGljYXRpb25zIHdpdGggdGhlICdjb20uYXBwbGUuZGV2ZWxvcGVyLndlYi1icm93 c2VyJyBlbnRpdGxlbWVudC4iIH0pOwogICAgICAgICByZXR1cm47CisgICAgfQogICAgIFdlYlBy b2Nlc3M6OnNpbmdsZXRvbigpLmVuc3VyZVdlYkF1dGhuUHJvY2Vzc0Nvbm5lY3Rpb24oKS5jb25u ZWN0aW9uKCkuc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJBdXRobkNvbm5lY3Rpb25U b1dlYlByb2Nlc3M6OklzVXNlclZlcmlmeWluZ1BsYXRmb3JtQXV0aGVudGljYXRvckF2YWlsYWJs ZSgpLCBXVEZNb3ZlKGhhbmRsZXIpKTsKIH0KIApAQCAtMTQ0LDQgKzE1OSw4IEBAIGJvb2wgV2Vi QXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjpwcm9jZXNzaW5nVXNlckdlc3R1cmUoY29uc3QgRnJh bWUmIGZyYW1lLCBjb25zCiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCisjdW5kZWYgV0VCQVVU SE5fUkVMRUFTRV9MT0cKKyN1bmRlZiBGUkFNRV9JRAorI3VuZGVmIFBBR0VfSUQKKwogI2VuZGlm IC8vIEVOQUJMRShXRUJfQVVUSE4pCg== 453643 2022-03-02 11:33:26 -0800 2022-03-02 12:48:46 -0800 Patch bug-237380-20220302113325.patch text/plain 4859 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYxMzA2NTAyMzhjZTY5NTVk YmY4YjViNjEzZWZlMWQ0NDhjNjA1ZDkuLjYyNTgxMGQxMTk1ZDUyYzY4YjFhZjRhZjNmOTUwNjBh MmIwZThmMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDMtMDIgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1dGhuXSBDb21wbGV0 aW9uIGhhbmRsZXIgaXMgbm90IGNhbGxlZCB3aGVuIFdlYkF1dGhuIGludm9rZWQgd2l0aG91dCBw cm9wZXIgZW50aXRsZW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzczODAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg5NzAwMjQyPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYkF1dGhuIGlz IG5vdCBwZXJtaXR0ZWQgb3V0c2lkZSBvZiBXZWIgQnJvd3NlciBhcHBsaWNhdGlvbnMuIFdoZW4g YW4gYXBwbGljYXRpb24gdGhhdCBsYWNrcworICAgICAgICB0aGUgZnVsbCB3ZWIgYnJvd3NlciBl bnRpdGxlbWVudCBhdHRlbXB0cyB0byBpbnZva2UgV2ViQXV0aG4gZmxvd3MsIHdlIGRvIGFuIGVh cmx5IHJldHVybi4gSG93ZXZlciwKKyAgICAgICAgdGhlIGNvbXBsZXRpb24gaGFuZGxlciBmb3Ig dGhpcyBmbG93IGlzIGJ5cGFzc2VkLCBwcmV2ZW50aW5nIGFwcGxpY2F0aW9ucyBmcm9tIGJlaW5n IGluZm9ybWVkIG9mCisgICAgICAgIHRoaXMgcHJvYmxlbS4KKworICAgICAgICAqIFdlYlByb2Nl c3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjptYWtlQ3JlZGVudGlh bCk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvcjo6Z2V0QXNz ZXJ0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjpp c1VzZXJWZXJpZnlpbmdQbGF0Zm9ybUF1dGhlbnRpY2F0b3JBdmFpbGFibGUpOgorCiAyMDIyLTAz LTAyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUg TWVkaWFTYW1wbGVBVkZPYmpDOjpjcmVhdGVJbWFnZVNhbXBsZSB0byBNZWRpYVNhbXBsZUFWRk9i akM6OmNyZWF0ZUZyb21QaXhlbEJ1ZmZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvci5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGlj YXRvckNvb3JkaW5hdG9yLmNwcAppbmRleCBiMWJhM2U0MTNkYjczMmY5MDVjNjhmYTcyMDQzNDZk N2RhNjgyY2QwLi5hNmQ2ZGQwOGFlZDMyZTY2ZDYyOWFiNzJhMjJhMzI0ZTg4MGUxMzk0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0 aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcApAQCAtNDcs NiArNDcsMTEgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1NlY3VyaXR5T3JpZ2luLmg+CiAjaW5jbHVk ZSA8V2ViQ29yZS9Vc2VyR2VzdHVyZUluZGljYXRvci5oPgogCisjdW5kZWYgV0VCQVVUSE5fUkVM RUFTRV9MT0cKKyNkZWZpbmUgUEFHRV9JRCAodmFsdWVPckRlZmF1bHQobV93ZWJQYWdlLnBhZ2VJ RCgpKS50b1VJbnQ2NCgpKQorI2RlZmluZSBGUkFNRV9JRCAodmFsdWVPckRlZmF1bHQod2ViRnJh bWUtPmZyYW1lSUQoKSkudG9VSW50NjQoKSkKKyNkZWZpbmUgV0VCQVVUSE5fUkVMRUFTRV9MT0co Zm10LCAuLi4pIFJFTEVBU0VfTE9HKFdlYkF1dGhuLCAiJXAgLSBbd2ViUGFnZUlEPSUiIFBSSXU2 NSAiLCB3ZWJGcmFtZUlEPSUiIFBSSXU2NCAiXSBXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6 OiIgZm10LCB0aGlzLCBQQUdFX0lELCBGUkFNRV9JRCwgIyNfX1ZBX0FSR1NfXykKKwogbmFtZXNw YWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtNzksOCArODQsMTEg QEAgdm9pZCBXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6Om1ha2VDcmVkZW50aWFsKGNvbnN0 IEZyYW1lJiBmcmFtZSwgY29uc3QgU2VjdXIKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAg IGlmICghaXNXZWJCcm93c2VyKCkpCisgICAgaWYgKCFpc1dlYkJyb3dzZXIoKSkgeworICAgICAg ICBXRUJBVVRITl9SRUxFQVNFX0xPRygiVGhlICduYXZpZ2F0b3IuY3JlZGVudGlhbHMuY3JlYXRl JyBBUEkgaXMgb25seSBwZXJtaXR0ZWQgaW4gYXBwbGljYXRpb25zIHdpdGggdGhlICdjb20uYXBw bGUuZGV2ZWxvcGVyLndlYi1icm93c2VyJyBlbnRpdGxlbWVudC4iKTsKKyAgICAgICAgaGFuZGxl cih7IH0sIHN0YXRpY19jYXN0PEF1dGhlbnRpY2F0b3JBdHRhY2htZW50PigwKSwgRXhjZXB0aW9u RGF0YSB7IE5vdEFsbG93ZWRFcnJvciwgIlRoZSAnbmF2aWdhdG9yLmNyZWRlbnRpYWxzLmNyZWF0 ZScgQVBJIGlzIG9ubHkgcGVybWl0dGVkIGluIGFwcGxpY2F0aW9ucyB3aXRoIHRoZSAnY29tLmFw cGxlLmRldmVsb3Blci53ZWItYnJvd3NlcicgZW50aXRsZW1lbnQuIiB9KTsKICAgICAgICAgcmV0 dXJuOworICAgIH0KICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5lbnN1cmVXZWJBdXRoblBy b2Nlc3NDb25uZWN0aW9uKCkuY29ubmVjdGlvbigpLnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdl czo6V2ViQXV0aG5Db25uZWN0aW9uVG9XZWJQcm9jZXNzOjpNYWtlQ3JlZGVudGlhbChoYXNoLCBv cHRpb25zLCBpc1Byb2Nlc3NpbmdVc2VyR2VzdHVyZSksIFdURk1vdmUoaGFuZGxlcikpOwogfQog CkBAIC0xMDEsOCArMTA5LDExIEBAIHZvaWQgV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjpn ZXRBc3NlcnRpb24oY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBTZWN1cml0CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKLSAgICBpZiAoIWlzV2ViQnJvd3NlcigpKQorICAgIGlmICghaXNXZWJC cm93c2VyKCkpIHsKKyAgICAgICAgV0VCQVVUSE5fUkVMRUFTRV9MT0coIlRoZSAnbmF2aWdhdG9y LmNyZWRlbnRpYWxzLmdldCcgQVBJIGlzIG9ubHkgcGVybWl0dGVkIGluIGFwcGxpY2F0aW9ucyB3 aXRoIHRoZSAnY29tLmFwcGxlLmRldmVsb3Blci53ZWItYnJvd3NlcicgZW50aXRsZW1lbnQuIik7 CisgICAgICAgIGhhbmRsZXIoeyB9LCBzdGF0aWNfY2FzdDxBdXRoZW50aWNhdG9yQXR0YWNobWVu dD4oMCksIEV4Y2VwdGlvbkRhdGEgeyBOb3RBbGxvd2VkRXJyb3IsICJUaGUgJ25hdmlnYXRvci5j cmVkZW50aWFscy5nZXQnIEFQSSBpcyBvbmx5IHBlcm1pdHRlZCBpbiBhcHBsaWNhdGlvbnMgd2l0 aCB0aGUgJ2NvbS5hcHBsZS5kZXZlbG9wZXIud2ViLWJyb3dzZXInIGVudGl0bGVtZW50LiIgfSk7 CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5z dXJlV2ViQXV0aG5Qcm9jZXNzQ29ubmVjdGlvbigpLmNvbm5lY3Rpb24oKS5zZW5kV2l0aEFzeW5j UmVwbHkoTWVzc2FnZXM6OldlYkF1dGhuQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6R2V0QXNzZXJ0 aW9uKGhhc2gsIG9wdGlvbnMsIGlzUHJvY2Vzc2luZ1VzZXJHZXN0dXJlKSwgV1RGTW92ZShoYW5k bGVyKSk7CiB9CiAKQEAgLTEyMyw4ICsxMzQsMTEgQEAgdm9pZCBXZWJBdXRoZW50aWNhdG9yQ29v cmRpbmF0b3I6OmlzVXNlclZlcmlmeWluZ1BsYXRmb3JtQXV0aGVudGljYXRvckF2YWlsYWJsZSgK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmICghaXNXZWJCcm93c2VyKCkpCisgICAg aWYgKCFpc1dlYkJyb3dzZXIoKSkgeworICAgICAgICBXRUJBVVRITl9SRUxFQVNFX0xPRygiV2Vi QXV0aG4gaXMgb25seSBwZXJtaXR0ZWQgaW4gYXBwbGljYXRpb25zIHdpdGggdGhlICdjb20uYXBw bGUuZGV2ZWxvcGVyLndlYi1icm93c2VyJyBlbnRpdGxlbWVudC4iKTsKKyAgICAgICAgaGFuZGxl cih7IH0sIHN0YXRpY19jYXN0PEF1dGhlbnRpY2F0b3JBdHRhY2htZW50PigwKSwgRXhjZXB0aW9u RGF0YSB7IE5vdEFsbG93ZWRFcnJvciwgIldlYkF1dGhuIGlzIG9ubHkgcGVybWl0dGVkIGluIGFw cGxpY2F0aW9ucyB3aXRoIHRoZSAnY29tLmFwcGxlLmRldmVsb3Blci53ZWItYnJvd3NlcicgZW50 aXRsZW1lbnQuIiB9KTsKICAgICAgICAgcmV0dXJuOworICAgIH0KICAgICBXZWJQcm9jZXNzOjpz aW5nbGV0b24oKS5lbnN1cmVXZWJBdXRoblByb2Nlc3NDb25uZWN0aW9uKCkuY29ubmVjdGlvbigp LnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2ViQXV0aG5Db25uZWN0aW9uVG9XZWJQcm9j ZXNzOjpJc1VzZXJWZXJpZnlpbmdQbGF0Zm9ybUF1dGhlbnRpY2F0b3JBdmFpbGFibGUoKSwgV1RG TW92ZShoYW5kbGVyKSk7CiB9CiAKQEAgLTE0NCw0ICsxNTgsOCBAQCBib29sIFdlYkF1dGhlbnRp Y2F0b3JDb29yZGluYXRvcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKGNvbnN0IEZyYW1lJiBmcmFt ZSwgY29ucwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAorI3VuZGVmIFdFQkFVVEhOX1JFTEVB U0VfTE9HCisjdW5kZWYgRlJBTUVfSUQKKyN1bmRlZiBQQUdFX0lECisKICNlbmRpZiAvLyBFTkFC TEUoV0VCX0FVVEhOKQo= 453646 2022-03-02 12:06:08 -0800 2022-03-02 13:36:02 -0800 Patch bug-237380-20220302120607.patch text/plain 4806 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYxMzA2NTAyMzhjZTY5NTVk YmY4YjViNjEzZWZlMWQ0NDhjNjA1ZDkuLjYyNTgxMGQxMTk1ZDUyYzY4YjFhZjRhZjNmOTUwNjBh MmIwZThmMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDMtMDIgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1dGhuXSBDb21wbGV0 aW9uIGhhbmRsZXIgaXMgbm90IGNhbGxlZCB3aGVuIFdlYkF1dGhuIGludm9rZWQgd2l0aG91dCBw cm9wZXIgZW50aXRsZW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzczODAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg5NzAwMjQyPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYkF1dGhuIGlz IG5vdCBwZXJtaXR0ZWQgb3V0c2lkZSBvZiBXZWIgQnJvd3NlciBhcHBsaWNhdGlvbnMuIFdoZW4g YW4gYXBwbGljYXRpb24gdGhhdCBsYWNrcworICAgICAgICB0aGUgZnVsbCB3ZWIgYnJvd3NlciBl bnRpdGxlbWVudCBhdHRlbXB0cyB0byBpbnZva2UgV2ViQXV0aG4gZmxvd3MsIHdlIGRvIGFuIGVh cmx5IHJldHVybi4gSG93ZXZlciwKKyAgICAgICAgdGhlIGNvbXBsZXRpb24gaGFuZGxlciBmb3Ig dGhpcyBmbG93IGlzIGJ5cGFzc2VkLCBwcmV2ZW50aW5nIGFwcGxpY2F0aW9ucyBmcm9tIGJlaW5n IGluZm9ybWVkIG9mCisgICAgICAgIHRoaXMgcHJvYmxlbS4KKworICAgICAgICAqIFdlYlByb2Nl c3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjptYWtlQ3JlZGVudGlh bCk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvcjo6Z2V0QXNz ZXJ0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjpp c1VzZXJWZXJpZnlpbmdQbGF0Zm9ybUF1dGhlbnRpY2F0b3JBdmFpbGFibGUpOgorCiAyMDIyLTAz LTAyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUg TWVkaWFTYW1wbGVBVkZPYmpDOjpjcmVhdGVJbWFnZVNhbXBsZSB0byBNZWRpYVNhbXBsZUFWRk9i akM6OmNyZWF0ZUZyb21QaXhlbEJ1ZmZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvci5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGlj YXRvckNvb3JkaW5hdG9yLmNwcAppbmRleCBiMWJhM2U0MTNkYjczMmY5MDVjNjhmYTcyMDQzNDZk N2RhNjgyY2QwLi4wZjg4NDJhOWY5MTAwNTMwNjkzYjQ4ZDVjZThkMzJlOTExYTkzYmQyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0 aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcApAQCAtNDcs NiArNDcsMTEgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1NlY3VyaXR5T3JpZ2luLmg+CiAjaW5jbHVk ZSA8V2ViQ29yZS9Vc2VyR2VzdHVyZUluZGljYXRvci5oPgogCisjdW5kZWYgV0VCQVVUSE5fUkVM RUFTRV9MT0cKKyNkZWZpbmUgUEFHRV9JRCAobV93ZWJQYWdlLmlkZW50aWZpZXIoKS50b1VJbnQ2 NCgpKQorI2RlZmluZSBGUkFNRV9JRCAod2ViRnJhbWUtPmZyYW1lSUQoKS50b1VJbnQ2NCgpKQor I2RlZmluZSBXRUJBVVRITl9SRUxFQVNFX0xPRyhmbXQsIC4uLikgUkVMRUFTRV9MT0coV2ViQXV0 aG4sICIlcCAtIFt3ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIHdlYkZyYW1lSUQ9JSIgUFJJdTY0ICJd IFdlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvcjo6IiBmbXQsIHRoaXMsIFBBR0VfSUQsIEZSQU1F X0lELCAjI19fVkFfQVJHU19fKQorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCkBAIC03OSw4ICs4NCwxMSBAQCB2b2lkIFdlYkF1dGhlbnRpY2F0b3JDb29y ZGluYXRvcjo6bWFrZUNyZWRlbnRpYWwoY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBTZWN1cgog ICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKCFpc1dlYkJyb3dzZXIoKSkKKyAgICBp ZiAoIWlzV2ViQnJvd3NlcigpKSB7CisgICAgICAgIFdFQkFVVEhOX1JFTEVBU0VfTE9HKCJtYWtl Q3JlZGVudGlhbDogVGhlICduYXZpZ2F0b3IuY3JlZGVudGlhbHMuY3JlYXRlJyBBUEkgaXMgb25s eSBwZXJtaXR0ZWQgaW4gYXBwbGljYXRpb25zIHdpdGggdGhlICdjb20uYXBwbGUuZGV2ZWxvcGVy LndlYi1icm93c2VyJyBlbnRpdGxlbWVudC4iKTsKKyAgICAgICAgaGFuZGxlcih7IH0sIHN0YXRp Y19jYXN0PEF1dGhlbnRpY2F0b3JBdHRhY2htZW50PigwKSwgRXhjZXB0aW9uRGF0YSB7IE5vdEFs bG93ZWRFcnJvciwgIlRoZSAnbmF2aWdhdG9yLmNyZWRlbnRpYWxzLmNyZWF0ZScgQVBJIGlzIG9u bHkgcGVybWl0dGVkIGluIGFwcGxpY2F0aW9ucyB3aXRoIHRoZSAnY29tLmFwcGxlLmRldmVsb3Bl ci53ZWItYnJvd3NlcicgZW50aXRsZW1lbnQuIiB9KTsKICAgICAgICAgcmV0dXJuOworICAgIH0K ICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5lbnN1cmVXZWJBdXRoblByb2Nlc3NDb25uZWN0 aW9uKCkuY29ubmVjdGlvbigpLnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2ViQXV0aG5D b25uZWN0aW9uVG9XZWJQcm9jZXNzOjpNYWtlQ3JlZGVudGlhbChoYXNoLCBvcHRpb25zLCBpc1By b2Nlc3NpbmdVc2VyR2VzdHVyZSksIFdURk1vdmUoaGFuZGxlcikpOwogfQogCkBAIC0xMDEsOCAr MTA5LDExIEBAIHZvaWQgV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjpnZXRBc3NlcnRpb24o Y29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBTZWN1cml0CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKLSAgICBpZiAoIWlzV2ViQnJvd3NlcigpKQorICAgIGlmICghaXNXZWJCcm93c2VyKCkpIHsK KyAgICAgICAgV0VCQVVUSE5fUkVMRUFTRV9MT0coImdldEFzc2VydGlvbjogVGhlICduYXZpZ2F0 b3IuY3JlZGVudGlhbHMuZ2V0JyBBUEkgaXMgb25seSBwZXJtaXR0ZWQgaW4gYXBwbGljYXRpb25z IHdpdGggdGhlICdjb20uYXBwbGUuZGV2ZWxvcGVyLndlYi1icm93c2VyJyBlbnRpdGxlbWVudC4i KTsKKyAgICAgICAgaGFuZGxlcih7IH0sIHN0YXRpY19jYXN0PEF1dGhlbnRpY2F0b3JBdHRhY2ht ZW50PigwKSwgRXhjZXB0aW9uRGF0YSB7IE5vdEFsbG93ZWRFcnJvciwgIlRoZSAnbmF2aWdhdG9y LmNyZWRlbnRpYWxzLmdldCcgQVBJIGlzIG9ubHkgcGVybWl0dGVkIGluIGFwcGxpY2F0aW9ucyB3 aXRoIHRoZSAnY29tLmFwcGxlLmRldmVsb3Blci53ZWItYnJvd3NlcicgZW50aXRsZW1lbnQuIiB9 KTsKICAgICAgICAgcmV0dXJuOworICAgIH0KICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5l bnN1cmVXZWJBdXRoblByb2Nlc3NDb25uZWN0aW9uKCkuY29ubmVjdGlvbigpLnNlbmRXaXRoQXN5 bmNSZXBseShNZXNzYWdlczo6V2ViQXV0aG5Db25uZWN0aW9uVG9XZWJQcm9jZXNzOjpHZXRBc3Nl cnRpb24oaGFzaCwgb3B0aW9ucywgaXNQcm9jZXNzaW5nVXNlckdlc3R1cmUpLCBXVEZNb3ZlKGhh bmRsZXIpKTsKIH0KIApAQCAtMTIzLDggKzEzNCwxMSBAQCB2b2lkIFdlYkF1dGhlbnRpY2F0b3JD b29yZGluYXRvcjo6aXNVc2VyVmVyaWZ5aW5nUGxhdGZvcm1BdXRoZW50aWNhdG9yQXZhaWxhYmxl KAogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKCFpc1dlYkJyb3dzZXIoKSkKKyAg ICBpZiAoIWlzV2ViQnJvd3NlcigpKSB7CisgICAgICAgIFJFTEVBU0VfTE9HKFdlYkF1dGhuLCAi JXAgLSBbd2ViUGFnZUlEPSUiIFBSSXU2NCAiXSBXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6 OmlzVXNlclZlcmlmeWluZ1BsYXRmb3JtQXV0aGVudGljYXRvckF2YWlsYWJsZTogV2ViQXV0aG4g aXMgb25seSBwZXJtaXR0ZWQgaW4gYXBwbGljYXRpb25zIHdpdGggdGhlICdjb20uYXBwbGUuZGV2 ZWxvcGVyLndlYi1icm93c2VyJyBlbnRpdGxlbWVudC4iLCB0aGlzLCBQQUdFX0lEKTsKKyAgICAg ICAgaGFuZGxlcihmYWxzZSk7CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgV2ViUHJvY2Vz czo6c2luZ2xldG9uKCkuZW5zdXJlV2ViQXV0aG5Qcm9jZXNzQ29ubmVjdGlvbigpLmNvbm5lY3Rp b24oKS5zZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2FnZXM6OldlYkF1dGhuQ29ubmVjdGlvblRvV2Vi UHJvY2Vzczo6SXNVc2VyVmVyaWZ5aW5nUGxhdGZvcm1BdXRoZW50aWNhdG9yQXZhaWxhYmxlKCks IFdURk1vdmUoaGFuZGxlcikpOwogfQogCkBAIC0xNDQsNCArMTU4LDggQEAgYm9vbCBXZWJBdXRo ZW50aWNhdG9yQ29vcmRpbmF0b3I6OnByb2Nlc3NpbmdVc2VyR2VzdHVyZShjb25zdCBGcmFtZSYg ZnJhbWUsIGNvbnMKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKKyN1bmRlZiBXRUJBVVRITl9S RUxFQVNFX0xPRworI3VuZGVmIEZSQU1FX0lECisjdW5kZWYgUEFHRV9JRAorCiAjZW5kaWYgLy8g RU5BQkxFKFdFQl9BVVRITikK 453655 2022-03-02 13:36:05 -0800 2022-03-02 14:08:48 -0800 Patch for landing bug-237380-20220302133604.patch text/plain 4997 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYxMzA2NTAyMzhjZTY5NTVk YmY4YjViNjEzZWZlMWQ0NDhjNjA1ZDkuLjFkODk5Yjg3NjBjNjU2NDU2N2I4MTc4YmU2MGI4Y2Vk MGQwNDI0ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDMtMDIgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1dGhuXSBDb21wbGV0 aW9uIGhhbmRsZXIgaXMgbm90IGNhbGxlZCB3aGVuIFdlYkF1dGhuIGludm9rZWQgd2l0aG91dCBw cm9wZXIgZW50aXRsZW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzczODAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg5NzAwMjQyPgorCisg ICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIFdlYkF1dGhuIGlzIG5v dCBwZXJtaXR0ZWQgb3V0c2lkZSBvZiBXZWIgQnJvd3NlciBhcHBsaWNhdGlvbnMuIFdoZW4gYW4g YXBwbGljYXRpb24gdGhhdCBsYWNrcworICAgICAgICB0aGUgZnVsbCB3ZWIgYnJvd3NlciBlbnRp dGxlbWVudCBhdHRlbXB0cyB0byBpbnZva2UgV2ViQXV0aG4gZmxvd3MsIHdlIGRvIGFuIGVhcmx5 IHJldHVybi4gSG93ZXZlciwKKyAgICAgICAgdGhlIGNvbXBsZXRpb24gaGFuZGxlciBmb3IgdGhp cyBmbG93IGlzIGJ5cGFzc2VkLCBwcmV2ZW50aW5nIGFwcGxpY2F0aW9ucyBmcm9tIGJlaW5nIGlu Zm9ybWVkIG9mCisgICAgICAgIHRoaXMgcHJvYmxlbS4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjptYWtlQ3JlZGVudGlhbCk6 CisgICAgICAgIChXZWJLaXQ6OldlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvcjo6Z2V0QXNzZXJ0 aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjppc1Vz ZXJWZXJpZnlpbmdQbGF0Zm9ybUF1dGhlbnRpY2F0b3JBdmFpbGFibGUpOgorCiAyMDIyLTAzLTAy ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgTWVk aWFTYW1wbGVBVkZPYmpDOjpjcmVhdGVJbWFnZVNhbXBsZSB0byBNZWRpYVNhbXBsZUFWRk9iakM6 OmNyZWF0ZUZyb21QaXhlbEJ1ZmZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYkF1dGhlbnRpY2F0aW9uL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvci5jcHAgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRv ckNvb3JkaW5hdG9yLmNwcAppbmRleCBiMWJhM2U0MTNkYjczMmY5MDVjNjhmYTcyMDQzNDZkN2Rh NjgyY2QwLi41MDk3MjA3YmE2NDQyZGRhNTAyODI5YjkwMTM2MjUxODIwZDhhYWViIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVu dGljYXRvckNvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi QXV0aGVudGljYXRpb24vV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcApAQCAtNDcsNiAr NDcsMTIgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1NlY3VyaXR5T3JpZ2luLmg+CiAjaW5jbHVkZSA8 V2ViQ29yZS9Vc2VyR2VzdHVyZUluZGljYXRvci5oPgogCisjdW5kZWYgV0VCQVVUSE5fUkVMRUFT RV9MT0cKKyNkZWZpbmUgUEFHRV9JRCAobV93ZWJQYWdlLmlkZW50aWZpZXIoKS50b1VJbnQ2NCgp KQorI2RlZmluZSBGUkFNRV9JRCAod2ViRnJhbWUtPmZyYW1lSUQoKS50b1VJbnQ2NCgpKQorI2Rl ZmluZSBXRUJBVVRITl9SRUxFQVNFX0xPR19FUlJPUihmbXQsIC4uLikgUkVMRUFTRV9MT0dfRVJS T1IoV2ViQXV0aG4sICIlcCAtIFt3ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIHdlYkZyYW1lSUQ9JSIg UFJJdTY0ICJdIFdlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvcjo6IiBmbXQsIHRoaXMsIFBBR0Vf SUQsIEZSQU1FX0lELCAjI19fVkFfQVJHU19fKQorI2RlZmluZSBXRUJBVVRITl9SRUxFQVNFX0xP R19FUlJPUl9OT19GUkFNRShmbXQsIC4uLikgUkVMRUFTRV9MT0dfRVJST1IoV2ViQXV0aG4sICIl cCAtIFt3ZWJQYWdlSUQ9JSIgUFJJdTY0ICJdIFdlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvcjo6 IiBmbXQsIHRoaXMsIFBBR0VfSUQsICMjX19WQV9BUkdTX18pCisKIG5hbWVzcGFjZSBXZWJLaXQg ewogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTc5LDggKzg1LDExIEBAIHZvaWQgV2Vi QXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjptYWtlQ3JlZGVudGlhbChjb25zdCBGcmFtZSYgZnJh bWUsIGNvbnN0IFNlY3VyCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoIWlzV2Vi QnJvd3NlcigpKQorICAgIGlmICghaXNXZWJCcm93c2VyKCkpIHsKKyAgICAgICAgV0VCQVVUSE5f UkVMRUFTRV9MT0dfRVJST1IoIm1ha2VDcmVkZW50aWFsOiBUaGUgJ25hdmlnYXRvci5jcmVkZW50 aWFscy5jcmVhdGUnIEFQSSBpcyBvbmx5IHBlcm1pdHRlZCBpbiBhcHBsaWNhdGlvbnMgd2l0aCB0 aGUgJ2NvbS5hcHBsZS5kZXZlbG9wZXIud2ViLWJyb3dzZXInIGVudGl0bGVtZW50LiIpOworICAg ICAgICBoYW5kbGVyKHsgfSwgc3RhdGljX2Nhc3Q8QXV0aGVudGljYXRvckF0dGFjaG1lbnQ+KDAp LCBFeGNlcHRpb25EYXRhIHsgTm90QWxsb3dlZEVycm9yLCAiVGhlICduYXZpZ2F0b3IuY3JlZGVu dGlhbHMuY3JlYXRlJyBBUEkgaXMgb25seSBwZXJtaXR0ZWQgaW4gYXBwbGljYXRpb25zIHdpdGgg dGhlICdjb20uYXBwbGUuZGV2ZWxvcGVyLndlYi1icm93c2VyJyBlbnRpdGxlbWVudC4iIH0pOwog ICAgICAgICByZXR1cm47CisgICAgfQogICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3Vy ZVdlYkF1dGhuUHJvY2Vzc0Nvbm5lY3Rpb24oKS5jb25uZWN0aW9uKCkuc2VuZFdpdGhBc3luY1Jl cGx5KE1lc3NhZ2VzOjpXZWJBdXRobkNvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6Ok1ha2VDcmVkZW50 aWFsKGhhc2gsIG9wdGlvbnMsIGlzUHJvY2Vzc2luZ1VzZXJHZXN0dXJlKSwgV1RGTW92ZShoYW5k bGVyKSk7CiB9CiAKQEAgLTEwMSw4ICsxMTAsMTEgQEAgdm9pZCBXZWJBdXRoZW50aWNhdG9yQ29v cmRpbmF0b3I6OmdldEFzc2VydGlvbihjb25zdCBGcmFtZSYgZnJhbWUsIGNvbnN0IFNlY3VyaXQK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmICghaXNXZWJCcm93c2VyKCkpCisgICAg aWYgKCFpc1dlYkJyb3dzZXIoKSkgeworICAgICAgICBXRUJBVVRITl9SRUxFQVNFX0xPR19FUlJP UigiZ2V0QXNzZXJ0aW9uOiBUaGUgJ25hdmlnYXRvci5jcmVkZW50aWFscy5nZXQnIEFQSSBpcyBv bmx5IHBlcm1pdHRlZCBpbiBhcHBsaWNhdGlvbnMgd2l0aCB0aGUgJ2NvbS5hcHBsZS5kZXZlbG9w ZXIud2ViLWJyb3dzZXInIGVudGl0bGVtZW50LiIpOworICAgICAgICBoYW5kbGVyKHsgfSwgc3Rh dGljX2Nhc3Q8QXV0aGVudGljYXRvckF0dGFjaG1lbnQ+KDApLCBFeGNlcHRpb25EYXRhIHsgTm90 QWxsb3dlZEVycm9yLCAiVGhlICduYXZpZ2F0b3IuY3JlZGVudGlhbHMuZ2V0JyBBUEkgaXMgb25s eSBwZXJtaXR0ZWQgaW4gYXBwbGljYXRpb25zIHdpdGggdGhlICdjb20uYXBwbGUuZGV2ZWxvcGVy LndlYi1icm93c2VyJyBlbnRpdGxlbWVudC4iIH0pOwogICAgICAgICByZXR1cm47CisgICAgfQog ICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3VyZVdlYkF1dGhuUHJvY2Vzc0Nvbm5lY3Rp b24oKS5jb25uZWN0aW9uKCkuc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJBdXRobkNv bm5lY3Rpb25Ub1dlYlByb2Nlc3M6OkdldEFzc2VydGlvbihoYXNoLCBvcHRpb25zLCBpc1Byb2Nl c3NpbmdVc2VyR2VzdHVyZSksIFdURk1vdmUoaGFuZGxlcikpOwogfQogCkBAIC0xMjMsOCArMTM1 LDExIEBAIHZvaWQgV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjppc1VzZXJWZXJpZnlpbmdQ bGF0Zm9ybUF1dGhlbnRpY2F0b3JBdmFpbGFibGUoCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK LSAgICBpZiAoIWlzV2ViQnJvd3NlcigpKQorICAgIGlmICghaXNXZWJCcm93c2VyKCkpIHsKKyAg ICAgICAgV0VCQVVUSE5fUkVMRUFTRV9MT0dfRVJST1JfTk9fRlJBTUUoImlzVXNlclZlcmlmeWlu Z1BsYXRmb3JtQXV0aGVudGljYXRvckF2YWlsYWJsZTogV2ViQXV0aG4gaXMgb25seSBwZXJtaXR0 ZWQgaW4gYXBwbGljYXRpb25zIHdpdGggdGhlICdjb20uYXBwbGUuZGV2ZWxvcGVyLndlYi1icm93 c2VyJyBlbnRpdGxlbWVudC4iKTsKKyAgICAgICAgaGFuZGxlcihmYWxzZSk7CiAgICAgICAgIHJl dHVybjsKKyAgICB9CiAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlV2ViQXV0aG5Q cm9jZXNzQ29ubmVjdGlvbigpLmNvbm5lY3Rpb24oKS5zZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2Fn ZXM6OldlYkF1dGhuQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6SXNVc2VyVmVyaWZ5aW5nUGxhdGZv cm1BdXRoZW50aWNhdG9yQXZhaWxhYmxlKCksIFdURk1vdmUoaGFuZGxlcikpOwogfQogCkBAIC0x NDQsNCArMTU5LDkgQEAgYm9vbCBXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6OnByb2Nlc3Np bmdVc2VyR2VzdHVyZShjb25zdCBGcmFtZSYgZnJhbWUsIGNvbnMKIAogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CiAKKyN1bmRlZiBXRUJBVVRITl9SRUxFQVNFX0xPR19FUlJPUl9OT19GUkFNRQorI3Vu ZGVmIFdFQkFVVEhOX1JFTEVBU0VfTE9HX0VSUk9SCisjdW5kZWYgRlJBTUVfSUQKKyN1bmRlZiBQ QUdFX0lECisKICNlbmRpZiAvLyBFTkFCTEUoV0VCX0FVVEhOKQo=