226595 2021-06-03 13:25:00 -0700 [Hardening] Stop storing raw pointers inside WebIDBServer::m_connections 2021-06-03 16:46:36 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen kkinnunen rniwa sihui_liu webkit-bug-importer oldest_to_newest 1766495 0 cdumez 2021-06-03 13:25:00 -0700 Stop storing raw pointers inside WebIDBServer::m_connections and use a WeakHashSet instead. 1766496 1 430495 cdumez 2021-06-03 13:29:00 -0700 Created attachment 430495 Patch 1766503 2 430495 rniwa 2021-06-03 13:42:38 -0700 Comment on attachment 430495 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430495&action=review > Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.h:106 > + WeakHashSet<IPC::Connection> m_connections; // Only used on the main thread. It's unfortunate that we can't assert this. 1766505 3 cdumez 2021-06-03 13:44:34 -0700 (In reply to Ryosuke Niwa from comment #2) > Comment on attachment 430495 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=430495&action=review > > > Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.h:106 > > + WeakHashSet<IPC::Connection> m_connections; // Only used on the main thread. > > It's unfortunate that we can't assert this. Well, we do have assertions in the places where it is used. But I agree I wish there was a way to enforce that a particular data member can only be used on the main thread. I guess we could come up with a MainThreadOnly<T> type that has the assertions embedded :P 1766507 4 rniwa 2021-06-03 13:52:54 -0700 (In reply to Chris Dumez from comment #3) > (In reply to Ryosuke Niwa from comment #2) > > Comment on attachment 430495 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=430495&action=review > > > > > Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.h:106 > > > + WeakHashSet<IPC::Connection> m_connections; // Only used on the main thread. > > > > It's unfortunate that we can't assert this. > > Well, we do have assertions in the places where it is used. But I agree I > wish there was a way to enforce that a particular data member can only be > used on the main thread. I guess we could come up with a MainThreadOnly<T> > type that has the assertions embedded :P Yeah, that might make sense. 1766538 5 ews-feeder 2021-06-03 14:47:28 -0700 Committed r278422 (238446@main): <https://commits.webkit.org/238446@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430495. 1766539 6 webkit-bug-importer 2021-06-03 14:48:22 -0700 <rdar://problem/78837612> 430495 2021-06-03 13:29:00 -0700 2021-06-03 16:46:36 -0700 Patch bug-226595-20210603132859.patch text/plain 4932 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVhZTFhZWY3NzNjMDcwMzA1 M2RjMmVmZjRmMGRhOGFmZmIxYzQyZDkuLjNkOGIwYzU3OGNjZDZkZGEyNTE5NmNlMGMxYWJlNzU2 ZDZjN2RmMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDYtMDMgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbSGFyZGVuaW5nXSBTdG9wIHN0b3Jp bmcgcmF3IHBvaW50ZXJzIGluc2lkZSBXZWJJREJTZXJ2ZXI6Om1fY29ubmVjdGlvbnMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjU5NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3Agc3RvcmluZyBy YXcgcG9pbnRlcnMgaW5zaWRlIFdlYklEQlNlcnZlcjo6bV9jb25uZWN0aW9ucyBhbmQgdXNlIGEg V2Vha0hhc2hTZXQgaW5zdGVhZC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0luZGV4ZWRE Qi9XZWJJREJTZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXI6OmFkZENv bm5lY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXI6OnJlbW92ZUNvbm5lY3Rp b24pOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXI6OmNsb3NlKToKKyAgICAgICAgKFdl YktpdDo6V2ViSURCU2VydmVyOjp0cnlDbG9zZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv SW5kZXhlZERCL1dlYklEQlNlcnZlci5oOgorICAgICAgICAqIFBsYXRmb3JtL0lQQy9Db25uZWN0 aW9uLmg6CisKIDIwMjEtMDYtMDMgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5j b20+CiAKICAgICAgICAgW21hY09TXSBJbWFnZSBleHRyYWN0aW9uIHByZXZpZXcgcGFuZWwgc2hv dWxkIGF1dG9tYXRpY2FsbHkgY2xvc2Ugd2hlbiB0aGUgd2ViIHZpZXcgaXMgdW5wYXJlbnRlZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURC U2VydmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklE QlNlcnZlci5jcHAKaW5kZXggYmNlMTJhNDg2M2NlMmUyYWFiYzVjOGIxOTU3MzljOTU2Mjg3ZTRh Zi4uZTI3ZDc3ZGVkMzJjY2Y3MTJjNjFjNGI0OWM4MjQ0Y2ZkMmI5MzIxYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXIu Y3BwCkBAIC0zNjksNyArMzY5LDcgQEAgdm9pZCBXZWJJREJTZXJ2ZXI6OmFkZENvbm5lY3Rpb24o SVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBXZWJDb3JlOjpQcm9jZXNzSWQKICAgICAgICAg TG9ja2VyIGxvY2tlciB7IG1fc2VydmVyTG9jayB9OwogICAgICAgICBtX3NlcnZlci0+cmVnaXN0 ZXJDb25uZWN0aW9uKGl0ZXItPnZhbHVlLT5jb25uZWN0aW9uVG9DbGllbnQoKSk7CiAgICAgfSk7 Ci0gICAgbV9jb25uZWN0aW9ucy5hZGQoJmNvbm5lY3Rpb24pOworICAgIG1fY29ubmVjdGlvbnMu YWRkKGNvbm5lY3Rpb24pOwogICAgIGNvbm5lY3Rpb24uYWRkVGhyZWFkTWVzc2FnZVJlY2VpdmVy KE1lc3NhZ2VzOjpXZWJJREJTZXJ2ZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgdGhpcyk7CiB9 CiAKQEAgLTM3NywxMSArMzc3LDEwIEBAIHZvaWQgV2ViSURCU2VydmVyOjpyZW1vdmVDb25uZWN0 aW9uKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikKIHsKICAgICBBU1NFUlQoUnVuTG9vcDo6 aXNNYWluKCkpOwogCi0gICAgYXV0byogdGFrZW5Db25uZWN0aW9uID0gbV9jb25uZWN0aW9ucy50 YWtlKCZjb25uZWN0aW9uKTsKLSAgICBpZiAoIXRha2VuQ29ubmVjdGlvbikKKyAgICBpZiAoIW1f Y29ubmVjdGlvbnMucmVtb3ZlKGNvbm5lY3Rpb24pKQogICAgICAgICByZXR1cm47CiAKLSAgICB0 YWtlbkNvbm5lY3Rpb24tPnJlbW92ZVRocmVhZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2Vi SURCU2VydmVyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOworICAgIGNvbm5lY3Rpb24ucmVtb3Zl VGhyZWFkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJJREJTZXJ2ZXI6Om1lc3NhZ2VSZWNl aXZlck5hbWUoKSk7CiAgICAgcG9zdFRhc2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVm KCp0aGlzKSwgY29ubmVjdGlvbklEID0gY29ubmVjdGlvbi51bmlxdWVJRCgpXSB7CiAgICAgICAg IGF1dG8gY29ubmVjdGlvbiA9IG1fY29ubmVjdGlvbk1hcC50YWtlKGNvbm5lY3Rpb25JRCk7CiAK QEAgLTQxMyw4ICs0MTIsOCBAQCB2b2lkIFdlYklEQlNlcnZlcjo6Y2xvc2UoKQogICAgICAgICBy ZXR1cm47CiAKICAgICAvLyBSZW1vdmUgdGhlIHJlZmVyZW5jZXMgaGVsZCBieSBJUEM6OkNvbm5l Y3Rpb24uCi0gICAgZm9yIChhdXRvKiBjb25uZWN0aW9uIDogbV9jb25uZWN0aW9ucykKLSAgICAg ICAgY29ubmVjdGlvbi0+cmVtb3ZlVGhyZWFkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJJ REJTZXJ2ZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSk7CisgICAgZm9yIChhdXRvJiBjb25uZWN0 aW9uIDogbV9jb25uZWN0aW9ucykKKyAgICAgICAgY29ubmVjdGlvbi5yZW1vdmVUaHJlYWRNZXNz YWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYklEQlNlcnZlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgp KTsKIAogICAgIENyb3NzVGhyZWFkVGFza0hhbmRsZXI6OnNldENvbXBsZXRpb25DYWxsYmFjayhb dGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSgpIG11dGFibGUgewogICAgICAg ICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKQEAgLTQ0Niw3ICs0NDUsNyBAQCB2b2lkIFdl YklEQlNlcnZlcjo6Y2xvc2UoKQogCiB2b2lkIFdlYklEQlNlcnZlcjo6dHJ5Q2xvc2UoKQogewot ICAgIGlmICghbV9jb25uZWN0aW9ucy5pc0VtcHR5KCkgfHwgbV9kYXRhVGFza0NvdW50ZXIudmFs dWUoKSkKKyAgICBpZiAoIW1fY29ubmVjdGlvbnMuY29tcHV0ZXNFbXB0eSgpIHx8IG1fZGF0YVRh c2tDb3VudGVyLnZhbHVlKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGNsb3NlKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0luZGV4ZWREQi9XZWJJREJTZXJ2 ZXIuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZl ci5oCmluZGV4IDhiNGFkYmE1ZjdjMTgzZjlkN2RkOGJkYTg3NzEyNDRjMGRjZTZkZDAuLjJlZTQ5 ZDc3MWY0MjZhZjQxOGViNTRlNzgxMTcyYTdhM2UxMTFjYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZlci5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZlci5oCkBAIC0zMiw2 ICszMiw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9TdG9yYWdlUXVvdGFNYW5hZ2VyLmg+CiAjaW5j bHVkZSA8d3RmL0Nyb3NzVGhyZWFkVGFza0hhbmRsZXIuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291 bnRlci5oPgorI2luY2x1ZGUgPHd0Zi9XZWFrSGFzaFNldC5oPgogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiBjbGFzcyBTdG9yYWdlUXVvdGFNYW5hZ2VyOwpAQCAtMTAyLDcgKzEwMyw3IEBAIHByaXZh dGU6CiAgICAgYm9vbCBtX2lzU3VzcGVuZGVkIHsgZmFsc2UgfTsKIAogICAgIEhhc2hNYXA8SVBD OjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgc3RkOjp1bmlxdWVfcHRyPFdlYklEQkNvbm5lY3Rpb25U b0NsaWVudD4+IG1fY29ubmVjdGlvbk1hcDsKLSAgICBIYXNoU2V0PElQQzo6Q29ubmVjdGlvbio+ IG1fY29ubmVjdGlvbnM7CisgICAgV2Vha0hhc2hTZXQ8SVBDOjpDb25uZWN0aW9uPiBtX2Nvbm5l Y3Rpb25zOyAvLyBPbmx5IHVzZWQgb24gdGhlIG1haW4gdGhyZWFkLgogCiAgICAgZW51bSBEYXRh VGFza0NvdW50ZXJUeXBlIHsgfTsKICAgICB1c2luZyBEYXRhVGFza0NvdW50ZXIgPSBSZWZDb3Vu dGVyPERhdGFUYXNrQ291bnRlclR5cGU+OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0 Zm9ybS9JUEMvQ29ubmVjdGlvbi5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvQ29ubmVj dGlvbi5oCmluZGV4IGJmZTUzNGFiNWU1MWYzM2IzMTNjNzBhZjBiMTc4MmVmOTY1MmIyYTkuLmZk NzIxZjM2NTBhYmY5MmZjOTM2ZWE0YWIyYmZkNjg4ZTdlYTE1N2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1Bs YXRmb3JtL0lQQy9Db25uZWN0aW9uLmgKQEAgLTEwNCw3ICsxMDQsNyBAQCB0ZW1wbGF0ZTx0eXBl bmFtZSBBc3luY1JlcGx5UmVzdWx0PiBzdHJ1Y3QgQXN5bmNSZXBseUVycm9yIHsKIGNsYXNzIE1h Y2hNZXNzYWdlOwogY2xhc3MgVW5peE1lc3NhZ2U7CiAKLWNsYXNzIENvbm5lY3Rpb24gOiBwdWJs aWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8Q29ubmVjdGlvbiwgV1RGOjpEZXN0cnVjdGlvblRocmVh ZDo6TWFpblJ1bkxvb3A+IHsKK2NsYXNzIENvbm5lY3Rpb24gOiBwdWJsaWMgVGhyZWFkU2FmZVJl ZkNvdW50ZWQ8Q29ubmVjdGlvbiwgV1RGOjpEZXN0cnVjdGlvblRocmVhZDo6TWFpblJ1bkxvb3A+ LCBwdWJsaWMgQ2FuTWFrZVdlYWtQdHI8Q29ubmVjdGlvbj4gewogcHVibGljOgogICAgIGVudW0g U3luY1JlcXVlc3RJRFR5cGUgeyB9OwogICAgIHVzaW5nIFN5bmNSZXF1ZXN0SUQgPSBPYmplY3RJ ZGVudGlmaWVyPFN5bmNSZXF1ZXN0SURUeXBlPjsK