230100 2021-09-09 08:54:17 -0700 Fix ASan+UBSan builds: part two 2024-04-10 14:22:39 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=216746 InRadar P2 Normal --- 229122 272481 1 ddkilzer ddkilzer ap bfulgham webkit-bug-importer oldest_to_newest 1791910 0 ddkilzer 2021-09-09 08:54:17 -0700 Fix ASan+UBSan builds: part two. In Bug 229122 Comment #9, Alexey Proskuryakov writes: > This is not what I was asking about. I was asking about including > sanitizer.xcconfig twice. This happens because it's included by both > asan.xcconfig and ubsan.xcconfig. There is a good chance that some settings > are messed up (at least duplicated) because of this. So it turns out that including sanitizer.xcconfig is basically okay (no duplicated settings), but investigating this lead me to discover something else: Xcode variables defined in an xcconfig file that is specified on the command-line are not resolved until later, so two variables with the same name will overwrite each other (last one wins), even if they use '$(inherited)'. This meant that, for example, defining WK_SANITIZER_OTHER_CFLAGS_YES in both sanitizer.xcconfig and ubsan.xcconfig will not work as expected--only one variable will win (the one in ubsan.xcconfig). So this bug is to fix those issues and clean up the xcconfig files in Tools/sanitizer. 1791912 1 webkit-bug-importer 2021-09-09 08:55:56 -0700 <rdar://problem/82926910> 1791923 2 437749 ddkilzer 2021-09-09 09:16:06 -0700 Created attachment 437749 Patch v1 1792414 3 437749 ap 2021-09-10 09:56:36 -0700 Comment on attachment 437749 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=437749&action=review > Tools/ChangeLog:16 > + That mechanism doesn't work at the time when Xcode resolves > + variables from an xcconfig file specified on the command-line. This is surprising, why would those be different? It seems like it cannot be by accident, someone would have to explicitly implement this behavior. > Tools/sanitizer/sanitizer.xcconfig:7 > +OTHER_CFLAGS = $(inherited) -fno-omit-frame-pointer -g $(WK_UNDEFINED_BEHAVIOR_SANITIZER_OTHER_CFLAGS_$(WK_ENABLE_UNDEFINED_BEHAVIOR_SANITIZER)); > +OTHER_CPLUSPLUSFLAGS = $(inherited) $(WK_ADDRESS_SANITIZER_OTHER_CPLUSPLUSFLAGS_$(WK_ENABLE_ADDRESS_SANITIZER)); I think that OTHER_CFLAGS apply to C++ files when OTHER_CPLUSPLUSFLAGS isn't defined. But it is defined, so we need UBSan flags in the second line too. > Tools/sanitizer/tsan.xcconfig:7 > +WK_ENABLE_THREAD_SANITIZER = $(ENABLE_THREAD_SANITIZER); This looks like dead code, not used anywhere. 1792526 4 437749 ddkilzer 2021-09-10 14:32:25 -0700 Comment on attachment 437749 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=437749&action=review >> Tools/ChangeLog:16 >> + variables from an xcconfig file specified on the command-line. > > This is surprising, why would those be different? It seems like it cannot be by accident, someone would have to explicitly implement this behavior. The conclusion I reached is that the values can't be fully resolved when the xcconfig file(s) are parsed on the command line—they're just stored for later interpretation. And the way the build system prints out the values early in each project build, it seems like they're stored as key-value pairs--not a block of text (such as pre-processed compiler output)--so only one value can be associated with one key. I assume this is mostly a rhetorical question that doesn't block landing the patch since I'm just reporting the behavior I see. I don't have any special insight into design decisions. >> Tools/sanitizer/sanitizer.xcconfig:7 >> +OTHER_CPLUSPLUSFLAGS = $(inherited) $(WK_ADDRESS_SANITIZER_OTHER_CPLUSPLUSFLAGS_$(WK_ENABLE_ADDRESS_SANITIZER)); > > I think that OTHER_CFLAGS apply to C++ files when OTHER_CPLUSPLUSFLAGS isn't defined. But it is defined, so we need UBSan flags in the second line too. Nope, that's not how it works. Build settings from configuration file 'OpenSource/Tools/sanitizer/asan+ubsan.xcconfig': ENABLE_ADDRESS_SANITIZER = $(ENABLE_ADDRESS_SANITIZER_$(WK_ASAN_DISALLOWED)) ENABLE_ADDRESS_SANITIZER_ = YES ENABLE_ADDRESS_SANITIZER_NO = YES ENABLE_UNDEFINED_BEHAVIOR_SANITIZER = $(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER_$(WK_UBSAN_DISALLOWED)) ENABLE_UNDEFINED_BEHAVIOR_SANITIZER_ = YES ENABLE_UNDEFINED_BEHAVIOR_SANITIZER_NO = YES GCC_OPTIMIZATION_LEVEL = $(GCC_OPTIMIZATION_LEVEL_$(CONFIGURATION)) GCC_OPTIMIZATION_LEVEL_Debug = 0 GCC_OPTIMIZATION_LEVEL_Production = 1 GCC_OPTIMIZATION_LEVEL_Release = 1 OTHER_CFLAGS = $(inherited) -fno-omit-frame-pointer -g $(WK_UNDEFINED_BEHAVIOR_SANITIZER_OTHER_CFLAGS_$(WK_ENABLE_UNDEFINED_BEHAVIOR_SANITIZER)) OTHER_CPLUSPLUSFLAGS = $(inherited) $(WK_ADDRESS_SANITIZER_OTHER_CPLUSPLUSFLAGS_$(WK_ENABLE_ADDRESS_SANITIZER)) OTHER_LDFLAGS = $(inherited) -Wl,-rpath,@executable_path/Frameworks WK_ADDRESS_SANITIZER_OTHER_CPLUSPLUSFLAGS_YES = -U_LIBCPP_HAS_NO_ASAN WK_ENABLE_ADDRESS_SANITIZER = $(ENABLE_ADDRESS_SANITIZER) WK_ENABLE_UNDEFINED_BEHAVIOR_SANITIZER = $(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER) WK_UNDEFINED_BEHAVIOR_SANITIZER_OTHER_CFLAGS_YES = -fno-delete-null-pointer-checks -fno-optimize-sibling-calls -fno-sanitize=vptr Both OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS are applied when building: /Applications/Xcode.app/Contents/Developer/Toolchains/OSX11.5.xctoolchain/usr/bin/clang -x c++ -target x86_64-apple-macos11.5 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -std=gnu++1z -stdlib=libc++ -Wno-trigraphs -fno-exceptions -fno-rtti -fno-sanitize=vptr -fpascal-strings -O1 -fno-common -Werror -Wno-missing-field-initializers -Wmissing-prototypes -Wunreachable-code -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wsign-compare -Wno-shorten-64-to-32 -Wnewline-eof -Wno-c++11-extensions -DNDEBUG -DPAS_BMALLOC -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.5.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -g -fvisibility=hidden -fvisibility-inlines-hidden -fno-threadsafe-statics -Wno-sign-conversion -Winfinite-recursion -Wmove -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wrange-loop-analysis -Wno-semicolon-before-method-body -fsanitize=address -D_LIBCPP_HAS_NO_ASAN -fsanitize=undefined -fno-sanitize=enum,return,float-divide-by-zero,function,vptr -iquote WebKitBuild/Release/bmalloc.build/bmalloc-generated-files.hmap -IWebKitBuild/Release/bmalloc.build/bmalloc-own-target-headers.hmap -IWebKitBuild/Release/bmalloc.build/bmalloc-all-target-headers.hmap -iquote WebKitBuild/Release/bmalloc.build/bmalloc-project-headers.hmap -IWebKitBuild/Release/include -IWebKitBuild/Release/bmalloc.build/DerivedSources-normal/x86_64 -IWebKitBuild/Release/bmalloc.build/DerivedSources/x86_64 -IWebKitBuild/Release/bmalloc.build/DerivedSources -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla -Wliteral-conversion -Wthread-safety -Wno-typedef-redefinition -FWebKitBuild/Release -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.5.sdk/System/Library/PrivateFrameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.5.sdk/System/Library/PrivateFrameworks -fno-omit-frame-pointer -g -fno-delete-null-pointer-checks -fno-optimize-sibling-calls -fno-sanitize=vptr -U_LIBCPP_HAS_NO_ASAN -MMD -MT dependencies -MF WebKitBuild/Release/bmalloc.build/Objects-normal-asan-ubsan/x86_64/Allocator.d --serialize-diagnostics WebKitBuild/Release/bmalloc.build/Objects-normal-asan-ubsan/x86_64/Allocator.dia -c OpenSource/Source/bmalloc/bmalloc/Allocator.cpp -o WebKitBuild/Release/bmalloc.build/Objects-normal-asan-ubsan/x86_64/Allocator.o Easy way to test locally: $ make release ASAN=YES TSAN=NO UBSAN=YES >> Tools/sanitizer/tsan.xcconfig:7 >> +WK_ENABLE_THREAD_SANITIZER = $(ENABLE_THREAD_SANITIZER); > > This looks like dead code, not used anywhere. I kept it for uniformity with the other *san.xcconfig files. But I suppose it's obvious how to add it given the other examples, so I'll remove it. Thanks for the review! 1792529 5 ddkilzer 2021-09-10 14:36:07 -0700 (In reply to Alexey Proskuryakov from comment #3) > Comment on attachment 437749 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=437749&action=review > > > Tools/sanitizer/sanitizer.xcconfig:7 > > +OTHER_CFLAGS = $(inherited) -fno-omit-frame-pointer -g $(WK_UNDEFINED_BEHAVIOR_SANITIZER_OTHER_CFLAGS_$(WK_ENABLE_UNDEFINED_BEHAVIOR_SANITIZER)); > > +OTHER_CPLUSPLUSFLAGS = $(inherited) $(WK_ADDRESS_SANITIZER_OTHER_CPLUSPLUSFLAGS_$(WK_ENABLE_ADDRESS_SANITIZER)); > > I think that OTHER_CFLAGS apply to C++ files when OTHER_CPLUSPLUSFLAGS isn't > defined. But it is defined, so we need UBSan flags in the second line too. See also Bug 216746, which fixed this faulty assumption that lead to duplicate command-line switches: Enable AddressSanitizer in C++ std library templates <https://bugs.webkit.org/show_bug.cgi?id=216746> <https://trac.webkit.org/changeset/267358/webkit> 1792550 6 437913 ddkilzer 2021-09-10 15:14:10 -0700 Created attachment 437913 Patch for landing 1792568 7 ews-feeder 2021-09-10 15:43:21 -0700 Committed r282297 (241570@main): <https://commits.webkit.org/241570@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437913. 437749 2021-09-09 09:16:06 -0700 2021-09-10 09:56:36 -0700 Patch v1 bug-230100-20210909091604.patch text/plain 5911 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODE2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTkzNTBmMDZlNzNiMTIxNTVmZDU4NjU4ODAwYjRjNzcw OGM4YzI5NC4uOTdkNzcyNzkwZGI4MDk1NDdkNWFiOGE3MDZmODdiNWYyMGE3NmU4OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5 IEBACisyMDIxLTA5LTA5ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgRml4IEFTYW4rVUJTYW4gYnVpbGRzOiBwYXJ0IHR3bworICAgICAgICA8aHR0cHM6Ly93 ZWJraXQub3JnL2IvMjMwMTAwPgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODI5MjY5MTA+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT3ZlcnZpZXcg b2YgY2hhbmdlczoKKyAgICAgICAgLSBSZW5hbWUgdmFyaWFibGVzIHNvIG5vIFRvb2xzL3Nhbml0 aXplci8qLnhjY29uZmlnIGZpbGUKKyAgICAgICAgICBjb250YWlucyBhIHZhcmlhYmxlIHdpdGgg dGhlIHNhbWUgbmFtZS4gIFRoaXMgaXMgcmVxdWlyZWQgZHVlCisgICAgICAgICAgdG8gdGhlIHdh eSBYY29kZSBjb2xsZWN0cyB2YXJpYWJsZXMgZnJvbSBhbiB4Y2NvbmZpZyBmaWxlCisgICAgICAg ICAgc3BlY2lmaWVkIG9uIHRoZSBjb21tYW5kLWxpbmUuCisgICAgICAgIC0gUmVtb3ZlIHVzZSBv ZiAkKGluaGVyaXRlZCkgZXhjZXB0IGluIHdlbGwta25vd24gdmFyaWFibGVzLgorICAgICAgICAg IFRoYXQgbWVjaGFuaXNtIGRvZXNuJ3Qgd29yayBhdCB0aGUgdGltZSB3aGVuIFhjb2RlIHJlc29s dmVzCisgICAgICAgICAgdmFyaWFibGVzIGZyb20gYW4geGNjb25maWcgZmlsZSBzcGVjaWZpZWQg b24gdGhlIGNvbW1hbmQtbGluZS4KKyAgICAgICAgLSBSZW1vdmUgb3IgaW5saW5lIGV4aXN0aW5n IHZhcmlhYmxlcyBpbiBzYW5pdGl6ZXIueGNjb25maWcuCisKKyAgICAgICAgKiBzYW5pdGl6ZXIv YXNhbi54Y2NvbmZpZzoKKyAgICAgICAgKFdLX0VOQUJMRV9BRERSRVNTX1NBTklUSVpFUik6Cisg ICAgICAgIC0gUmVuYW1lIGZyb20gV0tfRU5BQkxFX1NBTklUSVpFUi4KKyAgICAgICAgKFdLX0FE RFJFU1NfU0FOSVRJWkVSX09USEVSX0NQTFVTUExVU0ZMQUdTX1lFUyk6CisgICAgICAgIC0gUmVu YW1lIGZyb20gV0tfU0FOSVRJWkVSX09USEVSX0NQTFVTUExVU0ZMQUdTX1lFUyBhbmQgcmVtb3Zl CisgICAgICAgICAgJChpbmhlcml0ZWQpLgorCisgICAgICAgICogc2FuaXRpemVyL3Nhbml0aXpl ci54Y2NvbmZpZzoKKyAgICAgICAgKE9USEVSX0NGTEFHUyk6CisgICAgICAgIC0gSW5saW5lIFdL X1NBTklUSVpFUl9PVEhFUl9DRkxBR1NfWUVTIGFuZCBhZGQgdmFyaWFibGUgZGVmaW5lZAorICAg ICAgICAgIGluIHVic2FuLnhjY29uZmlnLgorICAgICAgICAoT1RIRVJfQ1BMVVNQTFVTRkxBR1Mp OgorICAgICAgICAtIFJlbW92ZSBXS19TQU5JVElaRVJfT1RIRVJfQ1BMVVNQTFVTRkxBR1NfWUVT IGFuZCBhZGQgdmFyaWFibGUKKyAgICAgICAgICBkZWZpbmVkIGluIGFzYW4ueGNjb25maWcuCisg ICAgICAgIChPVEhFUl9MREZMQUdTKToKKyAgICAgICAgLSBJbmxpbmUgV0tfTERGTEFHU19TQU5J VElaRVJfWUVTLgorCisgICAgICAgICogc2FuaXRpemVyL3RzYW4ueGNjb25maWc6CisgICAgICAg IChXS19FTkFCTEVfVEhSRUFEX1NBTklUSVpFUik6CisgICAgICAgIC0gUmVuYW1lIGZyb20gV0tf RU5BQkxFX1NBTklUSVpFUi4KKworICAgICAgICAqIHNhbml0aXplci91YnNhbi54Y2NvbmZpZzoK KyAgICAgICAgKFdLX0VOQUJMRV9VTkRFRklORURfQkVIQVZJT1JfU0FOSVRJWkVSKToKKyAgICAg ICAgLSBSZW5hbWUgZnJvbSBXS19FTkFCTEVfU0FOSVRJWkVSLgorICAgICAgICAoV0tfVU5ERUZJ TkVEX0JFSEFWSU9SX1NBTklUSVpFUl9PVEhFUl9DRkxBR1NfWUVTKToKKyAgICAgICAgLSBSZW5h bWUgZnJvbSBXS19TQU5JVElaRVJfT1RIRVJfQ0ZMQUdTX1lFUyBhbmQgcmVtb3ZlCisgICAgICAg ICAgJChpbmhlcml0ZWQpLgorCiAyMDIxLTA4LTMxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJk QGFwcGxlLmNvbT4KIAogICAgICAgICBbY29udHJpYnV0b3JzLmpzb25dIFJlcGxhY2UgY2xhc3M9 Ym90IHdpdGggc3RhdHVzPWJvdApkaWZmIC0tZ2l0IGEvVG9vbHMvc2FuaXRpemVyL2FzYW4ueGNj b25maWcgYi9Ub29scy9zYW5pdGl6ZXIvYXNhbi54Y2NvbmZpZwppbmRleCA5Y2ZmZjk3MWZlZTky N2Q3NDY2NTk4YjMzOWNlMWY1NWNkNGRkNTkxLi5hZWYwOTA0NjBjYWQ1Mjk1Mjg4YjgyZTVmN2Zk Yjc4ZmUyZjgxNzY5IDEwMDY0NAotLS0gYS9Ub29scy9zYW5pdGl6ZXIvYXNhbi54Y2NvbmZpZwor KysgYi9Ub29scy9zYW5pdGl6ZXIvYXNhbi54Y2NvbmZpZwpAQCAtNCw2ICs0LDYgQEAgRU5BQkxF X0FERFJFU1NfU0FOSVRJWkVSID0gJChFTkFCTEVfQUREUkVTU19TQU5JVElaRVJfJChXS19BU0FO X0RJU0FMTE9XRUQpKTsKIEVOQUJMRV9BRERSRVNTX1NBTklUSVpFUl8gPSBZRVM7CiBFTkFCTEVf QUREUkVTU19TQU5JVElaRVJfTk8gPSBZRVM7CiAKLVdLX0VOQUJMRV9TQU5JVElaRVIgPSAkKEVO QUJMRV9BRERSRVNTX1NBTklUSVpFUik7CitXS19FTkFCTEVfQUREUkVTU19TQU5JVElaRVIgPSAk KEVOQUJMRV9BRERSRVNTX1NBTklUSVpFUik7CiAKLVdLX1NBTklUSVpFUl9PVEhFUl9DUExVU1BM VVNGTEFHU19ZRVMgPSAkKGluaGVyaXRlZCkgLVVfTElCQ1BQX0hBU19OT19BU0FOOworV0tfQURE UkVTU19TQU5JVElaRVJfT1RIRVJfQ1BMVVNQTFVTRkxBR1NfWUVTID0gLVVfTElCQ1BQX0hBU19O T19BU0FOOwpkaWZmIC0tZ2l0IGEvVG9vbHMvc2FuaXRpemVyL3Nhbml0aXplci54Y2NvbmZpZyBi L1Rvb2xzL3Nhbml0aXplci9zYW5pdGl6ZXIueGNjb25maWcKaW5kZXggNTBiZDkxMDFkMDBiODAw ZmM0MmNmYmYxNGQ5YjQyMGZmNDE1MWVlYS4uOGI3ZmE3MzNiYzM4M2EwYmJhM2I3OWNhMzhhNGIw ZWE3YjI3ZDgxNCAxMDA2NDQKLS0tIGEvVG9vbHMvc2FuaXRpemVyL3Nhbml0aXplci54Y2NvbmZp ZworKysgYi9Ub29scy9zYW5pdGl6ZXIvc2FuaXRpemVyLnhjY29uZmlnCkBAIC0zLDEyICszLDgg QEAgR0NDX09QVElNSVpBVElPTl9MRVZFTF9EZWJ1ZyA9IDA7CiBHQ0NfT1BUSU1JWkFUSU9OX0xF VkVMX1Byb2R1Y3Rpb24gPSAxOwogR0NDX09QVElNSVpBVElPTl9MRVZFTF9SZWxlYXNlID0gMTsK IAotV0tfU0FOSVRJWkVSX09USEVSX0NGTEFHU19ZRVMgPSAtZm5vLW9taXQtZnJhbWUtcG9pbnRl ciAtZzsKLVdLX1NBTklUSVpFUl9PVEhFUl9DUExVU1BMVVNGTEFHU19ZRVMgPSA7CitPVEhFUl9D RkxBR1MgPSAkKGluaGVyaXRlZCkgLWZuby1vbWl0LWZyYW1lLXBvaW50ZXIgLWcgJChXS19VTkRF RklORURfQkVIQVZJT1JfU0FOSVRJWkVSX09USEVSX0NGTEFHU18kKFdLX0VOQUJMRV9VTkRFRklO RURfQkVIQVZJT1JfU0FOSVRJWkVSKSk7CitPVEhFUl9DUExVU1BMVVNGTEFHUyA9ICQoaW5oZXJp dGVkKSAkKFdLX0FERFJFU1NfU0FOSVRJWkVSX09USEVSX0NQTFVTUExVU0ZMQUdTXyQoV0tfRU5B QkxFX0FERFJFU1NfU0FOSVRJWkVSKSk7CiAKLU9USEVSX0NGTEFHUyA9ICQoaW5oZXJpdGVkKSAk KFdLX1NBTklUSVpFUl9PVEhFUl9DRkxBR1NfJChXS19FTkFCTEVfU0FOSVRJWkVSKSk7Ci1PVEhF Ul9DUExVU1BMVVNGTEFHUyA9ICQoaW5oZXJpdGVkKSAkKFdLX1NBTklUSVpFUl9PVEhFUl9DUExV U1BMVVNGTEFHU18kKFdLX0VOQUJMRV9TQU5JVElaRVIpKTsKLQotLy8gV29ya2Fyb3VuZCBmb3Ig cmRhcjovL3Byb2JsZW0vNDk0OTgwOTIKLU9USEVSX0xERkxBR1MgPSAkKGluaGVyaXRlZCkgJChX S19MREZMQUdTX1NBTklUSVpFUl8kKFdLX0VOQUJMRV9TQU5JVElaRVIpKTsKLVdLX0xERkxBR1Nf U0FOSVRJWkVSX1lFUyA9IC1XbCwtcnBhdGgsQGV4ZWN1dGFibGVfcGF0aC9GcmFtZXdvcmtzOwor Ly8gV29ya2Fyb3VuZCBmb3IgPHJkYXI6Ly9wcm9ibGVtLzQ5NDk4MDkyPi4KK09USEVSX0xERkxB R1MgPSAkKGluaGVyaXRlZCkgLVdsLC1ycGF0aCxAZXhlY3V0YWJsZV9wYXRoL0ZyYW1ld29ya3M7 CmRpZmYgLS1naXQgYS9Ub29scy9zYW5pdGl6ZXIvdHNhbi54Y2NvbmZpZyBiL1Rvb2xzL3Nhbml0 aXplci90c2FuLnhjY29uZmlnCmluZGV4IGJmMGFhZTgwMDg2YWZjZTc2YzNhN2E1NjNjYjcyZjdj YzI1ODgyNDcuLmY4NzBjZGMyNzk3NTU4OTg2Y2ZhNzdkNjAzOTE1YjYxNDA3OWIxNjYgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL3Nhbml0aXplci90c2FuLnhjY29uZmlnCisrKyBiL1Rvb2xzL3Nhbml0aXpl ci90c2FuLnhjY29uZmlnCkBAIC00LDQgKzQsNCBAQCBFTkFCTEVfVEhSRUFEX1NBTklUSVpFUiA9 ICQoRU5BQkxFX1RIUkVBRF9TQU5JVElaRVJfJChXS19UU0FOX0RJU0FMTE9XRUQpKTsKIEVOQUJM RV9USFJFQURfU0FOSVRJWkVSXyA9IFlFUzsKIEVOQUJMRV9USFJFQURfU0FOSVRJWkVSX05PID0g WUVTOwogCi1XS19FTkFCTEVfU0FOSVRJWkVSID0gJChFTkFCTEVfVEhSRUFEX1NBTklUSVpFUik7 CitXS19FTkFCTEVfVEhSRUFEX1NBTklUSVpFUiA9ICQoRU5BQkxFX1RIUkVBRF9TQU5JVElaRVIp OwpkaWZmIC0tZ2l0IGEvVG9vbHMvc2FuaXRpemVyL3Vic2FuLnhjY29uZmlnIGIvVG9vbHMvc2Fu aXRpemVyL3Vic2FuLnhjY29uZmlnCmluZGV4IDhmZjk4MmQyZGI1OTAyNjBkMTQ2MjFkYTkzZWI0 ZmVhZTgzZmFiOTguLmQ2ZGFiNDgxOWZjY2EzMTcwYzY4ZTcwZWI1ZGJlMzRlMmNhNTNmYmIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL3Nhbml0aXplci91YnNhbi54Y2NvbmZpZworKysgYi9Ub29scy9zYW5p dGl6ZXIvdWJzYW4ueGNjb25maWcKQEAgLTQsMTAgKzQsMTAgQEAgRU5BQkxFX1VOREVGSU5FRF9C RUhBVklPUl9TQU5JVElaRVIgPSAkKEVOQUJMRV9VTkRFRklORURfQkVIQVZJT1JfU0FOSVRJWkVS XyQoV0sKIEVOQUJMRV9VTkRFRklORURfQkVIQVZJT1JfU0FOSVRJWkVSXyA9IFlFUzsKIEVOQUJM RV9VTkRFRklORURfQkVIQVZJT1JfU0FOSVRJWkVSX05PID0gWUVTOwogCi1XS19FTkFCTEVfU0FO SVRJWkVSID0gJChFTkFCTEVfVU5ERUZJTkVEX0JFSEFWSU9SX1NBTklUSVpFUik7CitXS19FTkFC TEVfVU5ERUZJTkVEX0JFSEFWSU9SX1NBTklUSVpFUiA9ICQoRU5BQkxFX1VOREVGSU5FRF9CRUhB VklPUl9TQU5JVElaRVIpOwogCiAvLyBGSVhNRTogVHVuZSBsaXN0IG9mIFVCU2FuIGNoZWNrZXJz OiA8aHR0cHM6Ly9jbGFuZy5sbHZtLm9yZy9kb2NzL1VuZGVmaW5lZEJlaGF2aW9yU2FuaXRpemVy Lmh0bWw+LgogLy8gRklYTUU6IFVCU2FuIGNoZWNrZXIgLWZzYW5pdGl6ZT12cHRyIGlzIGluY29t cGF0aWJsZSB3aXRoIEdDQ19FTkFCTEVfQ1BQX1JUVEk9Tk8uCiAvLyAtZm5vLWRlbGV0ZS1udWxs LXBvaW50ZXItY2hlY2tzOiBkbyBub3QgbGV0IHRoZSBjb21waWxlciByZW1vdmUgbnVsbHB0ciBj aGVja3MgdGhhdCBjb3VsZCBvdGhlcndpc2UgYmUgcmVtb3ZlZCBiZWNhdXNlIHRoZXkgYXJlIGNv bnNpZGVyZWQgdW5kZWZpbmVkIGJlaGF2aW9yLgogLy8gLWZuby1vcHRpbWl6ZS1zaWJsaW5nLWNh bGxzOiBkaXNhYmxlIHRhaWwgY2FsbCBlbGltaW5hdGlvbiBmb3IgbW9yZSBhY2N1cmF0ZSBjcmFz aCBzdGFja3MuCi1XS19TQU5JVElaRVJfT1RIRVJfQ0ZMQUdTX1lFUyA9ICQoaW5oZXJpdGVkKSAt Zm5vLWRlbGV0ZS1udWxsLXBvaW50ZXItY2hlY2tzIC1mbm8tb3B0aW1pemUtc2libGluZy1jYWxs cyAtZm5vLXNhbml0aXplPXZwdHI7CitXS19VTkRFRklORURfQkVIQVZJT1JfU0FOSVRJWkVSX09U SEVSX0NGTEFHU19ZRVMgPSAtZm5vLWRlbGV0ZS1udWxsLXBvaW50ZXItY2hlY2tzIC1mbm8tb3B0 aW1pemUtc2libGluZy1jYWxscyAtZm5vLXNhbml0aXplPXZwdHI7Cg== 437913 2021-09-10 15:14:10 -0700 2021-09-10 15:43:22 -0700 Patch for landing bug-230100-20210910151409.patch text/plain 5909 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODE2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTkzNTBmMDZlNzNiMTIxNTVmZDU4NjU4ODAwYjRjNzcw OGM4YzI5NC4uMjBlYWQzYzEwZmYwMTFhMTA2NDgyYmU5YzBhZTczNmFmZTRhNThmMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUw IEBACisyMDIxLTA5LTEwICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgRml4IEFTYW4rVUJTYW4gYnVpbGRzOiBwYXJ0IHR3bworICAgICAgICA8aHR0cHM6Ly93 ZWJraXQub3JnL2IvMjMwMTAwPgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODI5MjY5MTA+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICBPdmVy dmlldyBvZiBjaGFuZ2VzOgorICAgICAgICAtIFJlbmFtZSB2YXJpYWJsZXMgc28gbm8gVG9vbHMv c2FuaXRpemVyLyoueGNjb25maWcgZmlsZQorICAgICAgICAgIGNvbnRhaW5zIGEgdmFyaWFibGUg d2l0aCB0aGUgc2FtZSBuYW1lLiAgVGhpcyBpcyByZXF1aXJlZCBkdWUKKyAgICAgICAgICB0byB0 aGUgd2F5IFhjb2RlIGNvbGxlY3RzIHZhcmlhYmxlcyBmcm9tIGFuIHhjY29uZmlnIGZpbGUKKyAg ICAgICAgICBzcGVjaWZpZWQgb24gdGhlIGNvbW1hbmQtbGluZS4KKyAgICAgICAgLSBSZW1vdmUg dXNlIG9mICQoaW5oZXJpdGVkKSBleGNlcHQgaW4gd2VsbC1rbm93biB2YXJpYWJsZXMuCisgICAg ICAgICAgVGhhdCBtZWNoYW5pc20gZG9lc24ndCB3b3JrIGF0IHRoZSB0aW1lIHdoZW4gWGNvZGUg cmVzb2x2ZXMKKyAgICAgICAgICB2YXJpYWJsZXMgZnJvbSBhbiB4Y2NvbmZpZyBmaWxlIHNwZWNp ZmllZCBvbiB0aGUgY29tbWFuZC1saW5lLgorICAgICAgICAtIFJlbW92ZSBvciBpbmxpbmUgZXhp c3RpbmcgdmFyaWFibGVzIGluIHNhbml0aXplci54Y2NvbmZpZy4KKworICAgICAgICAqIHNhbml0 aXplci9hc2FuLnhjY29uZmlnOgorICAgICAgICAoV0tfRU5BQkxFX0FERFJFU1NfU0FOSVRJWkVS KToKKyAgICAgICAgLSBSZW5hbWUgZnJvbSBXS19FTkFCTEVfU0FOSVRJWkVSLgorICAgICAgICAo V0tfQUREUkVTU19TQU5JVElaRVJfT1RIRVJfQ1BMVVNQTFVTRkxBR1NfWUVTKToKKyAgICAgICAg LSBSZW5hbWUgZnJvbSBXS19TQU5JVElaRVJfT1RIRVJfQ1BMVVNQTFVTRkxBR1NfWUVTIGFuZCBy ZW1vdmUKKyAgICAgICAgICAkKGluaGVyaXRlZCkuCisKKyAgICAgICAgKiBzYW5pdGl6ZXIvc2Fu aXRpemVyLnhjY29uZmlnOgorICAgICAgICAoT1RIRVJfQ0ZMQUdTKToKKyAgICAgICAgLSBJbmxp bmUgV0tfU0FOSVRJWkVSX09USEVSX0NGTEFHU19ZRVMgYW5kIGFkZCB2YXJpYWJsZSBkZWZpbmVk CisgICAgICAgICAgaW4gdWJzYW4ueGNjb25maWcuCisgICAgICAgIChPVEhFUl9DUExVU1BMVVNG TEFHUyk6CisgICAgICAgIC0gUmVtb3ZlIFdLX1NBTklUSVpFUl9PVEhFUl9DUExVU1BMVVNGTEFH U19ZRVMgYW5kIGFkZCB2YXJpYWJsZQorICAgICAgICAgIGRlZmluZWQgaW4gYXNhbi54Y2NvbmZp Zy4KKyAgICAgICAgKE9USEVSX0xERkxBR1MpOgorICAgICAgICAtIElubGluZSBXS19MREZMQUdT X1NBTklUSVpFUl9ZRVMuCisKKyAgICAgICAgKiBzYW5pdGl6ZXIvdHNhbi54Y2NvbmZpZzoKKyAg ICAgICAgKFdLX0VOQUJMRV9TQU5JVElaRVIpOgorICAgICAgICAtIFJlbW92ZSBpbnN0ZWFkIG9m IHJlbmFtaW5nIHRvIFdLX0VOQUJMRV9USFJFQURfU0FOSVRJWkVSIHNpbmNlCisgICAgICAgICAg dGhpcyBpcyB1bnVzZWQuCisKKyAgICAgICAgKiBzYW5pdGl6ZXIvdWJzYW4ueGNjb25maWc6Cisg ICAgICAgIChXS19FTkFCTEVfVU5ERUZJTkVEX0JFSEFWSU9SX1NBTklUSVpFUik6CisgICAgICAg IC0gUmVuYW1lIGZyb20gV0tfRU5BQkxFX1NBTklUSVpFUi4KKyAgICAgICAgKFdLX1VOREVGSU5F RF9CRUhBVklPUl9TQU5JVElaRVJfT1RIRVJfQ0ZMQUdTX1lFUyk6CisgICAgICAgIC0gUmVuYW1l IGZyb20gV0tfU0FOSVRJWkVSX09USEVSX0NGTEFHU19ZRVMgYW5kIHJlbW92ZQorICAgICAgICAg ICQoaW5oZXJpdGVkKS4KKwogMjAyMS0wOC0zMSAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBh cHBsZS5jb20+CiAKICAgICAgICAgW2NvbnRyaWJ1dG9ycy5qc29uXSBSZXBsYWNlIGNsYXNzPWJv dCB3aXRoIHN0YXR1cz1ib3QKZGlmZiAtLWdpdCBhL1Rvb2xzL3Nhbml0aXplci9hc2FuLnhjY29u ZmlnIGIvVG9vbHMvc2FuaXRpemVyL2FzYW4ueGNjb25maWcKaW5kZXggOWNmZmY5NzFmZWU5Mjdk NzQ2NjU5OGIzMzljZTFmNTVjZDRkZDU5MS4uYWVmMDkwNDYwY2FkNTI5NTI4OGI4MmU1ZjdmZGI3 OGZlMmY4MTc2OSAxMDA2NDQKLS0tIGEvVG9vbHMvc2FuaXRpemVyL2FzYW4ueGNjb25maWcKKysr IGIvVG9vbHMvc2FuaXRpemVyL2FzYW4ueGNjb25maWcKQEAgLTQsNiArNCw2IEBAIEVOQUJMRV9B RERSRVNTX1NBTklUSVpFUiA9ICQoRU5BQkxFX0FERFJFU1NfU0FOSVRJWkVSXyQoV0tfQVNBTl9E SVNBTExPV0VEKSk7CiBFTkFCTEVfQUREUkVTU19TQU5JVElaRVJfID0gWUVTOwogRU5BQkxFX0FE RFJFU1NfU0FOSVRJWkVSX05PID0gWUVTOwogCi1XS19FTkFCTEVfU0FOSVRJWkVSID0gJChFTkFC TEVfQUREUkVTU19TQU5JVElaRVIpOworV0tfRU5BQkxFX0FERFJFU1NfU0FOSVRJWkVSID0gJChF TkFCTEVfQUREUkVTU19TQU5JVElaRVIpOwogCi1XS19TQU5JVElaRVJfT1RIRVJfQ1BMVVNQTFVT RkxBR1NfWUVTID0gJChpbmhlcml0ZWQpIC1VX0xJQkNQUF9IQVNfTk9fQVNBTjsKK1dLX0FERFJF U1NfU0FOSVRJWkVSX09USEVSX0NQTFVTUExVU0ZMQUdTX1lFUyA9IC1VX0xJQkNQUF9IQVNfTk9f QVNBTjsKZGlmZiAtLWdpdCBhL1Rvb2xzL3Nhbml0aXplci9zYW5pdGl6ZXIueGNjb25maWcgYi9U b29scy9zYW5pdGl6ZXIvc2FuaXRpemVyLnhjY29uZmlnCmluZGV4IDUwYmQ5MTAxZDAwYjgwMGZj NDJjZmJmMTRkOWI0MjBmZjQxNTFlZWEuLjhiN2ZhNzMzYmMzODNhMGJiYTNiNzljYTM4YTRiMGVh N2IyN2Q4MTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3Nhbml0aXplci9zYW5pdGl6ZXIueGNjb25maWcK KysrIGIvVG9vbHMvc2FuaXRpemVyL3Nhbml0aXplci54Y2NvbmZpZwpAQCAtMywxMiArMyw4IEBA IEdDQ19PUFRJTUlaQVRJT05fTEVWRUxfRGVidWcgPSAwOwogR0NDX09QVElNSVpBVElPTl9MRVZF TF9Qcm9kdWN0aW9uID0gMTsKIEdDQ19PUFRJTUlaQVRJT05fTEVWRUxfUmVsZWFzZSA9IDE7CiAK LVdLX1NBTklUSVpFUl9PVEhFUl9DRkxBR1NfWUVTID0gLWZuby1vbWl0LWZyYW1lLXBvaW50ZXIg LWc7Ci1XS19TQU5JVElaRVJfT1RIRVJfQ1BMVVNQTFVTRkxBR1NfWUVTID0gOworT1RIRVJfQ0ZM QUdTID0gJChpbmhlcml0ZWQpIC1mbm8tb21pdC1mcmFtZS1wb2ludGVyIC1nICQoV0tfVU5ERUZJ TkVEX0JFSEFWSU9SX1NBTklUSVpFUl9PVEhFUl9DRkxBR1NfJChXS19FTkFCTEVfVU5ERUZJTkVE X0JFSEFWSU9SX1NBTklUSVpFUikpOworT1RIRVJfQ1BMVVNQTFVTRkxBR1MgPSAkKGluaGVyaXRl ZCkgJChXS19BRERSRVNTX1NBTklUSVpFUl9PVEhFUl9DUExVU1BMVVNGTEFHU18kKFdLX0VOQUJM RV9BRERSRVNTX1NBTklUSVpFUikpOwogCi1PVEhFUl9DRkxBR1MgPSAkKGluaGVyaXRlZCkgJChX S19TQU5JVElaRVJfT1RIRVJfQ0ZMQUdTXyQoV0tfRU5BQkxFX1NBTklUSVpFUikpOwotT1RIRVJf Q1BMVVNQTFVTRkxBR1MgPSAkKGluaGVyaXRlZCkgJChXS19TQU5JVElaRVJfT1RIRVJfQ1BMVVNQ TFVTRkxBR1NfJChXS19FTkFCTEVfU0FOSVRJWkVSKSk7Ci0KLS8vIFdvcmthcm91bmQgZm9yIHJk YXI6Ly9wcm9ibGVtLzQ5NDk4MDkyCi1PVEhFUl9MREZMQUdTID0gJChpbmhlcml0ZWQpICQoV0tf TERGTEFHU19TQU5JVElaRVJfJChXS19FTkFCTEVfU0FOSVRJWkVSKSk7Ci1XS19MREZMQUdTX1NB TklUSVpFUl9ZRVMgPSAtV2wsLXJwYXRoLEBleGVjdXRhYmxlX3BhdGgvRnJhbWV3b3JrczsKKy8v IFdvcmthcm91bmQgZm9yIDxyZGFyOi8vcHJvYmxlbS80OTQ5ODA5Mj4uCitPVEhFUl9MREZMQUdT ID0gJChpbmhlcml0ZWQpIC1XbCwtcnBhdGgsQGV4ZWN1dGFibGVfcGF0aC9GcmFtZXdvcmtzOwpk aWZmIC0tZ2l0IGEvVG9vbHMvc2FuaXRpemVyL3RzYW4ueGNjb25maWcgYi9Ub29scy9zYW5pdGl6 ZXIvdHNhbi54Y2NvbmZpZwppbmRleCBiZjBhYWU4MDA4NmFmY2U3NmMzYTdhNTYzY2I3MmY3Y2My NTg4MjQ3Li5iYWFhZDkzNTU0N2UwNzhhN2YwYmM3MDg5MTY4MWY2ZGY5MjhmZDA2IDEwMDY0NAot LS0gYS9Ub29scy9zYW5pdGl6ZXIvdHNhbi54Y2NvbmZpZworKysgYi9Ub29scy9zYW5pdGl6ZXIv dHNhbi54Y2NvbmZpZwpAQCAtMyw1ICszLDMgQEAKIEVOQUJMRV9USFJFQURfU0FOSVRJWkVSID0g JChFTkFCTEVfVEhSRUFEX1NBTklUSVpFUl8kKFdLX1RTQU5fRElTQUxMT1dFRCkpOwogRU5BQkxF X1RIUkVBRF9TQU5JVElaRVJfID0gWUVTOwogRU5BQkxFX1RIUkVBRF9TQU5JVElaRVJfTk8gPSBZ RVM7Ci0KLVdLX0VOQUJMRV9TQU5JVElaRVIgPSAkKEVOQUJMRV9USFJFQURfU0FOSVRJWkVSKTsK ZGlmZiAtLWdpdCBhL1Rvb2xzL3Nhbml0aXplci91YnNhbi54Y2NvbmZpZyBiL1Rvb2xzL3Nhbml0 aXplci91YnNhbi54Y2NvbmZpZwppbmRleCA4ZmY5ODJkMmRiNTkwMjYwZDE0NjIxZGE5M2ViNGZl YWU4M2ZhYjk4Li5kNmRhYjQ4MTlmY2NhMzE3MGM2OGU3MGViNWRiZTM0ZTJjYTUzZmJiIDEwMDY0 NAotLS0gYS9Ub29scy9zYW5pdGl6ZXIvdWJzYW4ueGNjb25maWcKKysrIGIvVG9vbHMvc2FuaXRp emVyL3Vic2FuLnhjY29uZmlnCkBAIC00LDEwICs0LDEwIEBAIEVOQUJMRV9VTkRFRklORURfQkVI QVZJT1JfU0FOSVRJWkVSID0gJChFTkFCTEVfVU5ERUZJTkVEX0JFSEFWSU9SX1NBTklUSVpFUl8k KFdLCiBFTkFCTEVfVU5ERUZJTkVEX0JFSEFWSU9SX1NBTklUSVpFUl8gPSBZRVM7CiBFTkFCTEVf VU5ERUZJTkVEX0JFSEFWSU9SX1NBTklUSVpFUl9OTyA9IFlFUzsKIAotV0tfRU5BQkxFX1NBTklU SVpFUiA9ICQoRU5BQkxFX1VOREVGSU5FRF9CRUhBVklPUl9TQU5JVElaRVIpOworV0tfRU5BQkxF X1VOREVGSU5FRF9CRUhBVklPUl9TQU5JVElaRVIgPSAkKEVOQUJMRV9VTkRFRklORURfQkVIQVZJ T1JfU0FOSVRJWkVSKTsKIAogLy8gRklYTUU6IFR1bmUgbGlzdCBvZiBVQlNhbiBjaGVja2Vyczog PGh0dHBzOi8vY2xhbmcubGx2bS5vcmcvZG9jcy9VbmRlZmluZWRCZWhhdmlvclNhbml0aXplci5o dG1sPi4KIC8vIEZJWE1FOiBVQlNhbiBjaGVja2VyIC1mc2FuaXRpemU9dnB0ciBpcyBpbmNvbXBh dGlibGUgd2l0aCBHQ0NfRU5BQkxFX0NQUF9SVFRJPU5PLgogLy8gLWZuby1kZWxldGUtbnVsbC1w b2ludGVyLWNoZWNrczogZG8gbm90IGxldCB0aGUgY29tcGlsZXIgcmVtb3ZlIG51bGxwdHIgY2hl Y2tzIHRoYXQgY291bGQgb3RoZXJ3aXNlIGJlIHJlbW92ZWQgYmVjYXVzZSB0aGV5IGFyZSBjb25z aWRlcmVkIHVuZGVmaW5lZCBiZWhhdmlvci4KIC8vIC1mbm8tb3B0aW1pemUtc2libGluZy1jYWxs czogZGlzYWJsZSB0YWlsIGNhbGwgZWxpbWluYXRpb24gZm9yIG1vcmUgYWNjdXJhdGUgY3Jhc2gg c3RhY2tzLgotV0tfU0FOSVRJWkVSX09USEVSX0NGTEFHU19ZRVMgPSAkKGluaGVyaXRlZCkgLWZu by1kZWxldGUtbnVsbC1wb2ludGVyLWNoZWNrcyAtZm5vLW9wdGltaXplLXNpYmxpbmctY2FsbHMg LWZuby1zYW5pdGl6ZT12cHRyOworV0tfVU5ERUZJTkVEX0JFSEFWSU9SX1NBTklUSVpFUl9PVEhF Ul9DRkxBR1NfWUVTID0gLWZuby1kZWxldGUtbnVsbC1wb2ludGVyLWNoZWNrcyAtZm5vLW9wdGlt aXplLXNpYmxpbmctY2FsbHMgLWZuby1zYW5pdGl6ZT12cHRyOwo=