232770 2021-11-05 15:24:00 -0700 trustd network connections occasionally omitted from App Privacy report 2021-11-08 08:39:31 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney achristensen benjamin bfulgham cdumez cmarcelo ddkilzer ews-watchlist oldest_to_newest 1812262 0 katherine_cheney 2021-11-05 15:24:00 -0700 trustd network connections occasionally omitted from App Privacy report 1812263 1 katherine_cheney 2021-11-05 15:24:12 -0700 rdar://83840427 1812264 2 443442 katherine_cheney 2021-11-05 15:27:20 -0700 Created attachment 443442 Patch 1812305 3 443442 achristensen 2021-11-05 17:14:57 -0700 Comment on attachment 443442 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443442&action=review > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:706 > + NSData *token = [NSData dataWithBytes:(uint8_t *)&tokenValue length:sizeof(tokenValue)]; nit: adoptNS([[NSData alloc] initWithBytes... > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:707 > + SecTrustSetClientAuditToken(challenge.nsURLAuthenticationChallenge().protectionSpace.serverTrust, (__bridge CFDataRef)token); SecuritySPI.h 1812480 4 443510 katherine_cheney 2021-11-07 08:11:23 -0800 Created attachment 443510 Patch 1812482 5 443510 bfulgham 2021-11-07 08:42:55 -0800 Comment on attachment 443510 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443510&action=review > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:704 > + if (auto auditToken = networkProcess().sourceApplicationAuditToken()) { It seems like all of this work is only needed if APP_PRIVACY_REPORT IS ENABLED, SO I’d widen the scope so you don’t create objects you don’t need for other build targets. You could use UNUSED_PARAM for the non-APR case. > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:706 > + RetainPtr<NSData> token = adoptNS([NSData dataWithBytes:(uint8_t *)&tokenValue length:sizeof(tokenValue)]); I think dataWithBytes returns an auto released value, so this adopt may cause an over release. Maybe check with Kilzer. 1812483 6 443510 bfulgham 2021-11-07 08:48:12 -0800 Comment on attachment 443510 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443510&action=review >> Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:706 >> + RetainPtr<NSData> token = adoptNS([NSData dataWithBytes:(uint8_t *)&tokenValue length:sizeof(tokenValue)]); > > I think dataWithBytes returns an auto released value, so this adopt may cause an over release. Maybe check with Kilzer. I also wonder if we could use dataWithBytesNoCopy to avoid copying the token (but perhaps the token is small enough to make the allocation a trivial cost) 1812485 7 443510 ddkilzer 2021-11-07 10:03:47 -0800 Comment on attachment 443510 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443510&action=review >> Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:704 >> + if (auto auditToken = networkProcess().sourceApplicationAuditToken()) { > > It seems like all of this work is only needed if APP_PRIVACY_REPORT IS ENABLED, SO I’d widen the scope so you don’t create objects you don’t need for other build targets. You could use UNUSED_PARAM for the non-APR case. +1 >>> Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:706 >>> + RetainPtr<NSData> token = adoptNS([NSData dataWithBytes:(uint8_t *)&tokenValue length:sizeof(tokenValue)]); >> >> I think dataWithBytes returns an auto released value, so this adopt may cause an over release. Maybe check with Kilzer. > > I also wonder if we could use dataWithBytesNoCopy to avoid copying the token (but perhaps the token is small enough to make the allocation a trivial cost) Do not use adoptNS() here because as Brent noted it causes an over-release. Use adootNS([[NSData alloc] initWith…:]) to avoid creating an autoreleased object and to use adoptNS() correctly. Using a “NoCopy” variant means that the lifetime of the backing buffer must be the same as or longer than the NS object. Since the NSData object “escapes” via call to SecTrustSetClientAuditToken(), I would not recommend doing that. > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:708 > + SecTrustSetClientAuditToken(challenge.nsURLAuthenticationChallenge().protectionSpace.serverTrust, (__bridge CFDataRef)token.get()); You may use `bridge_cast(token.get())` here to magically do the cast to CFDataRef from NSData. Just #import <wtf/cocoa/TypeCastsCocoa.h> above. 1812486 8 katherine_cheney 2021-11-07 10:14:04 -0800 (In reply to David Kilzer (:ddkilzer) from comment #7) > Comment on attachment 443510 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=443510&action=review > > >> Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:704 > >> + if (auto auditToken = networkProcess().sourceApplicationAuditToken()) { > > > > It seems like all of this work is only needed if APP_PRIVACY_REPORT IS ENABLED, SO I’d widen the scope so you don’t create objects you don’t need for other build targets. You could use UNUSED_PARAM for the non-APR case. > > +1 > Will fix. > >>> Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:706 > >>> + RetainPtr<NSData> token = adoptNS([NSData dataWithBytes:(uint8_t *)&tokenValue length:sizeof(tokenValue)]); > >> > >> I think dataWithBytes returns an auto released value, so this adopt may cause an over release. Maybe check with Kilzer. > > > > I also wonder if we could use dataWithBytesNoCopy to avoid copying the token (but perhaps the token is small enough to make the allocation a trivial cost) > > Do not use adoptNS() here because as Brent noted it causes an over-release. > > Use adootNS([[NSData alloc] initWith…:]) to avoid creating an autoreleased > object and to use adoptNS() correctly. > Ah, I misread Alex's comment above and didn't add the [NSData alloc] part, only the adoptNS, I will fix. > Using a “NoCopy” variant means that the lifetime of the backing buffer must > be the same as or longer than the NS object. Since the NSData object > “escapes” via call to SecTrustSetClientAuditToken(), I would not recommend > doing that. > > > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:708 > > + SecTrustSetClientAuditToken(challenge.nsURLAuthenticationChallenge().protectionSpace.serverTrust, (__bridge CFDataRef)token.get()); > > You may use `bridge_cast(token.get())` here to magically do the cast to > CFDataRef from NSData. > > Just #import <wtf/cocoa/TypeCastsCocoa.h> above. Nice! Will change. 1812487 9 katherine_cheney 2021-11-07 10:14:58 -0800 API test failures also look related :( 1812489 10 443513 katherine_cheney 2021-11-07 10:29:16 -0800 Created attachment 443513 Patch 1812589 11 443513 achristensen 2021-11-08 07:12:21 -0800 Comment on attachment 443513 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443513&action=review > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:707 > + auto tokenValue = *auditToken; nit: I think auto& would save an unnecessary copy of a few bytes. 1812603 12 443545 katherine_cheney 2021-11-08 07:45:55 -0800 Created attachment 443545 Patch for landing 1812604 13 katherine_cheney 2021-11-08 07:46:24 -0800 (In reply to Alex Christensen from comment #11) > Comment on attachment 443513 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=443513&action=review > > > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:707 > > + auto tokenValue = *auditToken; > > nit: I think auto& would save an unnecessary copy of a few bytes. Thanks, fixed in PFL. Thanks Dave and Brent also for the review comments! 1812625 14 ews-feeder 2021-11-08 08:39:28 -0800 Committed r285404 (243961@main): <https://commits.webkit.org/243961@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443545. 443442 2021-11-05 15:27:20 -0700 2021-11-07 08:11:21 -0800 Patch bug-232770-20211105152719.patch text/plain 3599 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI1ZDQyMjc0NDllMGRmNmMw NjNiNGNkZjMzODA1NWIxOTczNmFlMzQuLjg4YzNhZGRhMjFjMGU1ZTgwY2JkNDBlODdmZGFmMjA5 MjYzNjdlYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTEtMDUgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgdHJ1c3RkIG5ldHdv cmsgY29ubmVjdGlvbnMgb2NjYXNpb25hbGx5IG9taXR0ZWQgZnJvbSBBcHAgUHJpdmFjeSByZXBv cnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc3 MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODM4NDA0Mjc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3 b3JrU2Vzc2lvbkNvY29hLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29y a1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKE5ldHdvcmtTZXNzaW9uQ29jb2E6OnNldENsaWVu dEF1ZGl0VG9rZW4pOgorICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vz c2lvbjp0YXNrOmRpZFJlY2VpdmVDaGFsbGVuZ2U6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisKIDIw MjEtMTEtMDIgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjU5MwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lv bkNvY29hLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNz aW9uQ29jb2EuaAppbmRleCA0ODVkMThjNzcxOGEwYTJjNjYwYjY2ZDg2NTkxNGZmMWFmYTkyMzNj Li40M2VlYjA1N2ZlNTNlYjA3N2VjNjg0YTU0MTc1ODc0NTBhYjc5YzE4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaAor KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29j b2EuaApAQCAtMTExLDYgKzExMSw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiAgICAgc3RhdGljIGJv b2wgYWxsb3dzU3BlY2lmaWNIVFRQU0NlcnRpZmljYXRlRm9ySG9zdChjb25zdCBXZWJDb3JlOjpB dXRoZW50aWNhdGlvbkNoYWxsZW5nZSYpOworICAgIHZvaWQgc2V0Q2xpZW50QXVkaXRUb2tlbihj b25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYpOwogCiAgICAgdm9pZCBjb250 aW51ZURpZFJlY2VpdmVDaGFsbGVuZ2UoU2Vzc2lvbldyYXBwZXImLCBjb25zdCBXZWJDb3JlOjpB dXRoZW50aWNhdGlvbkNoYWxsZW5nZSYsIE5lZ290aWF0ZWRMZWdhY3lUTFMsIE5ldHdvcmtEYXRh VGFza0NvY29hOjpUYXNrSWRlbnRpZmllciwgTmV0d29ya0RhdGFUYXNrQ29jb2EqLCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKFdlYktpdDo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2VEaXNwb3NpdGlv biwgY29uc3QgV2ViQ29yZTo6Q3JlZGVudGlhbCYpPiYmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCmlu ZGV4IDNjZjY3NDNhMjM5ODkxMjJjZGQzZDljODhkMzk0ZjE4Y2Q1MmJkM2EuLjRhZmE1NDlhMTM3 MDQyM2UzNTRjMzg4NTJiOWRkNGFhYTE3MTM5NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KQEAgLTY5 OSw2ICs2OTksMTUgQEAgc3RhdGljIGlubGluZSB2b2lkIHByb2Nlc3NTZXJ2ZXJUcnVzdEV2YWx1 YXRpb24oTmV0d29ya1Nlc3Npb25Db2NvYSYgc2Vzc2lvbiwgU2UKICAgICByZXR1cm4gbnVsbHB0 cjsKIH0KIAordm9pZCBOZXR3b3JrU2Vzc2lvbkNvY29hOjpzZXRDbGllbnRBdWRpdFRva2VuKGNv bnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJiBjaGFsbGVuZ2UpCit7CisgICAg aWYgKGF1dG8gYXVkaXRUb2tlbiA9IG5ldHdvcmtQcm9jZXNzKCkuc291cmNlQXBwbGljYXRpb25B dWRpdFRva2VuKCkpIHsKKyAgICAgICAgYXV0byB0b2tlblZhbHVlID0gKmF1ZGl0VG9rZW47Cisg ICAgICAgIE5TRGF0YSAqdG9rZW4gPSBbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6KHVpbnQ4X3QgKikm dG9rZW5WYWx1ZSBsZW5ndGg6c2l6ZW9mKHRva2VuVmFsdWUpXTsKKyAgICAgICAgU2VjVHJ1c3RT ZXRDbGllbnRBdWRpdFRva2VuKGNoYWxsZW5nZS5uc1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl KCkucHJvdGVjdGlvblNwYWNlLnNlcnZlclRydXN0LCAoX19icmlkZ2UgQ0ZEYXRhUmVmKXRva2Vu KTsKKyAgICB9Cit9CisKIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2lv biB0YXNrOihOU1VSTFNlc3Npb25UYXNrICopdGFzayBkaWRSZWNlaXZlQ2hhbGxlbmdlOihOU1VS TEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlICopY2hhbGxlbmdlIGNvbXBsZXRpb25IYW5kbGVyOih2 b2lkICheKShOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24gZGlzcG9zaXRpb24s IE5TVVJMQ3JlZGVudGlhbCAqY3JlZGVudGlhbCkpY29tcGxldGlvbkhhbmRsZXIKIHsKICAgICBh dXRvKiBzZXNzaW9uQ29jb2EgPSBbc2VsZiBzZXNzaW9uRnJvbVRhc2s6IHRhc2tdOwpAQCAtNzIw LDYgKzcyOSw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBwcm9jZXNzU2VydmVyVHJ1c3RFdmFsdWF0 aW9uKE5ldHdvcmtTZXNzaW9uQ29jb2EmIHNlc3Npb24sIFNlCiAgICAgTmVnb3RpYXRlZExlZ2Fj eVRMUyBuZWdvdGlhdGVkTGVnYWN5VExTID0gTmVnb3RpYXRlZExlZ2FjeVRMUzo6Tm87CiAKICAg ICBpZiAoW2NoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UuYXV0aGVudGljYXRpb25NZXRob2QgaXNF cXVhbFRvU3RyaW5nOk5TVVJMQXV0aGVudGljYXRpb25NZXRob2RTZXJ2ZXJUcnVzdF0pIHsKKyAg ICAgICAgc2Vzc2lvbkNvY29hLT5zZXRDbGllbnRBdWRpdFRva2VuKGNoYWxsZW5nZSk7CiAgICAg ICAgIGlmIChOZXR3b3JrU2Vzc2lvbkNvY29hOjphbGxvd3NTcGVjaWZpY0hUVFBTQ2VydGlmaWNh dGVGb3JIb3N0KGNoYWxsZW5nZSkpCiAgICAgICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRs ZXIoTlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZVVzZUNyZWRlbnRpYWwsIFtOU1VSTENyZWRlbnRp YWwgY3JlZGVudGlhbEZvclRydXN0OmNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2Uuc2VydmVyVHJ1 c3RdKTsKIAo= 443510 2021-11-07 08:11:23 -0800 2021-11-07 10:29:13 -0800 Patch bug-232770-20211107081122.patch text/plain 4953 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDNiNjcwMTc2ZTQyOTEwMDdmOTY2ZWE5 ZTE1NGU3NjMxNzRjNzJkMTYuLjIzZjZhZWMwNDVkYjAxNTk3ZjgwMTkzYWVmZmJlNzQ5ZmVhMDkz YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTEtMDcgIEthdGUgQ2hlbmV5ICA8a2F0aGVy aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgdHJ1c3RkIG5ldHdvcmsgY29ubmVjdGlv bnMgb2NjYXNpb25hbGx5IG9taXR0ZWQgZnJvbSBBcHAgUHJpdmFjeSByZXBvcnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc3MAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vODM4NDA0Mjc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiB3dGYvc3BpL2NvY29hL1NlY3VyaXR5U1BJLmg6CisKIDIwMjEt MTEtMDIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgaGln aGVyIFFvUyBmb3IgV2hlZWxFdmVudCBhbmQgRGlzcGxheVdhc1JlZnJlc2hlZCBJUENzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CmluZGV4IDI1ZDQyMjc0NDllMGRmNmMwNjNiNGNkZjMzODA1NWIxOTczNmFlMzQuLjg4YzNhZGRh MjFjMGU1ZTgwY2JkNDBlODdmZGFmMjA5MjYzNjdlYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMjEtMTEtMDUgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+ CisKKyAgICAgICAgdHJ1c3RkIG5ldHdvcmsgY29ubmVjdGlvbnMgb2NjYXNpb25hbGx5IG9taXR0 ZWQgZnJvbSBBcHAgUHJpdmFjeSByZXBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMjc3MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODM4NDA0 Mjc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmg6CisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKE5ldHdv cmtTZXNzaW9uQ29jb2E6OnNldENsaWVudEF1ZGl0VG9rZW4pOgorICAgICAgICAoLVtXS05ldHdv cmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjp0YXNrOmRpZFJlY2VpdmVDaGFsbGVuZ2U6Y29t cGxldGlvbkhhbmRsZXI6XSk6CisKIDIwMjEtMTEtMDIgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5l X2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzMjU5MwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvc3BpL2NvY29h L1NlY3VyaXR5U1BJLmggYi9Tb3VyY2UvV1RGL3d0Zi9zcGkvY29jb2EvU2VjdXJpdHlTUEkuaApp bmRleCBhMTZjN2FjYTE4MGFmNmM5MDAxZWY5MWU0ZGRmNDNmZjU0ZmQ4YjVkLi4xZDk3NmE5NGNh NzhhZWU0NGVjNjBjZjY3MzgxNzYwNmY1NGFjNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0 Zi9zcGkvY29jb2EvU2VjdXJpdHlTUEkuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9zcGkvY29jb2Ev U2VjdXJpdHlTUEkuaApAQCAtOTksNiArOTksNyBAQCBDRl9SRVRVUk5TX1JFVEFJTkVEIFNlY1Ry dXN0UmVmIFNlY1RydXN0RGVzZXJpYWxpemUoQ0ZEYXRhUmVmIHNlcmlhbGl6ZWRUcnVzdCwgQwog I2VuZGlmCiAKIENGX1JFVFVSTlNfUkVUQUlORUQgQ0ZEaWN0aW9uYXJ5UmVmIFNlY1RydXN0Q29w eUluZm8oU2VjVHJ1c3RSZWYpOworT1NTdGF0dXMgU2VjVHJ1c3RTZXRDbGllbnRBdWRpdFRva2Vu KFNlY1RydXN0UmVmLCBDRkRhdGFSZWYpOwogCiBleHRlcm4gY29uc3QgQ0ZTdHJpbmdSZWYga1Nl Y1RydXN0SW5mb0V4dGVuZGVkVmFsaWRhdGlvbktleTsKIGV4dGVybiBjb25zdCBDRlN0cmluZ1Jl ZiBrU2VjVHJ1c3RJbmZvQ29tcGFueU5hbWVLZXk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaCBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oCmluZGV4IDQ4NWQx OGM3NzE4YTBhMmM2NjBiNjZkODY1OTE0ZmYxYWZhOTIzM2MuLjQzZWViMDU3ZmU1M2ViMDc3ZWM2 ODRhNTQxNzU4NzQ1MGFiNzljMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oCkBAIC0xMTEsNiArMTExLDcg QEAgcHVibGljOgogI2VuZGlmCiAKICAgICBzdGF0aWMgYm9vbCBhbGxvd3NTcGVjaWZpY0hUVFBT Q2VydGlmaWNhdGVGb3JIb3N0KGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl Jik7CisgICAgdm9pZCBzZXRDbGllbnRBdWRpdFRva2VuKGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlJik7CiAKICAgICB2b2lkIGNvbnRpbnVlRGlkUmVjZWl2ZUNoYWxsZW5n ZShTZXNzaW9uV3JhcHBlciYsIGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl JiwgTmVnb3RpYXRlZExlZ2FjeVRMUywgTmV0d29ya0RhdGFUYXNrQ29jb2E6OlRhc2tJZGVudGlm aWVyLCBOZXR3b3JrRGF0YVRhc2tDb2NvYSosIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV2ViS2l0 OjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZURpc3Bvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpDcmVk ZW50aWFsJik+JiYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KaW5kZXggM2NmNjc0M2EyMzk4OTEyMmNk ZDNkOWM4OGQzOTRmMThjZDUyYmQzYS4uZWIxNjQwMjQ2NDMxNGU0ODkwZjJkMjRhN2JmNDMzYWU4 MTk1ODgxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9O ZXR3b3JrU2Vzc2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAtNjk5LDYgKzY5OSwxNyBAQCBzdGF0aWMg aW5saW5lIHZvaWQgcHJvY2Vzc1NlcnZlclRydXN0RXZhbHVhdGlvbihOZXR3b3JrU2Vzc2lvbkNv Y29hJiBzZXNzaW9uLCBTZQogICAgIHJldHVybiBudWxscHRyOwogfQogCit2b2lkIE5ldHdvcmtT ZXNzaW9uQ29jb2E6OnNldENsaWVudEF1ZGl0VG9rZW4oY29uc3QgV2ViQ29yZTo6QXV0aGVudGlj YXRpb25DaGFsbGVuZ2UmIGNoYWxsZW5nZSkKK3sKKyAgICBpZiAoYXV0byBhdWRpdFRva2VuID0g bmV0d29ya1Byb2Nlc3MoKS5zb3VyY2VBcHBsaWNhdGlvbkF1ZGl0VG9rZW4oKSkgeworICAgICAg ICBhdXRvIHRva2VuVmFsdWUgPSAqYXVkaXRUb2tlbjsKKyAgICAgICAgUmV0YWluUHRyPE5TRGF0 YT4gdG9rZW4gPSBhZG9wdE5TKFtOU0RhdGEgZGF0YVdpdGhCeXRlczoodWludDhfdCAqKSZ0b2tl blZhbHVlIGxlbmd0aDpzaXplb2YodG9rZW5WYWx1ZSldKTsKKyNpZiBFTkFCTEUoQVBQX1BSSVZB Q1lfUkVQT1JUKQorICAgICAgICBTZWNUcnVzdFNldENsaWVudEF1ZGl0VG9rZW4oY2hhbGxlbmdl Lm5zVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoKS5wcm90ZWN0aW9uU3BhY2Uuc2VydmVyVHJ1 c3QsIChfX2JyaWRnZSBDRkRhdGFSZWYpdG9rZW4uZ2V0KCkpOworI2VuZGlmCisgICAgfQorfQor CiAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3Npb24gdGFzazooTlNVUkxT ZXNzaW9uVGFzayAqKXRhc2sgZGlkUmVjZWl2ZUNoYWxsZW5nZTooTlNVUkxBdXRoZW50aWNhdGlv bkNoYWxsZW5nZSAqKWNoYWxsZW5nZSBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNVUkxT ZXNzaW9uQXV0aENoYWxsZW5nZURpc3Bvc2l0aW9uIGRpc3Bvc2l0aW9uLCBOU1VSTENyZWRlbnRp YWwgKmNyZWRlbnRpYWwpKWNvbXBsZXRpb25IYW5kbGVyCiB7CiAgICAgYXV0byogc2Vzc2lvbkNv Y29hID0gW3NlbGYgc2Vzc2lvbkZyb21UYXNrOiB0YXNrXTsKQEAgLTcyMCw2ICs3MzEsNyBAQCBz dGF0aWMgaW5saW5lIHZvaWQgcHJvY2Vzc1NlcnZlclRydXN0RXZhbHVhdGlvbihOZXR3b3JrU2Vz c2lvbkNvY29hJiBzZXNzaW9uLCBTZQogICAgIE5lZ290aWF0ZWRMZWdhY3lUTFMgbmVnb3RpYXRl ZExlZ2FjeVRMUyA9IE5lZ290aWF0ZWRMZWdhY3lUTFM6Ok5vOwogCiAgICAgaWYgKFtjaGFsbGVu Z2UucHJvdGVjdGlvblNwYWNlLmF1dGhlbnRpY2F0aW9uTWV0aG9kIGlzRXF1YWxUb1N0cmluZzpO U1VSTEF1dGhlbnRpY2F0aW9uTWV0aG9kU2VydmVyVHJ1c3RdKSB7CisgICAgICAgIHNlc3Npb25D b2NvYS0+c2V0Q2xpZW50QXVkaXRUb2tlbihjaGFsbGVuZ2UpOwogICAgICAgICBpZiAoTmV0d29y a1Nlc3Npb25Db2NvYTo6YWxsb3dzU3BlY2lmaWNIVFRQU0NlcnRpZmljYXRlRm9ySG9zdChjaGFs bGVuZ2UpKQogICAgICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKE5TVVJMU2Vzc2lv bkF1dGhDaGFsbGVuZ2VVc2VDcmVkZW50aWFsLCBbTlNVUkxDcmVkZW50aWFsIGNyZWRlbnRpYWxG b3JUcnVzdDpjaGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlLnNlcnZlclRydXN0XSk7CiAK 443513 2021-11-07 10:29:16 -0800 2021-11-08 07:45:52 -0800 Patch bug-232770-20211107102915.patch text/plain 5229 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDNiNjcwMTc2ZTQyOTEwMDdmOTY2ZWE5 ZTE1NGU3NjMxNzRjNzJkMTYuLjIzZjZhZWMwNDVkYjAxNTk3ZjgwMTkzYWVmZmJlNzQ5ZmVhMDkz YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTEtMDcgIEthdGUgQ2hlbmV5ICA8a2F0aGVy aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgdHJ1c3RkIG5ldHdvcmsgY29ubmVjdGlv bnMgb2NjYXNpb25hbGx5IG9taXR0ZWQgZnJvbSBBcHAgUHJpdmFjeSByZXBvcnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc3MAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vODM4NDA0Mjc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiB3dGYvc3BpL2NvY29hL1NlY3VyaXR5U1BJLmg6CisKIDIwMjEt MTEtMDIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgaGln aGVyIFFvUyBmb3IgV2hlZWxFdmVudCBhbmQgRGlzcGxheVdhc1JlZnJlc2hlZCBJUENzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CmluZGV4IDI1ZDQyMjc0NDllMGRmNmMwNjNiNGNkZjMzODA1NWIxOTczNmFlMzQuLjg4YzNhZGRh MjFjMGU1ZTgwY2JkNDBlODdmZGFmMjA5MjYzNjdlYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMjEtMTEtMDUgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+ CisKKyAgICAgICAgdHJ1c3RkIG5ldHdvcmsgY29ubmVjdGlvbnMgb2NjYXNpb25hbGx5IG9taXR0 ZWQgZnJvbSBBcHAgUHJpdmFjeSByZXBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMjc3MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODM4NDA0 Mjc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmg6CisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKE5ldHdv cmtTZXNzaW9uQ29jb2E6OnNldENsaWVudEF1ZGl0VG9rZW4pOgorICAgICAgICAoLVtXS05ldHdv cmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjp0YXNrOmRpZFJlY2VpdmVDaGFsbGVuZ2U6Y29t cGxldGlvbkhhbmRsZXI6XSk6CisKIDIwMjEtMTEtMDIgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5l X2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzMjU5MwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvc3BpL2NvY29h L1NlY3VyaXR5U1BJLmggYi9Tb3VyY2UvV1RGL3d0Zi9zcGkvY29jb2EvU2VjdXJpdHlTUEkuaApp bmRleCBhMTZjN2FjYTE4MGFmNmM5MDAxZWY5MWU0ZGRmNDNmZjU0ZmQ4YjVkLi4xZDk3NmE5NGNh NzhhZWU0NGVjNjBjZjY3MzgxNzYwNmY1NGFjNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0 Zi9zcGkvY29jb2EvU2VjdXJpdHlTUEkuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9zcGkvY29jb2Ev U2VjdXJpdHlTUEkuaApAQCAtOTksNiArOTksNyBAQCBDRl9SRVRVUk5TX1JFVEFJTkVEIFNlY1Ry dXN0UmVmIFNlY1RydXN0RGVzZXJpYWxpemUoQ0ZEYXRhUmVmIHNlcmlhbGl6ZWRUcnVzdCwgQwog I2VuZGlmCiAKIENGX1JFVFVSTlNfUkVUQUlORUQgQ0ZEaWN0aW9uYXJ5UmVmIFNlY1RydXN0Q29w eUluZm8oU2VjVHJ1c3RSZWYpOworT1NTdGF0dXMgU2VjVHJ1c3RTZXRDbGllbnRBdWRpdFRva2Vu KFNlY1RydXN0UmVmLCBDRkRhdGFSZWYpOwogCiBleHRlcm4gY29uc3QgQ0ZTdHJpbmdSZWYga1Nl Y1RydXN0SW5mb0V4dGVuZGVkVmFsaWRhdGlvbktleTsKIGV4dGVybiBjb25zdCBDRlN0cmluZ1Jl ZiBrU2VjVHJ1c3RJbmZvQ29tcGFueU5hbWVLZXk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaCBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oCmluZGV4IDQ4NWQx OGM3NzE4YTBhMmM2NjBiNjZkODY1OTE0ZmYxYWZhOTIzM2MuLjQzZWViMDU3ZmU1M2ViMDc3ZWM2 ODRhNTQxNzU4NzQ1MGFiNzljMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oCkBAIC0xMTEsNiArMTExLDcg QEAgcHVibGljOgogI2VuZGlmCiAKICAgICBzdGF0aWMgYm9vbCBhbGxvd3NTcGVjaWZpY0hUVFBT Q2VydGlmaWNhdGVGb3JIb3N0KGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl Jik7CisgICAgdm9pZCBzZXRDbGllbnRBdWRpdFRva2VuKGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlJik7CiAKICAgICB2b2lkIGNvbnRpbnVlRGlkUmVjZWl2ZUNoYWxsZW5n ZShTZXNzaW9uV3JhcHBlciYsIGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl JiwgTmVnb3RpYXRlZExlZ2FjeVRMUywgTmV0d29ya0RhdGFUYXNrQ29jb2E6OlRhc2tJZGVudGlm aWVyLCBOZXR3b3JrRGF0YVRhc2tDb2NvYSosIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV2ViS2l0 OjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZURpc3Bvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpDcmVk ZW50aWFsJik+JiYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KaW5kZXggM2NmNjc0M2EyMzk4OTEyMmNk ZDNkOWM4OGQzOTRmMThjZDUyYmQzYS4uY2IwMmNjMWNkZjQzZWVlMDAzNzIxOTZhOGVmOTJkNjg4 MTQxN2VjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9O ZXR3b3JrU2Vzc2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAtNjAsNiArNjAsNyBAQAogI2ltcG9ydCA8 d3RmL1NvZnRMaW5raW5nLmg+CiAjaW1wb3J0IDx3dGYvVVJMLmg+CiAjaW1wb3J0IDx3dGYvV2Vh a09iakNQdHIuaD4KKyNpbXBvcnQgPHd0Zi9jb2NvYS9UeXBlQ2FzdHNDb2NvYS5oPgogI2ltcG9y dCA8d3RmL2NvY29hL1ZlY3RvckNvY29hLmg+CiAjaW1wb3J0IDx3dGYvZGFyd2luL1dlYWtMaW5r aW5nLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KQEAgLTY5OSw2ICs3MDAsMTkg QEAgc3RhdGljIGlubGluZSB2b2lkIHByb2Nlc3NTZXJ2ZXJUcnVzdEV2YWx1YXRpb24oTmV0d29y a1Nlc3Npb25Db2NvYSYgc2Vzc2lvbiwgU2UKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAordm9p ZCBOZXR3b3JrU2Vzc2lvbkNvY29hOjpzZXRDbGllbnRBdWRpdFRva2VuKGNvbnN0IFdlYkNvcmU6 OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJiBjaGFsbGVuZ2UpCit7CisjaWYgRU5BQkxFKEFQUF9Q UklWQUNZX1JFUE9SVCkKKyAgICBpZiAoYXV0byBhdWRpdFRva2VuID0gbmV0d29ya1Byb2Nlc3Mo KS5zb3VyY2VBcHBsaWNhdGlvbkF1ZGl0VG9rZW4oKSkgeworICAgICAgICBhdXRvIHRva2VuVmFs dWUgPSAqYXVkaXRUb2tlbjsKKyAgICAgICAgUmV0YWluUHRyPE5TRGF0YT4gdG9rZW4gPSBhZG9w dE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzOih1aW50OF90ICopJnRva2VuVmFsdWUg bGVuZ3RoOnNpemVvZih0b2tlblZhbHVlKV0pOworICAgICAgICBTZWNUcnVzdFNldENsaWVudEF1 ZGl0VG9rZW4oY2hhbGxlbmdlLm5zVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoKS5wcm90ZWN0 aW9uU3BhY2Uuc2VydmVyVHJ1c3QsIGJyaWRnZV9jYXN0KHRva2VuLmdldCgpKSk7CisgICAgfQor I2Vsc2UKKyAgICBVTlVTRURfUEFSQU0oY2hhbGxlbmdlKTsKKyNlbmRpZgorfQorCiAtICh2b2lk KVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3Npb24gdGFzazooTlNVUkxTZXNzaW9uVGFz ayAqKXRhc2sgZGlkUmVjZWl2ZUNoYWxsZW5nZTooTlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5n ZSAqKWNoYWxsZW5nZSBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNVUkxTZXNzaW9uQXV0 aENoYWxsZW5nZURpc3Bvc2l0aW9uIGRpc3Bvc2l0aW9uLCBOU1VSTENyZWRlbnRpYWwgKmNyZWRl bnRpYWwpKWNvbXBsZXRpb25IYW5kbGVyCiB7CiAgICAgYXV0byogc2Vzc2lvbkNvY29hID0gW3Nl bGYgc2Vzc2lvbkZyb21UYXNrOiB0YXNrXTsKQEAgLTcyMCw2ICs3MzQsNyBAQCBzdGF0aWMgaW5s aW5lIHZvaWQgcHJvY2Vzc1NlcnZlclRydXN0RXZhbHVhdGlvbihOZXR3b3JrU2Vzc2lvbkNvY29h JiBzZXNzaW9uLCBTZQogICAgIE5lZ290aWF0ZWRMZWdhY3lUTFMgbmVnb3RpYXRlZExlZ2FjeVRM UyA9IE5lZ290aWF0ZWRMZWdhY3lUTFM6Ok5vOwogCiAgICAgaWYgKFtjaGFsbGVuZ2UucHJvdGVj dGlvblNwYWNlLmF1dGhlbnRpY2F0aW9uTWV0aG9kIGlzRXF1YWxUb1N0cmluZzpOU1VSTEF1dGhl bnRpY2F0aW9uTWV0aG9kU2VydmVyVHJ1c3RdKSB7CisgICAgICAgIHNlc3Npb25Db2NvYS0+c2V0 Q2xpZW50QXVkaXRUb2tlbihjaGFsbGVuZ2UpOwogICAgICAgICBpZiAoTmV0d29ya1Nlc3Npb25D b2NvYTo6YWxsb3dzU3BlY2lmaWNIVFRQU0NlcnRpZmljYXRlRm9ySG9zdChjaGFsbGVuZ2UpKQog ICAgICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKE5TVVJMU2Vzc2lvbkF1dGhDaGFs bGVuZ2VVc2VDcmVkZW50aWFsLCBbTlNVUkxDcmVkZW50aWFsIGNyZWRlbnRpYWxGb3JUcnVzdDpj aGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlLnNlcnZlclRydXN0XSk7CiAK 443545 2021-11-08 07:45:55 -0800 2021-11-08 08:39:29 -0800 Patch for landing bug-232770-20211108074554.patch text/plain 5234 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDNiNjcwMTc2ZTQyOTEwMDdmOTY2ZWE5 ZTE1NGU3NjMxNzRjNzJkMTYuLjRjNDE5ZmM2ZjljYTQwMzk1NzcwZGI5MGUyYTRiOGUxZjJlNDFk ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTEtMDcgIEthdGUgQ2hlbmV5ICA8a2F0aGVy aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgdHJ1c3RkIG5ldHdvcmsgY29ubmVjdGlv bnMgb2NjYXNpb25hbGx5IG9taXR0ZWQgZnJvbSBBcHAgUHJpdmFjeSByZXBvcnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc3MAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vODM4NDA0Mjc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJp c3RlbnNlbi4KKworICAgICAgICAqIHd0Zi9zcGkvY29jb2EvU2VjdXJpdHlTUEkuaDoKKwogMjAy MS0xMS0wMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBo aWdoZXIgUW9TIGZvciBXaGVlbEV2ZW50IGFuZCBEaXNwbGF5V2FzUmVmcmVzaGVkIElQQ3MKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKaW5kZXggMjVkNDIyNzQ0OWUwZGY2YzA2M2I0Y2RmMzM4MDU1YjE5NzM2YWUzNC4uZjFiMmFm Y2FmOThkYjkxNWRlOGFlYzllMjkzZjMxZmU3M2I1ZDUzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAyMS0xMS0wNSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNv bT4KKworICAgICAgICB0cnVzdGQgbmV0d29yayBjb25uZWN0aW9ucyBvY2Nhc2lvbmFsbHkgb21p dHRlZCBmcm9tIEFwcCBQcml2YWN5IHJlcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNzcwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84Mzg0 MDQyNz4KKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oOgorICAgICAgICAq IE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAgIChO ZXR3b3JrU2Vzc2lvbkNvY29hOjpzZXRDbGllbnRBdWRpdFRva2VuKToKKyAgICAgICAgKC1bV0tO ZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNlc3Npb246dGFzazpkaWRSZWNlaXZlQ2hhbGxlbmdl OmNvbXBsZXRpb25IYW5kbGVyOl0pOgorCiAyMDIxLTExLTAyICBLYXRlIENoZW5leSAgPGthdGhl cmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzI1OTMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3NwaS9j b2NvYS9TZWN1cml0eVNQSS5oIGIvU291cmNlL1dURi93dGYvc3BpL2NvY29hL1NlY3VyaXR5U1BJ LmgKaW5kZXggYTE2YzdhY2ExODBhZjZjOTAwMWVmOTFlNGRkZjQzZmY1NGZkOGI1ZC4uMWQ5NzZh OTRjYTc4YWVlNDRlYzYwY2Y2NzM4MTc2MDZmNTRhYzc2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvc3BpL2NvY29hL1NlY3VyaXR5U1BJLmgKKysrIGIvU291cmNlL1dURi93dGYvc3BpL2Nv Y29hL1NlY3VyaXR5U1BJLmgKQEAgLTk5LDYgKzk5LDcgQEAgQ0ZfUkVUVVJOU19SRVRBSU5FRCBT ZWNUcnVzdFJlZiBTZWNUcnVzdERlc2VyaWFsaXplKENGRGF0YVJlZiBzZXJpYWxpemVkVHJ1c3Qs IEMKICNlbmRpZgogCiBDRl9SRVRVUk5TX1JFVEFJTkVEIENGRGljdGlvbmFyeVJlZiBTZWNUcnVz dENvcHlJbmZvKFNlY1RydXN0UmVmKTsKK09TU3RhdHVzIFNlY1RydXN0U2V0Q2xpZW50QXVkaXRU b2tlbihTZWNUcnVzdFJlZiwgQ0ZEYXRhUmVmKTsKIAogZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVm IGtTZWNUcnVzdEluZm9FeHRlbmRlZFZhbGlkYXRpb25LZXk7CiBleHRlcm4gY29uc3QgQ0ZTdHJp bmdSZWYga1NlY1RydXN0SW5mb0NvbXBhbnlOYW1lS2V5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmggYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaAppbmRleCA0 ODVkMThjNzcxOGEwYTJjNjYwYjY2ZDg2NTkxNGZmMWFmYTkyMzNjLi40M2VlYjA1N2ZlNTNlYjA3 N2VjNjg0YTU0MTc1ODc0NTBhYjc5YzE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaApAQCAtMTExLDYgKzEx MSw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiAgICAgc3RhdGljIGJvb2wgYWxsb3dzU3BlY2lmaWNI VFRQU0NlcnRpZmljYXRlRm9ySG9zdChjb25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZSYpOworICAgIHZvaWQgc2V0Q2xpZW50QXVkaXRUb2tlbihjb25zdCBXZWJDb3JlOjpBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZSYpOwogCiAgICAgdm9pZCBjb250aW51ZURpZFJlY2VpdmVDaGFs bGVuZ2UoU2Vzc2lvbldyYXBwZXImLCBjb25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZSYsIE5lZ290aWF0ZWRMZWdhY3lUTFMsIE5ldHdvcmtEYXRhVGFza0NvY29hOjpUYXNrSWRl bnRpZmllciwgTmV0d29ya0RhdGFUYXNrQ29jb2EqLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFdl YktpdDo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2VEaXNwb3NpdGlvbiwgY29uc3QgV2ViQ29yZTo6 Q3JlZGVudGlhbCYpPiYmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCmluZGV4IDNjZjY3NDNhMjM5ODkx MjJjZGQzZDljODhkMzk0ZjE4Y2Q1MmJkM2EuLjEwMWY3ZjQwNWJjZGI4Y2UwNDE0YzhjZmQ3MWI1 NTY2YWVkZDI3ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29j b2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KQEAgLTYwLDYgKzYwLDcgQEAKICNpbXBv cnQgPHd0Zi9Tb2Z0TGlua2luZy5oPgogI2ltcG9ydCA8d3RmL1VSTC5oPgogI2ltcG9ydCA8d3Rm L1dlYWtPYmpDUHRyLmg+CisjaW1wb3J0IDx3dGYvY29jb2EvVHlwZUNhc3RzQ29jb2EuaD4KICNp bXBvcnQgPHd0Zi9jb2NvYS9WZWN0b3JDb2NvYS5oPgogI2ltcG9ydCA8d3RmL2Rhcndpbi9XZWFr TGlua2luZy5oPgogI2ltcG9ydCA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CkBAIC02OTksNiArNzAw LDE5IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBwcm9jZXNzU2VydmVyVHJ1c3RFdmFsdWF0aW9uKE5l dHdvcmtTZXNzaW9uQ29jb2EmIHNlc3Npb24sIFNlCiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAK K3ZvaWQgTmV0d29ya1Nlc3Npb25Db2NvYTo6c2V0Q2xpZW50QXVkaXRUb2tlbihjb25zdCBXZWJD b3JlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYgY2hhbGxlbmdlKQoreworI2lmIEVOQUJMRShB UFBfUFJJVkFDWV9SRVBPUlQpCisgICAgaWYgKGF1dG8gYXVkaXRUb2tlbiA9IG5ldHdvcmtQcm9j ZXNzKCkuc291cmNlQXBwbGljYXRpb25BdWRpdFRva2VuKCkpIHsKKyAgICAgICAgYXV0byYgdG9r ZW5WYWx1ZSA9ICphdWRpdFRva2VuOworICAgICAgICBSZXRhaW5QdHI8TlNEYXRhPiB0b2tlbiA9 IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6KHVpbnQ4X3QgKikmdG9rZW5W YWx1ZSBsZW5ndGg6c2l6ZW9mKHRva2VuVmFsdWUpXSk7CisgICAgICAgIFNlY1RydXN0U2V0Q2xp ZW50QXVkaXRUb2tlbihjaGFsbGVuZ2UubnNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSgpLnBy b3RlY3Rpb25TcGFjZS5zZXJ2ZXJUcnVzdCwgYnJpZGdlX2Nhc3QodG9rZW4uZ2V0KCkpKTsKKyAg ICB9CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShjaGFsbGVuZ2UpOworI2VuZGlmCit9CisKIC0g KHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2lvbiB0YXNrOihOU1VSTFNlc3Np b25UYXNrICopdGFzayBkaWRSZWNlaXZlQ2hhbGxlbmdlOihOU1VSTEF1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlICopY2hhbGxlbmdlIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShOU1VSTFNlc3Np b25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24gZGlzcG9zaXRpb24sIE5TVVJMQ3JlZGVudGlhbCAq Y3JlZGVudGlhbCkpY29tcGxldGlvbkhhbmRsZXIKIHsKICAgICBhdXRvKiBzZXNzaW9uQ29jb2Eg PSBbc2VsZiBzZXNzaW9uRnJvbVRhc2s6IHRhc2tdOwpAQCAtNzIwLDYgKzczNCw3IEBAIHN0YXRp YyBpbmxpbmUgdm9pZCBwcm9jZXNzU2VydmVyVHJ1c3RFdmFsdWF0aW9uKE5ldHdvcmtTZXNzaW9u Q29jb2EmIHNlc3Npb24sIFNlCiAgICAgTmVnb3RpYXRlZExlZ2FjeVRMUyBuZWdvdGlhdGVkTGVn YWN5VExTID0gTmVnb3RpYXRlZExlZ2FjeVRMUzo6Tm87CiAKICAgICBpZiAoW2NoYWxsZW5nZS5w cm90ZWN0aW9uU3BhY2UuYXV0aGVudGljYXRpb25NZXRob2QgaXNFcXVhbFRvU3RyaW5nOk5TVVJM QXV0aGVudGljYXRpb25NZXRob2RTZXJ2ZXJUcnVzdF0pIHsKKyAgICAgICAgc2Vzc2lvbkNvY29h LT5zZXRDbGllbnRBdWRpdFRva2VuKGNoYWxsZW5nZSk7CiAgICAgICAgIGlmIChOZXR3b3JrU2Vz c2lvbkNvY29hOjphbGxvd3NTcGVjaWZpY0hUVFBTQ2VydGlmaWNhdGVGb3JIb3N0KGNoYWxsZW5n ZSkpCiAgICAgICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoTlNVUkxTZXNzaW9uQXV0 aENoYWxsZW5nZVVzZUNyZWRlbnRpYWwsIFtOU1VSTENyZWRlbnRpYWwgY3JlZGVudGlhbEZvclRy dXN0OmNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2Uuc2VydmVyVHJ1c3RdKTsKIAo=