211799 2020-05-12 13:07:42 -0700 catch_mach_exception_raise_state() should fail early if the faulting address is not of interest. 2020-05-12 21:36:02 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam benjamin cdumez cmarcelo ews-watchlist msaboff saam webkit-bug-importer oldest_to_newest 1651881 0 mark.lam 2020-05-12 13:07:42 -0700 <rdar://problem/62939204> 1651895 1 399166 mark.lam 2020-05-12 13:28:08 -0700 Created attachment 399166 proposed patch. Let's try this on the EWS. 1651948 2 399166 msaboff 2020-05-12 14:23:46 -0700 Comment on attachment 399166 proposed patch. r=me 1651957 3 399166 saam 2020-05-12 14:43:49 -0700 Comment on attachment 399166 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=399166&action=review > Source/WTF/wtf/threads/Signals.cpp:178 > +#if CPU(ADDRESS64) && (CPU(ARM64) || CPU(X86_64)) We already specify valid pointer width in some WTF header. You should use that 1651959 4 saam 2020-05-12 14:49:47 -0700 (In reply to Saam Barati from comment #3) > Comment on attachment 399166 [details] > proposed patch. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=399166&action=review > > > Source/WTF/wtf/threads/Signals.cpp:178 > > +#if CPU(ADDRESS64) && (CPU(ARM64) || CPU(X86_64)) > > We already specify valid pointer width in some WTF header. You should use > that WTF_OS_CONSTANT_EFFECTIVE_ADDRESS_WIDTH 1651964 5 399182 mark.lam 2020-05-12 14:56:40 -0700 Created attachment 399182 proposed patch. 1651967 6 399182 saam 2020-05-12 15:01:55 -0700 Comment on attachment 399182 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=399182&action=review r=me > Source/WTF/wtf/threads/Signals.cpp:181 > + if ((exceptionType == EXC_BAD_ACCESS) && (exceptionData[1] & invalidAddressMask)) can this code be moved below so we can use "faultingAddress" below? > Source/WTF/wtf/threads/Signals.cpp:183 > + compilerFence(); this doesn't seem necessary 1651982 7 399189 mark.lam 2020-05-12 15:36:23 -0700 Created attachment 399189 proposed patch. 1652057 8 399189 mark.lam 2020-05-12 17:49:13 -0700 Comment on attachment 399189 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=399189&action=review > Source/WTF/wtf/threads/Signals.cpp:201 > memcpy(outState, inState, inStateCount * sizeof(inState[0])); > *outStateCount = inStateCount; Talked with Saam offline: we can't find any documentation on whether this memcpy is required even if we return KERN_FAILURE. So, I'll move the above if statement back to its original position after the memcpy to be conservative. 1652117 9 mark.lam 2020-05-12 21:36:02 -0700 Thanks for the reviews. Landed in r261598: <http://trac.webkit.org/r261598>. 399166 2020-05-12 13:28:08 -0700 2020-05-12 14:56:40 -0700 proposed patch. bug-211799.patch text/plain 1817 mark.lam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNjE1NzEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA1LTEyICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KKworICAgICAgICBjYXRjaF9tYWNoX2V4Y2VwdGlvbl9yYWlzZV9zdGF0ZSgp IHNob3VsZCBmYWlsIGVhcmx5IGlmIHRoZSBmYXVsdGluZyBhZGRyZXNzIGlzIG5vdCBvZiBpbnRl cmVzdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MTc5OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjI5MzkyMDQ+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvdGhyZWFkcy9TaWduYWxzLmNw cDoKKwogMjAyMC0wNS0xMiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+ CiAKICAgICAgICAgRml4IGV4aXN0aW5nIHVzYWdlIG9mIGZpbmFsL292ZXJyaWRlL3ZpcnR1YWwg aW4gSlNDIGFuZCBXVEYKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvdGhyZWFkcy9TaWduYWxzLmNwcAkocmV2aXNp b24gMjYxNTY3KQorKysgU291cmNlL1dURi93dGYvdGhyZWFkcy9TaWduYWxzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTczLDYgKzE3MywyMCBAQCBrZXJuX3JldHVybl90IGNhdGNoX21hY2hfZXhj ZXB0aW9uX3JhaXNlCiAgICAgdGhyZWFkX3N0YXRlX3Qgb3V0U3RhdGUsCiAgICAgbWFjaF9tc2df dHlwZV9udW1iZXJfdCogb3V0U3RhdGVDb3VudCkKIHsKKyAgICAvLyBJZiB0aGUgZmF1bHRpbmcg YWRkcmVzcyBpcyBvdXQgb2YgdGhlIHJhbmdlIG9mIGFueSB2YWxpZCBtZW1vcnksIHdlIHdvdWxk CisgICAgLy8gbm90IGhhdmUgYW55IHJlYXNvbiB0byBoYW5kbGUgaXQuIEp1c3QgbGV0IHRoZSBk ZWZhdWx0IGhhbmRsZXIgdGFrZSBjYXJlIG9mIGl0LgorI2lmIENQVShBRERSRVNTNjQpICYmIChD UFUoQVJNNjQpIHx8IENQVShYODZfNjQpKQorI2lmIENQVShBUk02NCkKKyAgICBzdGF0aWMgY29u c3RleHByIHVuc2lnbmVkIHZhbGlkQWRkcmVzc0JpdHMgPSAzOTsKKyNlbHNlCisgICAgc3RhdGlj IGNvbnN0ZXhwciB1bnNpZ25lZCB2YWxpZEFkZHJlc3NCaXRzID0gNDg7CisjZW5kaWYKKyAgICBz dGF0aWMgY29uc3RleHByIHVpbnRwdHJfdCBpbnZhbGlkQWRkcmVzc01hc2sgPSB+KCgxdWxsIDw8 IHZhbGlkQWRkcmVzc0JpdHMpIC0gMSk7CisgICAgaWYgKChleGNlcHRpb25UeXBlID09IEVYQ19C QURfQUNDRVNTKSAmJiAoZXhjZXB0aW9uRGF0YVsxXSAmIGludmFsaWRBZGRyZXNzTWFzaykpCisg ICAgICAgIHJldHVybiBLRVJOX0ZBSUxVUkU7CisgICAgY29tcGlsZXJGZW5jZSgpOworI2VuZGlm CisKICAgICBTaWduYWxIYW5kbGVycyYgaGFuZGxlcnMgPSBnX3d0ZkNvbmZpZy5zaWduYWxIYW5k bGVyczsKICAgICBSRUxFQVNFX0FTU0VSVChwb3J0ID09IGhhbmRsZXJzLmV4Y2VwdGlvblBvcnQp OwogICAgIC8vIElmIHdlIHdhbnRlZCB0byBkaXN0aW5ndWlzaCBiZXR3ZWVuIFNJR0JVUyBhbmQg U0lHU0VHViBmb3IgRVhDX0JBRF9BQ0NFU1Mgb24gRGFyd2luIHdlIGNvdWxkIGRvOgo= 399182 2020-05-12 14:56:40 -0700 2020-05-12 15:36:23 -0700 proposed patch. bug-211799.patch text/plain 1735 mark.lam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNjE1NzEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA1LTEyICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KKworICAgICAgICBjYXRjaF9tYWNoX2V4Y2VwdGlvbl9yYWlzZV9zdGF0ZSgp IHNob3VsZCBmYWlsIGVhcmx5IGlmIHRoZSBmYXVsdGluZyBhZGRyZXNzIGlzIG5vdCBvZiBpbnRl cmVzdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MTc5OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjI5MzkyMDQ+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvdGhyZWFkcy9TaWduYWxzLmNw cDoKKwogMjAyMC0wNS0xMiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+ CiAKICAgICAgICAgRml4IGV4aXN0aW5nIHVzYWdlIG9mIGZpbmFsL292ZXJyaWRlL3ZpcnR1YWwg aW4gSlNDIGFuZCBXVEYKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvdGhyZWFkcy9TaWduYWxzLmNwcAkocmV2aXNp b24gMjYxNTY3KQorKysgU291cmNlL1dURi93dGYvdGhyZWFkcy9TaWduYWxzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTczLDYgKzE3MywxNiBAQCBrZXJuX3JldHVybl90IGNhdGNoX21hY2hfZXhj ZXB0aW9uX3JhaXNlCiAgICAgdGhyZWFkX3N0YXRlX3Qgb3V0U3RhdGUsCiAgICAgbWFjaF9tc2df dHlwZV9udW1iZXJfdCogb3V0U3RhdGVDb3VudCkKIHsKKyAgICAvLyBJZiB0aGUgZmF1bHRpbmcg YWRkcmVzcyBpcyBvdXQgb2YgdGhlIHJhbmdlIG9mIGFueSB2YWxpZCBtZW1vcnksIHdlIHdvdWxk CisgICAgLy8gbm90IGhhdmUgYW55IHJlYXNvbiB0byBoYW5kbGUgaXQuIEp1c3QgbGV0IHRoZSBk ZWZhdWx0IGhhbmRsZXIgdGFrZSBjYXJlIG9mIGl0LgorI2lmIENQVShBRERSRVNTNjQpCisgICAg c3RhdGljIGNvbnN0ZXhwciB1bnNpZ25lZCB2YWxpZEFkZHJlc3NCaXRzID0gT1NfQ09OU1RBTlQo RUZGRUNUSVZFX0FERFJFU1NfV0lEVEgpOworICAgIHN0YXRpYyBjb25zdGV4cHIgdWludHB0cl90 IGludmFsaWRBZGRyZXNzTWFzayA9IH4oKDF1bGwgPDwgdmFsaWRBZGRyZXNzQml0cykgLSAxKTsK KyAgICBpZiAoKGV4Y2VwdGlvblR5cGUgPT0gRVhDX0JBRF9BQ0NFU1MpICYmIChleGNlcHRpb25E YXRhWzFdICYgaW52YWxpZEFkZHJlc3NNYXNrKSkKKyAgICAgICAgcmV0dXJuIEtFUk5fRkFJTFVS RTsKKyAgICBjb21waWxlckZlbmNlKCk7CisjZW5kaWYKKwogICAgIFNpZ25hbEhhbmRsZXJzJiBo YW5kbGVycyA9IGdfd3RmQ29uZmlnLnNpZ25hbEhhbmRsZXJzOwogICAgIFJFTEVBU0VfQVNTRVJU KHBvcnQgPT0gaGFuZGxlcnMuZXhjZXB0aW9uUG9ydCk7CiAgICAgLy8gSWYgd2Ugd2FudGVkIHRv IGRpc3Rpbmd1aXNoIGJldHdlZW4gU0lHQlVTIGFuZCBTSUdTRUdWIGZvciBFWENfQkFEX0FDQ0VT UyBvbiBEYXJ3aW4gd2UgY291bGQgZG86Cg== 399189 2020-05-12 15:36:23 -0700 2020-05-12 15:46:15 -0700 proposed patch. bug-211799.patch text/plain 2373 mark.lam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNjE1NzEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA1LTEyICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KKworICAgICAgICBjYXRjaF9tYWNoX2V4Y2VwdGlvbl9yYWlzZV9zdGF0ZSgp IHNob3VsZCBmYWlsIGVhcmx5IGlmIHRoZSBmYXVsdGluZyBhZGRyZXNzIGlzIG5vdCBvZiBpbnRl cmVzdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MTc5OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjI5MzkyMDQ+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvdGhyZWFkcy9TaWduYWxzLmNw cDoKKwogMjAyMC0wNS0xMiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+ CiAKICAgICAgICAgRml4IGV4aXN0aW5nIHVzYWdlIG9mIGZpbmFsL292ZXJyaWRlL3ZpcnR1YWwg aW4gSlNDIGFuZCBXVEYKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvdGhyZWFkcy9TaWduYWxzLmNwcAkocmV2aXNp b24gMjYxNTY3KQorKysgU291cmNlL1dURi93dGYvdGhyZWFkcy9TaWduYWxzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTgzLDYgKzE4MywyMCBAQCBrZXJuX3JldHVybl90IGNhdGNoX21hY2hfZXhj ZXB0aW9uX3JhaXNlCiAgICAgU2lnbmFsIHNpZ25hbCA9IGZyb21NYWNoRXhjZXB0aW9uKGV4Y2Vw dGlvblR5cGUpOwogICAgIFJFTEVBU0VfQVNTRVJUKHNpZ25hbCAhPSBTaWduYWw6OlVua25vd24p OwogCisgICAgU2lnSW5mbyBpbmZvOworICAgIGlmIChzaWduYWwgPT0gU2lnbmFsOjpCYWRBY2Nl c3MpIHsKKyAgICAgICAgQVNTRVJUX1VOVVNFRChkYXRhQ291bnQsIGRhdGFDb3VudCA9PSAyKTsK KyAgICAgICAgaW5mby5mYXVsdGluZ0FkZHJlc3MgPSByZWludGVycHJldF9jYXN0PHZvaWQqPihl eGNlcHRpb25EYXRhWzFdKTsKKyNpZiBDUFUoQUREUkVTUzY0KQorICAgICAgICAvLyBJZiB0aGUg ZmF1bHRpbmcgYWRkcmVzcyBpcyBvdXQgb2YgdGhlIHJhbmdlIG9mIGFueSB2YWxpZCBtZW1vcnks IHdlIHdvdWxkCisgICAgICAgIC8vIG5vdCBoYXZlIGFueSByZWFzb24gdG8gaGFuZGxlIGl0LiBK dXN0IGxldCB0aGUgZGVmYXVsdCBoYW5kbGVyIHRha2UgY2FyZSBvZiBpdC4KKyAgICAgICAgc3Rh dGljIGNvbnN0ZXhwciB1bnNpZ25lZCB2YWxpZEFkZHJlc3NCaXRzID0gT1NfQ09OU1RBTlQoRUZG RUNUSVZFX0FERFJFU1NfV0lEVEgpOworICAgICAgICBzdGF0aWMgY29uc3RleHByIHVpbnRwdHJf dCBpbnZhbGlkQWRkcmVzc01hc2sgPSB+KCgxdWxsIDw8IHZhbGlkQWRkcmVzc0JpdHMpIC0gMSk7 CisgICAgICAgIGlmIChiaXR3aXNlX2Nhc3Q8dWludHB0cl90PihpbmZvLmZhdWx0aW5nQWRkcmVz cykgJiBpbnZhbGlkQWRkcmVzc01hc2spCisgICAgICAgICAgICByZXR1cm4gS0VSTl9GQUlMVVJF OworI2VuZGlmCisgICAgfQorCiAgICAgbWVtY3B5KG91dFN0YXRlLCBpblN0YXRlLCBpblN0YXRl Q291bnQgKiBzaXplb2YoaW5TdGF0ZVswXSkpOwogICAgICpvdXRTdGF0ZUNvdW50ID0gaW5TdGF0 ZUNvdW50OwogCkBAIC0yMDAsMTIgKzIxNCw2IEBAIGtlcm5fcmV0dXJuX3QgY2F0Y2hfbWFjaF9l eGNlcHRpb25fcmFpc2UKICAgICBQbGF0Zm9ybVJlZ2lzdGVycyYgcmVnaXN0ZXJzID0gcmVpbnRl cnByZXRfY2FzdDxhcm1fdW5pZmllZF90aHJlYWRfc3RhdGUqPihvdXRTdGF0ZSktPnRzXzMyOwog I2VuZGlmCiAKLSAgICBTaWdJbmZvIGluZm87Ci0gICAgaWYgKHNpZ25hbCA9PSBTaWduYWw6OkJh ZEFjY2VzcykgewotICAgICAgICBBU1NFUlRfVU5VU0VEKGRhdGFDb3VudCwgZGF0YUNvdW50ID09 IDIpOwotICAgICAgICBpbmZvLmZhdWx0aW5nQWRkcmVzcyA9IHJlaW50ZXJwcmV0X2Nhc3Q8dm9p ZCo+KGV4Y2VwdGlvbkRhdGFbMV0pOwotICAgIH0KLQogICAgIGJvb2wgZGlkSGFuZGxlID0gZmFs c2U7CiAgICAgaGFuZGxlcnMuZm9yRWFjaEhhbmRsZXIoc2lnbmFsLCBbJl0gKGNvbnN0IFNpZ25h bEhhbmRsZXImIGhhbmRsZXIpIHsKICAgICAgICAgU2lnbmFsQWN0aW9uIGhhbmRsZXJSZXN1bHQg PSBoYW5kbGVyKHNpZ25hbCwgaW5mbywgcmVnaXN0ZXJzKTsK