201202 2019-08-27 14:10:53 -0700 Update PACCage changes for builds without Gigacage, but with signed pointers 2019-08-27 16:48:56 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff msaboff ews-watchlist keith_miller mark.lam saam tzagallo webkit-bug-importer oldest_to_newest 1565516 0 msaboff 2019-08-27 14:10:53 -0700 The PACCage changes which landed in r247101 don't properly handle the case where Giga Cage is not enabled, either at compile time or runtime, and we have data pointer signing. A little restructuring is needed to make it right. 1565517 1 msaboff 2019-08-27 14:11:23 -0700 <rdar://problem/54571261> 1565525 2 377383 msaboff 2019-08-27 14:27:06 -0700 Created attachment 377383 Patch 1565544 3 377383 saam 2019-08-27 15:06:30 -0700 Comment on attachment 377383 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=377383&action=review r=me > Source/JavaScriptCore/ChangeLog:3 > + Update PACCage changes for builds without Giga Cage, but with signed pointers "Giga Cage" => "Gigacage" > Source/JavaScriptCore/ChangeLog:8 > + Factored out the untaging of pointers and added that to both the Giga Cage enabled "Giga Cage" => "Gigacage" "untaging" -> "untagging" 1565575 4 msaboff 2019-08-27 16:47:51 -0700 (In reply to Saam Barati from comment #3) > Comment on attachment 377383 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=377383&action=review > > r=me > > > Source/JavaScriptCore/ChangeLog:3 > > + Update PACCage changes for builds without Giga Cage, but with signed pointers > > "Giga Cage" => "Gigacage" > > > Source/JavaScriptCore/ChangeLog:8 > > + Factored out the untaging of pointers and added that to both the Giga Cage enabled > > "Giga Cage" => "Gigacage" > "untaging" -> "untagging" I made these changes locally. 1565576 5 msaboff 2019-08-27 16:48:56 -0700 Committed r249184: <https://trac.webkit.org/changeset/249184> 377383 2019-08-27 14:27:06 -0700 2019-08-27 15:06:30 -0700 Patch 201202.patch text/plain 7271 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQ5MTcxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBA CisyMDE5LTA4LTI3ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIFVwZGF0ZSBQQUNDYWdlIGNoYW5nZXMgZm9yIGJ1aWxkcyB3aXRob3V0IEdpZ2EgQ2FnZSwg YnV0IHdpdGggc2lnbmVkIHBvaW50ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDEyMDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBGYWN0b3JlZCBvdXQgdGhlIHVudGFnaW5nIG9mIHBvaW50ZXJzIGFu ZCBhZGRlZCB0aGF0IHRvIGJvdGggdGhlIEdpZ2EgQ2FnZSBlbmFibGVkCisgICAgICAgIGFuZCBk aXNhYmxlZCBjb2RlIHBhdGhzLiAgRGlkIHRoaXMgZm9yIHRoZSBMTEludCBhcyB3ZWxsIGFzIHRo ZSBKSVRzLgorCisgICAgICAgICogSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvajogQWRkZWQgYXJtNjRlLnJiIHRvIG9mZmxpbmVhc20gZmlsZSBsaXN0LgorICAgICAgICAq IGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRp dmVKSVQ6OmNhZ2VUeXBlZEFycmF5U3RvcmFnZSk6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZH VG9CMy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNhZ2VkKToK KyAgICAgICAgKiBsbGludC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtOgorCiAyMDE5LTA4LTI3 ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBjb25zdHJ1Y3RGdW5j dGlvblNraXBwaW5nRXZhbEVuYWJsZWRDaGVjaygpIHNob3VsZCB1c2UgdHJ5TWFrZVN0cmluZygp IGFuZCBjaGVjayBmb3IgT09NLgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3Jp cHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJl dmlzaW9uIDI0OTE3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0zODYxLDYgKzM4NjEs NyBAQAogCQk2NUE5NDYxNDFDOEU5RjZGMDBBNzIwOUEgLyogWWFyckNhbm9uaWNhbGl6ZVVuaWNv ZGUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gWWFyckNhbm9uaWNh bGl6ZVVuaWNvZGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk2NUI4MzkyQzFC QUNBOTJBMDA0NEU4MjQgLyogQ2FjaGVkUmVjb3ZlcnkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Yy5oOyBwYXRoID0gQ2FjaGVkUmVjb3ZlcnkuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJNjVCODM5MkQxQkFDQTlEMzAwNDRFODI0IC8qIENhY2hlZFJlY292ZXJ5LmNwcCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IENhY2hlZFJlY292ZXJ5LmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNjVCODk4QUQyMzE0NkU5QjAwNDc2MzU4IC8qIGFybTY0 ZS5yYiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHRleHQuc2NyaXB0LnJ1Ynk7IHBhdGggPSBhcm02NGUucmI7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTY1QzAyRkJCMDYzNzQ2MkEwMDNFN0VFNiAvKiBQcm90 ZWN0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGlu ZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IFByb3RlY3QuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB9OwogCQk2 NUM2QkVERjIxMTI4QzNCMDA2ODQ5QzMgLyogWWFyckRpc2Fzc2VtYmxlci5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5hbWUgPSBZYXJyRGlzYXNzZW1ibGVyLmNwcDsgcGF0aCA9 IHlhcnIvWWFyckRpc2Fzc2VtYmxlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTY1QzZCRUUwMjExMjhDM0IwMDY4NDlDMyAvKiBZYXJyRGlzYXNzZW1ibGVyLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IFlhcnJEaXNhc3NlbWJsZXIuaDsgcGF0aCA9IHlhcnIv WWFyckRpc2Fzc2VtYmxlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtODY1Niw2 ICs4NjU3LDcgQEAKIAkJCWNoaWxkcmVuID0gKAogCQkJCUZFRjM0NzU1MjAzNjJCMUMwMEI3QzBF RiAvKiBhcm0ucmIgKi8sCiAJCQkJRkVGMzQ3NjIyMDM2MkIyMjAwQjdDMEVGIC8qIGFybTY0LnJi ICovLAorCQkJCTY1Qjg5OEFEMjMxNDZFOUIwMDQ3NjM1OCAvKiBhcm02NGUucmIgKi8sCiAJCQkJ RkVGMzQ3NTkyMDM2MkIxRDAwQjdDMEVGIC8qIGFzbS5yYiAqLywKIAkJCQlGRUYzNDc1ODIwMzYy QjFEMDBCN0MwRUYgLyogYXN0LnJiICovLAogCQkJCUZFRjM0NzU2MjAzNjJCMUMwMEI3QzBFRiAv KiBiYWNrZW5kcy5yYiAqLywKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3Bl Y3VsYXRpdmVKSVQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHU3BlY3VsYXRpdmVKSVQuY3BwCShyZXZpc2lvbiAyNDkxNzEpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjc4 MSwyNyArNjc4MSwzNCBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlQ29uc3RhbnRTdG9y CiAKIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNhZ2VUeXBlZEFycmF5U3RvcmFnZShHUFJSZWcgYmFz ZVJlZywgR1BSUmVnIHN0b3JhZ2VSZWcpCiB7CisgICAgYXV0byB1bnRhZ0FycmF5UHRyID0gWyZd KCkgewogI2lmIENQVShBUk02NEUpCi0gICAgbV9qaXQudW50YWdBcnJheVB0cihNYWNyb0Fzc2Vt Ymxlcjo6QWRkcmVzcyhiYXNlUmVnLCBKU0FycmF5QnVmZmVyVmlldzo6b2Zmc2V0T2ZMZW5ndGgo KSksIHN0b3JhZ2VSZWcpOworICAgICAgICBtX2ppdC51bnRhZ0FycmF5UHRyKE1hY3JvQXNzZW1i bGVyOjpBZGRyZXNzKGJhc2VSZWcsIEpTQXJyYXlCdWZmZXJWaWV3OjpvZmZzZXRPZkxlbmd0aCgp KSwgc3RvcmFnZVJlZyk7CiAjZWxzZQotICAgIFVOVVNFRF9QQVJBTShiYXNlUmVnKTsKLSAgICBV TlVTRURfUEFSQU0oc3RvcmFnZVJlZyk7CisgICAgICAgIFVOVVNFRF9QQVJBTShiYXNlUmVnKTsK KyAgICAgICAgVU5VU0VEX1BBUkFNKHN0b3JhZ2VSZWcpOwogI2VuZGlmCisgICAgfTsKIAogI2lm IEdJR0FDQUdFX0VOQUJMRUQKICAgICBVTlVTRURfUEFSQU0oYmFzZVJlZyk7Ci0gICAgaWYgKCFH aWdhY2FnZTo6c2hvdWxkQmVFbmFibGVkKCkpCisgICAgaWYgKCFHaWdhY2FnZTo6c2hvdWxkQmVF bmFibGVkKCkpIHsKKyAgICAgICAgdW50YWdBcnJheVB0cigpOwogICAgICAgICByZXR1cm47Cisg ICAgfQogICAgIAogICAgIGlmIChHaWdhY2FnZTo6Y2FuUHJpbWl0aXZlR2lnYWNhZ2VCZURpc2Fi bGVkKCkpIHsKICAgICAgICAgaWYgKG1faml0LnZtKCktPnByaW1pdGl2ZUdpZ2FjYWdlRW5hYmxl ZCgpLmlzU3RpbGxWYWxpZCgpKQogICAgICAgICAgICAgbV9qaXQuZ3JhcGgoKS53YXRjaHBvaW50 cygpLmFkZExhemlseShtX2ppdC52bSgpLT5wcmltaXRpdmVHaWdhY2FnZUVuYWJsZWQoKSk7Ci0g ICAgICAgIGVsc2UKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICB1bnRhZ0FycmF5UHRyKCk7 CiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAgICB9CiAgICAgCiAgICAgbV9qaXQu Y2FnZVdpdGhvdXRVbnRhZ2dpbmcoR2lnYWNhZ2U6OlByaW1pdGl2ZSwgc3RvcmFnZVJlZyk7CiAj ZW5kaWYKKyAgICB1bnRhZ0FycmF5UHRyKCk7CiB9CiAKIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNv bXBpbGVHZXRJbmRleGVkUHJvcGVydHlTdG9yYWdlKE5vZGUqIG5vZGUpCkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCShyZXZpc2lvbiAyNDkx NzEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE0MTkwLDE1ICsxNDE5MCwyOCBAQCBwcml2YXRlOgogCiAgICAgTFZh bHVlIGNhZ2VkKEdpZ2FjYWdlOjpLaW5kIGtpbmQsIExWYWx1ZSBwdHIsIExWYWx1ZSBiYXNlKQog ICAgIHsKKyAgICAgICAgYXV0byBkb1VudGFnQXJyYXlQdHIgPSBbJl0oTFZhbHVlIHRhZ2dlZFB0 cikgeworI2lmIENQVShBUk02NEUpCisgICAgICAgICAgICBpZiAoa2luZCA9PSBHaWdhY2FnZTo6 UHJpbWl0aXZlKSB7CisgICAgICAgICAgICAgICAgTFZhbHVlIHNpemUgPSBtX291dC5sb2FkMzIo YmFzZSwgbV9oZWFwcy5KU0FycmF5QnVmZmVyVmlld19sZW5ndGgpOworICAgICAgICAgICAgICAg IHJldHVybiB1bnRhZ0FycmF5UHRyKHRhZ2dlZFB0ciwgc2l6ZSk7CisgICAgICAgICAgICB9Cisg ICAgICAgICAgICByZXR1cm4gcHRyOworI2Vsc2UKKyAgICAgICAgICAgIFVOVVNFRF9QQVJBTSh0 YWdnZWRQdHIpOworICAgICAgICAgICAgcmV0dXJuIHB0cjsKKyNlbmRpZgorICAgICAgICB9Owor CiAjaWYgR0lHQUNBR0VfRU5BQkxFRAogICAgICAgICBpZiAoIUdpZ2FjYWdlOjppc0VuYWJsZWQo a2luZCkpCi0gICAgICAgICAgICByZXR1cm4gcHRyOworICAgICAgICAgICAgcmV0dXJuIGRvVW50 YWdBcnJheVB0cihwdHIpOwogICAgICAgICAKICAgICAgICAgaWYgKGtpbmQgPT0gR2lnYWNhZ2U6 OlByaW1pdGl2ZSAmJiBHaWdhY2FnZTo6Y2FuUHJpbWl0aXZlR2lnYWNhZ2VCZURpc2FibGVkKCkp IHsKICAgICAgICAgICAgIGlmICh2bSgpLnByaW1pdGl2ZUdpZ2FjYWdlRW5hYmxlZCgpLmlzU3Rp bGxWYWxpZCgpKQogICAgICAgICAgICAgICAgIG1fZ3JhcGgud2F0Y2hwb2ludHMoKS5hZGRMYXpp bHkodm0oKS5wcmltaXRpdmVHaWdhY2FnZUVuYWJsZWQoKSk7CiAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgcmV0dXJuIHB0cjsKKyAgICAgICAgICAgICAgICByZXR1cm4gZG9VbnRh Z0FycmF5UHRyKHB0cik7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIExWYWx1ZSBiYXNl UHRyID0gbV9vdXQuY29uc3RJbnRQdHIoR2lnYWNhZ2U6OmJhc2VQdHIoa2luZCkpOwpAQCAtMTQy MTcsOCArMTQyMzAsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIGppdC5iaXRGaWVsZElu c2VydDY0KHBhcmFtc1sxXS5ncHIoKSwgMCwgNjQgLSBNYWNyb0Fzc2VtYmxlcjo6bnVtYmVyT2ZQ QUNCaXRzLCBwYXJhbXNbMF0uZ3ByKCkpOwogICAgICAgICAgICAgfSk7CiAKLSAgICAgICAgICAg IExWYWx1ZSBzaXplID0gbV9vdXQubG9hZDMyKGJhc2UsIG1faGVhcHMuSlNBcnJheUJ1ZmZlclZp ZXdfbGVuZ3RoKTsKLSAgICAgICAgICAgIHJlc3VsdCA9IHVudGFnQXJyYXlQdHIobWVyZ2UsIHNp emUpOworICAgICAgICAgICAgcmVzdWx0ID0gZG9VbnRhZ0FycmF5UHRyKG1lcmdlKTsKICAgICAg ICAgfQogI2VuZGlmIC8vIENQVShBUk02NEUpCiAKQEAgLTE0MjM4LDcgKzE0MjUwLDcgQEAgcHJp dmF0ZToKIAogICAgICAgICBVTlVTRURfUEFSQU0oa2luZCk7CiAgICAgICAgIFVOVVNFRF9QQVJB TShiYXNlKTsKLSAgICAgICAgcmV0dXJuIHB0cjsKKyAgICAgICAgcmV0dXJuIGRvVW50YWdBcnJh eVB0cihwdHIpOwogICAgIH0KICAgICAKICAgICB2b2lkIGJ1aWxkU3dpdGNoKFN3aXRjaERhdGEq IGRhdGEsIExUeXBlIHR5cGUsIExWYWx1ZSBzd2l0Y2hWYWx1ZSkKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtCShy ZXZpc2lvbiAyNDkxNzEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJ bnRlcnByZXRlcjY0LmFzbQkod29ya2luZyBjb3B5KQpAQCAtNDQ0LDkgKzQ0NCwxMSBAQCBtYWNy byBjYWdlZFByaW1pdGl2ZShwdHIsIGxlbmd0aCwgc2NyYXRjCiAgICAgICAgIGlmIEFSTTY0RQog ICAgICAgICAgICAgY29uc3QgbnVtYmVyT2ZQQUNCaXRzID0gY29uc3RleHByIE1hY3JvQXNzZW1i bGVyOjpudW1iZXJPZlBBQ0JpdHMKICAgICAgICAgICAgIGJmaXEgc2NyYXRjaDIsIDAsIDY0IC0g bnVtYmVyT2ZQQUNCaXRzLCBwdHIKLSAgICAgICAgICAgIHVudGFnQXJyYXlQdHIgbGVuZ3RoLCBw dHIKICAgICAgICAgZW5kCiAgICAgZW5kCisgICAgaWYgQVJNNjRFCisgICAgICAgIHVudGFnQXJy YXlQdHIgbGVuZ3RoLCBwdHIKKyAgICBlbmQKIGVuZAogCiBtYWNybyBsb2FkQ2FnZWRKU1ZhbHVl KHNvdXJjZSwgZGVzdCwgc2NyYXRjaE9yTGVuZ3RoKQo=