194224 2019-02-04 10:13:18 -0800 Protect globalWebSocketStreamMap with a Lock 2019-02-05 07:38:36 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen rniwa webkit-bug-importer oldest_to_newest 1501877 0 achristensen 2019-02-04 10:13:18 -0800 Protect globalWebSocketStreamMap with a Lock 1501878 1 361069 achristensen 2019-02-04 10:13:33 -0800 Created attachment 361069 Patch 1501879 2 achristensen 2019-02-04 10:13:35 -0800 <rdar://problem/47581081> 1502032 3 361069 rniwa 2019-02-04 14:39:28 -0800 Comment on attachment 361069 Patch Do we know which thread/function may end up accessing globalWebSocketStreamMap()? Can we mention that in the change log if so? Otherwise, can we mention that it's a speculative fix? 1502037 4 achristensen 2019-02-04 14:54:21 -0800 I think this is related to WebSocket use from workers. I can put such in the ChangeLog after review. 1502101 5 361069 rniwa 2019-02-04 16:33:06 -0800 Comment on attachment 361069 Patch Okay, let's hope the rest of the code is thread safe. 1502356 6 achristensen 2019-02-05 07:38:36 -0800 http://trac.webkit.org/r240974 361069 2019-02-04 10:13:33 -0800 2019-02-04 16:33:06 -0800 Patch bug-194224-20190204101332.patch text/plain 3218 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDA5MjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAyLTA0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUHJvdGVjdCBnbG9i YWxXZWJTb2NrZXRTdHJlYW1NYXAgd2l0aCBhIExvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDIyNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NDc1ODEwODE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViU29ja2V0U3RyZWFtLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViU29ja2V0U3RyZWFtOjpzdHJlYW1XaXRoSWRlbnRpZmllcik6CisgICAgICAgIChX ZWJLaXQ6OldlYlNvY2tldFN0cmVhbTo6bmV0d29ya1Byb2Nlc3NDcmFzaGVkKToKKyAgICAgICAg KFdlYktpdDo6V2ViU29ja2V0U3RyZWFtOjpXZWJTb2NrZXRTdHJlYW0pOgorICAgICAgICAoV2Vi S2l0OjpXZWJTb2NrZXRTdHJlYW06On5XZWJTb2NrZXRTdHJlYW0pOgorCiAyMDE5LTAyLTA0ICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBDYXB0dXJlIHN0YXRl IHNob3VsZCBiZSBtYW5hZ2VkIGNvbnNpc3RlbnRseSB3aGVuIGRvaW5nIHByb2Nlc3Mgc3dhcHBp bmcKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tldFN0cmVh bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2Vi U29ja2V0U3RyZWFtLmNwcAkocmV2aXNpb24gMjQwOTAxKQorKysgU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViU29ja2V0U3RyZWFtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEs NiArNDEsNyBAQAogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsK IAorc3RhdGljIExvY2sgZ2xvYmFsV2ViU29ja2V0U3RyZWFtTWFwTG9jazsKIHN0YXRpYyBIYXNo TWFwPHVpbnQ2NF90LCBXZWJTb2NrZXRTdHJlYW0qPiYgZ2xvYmFsV2ViU29ja2V0U3RyZWFtTWFw KCkKIHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8SGFzaE1hcDx1aW50NjRfdCwgV2ViU29j a2V0U3RyZWFtKj4+IGdsb2JhbE1hcDsKQEAgLTQ5LDE5ICs1MCwzMCBAQCBzdGF0aWMgSGFzaE1h cDx1aW50NjRfdCwgV2ViU29ja2V0U3RyZWFtCiAKIFdlYlNvY2tldFN0cmVhbSogV2ViU29ja2V0 U3RyZWFtOjpzdHJlYW1XaXRoSWRlbnRpZmllcih1aW50NjRfdCBpZGVudGlmaWVyKQogeworICAg IExvY2tIb2xkZXIgbG9ja2VyKGdsb2JhbFdlYlNvY2tldFN0cmVhbU1hcExvY2spOwogICAgIHJl dHVybiBnbG9iYWxXZWJTb2NrZXRTdHJlYW1NYXAoKS5nZXQoaWRlbnRpZmllcik7CiB9CiAKIHZv aWQgV2ViU29ja2V0U3RyZWFtOjpuZXR3b3JrUHJvY2Vzc0NyYXNoZWQoKQogewotICAgIGZvciAo YXV0byYgc3RyZWFtIDogZ2xvYmFsV2ViU29ja2V0U3RyZWFtTWFwKCkudmFsdWVzKCkpIHsKKyAg ICBWZWN0b3I8UmVmUHRyPFdlYlNvY2tldFN0cmVhbT4+IHNvY2tldHM7CisgICAgeworICAgICAg ICBMb2NrSG9sZGVyIGxvY2tlcihnbG9iYWxXZWJTb2NrZXRTdHJlYW1NYXBMb2NrKTsKKyAgICAg ICAgc29ja2V0cy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGdsb2JhbFdlYlNvY2tldFN0cmVhbU1h cCgpLnNpemUoKSk7CisgICAgICAgIGZvciAoYXV0byYgc3RyZWFtIDogZ2xvYmFsV2ViU29ja2V0 U3RyZWFtTWFwKCkudmFsdWVzKCkpCisgICAgICAgICAgICBzb2NrZXRzLnVuY2hlY2tlZEFwcGVu ZChzdHJlYW0pOworICAgIH0KKworICAgIGZvciAoYXV0byYgc3RyZWFtIDogc29ja2V0cykgewog ICAgICAgICBmb3IgKGF1dG8mIGNhbGxiYWNrIDogc3RyZWFtLT5tX3NlbmREYXRhQ2FsbGJhY2tz LnZhbHVlcygpKQogICAgICAgICAgICAgY2FsbGJhY2soZmFsc2UpOwogICAgICAgICBmb3IgKGF1 dG8mIGNhbGxiYWNrIDogc3RyZWFtLT5tX3NlbmRIYW5kc2hha2VDYWxsYmFja3MudmFsdWVzKCkp CiAgICAgICAgICAgICBjYWxsYmFjayhmYWxzZSwgZmFsc2UpOwogICAgICAgICBzdHJlYW0tPm1f Y2xpZW50LmRpZEZhaWxTb2NrZXRTdHJlYW0oKnN0cmVhbSwgU29ja2V0U3RyZWFtRXJyb3IoMCwg eyB9LCAiTmV0d29yayBwcm9jZXNzIGNyYXNoZWQuIikpOworICAgICAgICBzdHJlYW0gPSBudWxs cHRyOwogICAgIH0KIAorICAgIExvY2tIb2xkZXIgbG9ja2VyKGdsb2JhbFdlYlNvY2tldFN0cmVh bU1hcExvY2spOwogICAgIGdsb2JhbFdlYlNvY2tldFN0cmVhbU1hcCgpLmNsZWFyKCk7CiB9CiAK QEAgLTc2LDEyICs4OCwxNCBAQCBXZWJTb2NrZXRTdHJlYW06OldlYlNvY2tldFN0cmVhbShjb25z dCBVCiB7CiAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlTmV0d29ya1Byb2Nlc3ND b25uZWN0aW9uKCkuY29ubmVjdGlvbigpLnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9u VG9XZWJQcm9jZXNzOjpDcmVhdGVTb2NrZXRTdHJlYW0odXJsLCBzZXNzaW9uSUQsIGNhY2hlUGFy dGl0aW9uLCBpZGVudGlmaWVyKCkpLCAwKTsKIAorICAgIExvY2tIb2xkZXIgbG9ja2VyKGdsb2Jh bFdlYlNvY2tldFN0cmVhbU1hcExvY2spOwogICAgIEFTU0VSVCghZ2xvYmFsV2ViU29ja2V0U3Ry ZWFtTWFwKCkuY29udGFpbnMoaWRlbnRpZmllcigpKSk7CiAgICAgZ2xvYmFsV2ViU29ja2V0U3Ry ZWFtTWFwKCkuc2V0KGlkZW50aWZpZXIoKSwgdGhpcyk7CiB9CiAKIFdlYlNvY2tldFN0cmVhbTo6 fldlYlNvY2tldFN0cmVhbSgpCiB7CisgICAgTG9ja0hvbGRlciBsb2NrZXIoZ2xvYmFsV2ViU29j a2V0U3RyZWFtTWFwTG9jayk7CiAgICAgQVNTRVJUKGdsb2JhbFdlYlNvY2tldFN0cmVhbU1hcCgp LmNvbnRhaW5zKGlkZW50aWZpZXIoKSkpOwogICAgIGdsb2JhbFdlYlNvY2tldFN0cmVhbU1hcCgp LnJlbW92ZShpZGVudGlmaWVyKCkpOwogfQo=