211131 2020-04-28 09:17:31 -0700 [WPE][GTK] Paths should be canonicalized before calling bwrap 2023-07-02 07:45:11 -0700 1 1 1 Unclassified WebKit WebKitGTK Other Unspecified Linux RESOLVED FIXED P2 Normal --- 206533 1 jackhill webkit-unassigned aperez bugs-noreply cgarcia jackhill maxim.cournoyer mcatanzaro pgriffis philn robin oldest_to_newest 1646511 0 jackhill 2020-04-28 09:17:31 -0700 Before setting up worker sandboxes with Bubblewrap, the paths should be canonicalized by calling realpath(). Bubblewrap does not handle paths with absolute symlinks <https://github.com/containers/bubblewrap/issues/195>, so this avoids that problem. The error message presented by bwrap in such a case is, "bwrap: Can't create file at /path/to/symbolic/link: No such file or directory". This problem was observed on GNU Guix with WebKitGTK 2.28.1 <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40837>. 1845143 1 452983 maxim.cournoyer 2022-02-23 08:20:08 -0800 Created attachment 452983 Patch 1845146 2 aperez 2022-02-23 08:29:27 -0800 (In reply to apteryx from comment #1) > Created attachment 452983 [details] > Patch The patch looks reasonable to me, but I am a bit shy to approve it because there are other reviewers with more knowledge about of the sandbox code. If Michael or Patrick could rubber-stamp this, that would be perfect. 1845160 3 452983 mcatanzaro 2022-02-23 08:58:43 -0800 Comment on attachment 452983 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452983&action=review > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:334 > +static void bindSymlinksRealPath(Vector<CString>& args, const char* path, const char* bindOption = "--ro-bind") > +{ > + WTF::String realPath = FileSystem::realPath(path); > + if (path == realPath) { > + const char* rpath = realPath.utf8().data(); > + args.appendVector(Vector<CString>({ bindOption, rpath, rpath })); > + } > +} I'm a little confused here. What I expected: if the path is a symlink, bind its target instead so the operation doesn't fail. What you have here: if the path is a symlink (path != realPath), ignore it. Sure, the operation will not fail if you skip it, but won't you still wind up with a broken sandbox? > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:352 > + bindSymlinksRealPath(args, path, bindType); > + // As /etc is exposed wholesale, do not layer extraneous bind Style nit: leave a blank line here. 1845221 4 452983 mcatanzaro 2022-02-23 10:39:57 -0800 Comment on attachment 452983 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452983&action=review > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:330 > + if (path == realPath) { Seems this was supposed to be !=, which indicates that another round of testing is warranted here. ;) 1845226 5 452983 pgriffis 2022-02-23 10:57:21 -0800 Comment on attachment 452983 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452983&action=review > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:355 > + if (!WTF::String(path).startsWith("/etc/")) No point in making a new object. `g_str_has_prefix()` takes a `char*`. 1845231 6 453003 maxim.cournoyer 2022-02-23 11:20:37 -0800 Created attachment 453003 Patch 1845241 7 maxim.cournoyer 2022-02-23 11:35:16 -0800 (In reply to Michael Catanzaro from comment #3) > Comment on attachment 452983 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=452983&action=review > > > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:334 > > +static void bindSymlinksRealPath(Vector<CString>& args, const char* path, const char* bindOption = "--ro-bind") > > +{ > > + WTF::String realPath = FileSystem::realPath(path); > > + if (path == realPath) { > > + const char* rpath = realPath.utf8().data(); > > + args.appendVector(Vector<CString>({ bindOption, rpath, rpath })); > > + } > > +} > > I'm a little confused here. > > What I expected: if the path is a symlink, bind its target instead so the > operation doesn't fail. > > What you have here: if the path is a symlink (path != realPath), ignore it. > Sure, the operation will not fail if you skip it, but won't you still wind > up with a broken sandbox? Hmm, you are right. Fixed. > > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:352 > > + bindSymlinksRealPath(args, path, bindType); > > + // As /etc is exposed wholesale, do not layer extraneous bind > > Style nit: leave a blank line here. Fixed. Thank you! 1845271 8 453003 mcatanzaro 2022-02-23 12:46:37 -0800 Comment on attachment 453003 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453003&action=review OK, almost there... > Source/WebKit/ChangeLog:3 > + Canonicalize source paths passed to bindIfExists in BubbleWrap launcher This line should match the title of the bug: [WPE][GTK] Paths should be canonicalized before calling bwrap > Source/WebKit/ChangeLog:6 > + Reviewed by Michael Catanzaro and Adrian Perez. Please don't fill this out yourself unless you've actually received r+. Just leave it saying NOBODY (OOPS!). Confusing, I know.... > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:172 > + const char* rpath = realPath.utf8().data(); > + args.appendVector(Vector<CString>({ bindOption, rpath, rpath })); This is a use-after-free again. The temporary utf8() is out of scope, so rpath is dangling here. You must own the memory somehow. Probably the easiest way is to change rpath to be a CString: CString rpath = realPath.utf8(); args.appendVector(Vector<CString>({ bindOption, rpath.data(), rpath.data() })); I think that would work. 1845311 9 453026 maxim.cournoyer 2022-02-23 14:12:06 -0800 Created attachment 453026 Patch 1845312 10 maxim.cournoyer 2022-02-23 14:14:11 -0800 > > > Source/WebKit/ChangeLog:3 > > + Canonicalize source paths passed to bindIfExists in BubbleWrap launcher > > This line should match the title of the bug: > > > [WPE][GTK] Paths should be canonicalized before calling bwrap Fixed. > > Source/WebKit/ChangeLog:6 > > + Reviewed by Michael Catanzaro and Adrian Perez. > > Please don't fill this out yourself unless you've actually received r+. Just > leave it saying NOBODY (OOPS!). Confusing, I know.... OK! I wasn't sure. Fixed. > > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:172 > > + const char* rpath = realPath.utf8().data(); > > + args.appendVector(Vector<CString>({ bindOption, rpath, rpath })); > > This is a use-after-free again. The temporary utf8() is out of scope, so > rpath is dangling here. You must own the memory somehow. Probably the > easiest way is to change rpath to be a CString: > > CString rpath = realPath.utf8(); > args.appendVector(Vector<CString>({ bindOption, rpath.data(), rpath.data() > })); > > I think that would work. Tricky! I'm still not sure I fully understand; but I've used your suggestion. Thank you! 1845320 11 mcatanzaro 2022-02-23 14:30:26 -0800 (In reply to apteryx from comment #10) > Tricky! I'm still not sure I fully understand; but I've used your > suggestion. It's really simple. rpath.utf8() is a CString. rpath.utf8().data() is a pointer to the char* data owned by the CString. It's valid for the lifetime of rpath.utf8(). Once rpath.utf8() is destroyed, it's a dangling pointer to memory that is no longer valid. And in your previous patch, it was destroyed right away, because it was a temporary. 1845338 12 maxim.cournoyer 2022-02-23 15:03:55 -0800 (In reply to Michael Catanzaro from comment #11) > (In reply to apteryx from comment #10) > > Tricky! I'm still not sure I fully understand; but I've used your > > suggestion. > > It's really simple. rpath.utf8() is a CString. rpath.utf8().data() is a > pointer to the char* data owned by the CString. It's valid for the lifetime > of rpath.utf8(). Once rpath.utf8() is destroyed, it's a dangling pointer to > memory that is no longer valid. And in your previous patch, it was destroyed > right away, because it was a temporary. Thank you for having explained in more details... it's clear now! 1845427 13 ews-feeder 2022-02-23 16:50:34 -0800 Committed r290401 (247713@main): <https://commits.webkit.org/247713@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453026. 1964455 14 453026 philn 2023-06-30 05:00:55 -0700 Comment on attachment 453026 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453026&action=review > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:173 > + if (path != realPath) { > + CString rpath = realPath.utf8(); > + args.appendVector(Vector<CString>({ bindOption, rpath.data(), rpath.data() })); > + } I don't understand this, path and realPath will be equal if path has no symlink, so path won't be bound at all in the sandbox. Was that really the intent here? 1964680 15 mcatanzaro 2023-07-02 07:45:11 -0700 If it's not a symlink then it gets bound at the bottom of bindIfExists, after the call to bindSymlinksRealPath. 452983 2022-02-23 08:20:08 -0800 2022-02-23 11:20:33 -0800 Patch bug-211131-20220223112007.patch text/plain 3566 maxim.cournoyer U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkyN2I1NjIyMjQ3ZDlkNTg3 NTI0MTc3NzFkMWMwNzc2YzE0MjhkMzAuLjUxMTQ5MDliZmIzYTZjMjMwYTU0ZjdhNzRiYmFkZGYx MTMyNjBkNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjItMDItMjMgIE1heGltIENv dXJub3llciAgPG1heGltLmNvdXJub3llckBnbWFpbC5jb20+CisKKyAgICAgICAgQ2Fub25pY2Fs aXplIHNvdXJjZSBwYXRocyBwYXNzZWQgdG8gYmluZElmRXhpc3RzIGluIEJ1YmJsZVdyYXAgbGF1 bmNoZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MTEzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvQnViYmxld3JhcExhdW5jaGVyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6YmluZFN5bWxpbmtzUmVhbFBhdGgpOiBSZWxvY2F0ZSBlYXJsaWVyIGluIGZpbGUs CisgICAgICAgIGFkZCBhICdiaW5kT3B0aW9uJyBhcmd1bWVudCBhbmQgdXNlIEZpbGVTeXN0ZW06 OnJlYWxQYXRoIGluc3RlYWQKKyAgICAgICAgb2YgcmVhbHBhdGggZnJvbSB0aGUgc3RhbmRhcmQg QyBsaWJyYXJ5LgorICAgICAgICAoV2ViS2l0OjpiaW5kSWZFeGlzdHMpOiBVc2UgdGhlIG1vZGlm aWVkIGFib3ZlIHByb2NlZHVyZSB0bworICAgICAgICBjYW5vbmljYWxpemUgdGhlIHNvdXJjZSBw YXRoLCBhbmQgYXZvaWQgYWRkaW5nIGJpbmQgbW91bnRzIGZvcgorICAgICAgICBsb2NhdGlvbnMg dW5kZXIgL2V0Yy4KKwogMjAyMi0wMi0wNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBSZWZhY3RvciBSZW1vdGVMYXllckJhY2tpbmdTdG9yZUNvbGxl Y3Rpb24gdG8gaGF2ZSBhIHNpbmdsZSBiYWNraW5nIHN0b3JlIHRyYXZlcnNhbCBmdW5jdGlvbgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9CdWJibGV3 cmFwTGF1bmNoZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9C dWJibGV3cmFwTGF1bmNoZXIuY3BwCmluZGV4IDBkNWRkNGY2OTg2ZDY3MzNmNmZmY2I2OGI5ZmFi OTExM2JiNTMyN2IuLmYwYTVlNGIwNWRmZmFjNDkyNmM4YjE0MWJkYTZhZDRlNTk3YTU3YjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvQnViYmxld3Jh cExhdW5jaGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MYXVuY2hlci9nbGli L0J1YmJsZXdyYXBMYXVuY2hlci5jcHAKQEAgLTI2LDcgKzI2LDYgQEAKICNpbmNsdWRlIDxzZWNj b21wLmg+CiAjaW5jbHVkZSA8c3lzL2lvY3RsLmg+CiAjaW5jbHVkZSA8c3lzL21tYW4uaD4KLSNp bmNsdWRlIDx1bmlzdGQuaD4KICNpbmNsdWRlIDx3dGYvRmlsZVN5c3RlbS5oPgogI2luY2x1ZGUg PHd0Zi9VbmlTdGRFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvZ2xpYi9HUmVmUHRyLmg+CkBAIC0z MjUsNiArMzI0LDE1IEBAIGVudW0gY2xhc3MgQmluZEZsYWdzIHsKICAgICBEZXZpY2UsCiB9Owog CitzdGF0aWMgdm9pZCBiaW5kU3ltbGlua3NSZWFsUGF0aChWZWN0b3I8Q1N0cmluZz4mIGFyZ3Ms IGNvbnN0IGNoYXIqIHBhdGgsIGNvbnN0IGNoYXIqIGJpbmRPcHRpb24gPSAiLS1yby1iaW5kIikK K3sKKyAgICBXVEY6OlN0cmluZyByZWFsUGF0aCA9IEZpbGVTeXN0ZW06OnJlYWxQYXRoKHBhdGgp OworICAgIGlmIChwYXRoID09IHJlYWxQYXRoKSB7CisgICAgICAgIGNvbnN0IGNoYXIqIHJwYXRo ID0gcmVhbFBhdGgudXRmOCgpLmRhdGEoKTsKKyAgICAgICAgYXJncy5hcHBlbmRWZWN0b3IoVmVj dG9yPENTdHJpbmc+KHsgYmluZE9wdGlvbiwgcnBhdGgsIHJwYXRoIH0pKTsKKyAgICB9Cit9CisK IHN0YXRpYyB2b2lkIGJpbmRJZkV4aXN0cyhWZWN0b3I8Q1N0cmluZz4mIGFyZ3MsIGNvbnN0IGNo YXIqIHBhdGgsIEJpbmRGbGFncyBiaW5kRmxhZ3MgPSBCaW5kRmxhZ3M6OlJlYWRPbmx5KQogewog ICAgIGlmICghcGF0aCB8fCBwYXRoWzBdID09ICdcMCcpCkBAIC0zMzcsNyArMzQ1LDE1IEBAIHN0 YXRpYyB2b2lkIGJpbmRJZkV4aXN0cyhWZWN0b3I8Q1N0cmluZz4mIGFyZ3MsIGNvbnN0IGNoYXIq IHBhdGgsIEJpbmRGbGFncyBiaW5kCiAgICAgICAgIGJpbmRUeXBlID0gIi0tcm8tYmluZC10cnki OwogICAgIGVsc2UKICAgICAgICAgYmluZFR5cGUgPSAiLS1iaW5kLXRyeSI7Ci0gICAgYXJncy5h cHBlbmRWZWN0b3IoVmVjdG9yPENTdHJpbmc+KHsgYmluZFR5cGUsIHBhdGgsIHBhdGggfSkpOwor CisgICAgLy8gQ2Fub25pY2FsaXplIHRoZSBzb3VyY2UgcGF0aCwgb3RoZXJ3aXNlIGEgc3ltYm9s aWMgbGluayBjb3VsZAorICAgIC8vIHBvaW50IHRvIGEgbG9jYXRpb24gb3V0c2lkZSBvZiB0aGUg bmFtZXNwYWNlLgorICAgIGJpbmRTeW1saW5rc1JlYWxQYXRoKGFyZ3MsIHBhdGgsIGJpbmRUeXBl KTsKKyAgICAvLyBBcyAvZXRjIGlzIGV4cG9zZWQgd2hvbGVzYWxlLCBkbyBub3QgbGF5ZXIgZXh0 cmFuZW91cyBiaW5kCisgICAgLy8gZGlyZWN0aXZlcyBvbiB0b3AsIHdoaWNoIGNvdWxkIGZhaWwg aW4gdGhlIHByZXNlbmNlIG9mIHN5bWJvbGljCisgICAgLy8gbGlua3MuCisgICAgaWYgKCFXVEY6 OlN0cmluZyhwYXRoKS5zdGFydHNXaXRoKCIvZXRjLyIpKQorICAgICAgICBhcmdzLmFwcGVuZFZl Y3RvcihWZWN0b3I8Q1N0cmluZz4oeyBiaW5kVHlwZSwgcGF0aCwgcGF0aCB9KSk7CiB9CiAKIHN0 YXRpYyB2b2lkIGJpbmREQnVzU2Vzc2lvbihWZWN0b3I8Q1N0cmluZz4mIGFyZ3MsIFhER0RCdXNQ cm94eUxhdW5jaGVyJiBwcm94eSkKQEAgLTYxNSwxNyArNjMxLDYgQEAgc3RhdGljIHZvaWQgYmlu ZFY0bChWZWN0b3I8Q1N0cmluZz4mIGFyZ3MpCiAgICAgfSkpOwogfQogCi1zdGF0aWMgdm9pZCBi aW5kU3ltbGlua3NSZWFsUGF0aChWZWN0b3I8Q1N0cmluZz4mIGFyZ3MsIGNvbnN0IGNoYXIqIHBh dGgpCi17Ci0gICAgY2hhciByZWFsUGF0aFtQQVRIX01BWF07Ci0KLSAgICBpZiAocmVhbHBhdGgo cGF0aCwgcmVhbFBhdGgpICYmIHN0cmNtcChwYXRoLCByZWFsUGF0aCkpIHsKLSAgICAgICAgYXJn cy5hcHBlbmRWZWN0b3IoVmVjdG9yPENTdHJpbmc+KHsKLSAgICAgICAgICAgICItLXJvLWJpbmQi LCByZWFsUGF0aCwgcmVhbFBhdGgsCi0gICAgICAgIH0pKTsKLSAgICB9Ci19Ci0KIC8vIFRyYW5z bGF0ZSBhIGxpYnNlY2NvbXAgZXJyb3IgY29kZSBpbnRvIGFuIGVycm9yIG1lc3NhZ2UuIGxpYnNl Y2NvbXAKIC8vIG1vc3RseSByZXR1cm5zIG5lZ2F0aXZlIGVycm5vIHZhbHVlcyBzdWNoIGFzIC1F Tk9NRU0sIGJ1dCBzb21lCiAvLyBzdGFuZGFyZCBlcnJubyB2YWx1ZXMgYXJlIHVzZWQgZm9yIG5v bi1zdGFuZGFyZCBwdXJwb3NlcyB3aGVyZSB0aGVpcgo= 453003 2022-02-23 11:20:37 -0800 2022-02-23 14:12:02 -0800 Patch bug-211131-20220223142036.patch text/plain 3552 maxim.cournoyer U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2Y2ZiZWQ1N2UxMzlmNGI4 OGM5MzVmOGVjNDk1ZjljNjVhMzdmNGMuLjFjMmNhNTZjNGU0MWVlZDY2NGRiZDZlOTFkY2ZlZWMy N2NjOTc4N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjItMDItMjMgIE1heGltIENv dXJub3llciAgPG1heGltLmNvdXJub3llckBnbWFpbC5jb20+CisKKyAgICAgICAgQ2Fub25pY2Fs aXplIHNvdXJjZSBwYXRocyBwYXNzZWQgdG8gYmluZElmRXhpc3RzIGluIEJ1YmJsZVdyYXAgbGF1 bmNoZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MTEzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgQ2F0YW56YXJvIGFuZCBBZHJpYW4g UGVyZXouCisKKyAgICAgICAgKiBVSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9CdWJibGV3cmFwTGF1 bmNoZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpiaW5kU3ltbGlua3NSZWFsUGF0aCk6IFJlbG9j YXRlIGVhcmxpZXIgaW4gZmlsZSwKKyAgICAgICAgYWRkIGEgJ2JpbmRPcHRpb24nIGFyZ3VtZW50 IGFuZCB1c2UgRmlsZVN5c3RlbTo6cmVhbFBhdGggaW5zdGVhZAorICAgICAgICBvZiByZWFscGF0 aCBmcm9tIHRoZSBzdGFuZGFyZCBDIGxpYnJhcnkuCisgICAgICAgIChXZWJLaXQ6OmJpbmRJZkV4 aXN0cyk6IFVzZSB0aGUgbW9kaWZpZWQgYWJvdmUgcHJvY2VkdXJlIHRvCisgICAgICAgIGNhbm9u aWNhbGl6ZSB0aGUgc291cmNlIHBhdGgsIGFuZCBhdm9pZCBhZGRpbmcgYmluZCBtb3VudHMgZm9y CisgICAgICAgIGxvY2F0aW9ucyB1bmRlciAvZXRjLgorCiAyMDIyLTAyLTIzICBQaGlsaXBwZSBO b3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBEZS1p bml0aWFsaXplIEdTdHJlYW1lciBiZWZvcmUgdGVybWluYXRpbmcgV2ViUHJvY2VzcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9CdWJibGV3cmFwTGF1 bmNoZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9CdWJibGV3 cmFwTGF1bmNoZXIuY3BwCmluZGV4IGVjYzgwNDY2Mzc4NGIxM2RjNjg1NDM4OTZkN2Y4MjkwYWUy ZjM2MmEuLmMwZGZjOGE4ODMzYWM3ODAwYzhkNTMyZTFjOWI4NDhhZWU3OTcxZGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvQnViYmxld3JhcExhdW5j aGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MYXVuY2hlci9nbGliL0J1YmJs ZXdyYXBMYXVuY2hlci5jcHAKQEAgLTI3LDcgKzI3LDYgQEAKICNpbmNsdWRlIDxzZWNjb21wLmg+ CiAjaW5jbHVkZSA8c3lzL2lvY3RsLmg+CiAjaW5jbHVkZSA8c3lzL21tYW4uaD4KLSNpbmNsdWRl IDx1bmlzdGQuaD4KICNpbmNsdWRlIDx3dGYvRmlsZVN5c3RlbS5oPgogI2luY2x1ZGUgPHd0Zi9V bmlTdGRFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvZ2xpYi9HUmVmUHRyLmg+CkBAIC0xNjUsNiAr MTY0LDE1IEBAIGVudW0gY2xhc3MgQmluZEZsYWdzIHsKICAgICBEZXZpY2UsCiB9OwogCitzdGF0 aWMgdm9pZCBiaW5kU3ltbGlua3NSZWFsUGF0aChWZWN0b3I8Q1N0cmluZz4mIGFyZ3MsIGNvbnN0 IGNoYXIqIHBhdGgsIGNvbnN0IGNoYXIqIGJpbmRPcHRpb24gPSAiLS1yby1iaW5kIikKK3sKKyAg ICBXVEY6OlN0cmluZyByZWFsUGF0aCA9IEZpbGVTeXN0ZW06OnJlYWxQYXRoKHBhdGgpOworICAg IGlmIChwYXRoICE9IHJlYWxQYXRoKSB7CisgICAgICAgIGNvbnN0IGNoYXIqIHJwYXRoID0gcmVh bFBhdGgudXRmOCgpLmRhdGEoKTsKKyAgICAgICAgYXJncy5hcHBlbmRWZWN0b3IoVmVjdG9yPENT dHJpbmc+KHsgYmluZE9wdGlvbiwgcnBhdGgsIHJwYXRoIH0pKTsKKyAgICB9Cit9CisKIHN0YXRp YyB2b2lkIGJpbmRJZkV4aXN0cyhWZWN0b3I8Q1N0cmluZz4mIGFyZ3MsIGNvbnN0IGNoYXIqIHBh dGgsIEJpbmRGbGFncyBiaW5kRmxhZ3MgPSBCaW5kRmxhZ3M6OlJlYWRPbmx5KQogewogICAgIGlm ICghcGF0aCB8fCBwYXRoWzBdID09ICdcMCcpCkBAIC0xNzcsNyArMTg1LDE2IEBAIHN0YXRpYyB2 b2lkIGJpbmRJZkV4aXN0cyhWZWN0b3I8Q1N0cmluZz4mIGFyZ3MsIGNvbnN0IGNoYXIqIHBhdGgs IEJpbmRGbGFncyBiaW5kCiAgICAgICAgIGJpbmRUeXBlID0gIi0tcm8tYmluZC10cnkiOwogICAg IGVsc2UKICAgICAgICAgYmluZFR5cGUgPSAiLS1iaW5kLXRyeSI7Ci0gICAgYXJncy5hcHBlbmRW ZWN0b3IoVmVjdG9yPENTdHJpbmc+KHsgYmluZFR5cGUsIHBhdGgsIHBhdGggfSkpOworCisgICAg Ly8gQ2Fub25pY2FsaXplIHRoZSBzb3VyY2UgcGF0aCwgb3RoZXJ3aXNlIGEgc3ltYm9saWMgbGlu ayBjb3VsZAorICAgIC8vIHBvaW50IHRvIGEgbG9jYXRpb24gb3V0c2lkZSBvZiB0aGUgbmFtZXNw YWNlLgorICAgIGJpbmRTeW1saW5rc1JlYWxQYXRoKGFyZ3MsIHBhdGgsIGJpbmRUeXBlKTsKKwor ICAgIC8vIEFzIC9ldGMgaXMgZXhwb3NlZCB3aG9sZXNhbGUsIGRvIG5vdCBsYXllciBleHRyYW5l b3VzIGJpbmQKKyAgICAvLyBkaXJlY3RpdmVzIG9uIHRvcCwgd2hpY2ggY291bGQgZmFpbCBpbiB0 aGUgcHJlc2VuY2Ugb2Ygc3ltYm9saWMKKyAgICAvLyBsaW5rcy4KKyAgICBpZiAoIVdURjo6U3Ry aW5nKHBhdGgpLnN0YXJ0c1dpdGgoIi9ldGMvIikpCisgICAgICAgIGFyZ3MuYXBwZW5kVmVjdG9y KFZlY3RvcjxDU3RyaW5nPih7IGJpbmRUeXBlLCBwYXRoLCBwYXRoIH0pKTsKIH0KIAogc3RhdGlj IHZvaWQgYmluZERCdXNTZXNzaW9uKFZlY3RvcjxDU3RyaW5nPiYgYXJncywgYm9vbCBhbGxvd1Bv cnRhbHMpCkBAIC00MTAsMTcgKzQyNyw2IEBAIHN0YXRpYyB2b2lkIGJpbmRWNGwoVmVjdG9yPENT dHJpbmc+JiBhcmdzKQogICAgIH0pKTsKIH0KIAotc3RhdGljIHZvaWQgYmluZFN5bWxpbmtzUmVh bFBhdGgoVmVjdG9yPENTdHJpbmc+JiBhcmdzLCBjb25zdCBjaGFyKiBwYXRoKQotewotICAgIGNo YXIgcmVhbFBhdGhbUEFUSF9NQVhdOwotCi0gICAgaWYgKHJlYWxwYXRoKHBhdGgsIHJlYWxQYXRo KSAmJiBzdHJjbXAocGF0aCwgcmVhbFBhdGgpKSB7Ci0gICAgICAgIGFyZ3MuYXBwZW5kVmVjdG9y KFZlY3RvcjxDU3RyaW5nPih7Ci0gICAgICAgICAgICAiLS1yby1iaW5kIiwgcmVhbFBhdGgsIHJl YWxQYXRoLAotICAgICAgICB9KSk7Ci0gICAgfQotfQotCiAvLyBUcmFuc2xhdGUgYSBsaWJzZWNj b21wIGVycm9yIGNvZGUgaW50byBhbiBlcnJvciBtZXNzYWdlLiBsaWJzZWNjb21wCiAvLyBtb3N0 bHkgcmV0dXJucyBuZWdhdGl2ZSBlcnJubyB2YWx1ZXMgc3VjaCBhcyAtRU5PTUVNLCBidXQgc29t ZQogLy8gc3RhbmRhcmQgZXJybm8gdmFsdWVzIGFyZSB1c2VkIGZvciBub24tc3RhbmRhcmQgcHVy cG9zZXMgd2hlcmUgdGhlaXIK 453026 2022-02-23 14:12:06 -0800 2022-02-23 16:50:37 -0800 Patch bug-211131-20220223171206.patch text/plain 3519 maxim.cournoyer U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2Y2ZiZWQ1N2UxMzlmNGI4 OGM5MzVmOGVjNDk1ZjljNjVhMzdmNGMuLmY1YWFlNGE0NTRjZTNjMDQyMGMzMzFlOWFlNGE4ZWNk OTg2NjQ1YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjItMDItMjMgIE1heGltIENv dXJub3llciAgPG1heGltLmNvdXJub3llckBnbWFpbC5jb20+CisKKyAgICAgICAgW1dQRV1bR1RL XSBQYXRocyBzaG91bGQgYmUgY2Fub25pY2FsaXplZCBiZWZvcmUgY2FsbGluZyBid3JhcAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMTMxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv TGF1bmNoZXIvZ2xpYi9CdWJibGV3cmFwTGF1bmNoZXIuY3BwOgorICAgICAgICAoV2ViS2l0Ojpi aW5kU3ltbGlua3NSZWFsUGF0aCk6IFJlbG9jYXRlIGVhcmxpZXIgaW4gZmlsZSwKKyAgICAgICAg YWRkIGEgJ2JpbmRPcHRpb24nIGFyZ3VtZW50IGFuZCB1c2UgRmlsZVN5c3RlbTo6cmVhbFBhdGgg aW5zdGVhZAorICAgICAgICBvZiByZWFscGF0aCBmcm9tIHRoZSBzdGFuZGFyZCBDIGxpYnJhcnku CisgICAgICAgIChXZWJLaXQ6OmJpbmRJZkV4aXN0cyk6IFVzZSB0aGUgbW9kaWZpZWQgYWJvdmUg cHJvY2VkdXJlIHRvCisgICAgICAgIGNhbm9uaWNhbGl6ZSB0aGUgc291cmNlIHBhdGgsIGFuZCBh dm9pZCBhZGRpbmcgYmluZCBtb3VudHMgZm9yCisgICAgICAgIGxvY2F0aW9ucyB1bmRlciAvZXRj LgorCiAyMDIyLTAyLTIzICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K IAogICAgICAgICBbR1N0cmVhbWVyXSBEZS1pbml0aWFsaXplIEdTdHJlYW1lciBiZWZvcmUgdGVy bWluYXRpbmcgV2ViUHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv TGF1bmNoZXIvZ2xpYi9CdWJibGV3cmFwTGF1bmNoZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvTGF1bmNoZXIvZ2xpYi9CdWJibGV3cmFwTGF1bmNoZXIuY3BwCmluZGV4IGVjYzgwNDY2 Mzc4NGIxM2RjNjg1NDM4OTZkN2Y4MjkwYWUyZjM2MmEuLmEyYTFjOWQ3YTRkZGEzMjVlNDA0NmM5 ZTYyZDBjYzFhOGE4NGYxNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0xh dW5jaGVyL2dsaWIvQnViYmxld3JhcExhdW5jaGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9MYXVuY2hlci9nbGliL0J1YmJsZXdyYXBMYXVuY2hlci5jcHAKQEAgLTI3LDcgKzI3 LDYgQEAKICNpbmNsdWRlIDxzZWNjb21wLmg+CiAjaW5jbHVkZSA8c3lzL2lvY3RsLmg+CiAjaW5j bHVkZSA8c3lzL21tYW4uaD4KLSNpbmNsdWRlIDx1bmlzdGQuaD4KICNpbmNsdWRlIDx3dGYvRmls ZVN5c3RlbS5oPgogI2luY2x1ZGUgPHd0Zi9VbmlTdGRFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYv Z2xpYi9HUmVmUHRyLmg+CkBAIC0xNjUsNiArMTY0LDE1IEBAIGVudW0gY2xhc3MgQmluZEZsYWdz IHsKICAgICBEZXZpY2UsCiB9OwogCitzdGF0aWMgdm9pZCBiaW5kU3ltbGlua3NSZWFsUGF0aChW ZWN0b3I8Q1N0cmluZz4mIGFyZ3MsIGNvbnN0IGNoYXIqIHBhdGgsIGNvbnN0IGNoYXIqIGJpbmRP cHRpb24gPSAiLS1yby1iaW5kIikKK3sKKyAgICBXVEY6OlN0cmluZyByZWFsUGF0aCA9IEZpbGVT eXN0ZW06OnJlYWxQYXRoKHBhdGgpOworICAgIGlmIChwYXRoICE9IHJlYWxQYXRoKSB7CisgICAg ICAgIENTdHJpbmcgcnBhdGggPSByZWFsUGF0aC51dGY4KCk7CisgICAgICAgIGFyZ3MuYXBwZW5k VmVjdG9yKFZlY3RvcjxDU3RyaW5nPih7IGJpbmRPcHRpb24sIHJwYXRoLmRhdGEoKSwgcnBhdGgu ZGF0YSgpIH0pKTsKKyAgICB9Cit9CisKIHN0YXRpYyB2b2lkIGJpbmRJZkV4aXN0cyhWZWN0b3I8 Q1N0cmluZz4mIGFyZ3MsIGNvbnN0IGNoYXIqIHBhdGgsIEJpbmRGbGFncyBiaW5kRmxhZ3MgPSBC aW5kRmxhZ3M6OlJlYWRPbmx5KQogewogICAgIGlmICghcGF0aCB8fCBwYXRoWzBdID09ICdcMCcp CkBAIC0xNzcsNyArMTg1LDE2IEBAIHN0YXRpYyB2b2lkIGJpbmRJZkV4aXN0cyhWZWN0b3I8Q1N0 cmluZz4mIGFyZ3MsIGNvbnN0IGNoYXIqIHBhdGgsIEJpbmRGbGFncyBiaW5kCiAgICAgICAgIGJp bmRUeXBlID0gIi0tcm8tYmluZC10cnkiOwogICAgIGVsc2UKICAgICAgICAgYmluZFR5cGUgPSAi LS1iaW5kLXRyeSI7Ci0gICAgYXJncy5hcHBlbmRWZWN0b3IoVmVjdG9yPENTdHJpbmc+KHsgYmlu ZFR5cGUsIHBhdGgsIHBhdGggfSkpOworCisgICAgLy8gQ2Fub25pY2FsaXplIHRoZSBzb3VyY2Ug cGF0aCwgb3RoZXJ3aXNlIGEgc3ltYm9saWMgbGluayBjb3VsZAorICAgIC8vIHBvaW50IHRvIGEg bG9jYXRpb24gb3V0c2lkZSBvZiB0aGUgbmFtZXNwYWNlLgorICAgIGJpbmRTeW1saW5rc1JlYWxQ YXRoKGFyZ3MsIHBhdGgsIGJpbmRUeXBlKTsKKworICAgIC8vIEFzIC9ldGMgaXMgZXhwb3NlZCB3 aG9sZXNhbGUsIGRvIG5vdCBsYXllciBleHRyYW5lb3VzIGJpbmQKKyAgICAvLyBkaXJlY3RpdmVz IG9uIHRvcCwgd2hpY2ggY291bGQgZmFpbCBpbiB0aGUgcHJlc2VuY2Ugb2Ygc3ltYm9saWMKKyAg ICAvLyBsaW5rcy4KKyAgICBpZiAoIWdfc3RyX2hhc19wcmVmaXgocGF0aCwgIi9ldGMvIikpCisg ICAgICAgIGFyZ3MuYXBwZW5kVmVjdG9yKFZlY3RvcjxDU3RyaW5nPih7IGJpbmRUeXBlLCBwYXRo LCBwYXRoIH0pKTsKIH0KIAogc3RhdGljIHZvaWQgYmluZERCdXNTZXNzaW9uKFZlY3RvcjxDU3Ry aW5nPiYgYXJncywgYm9vbCBhbGxvd1BvcnRhbHMpCkBAIC00MTAsMTcgKzQyNyw2IEBAIHN0YXRp YyB2b2lkIGJpbmRWNGwoVmVjdG9yPENTdHJpbmc+JiBhcmdzKQogICAgIH0pKTsKIH0KIAotc3Rh dGljIHZvaWQgYmluZFN5bWxpbmtzUmVhbFBhdGgoVmVjdG9yPENTdHJpbmc+JiBhcmdzLCBjb25z dCBjaGFyKiBwYXRoKQotewotICAgIGNoYXIgcmVhbFBhdGhbUEFUSF9NQVhdOwotCi0gICAgaWYg KHJlYWxwYXRoKHBhdGgsIHJlYWxQYXRoKSAmJiBzdHJjbXAocGF0aCwgcmVhbFBhdGgpKSB7Ci0g ICAgICAgIGFyZ3MuYXBwZW5kVmVjdG9yKFZlY3RvcjxDU3RyaW5nPih7Ci0gICAgICAgICAgICAi LS1yby1iaW5kIiwgcmVhbFBhdGgsIHJlYWxQYXRoLAotICAgICAgICB9KSk7Ci0gICAgfQotfQot CiAvLyBUcmFuc2xhdGUgYSBsaWJzZWNjb21wIGVycm9yIGNvZGUgaW50byBhbiBlcnJvciBtZXNz YWdlLiBsaWJzZWNjb21wCiAvLyBtb3N0bHkgcmV0dXJucyBuZWdhdGl2ZSBlcnJubyB2YWx1ZXMg c3VjaCBhcyAtRU5PTUVNLCBidXQgc29tZQogLy8gc3RhbmRhcmQgZXJybm8gdmFsdWVzIGFyZSB1 c2VkIGZvciBub24tc3RhbmRhcmQgcHVycG9zZXMgd2hlcmUgdGhlaXIK