218269 2020-10-27 18:23:23 -0700 Use _CFURLConnectionSetFrameworkStubs for SecItemShim instead of DYLD_INTERPOSE on Apple Silicon Macs 2020-10-28 21:53:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen darin mitz sam webkit-bug-importer oldest_to_newest 1702183 0 achristensen 2020-10-27 18:23:23 -0700 Use _CFURLConnectionSetFrameworkStubs instead of DYLD_INTERPOSE on Apple Silicon Macs 1702188 1 412493 achristensen 2020-10-27 18:32:56 -0700 Created attachment 412493 Patch 1702195 2 412493 darin 2020-10-27 18:44:02 -0700 Comment on attachment 412493 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412493&action=review > Source/WebKit/Shared/mac/SecItemShim.cpp:146 > -#if PLATFORM(IOS_FAMILY) > +#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && !CPU(X86_64)) How about this instead: #if !CPU(X86_64) It doesn’t seem like we need IOS_FAMILY vs. MAC here. > Source/WebKit/Shared/mac/SecItemShim.cpp:158 > -#if PLATFORM(MAC) > +#if PLATFORM(MAC) && CPU(X86_64) How about this instead: #if CPU(X86_64) Or: #else It doesn’t seem like we need IOS_FAMILY vs. MAC here. 1702196 3 412493 mitz 2020-10-27 18:49:23 -0700 Comment on attachment 412493 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412493&action=review >> Source/WebKit/Shared/mac/SecItemShim.cpp:146 >> +#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && !CPU(X86_64)) > > How about this instead: > > #if !CPU(X86_64) > > It doesn’t seem like we need IOS_FAMILY vs. MAC here. I believe the iOS Simulator is x86_64 but doesn’t have the interposing shim. 1702216 4 achristensen 2020-10-27 20:04:06 -0700 http://trac.webkit.org/r269094 1702217 5 webkit-bug-importer 2020-10-27 20:05:18 -0700 <rdar://problem/70749479> 1702368 6 sam 2020-10-28 10:39:17 -0700 I would propose we use a more clear USE(DYLD_INTERPOSE_FOR_SEC_ITEM_SHIM) or something like that. 1702626 7 achristensen 2020-10-28 21:53:16 -0700 I would propose we stop using DYLD_INTERPOSE entirely and replace it with _CFURLConnectionSetFrameworkStubs in the short term and a per-NSURLSession solution I have yet to write in the long term. Given the nature of this radar, though, I wanted the absolute minimum risk and the easiest cherry picking to the branch. 412493 2020-10-27 18:32:56 -0700 2020-10-27 19:59:06 -0700 Patch bug-218269-20201027193255.patch text/plain 5463 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4OTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDExY2QzMGQ5NTBjNWUwOThl M2RiYzk3MzhiMGUzY2Y2YzQxZTA1MGMuLmNmZjU4ZDdmNmRmMWFmOGJjYzVlMzhhOTZhMmE2MGMw MzIxODk4MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjAtMTAtMjcgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVc2UgX0NGVVJM Q29ubmVjdGlvblNldEZyYW1ld29ya1N0dWJzIGZvciBTZWNJdGVtU2hpbSBpbnN0ZWFkIG9mIERZ TERfSU5URVJQT1NFIG9uIEFwcGxlIFNpbGljb24gTWFjcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4MjY5CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS83MDQ5MTUzMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICByMTcxMDY2IGludHJvZHVjZWQgdGhlIHVzZSBvZiBfQ0ZVUkxDb25uZWN0aW9uU2V0RnJh bWV3b3JrU3R1YnMgb24gaU9TIGZvciBDRk5ldHdvcmsgdG8gYmUgYWJsZQorICAgICAgICB0byBn ZXQgYW5kIHNldCBjcmVkZW50aWFscyBhcyB0aGUgVUkgcHJvY2Vzcy4gIFRoaXMgaXMgYWxzbyBu ZWVkZWQgb24gQXBwbGUgU2lsaWNvbiBNYWNzLgorICAgICAgICBXZSBzaG91bGQgZXZlbnR1YWxs eSByZXBsYWNlIGl0IHdpdGggYW4gZXZlbiBjbGVhbmVyIHBlci1OU1VSTFNlc3Npb24gc29sdXRp b24sIGJ1dCB0aGlzIGlzIGEgc3RlcAorICAgICAgICBpbiB0aGUgcmlnaHQgZGlyZWN0aW9uLCBh bmQgSSB2ZXJpZmllZCBtYW51YWxseSB0aGF0IGl0IGZpeGVzIHRoZSByYWRhci4KKworICAgICAg ICBDb3ZlcmVkIGJ5IGFuIEFQSSB0ZXN0IHRoYXQgdXNlZCB0byBmYWlsIG9uIEFwcGxlIFNpbGlj b24gTWFjcy4KKworICAgICAgICAqIFNoYXJlZC9tYWMvU2VjSXRlbVNoaW0uY3BwOgorICAgICAg ICAoV2ViS2l0Ojppbml0aWFsaXplU2VjSXRlbVNoaW0pOgorCiAyMDIwLTEwLTI2ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIG51bGwg Y2hlY2tzIGFuZCBzbWFydCBwb2ludGVycyBpbiBQREYgYW5kIFBsdWdpbiBjb2RlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvU2VjSXRlbVNoaW0uY3BwIGIvU291cmNlL1dl YktpdC9TaGFyZWQvbWFjL1NlY0l0ZW1TaGltLmNwcAppbmRleCAzODU5NjRmOWE0Yzc2ODkyYzQ2 YTVkZmJkMzgwOGEzMTE3NmEzOGYxLi4xMzRmYWRmMmVhMmRiYmMyMDkzYTZmMDI1OTNjZTdlNDNi MTQ3OGRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvU2VjSXRlbVNoaW0u Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9TZWNJdGVtU2hpbS5jcHAKQEAgLTE0 Myw3ICsxNDMsNyBAQCB2b2lkIGluaXRpYWxpemVTZWNJdGVtU2hpbShOZXR3b3JrUHJvY2VzcyYg cHJvY2VzcykKIHsKICAgICBnbG9iYWxOZXR3b3JrUHJvY2VzcygpID0gbWFrZVdlYWtQdHIocHJv Y2Vzcyk7CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorI2lmIFBMQVRGT1JNKElPU19GQU1J TFkpIHx8IChQTEFURk9STShNQUMpICYmICFDUFUoWDg2XzY0KSkKICAgICBzdHJ1Y3QgX0NGTkZy YW1ld29ya3NTdHVicyBzdHVicyA9IHsKICAgICAgICAgLnZlcnNpb24gPSAwLAogICAgICAgICAu U2VjSXRlbV9zdHViX0NvcHlNYXRjaGluZyA9IHdlYlNlY0l0ZW1Db3B5TWF0Y2hpbmcsCkBAIC0x NTUsNyArMTU1LDcgQEAgdm9pZCBpbml0aWFsaXplU2VjSXRlbVNoaW0oTmV0d29ya1Byb2Nlc3Mm IHByb2Nlc3MpCiAgICAgX0NGVVJMQ29ubmVjdGlvblNldEZyYW1ld29ya1N0dWJzKCZzdHVicyk7 CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKE1BQykKKyNpZiBQTEFURk9STShNQUMpICYmIENQVShY ODZfNjQpCiAgICAgY29uc3QgU2VjSXRlbVNoaW1DYWxsYmFja3MgY2FsbGJhY2tzID0gewogICAg ICAgICB3ZWJTZWNJdGVtQ29weU1hdGNoaW5nLAogICAgICAgICB3ZWJTZWNJdGVtQWRkLApkaWZm IC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDFkODFlNmQ2 OTgwZGZiYzAxOWE1NTEzMzYyYjg3YjYyYWNiNDNiYWEuLjFmMjgzNjM4Yzk5MGFkMTcyZDQwMDRk MGU5YjFmNDUwNTk0YTE0M2IgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMC0xMC0yNyAgQWxleCBDaHJpc3RlbnNl biAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIFVzZSBfQ0ZVUkxDb25uZWN0 aW9uU2V0RnJhbWV3b3JrU3R1YnMgZm9yIFNlY0l0ZW1TaGltIGluc3RlYWQgb2YgRFlMRF9JTlRF UlBPU0Ugb24gQXBwbGUgU2lsaWNvbiBNYWNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgyNjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwNDkx NTMzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9DaGFsbGVuZ2UubW06CisgICAgICAgIChU RVNUKToKKwogMjAyMC0xMC0yNiAgTWF0dCBMZXdpcyAgPGpsZXdpczNAYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYmtpdHNjbXB5IGhhcyBtaXNzaW5nIC8gaW4gc2NtIGV4ZWN1dGFibGUgY2FuZGlk YXRlIGxpc3QuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL0NoYWxsZW5nZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev Q2hhbGxlbmdlLm1tCmluZGV4IDBjOWNkNTM0Nzg5NGQyMzJjYTZjODIwZmE5MGVkMzI1ZjFmMTU0 NWUuLmMyZjMxYmZlZDg3ZWMwOGQxYzNjNmQ2ZTUyODVmMjA1OGVjNmYxZjkgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvQ2hhbGxlbmdlLm1tCisrKyBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvQ2hhbGxlbmdlLm1tCkBAIC0z NjYsNiArMzY2LDQwIEBAIFRFU1QoQ2hhbGxlbmdlLCBCYXNpY1Byb3Bvc2VkQ3JlZGVudGlhbCkK ICAgICBbW3dlYlZpZXcgY29uZmlndXJhdGlvbl0ucHJvY2Vzc1Bvb2wgX2NsZWFyUGVybWFuZW50 Q3JlZGVudGlhbHNGb3JQcm90ZWN0aW9uU3BhY2U6cHJvdGVjdGlvblNwYWNlXTsKIH0KIAorVEVT VChDaGFsbGVuZ2UsIEJhc2ljUGVyc2lzdGVudENyZWRlbnRpYWwpCit7CisgICAgdXNpbmcgbmFt ZXNwYWNlIFRlc3RXZWJLaXRBUEk7CisgICAgSFRUUFNlcnZlciBzZXJ2ZXIoSFRUUFNlcnZlcjo6 cmVzcG9uZFdpdGhDaGFsbGVuZ2VUaGVuT0spOworICAgIGF1dG8gZGVsZWdhdGUgPSBbW1Rlc3RO YXZpZ2F0aW9uRGVsZWdhdGUgbmV3XSBhdXRvcmVsZWFzZV07CisgICAgX19ibG9jayBSZXRhaW5Q dHI8TlNVUkxQcm90ZWN0aW9uU3BhY2U+IHByb3RlY3Rpb25TcGFjZTsKKyAgICBhdXRvIGNyZWRl bnRpYWxTdG9yYWdlID0gW05TVVJMQ3JlZGVudGlhbFN0b3JhZ2Ugc2hhcmVkQ3JlZGVudGlhbFN0 b3JhZ2VdOworICAgIGRlbGVnYXRlLmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSA9 IF4oV0tXZWJWaWV3ICosIE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKmNoYWxsZW5nZSwg dm9pZCAoXmNvbXBsZXRpb25IYW5kbGVyKShOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9z aXRpb24sIE5TVVJMQ3JlZGVudGlhbCAqKSkgeworICAgICAgICBwcm90ZWN0aW9uU3BhY2UgPSBj aGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlOworICAgICAgICBOU1VSTENyZWRlbnRpYWwgKmV4aXN0 aW5nQ3JlZGVudGlhbCA9IFtjcmVkZW50aWFsU3RvcmFnZSBkZWZhdWx0Q3JlZGVudGlhbEZvclBy b3RlY3Rpb25TcGFjZTpwcm90ZWN0aW9uU3BhY2UuZ2V0KCldOworICAgICAgICBFWFBFQ1RfTlVM TChleGlzdGluZ0NyZWRlbnRpYWwpOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEocHJvdGVjdGlv blNwYWNlLmdldCgpLmF1dGhlbnRpY2F0aW9uTWV0aG9kLCBOU1VSTEF1dGhlbnRpY2F0aW9uTWV0 aG9kSFRUUEJhc2ljKTsKKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoTlNVUkxTZXNzaW9uQXV0 aENoYWxsZW5nZVVzZUNyZWRlbnRpYWwsIFtOU1VSTENyZWRlbnRpYWwgY3JlZGVudGlhbFdpdGhV c2VyOkAidGVzdHVzZXIiIHBhc3N3b3JkOkAidGVzdHBhc3N3b3JkIiBwZXJzaXN0ZW5jZTpOU1VS TENyZWRlbnRpYWxQZXJzaXN0ZW5jZVBlcm1hbmVudF0pOworICAgIH07CisgICAgYXV0byB3ZWJW aWV3ID0gW1tXS1dlYlZpZXcgbmV3XSBhdXRvcmVsZWFzZV07CisgICAgd2ViVmlldy5uYXZpZ2F0 aW9uRGVsZWdhdGUgPSBkZWxlZ2F0ZTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpzZXJ2ZXIu cmVxdWVzdCgpXTsKKyAgICBbZGVsZWdhdGUgd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb25dOwor CisgICAgTlNVUkxDcmVkZW50aWFsICpzdG9yZWRDcmVkZW50aWFsID0gbmlsOworICAgIHdoaWxl ICghc3RvcmVkQ3JlZGVudGlhbCkgeworICAgICAgICBzdG9yZWRDcmVkZW50aWFsID0gW1tOU1VS TENyZWRlbnRpYWxTdG9yYWdlIHNoYXJlZENyZWRlbnRpYWxTdG9yYWdlXSBkZWZhdWx0Q3JlZGVu dGlhbEZvclByb3RlY3Rpb25TcGFjZTpwcm90ZWN0aW9uU3BhY2UuZ2V0KCldOworICAgICAgICBV dGlsOjpzcGluUnVuTG9vcCgpOworICAgIH0KKyAgICBFWFBFQ1RfTk9UX05VTEwoc3RvcmVkQ3Jl ZGVudGlhbCk7CisgICAgRVhQRUNUX1dLX1NUUkVRKHN0b3JlZENyZWRlbnRpYWwudXNlciwgInRl c3R1c2VyIik7CisgICAgRVhQRUNUX1dLX1NUUkVRKHN0b3JlZENyZWRlbnRpYWwucGFzc3dvcmQs ICJ0ZXN0cGFzc3dvcmQiKTsKKyAgICBFWFBFQ1RfRVEoc3RvcmVkQ3JlZGVudGlhbC5wZXJzaXN0 ZW5jZSwgTlNVUkxDcmVkZW50aWFsUGVyc2lzdGVuY2VQZXJtYW5lbnQpOworCisgICAgW2NyZWRl bnRpYWxTdG9yYWdlIHJlbW92ZUNyZWRlbnRpYWw6c3RvcmVkQ3JlZGVudGlhbCBmb3JQcm90ZWN0 aW9uU3BhY2U6cHJvdGVjdGlvblNwYWNlLmdldCgpXTsKKyAgICBOU1VSTENyZWRlbnRpYWwgKnJl bW92ZWRDcmVkZW50aWFsID0gW2NyZWRlbnRpYWxTdG9yYWdlIGRlZmF1bHRDcmVkZW50aWFsRm9y UHJvdGVjdGlvblNwYWNlOnByb3RlY3Rpb25TcGFjZS5nZXQoKV07CisgICAgRVhQRUNUX05VTEwo cmVtb3ZlZENyZWRlbnRpYWwpOworfQorCiAjaWYgSEFWRShTU0wpCiBzdGF0aWMgdm9pZCB2ZXJp ZnlDZXJ0aWZpY2F0ZUFuZFB1YmxpY0tleShTZWNUcnVzdFJlZiB0cnVzdCkKIHsK