121307 2013-09-13 10:32:29 -0700 [Windows] Activate FastMalloc hardening on Windows 2013-09-13 12:40:16 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC All RESOLVED FIXED InRadar P2 Enhancement --- 109334 1 bfulgham bfulgham benjamin bfulgham cmarcelo commit-queue oliver webkit-bug-importer oldest_to_newest 928900 0 bfulgham 2013-09-13 10:32:29 -0700 The hardening logic in the FastMalloc implementation works fine on Windows (with a couple of small changes to work around some Visual Studio compiler bugs). Let's turn it on so that we can have comparable safety to our other ports! 928901 1 webkit-bug-importer 2013-09-13 10:34:42 -0700 <rdar://problem/14986554> 928909 2 211563 bfulgham 2013-09-13 10:45:50 -0700 Created attachment 211563 Patch 928914 3 211563 oliver 2013-09-13 10:52:41 -0700 Comment on attachment 211563 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211563&action=review r=me with comments > Source/WTF/wtf/FastMalloc.cpp:110 > +#if (COMPILER(GCC) || COMPILER(MSVC)) && !PLATFORM(QT) maybe we can just try !PLATFORM(QT) and see what happens? > Source/WTF/wtf/FastMalloc.cpp:840 > +#if COMPILER(MSVC) > + void* tValNext = *(reinterpret_cast<void**>(t.value())); // FIXME: This exists to work around a MSVC bug > + return HardenedSLL::create(XOR_MASK_PTR_WITH_KEY(tValNext, t.value(), entropy)); > +#else > return HardenedSLL::create(XOR_MASK_PTR_WITH_KEY(*(reinterpret_cast<void**>(t.value())), t.value(), entropy)); > +#endif Remove the #if MSVC and just always use that path. It's conceivable that it's a "legitimate" piece of behaviour and it really shouldn't hurt. 928954 4 bfulgham 2013-09-13 12:40:16 -0700 Committed r155717: <http://trac.webkit.org/changeset/155717> 211563 2013-09-13 10:45:50 -0700 2013-09-13 10:52:41 -0700 Patch bug-121307-20130913104530.patch text/plain 2398 bfulgham SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNTU3MDgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA5LTEzICBCcmVudCBGdWxnaGFtICA8YmZ1 bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5kb3dzXSBBY3RpdmF0ZSBGYXN0TWFsbG9j IGhhcmRlbmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIxMzA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiB3dGYvRmFzdE1hbGxvYy5jcHA6IAorICAgICAgICAoV1RGOjpTTExfTmV4dCk6IEFkZCB3 b3JrYXJvdW5kIGZvciBNU1ZDIGNvbXBpbGVyIGJ1Zy4KKwogMjAxMy0wOS0xMyAgTWlraGFpbCBQ b3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4KIAogICAgICAgICBPd25B cnJheVB0cjogTmV2ZXIgYWxsb3cgaW1wbGljaXQgcG9pbnRlciBjb252ZXJzaW9uCkluZGV4OiBT b3VyY2UvV1RGL3d0Zi9GYXN0TWFsbG9jLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0 Zi9GYXN0TWFsbG9jLmNwcAkocmV2aXNpb24gMTU1NzA3KQorKysgU291cmNlL1dURi93dGYvRmFz dE1hbGxvYy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNyw3ICsxMDcsNyBAQAogI2VuZGlmCiAK IC8vIEhhcmRlbiB0aGUgcG9pbnRlcnMgc3RvcmVkIGluIHRoZSBUQ01hbGxvYyBsaW5rZWQgbGlz dHMKLSNpZiBDT01QSUxFUihHQ0MpICYmICFQTEFURk9STShRVCkKKyNpZiAoQ09NUElMRVIoR0ND KSB8fCBDT01QSUxFUihNU1ZDKSkgJiYgIVBMQVRGT1JNKFFUKQogI2RlZmluZSBFTkFCTEVfVENN QUxMT0NfSEFSREVOSU5HIDEKICNlbmRpZgogCkBAIC01NTYsOCArNTU2LDExIEBAIHN0YXRpYyBB TFdBWVNfSU5MSU5FIHVpbnRwdHJfdCBpbnRlcm5hbEUKIAogI2RlZmluZSBIQVJERU5JTkdfRU5U Uk9QWSBpbnRlcm5hbEVudHJvcHlWYWx1ZSgpCiAjZGVmaW5lIFJPVEFURV9WQUxVRSh2YWx1ZSwg YW1vdW50KSAoKCh2YWx1ZSkgPj4gKGFtb3VudCkpIHwgKCh2YWx1ZSkgPDwgKHNpemVvZih2YWx1 ZSkgKiA4IC0gKGFtb3VudCkpKSkKKyNpZiBDT01QSUxFUihNU1ZDKQorI2RlZmluZSBYT1JfTUFT S19QVFJfV0lUSF9LRVkocHRyLCBrZXksIGVudHJvcHkpIChyZWludGVycHJldF9jYXN0PGRlY2x0 eXBlKHB0cik+KHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihwdHIpXihST1RBVEVfVkFMVUUo cmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGtleSksIE1hc2tLZXlTaGlmdCleZW50cm9weSkp KQorI2Vsc2UKICNkZWZpbmUgWE9SX01BU0tfUFRSX1dJVEhfS0VZKHB0ciwga2V5LCBlbnRyb3B5 KSAocmVpbnRlcnByZXRfY2FzdDxfX3R5cGVvZl9fKHB0cik+KHJlaW50ZXJwcmV0X2Nhc3Q8dWlu dHB0cl90PihwdHIpXihST1RBVEVfVkFMVUUocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGtl eSksIE1hc2tLZXlTaGlmdCleZW50cm9weSkpKQotCisjZW5kaWYKIAogc3RhdGljIEFMV0FZU19J TkxJTkUgdWludDMyX3QgZnJlZWRPYmplY3RTdGFydFBvaXNvbigpCiB7CkBAIC04MjksNyArODMy LDEyIEBAIHN0YXRpYyBpbmxpbmUgaW50IExnRmxvb3Ioc2l6ZV90IG4pIHsKIAogLy8gRnVuY3Rp b25zIGZvciB1c2luZyBvdXIgc2ltcGxlIGhhcmRlbmVkIHNpbmdseSBsaW5rZWQgbGlzdAogc3Rh dGljIEFMV0FZU19JTkxJTkUgSGFyZGVuZWRTTEwgU0xMX05leHQoSGFyZGVuZWRTTEwgdCwgdWlu dHB0cl90IGVudHJvcHkpIHsKKyNpZiBDT01QSUxFUihNU1ZDKQorICAgIHZvaWQqIHRWYWxOZXh0 ID0gKihyZWludGVycHJldF9jYXN0PHZvaWQqKj4odC52YWx1ZSgpKSk7IC8vIEZJWE1FOiBUaGlz IGV4aXN0cyB0byB3b3JrIGFyb3VuZCBhIE1TVkMgYnVnCisgICAgcmV0dXJuIEhhcmRlbmVkU0xM OjpjcmVhdGUoWE9SX01BU0tfUFRSX1dJVEhfS0VZKHRWYWxOZXh0LCB0LnZhbHVlKCksIGVudHJv cHkpKTsKKyNlbHNlCiAgICAgcmV0dXJuIEhhcmRlbmVkU0xMOjpjcmVhdGUoWE9SX01BU0tfUFRS X1dJVEhfS0VZKCoocmVpbnRlcnByZXRfY2FzdDx2b2lkKio+KHQudmFsdWUoKSkpLCB0LnZhbHVl KCksIGVudHJvcHkpKTsKKyNlbmRpZgogfQogCiBzdGF0aWMgQUxXQVlTX0lOTElORSB2b2lkIFNM TF9TZXROZXh0KEhhcmRlbmVkU0xMIHQsIEhhcmRlbmVkU0xMIG4sIHVpbnRwdHJfdCBlbnRyb3B5 KSB7Cg==