From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Garnier Subject: [RFC v3 16/27] x86/relocs: Handle PIE relocations Date: Wed, 4 Oct 2017 14:19:52 -0700 Message-ID: <20171004212003.28296-17-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter , Bor Return-path: In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" List-Id: linux-crypto.vger.kernel.org Q2hhbmdlIHRoZSByZWxvY2F0aW9uIHRvb2wgdG8gY29ycmVjdGx5IGhhbmRsZSByZWxvY2F0aW9u cyBnZW5lcmF0ZWQgYnkKLWZQSUUgb3B0aW9uOgoKIC0gQWRkIHJlbG9jYXRpb24gZm9yIGVhY2gg ZW50cnkgb2YgdGhlIC5nb3Qgc2VjdGlvbiBnaXZlbiB0aGUgbGlua2VyIGRvZXMgbm90CiAgIGdl bmVyYXRlIFJfWDg2XzY0X0dMT0JfREFUIG9uIGEgc2ltcGxlIGxpbmsuCiAtIElnbm9yZSBSX1g4 Nl82NF9HT1RQQ1JFTCBhbmQgUl9YODZfNjRfUExUMzIuCgpTaWduZWQtb2ZmLWJ5OiBUaG9tYXMg R2FybmllciA8dGhnYXJuaWVAZ29vZ2xlLmNvbT4KLS0tCiBhcmNoL3g4Ni90b29scy9yZWxvY3Mu YyB8IDk0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0K IDEgZmlsZSBjaGFuZ2VkLCA5MyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0t Z2l0IGEvYXJjaC94ODYvdG9vbHMvcmVsb2NzLmMgYi9hcmNoL3g4Ni90b29scy9yZWxvY3MuYwpp bmRleCA3M2ViN2ZkNGFlYzQuLjVkM2ViMjc2MDE5OCAxMDA2NDQKLS0tIGEvYXJjaC94ODYvdG9v bHMvcmVsb2NzLmMKKysrIGIvYXJjaC94ODYvdG9vbHMvcmVsb2NzLmMKQEAgLTMxLDYgKzMxLDcg QEAgc3RydWN0IHNlY3Rpb24gewogCUVsZl9TeW0gICAgICAgICpzeW10YWI7CiAJRWxmX1JlbCAg ICAgICAgKnJlbHRhYjsKIAljaGFyICAgICAgICAgICAqc3RydGFiOworCUVsZl9BZGRyICAgICAg ICpnb3Q7CiB9Owogc3RhdGljIHN0cnVjdCBzZWN0aW9uICpzZWNzOwogCkBAIC0yOTIsNiArMjkz LDM1IEBAIHN0YXRpYyBFbGZfU3ltICpzeW1fbG9va3VwKGNvbnN0IGNoYXIgKnN5bW5hbWUpCiAJ cmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBFbGZfU3ltICpzeW1fbG9va3VwX2FkZHIoRWxmX0FkZHIg YWRkciwgY29uc3QgY2hhciAqKm5hbWUpCit7CisJaW50IGk7CisJZm9yIChpID0gMDsgaSA8IGVo ZHIuZV9zaG51bTsgaSsrKSB7CisJCXN0cnVjdCBzZWN0aW9uICpzZWMgPSAmc2Vjc1tpXTsKKwkJ bG9uZyBuc3ltczsKKwkJRWxmX1N5bSAqc3ltdGFiOworCQlFbGZfU3ltICpzeW07CisKKwkJaWYg KHNlYy0+c2hkci5zaF90eXBlICE9IFNIVF9TWU1UQUIpCisJCQljb250aW51ZTsKKworCQluc3lt cyA9IHNlYy0+c2hkci5zaF9zaXplL3NpemVvZihFbGZfU3ltKTsKKwkJc3ltdGFiID0gc2VjLT5z eW10YWI7CisKKwkJZm9yIChzeW0gPSBzeW10YWI7IC0tbnN5bXMgPj0gMDsgc3ltKyspIHsKKwkJ CWlmIChzeW0tPnN0X3ZhbHVlID09IGFkZHIpIHsKKwkJCQlpZiAobmFtZSkgeworCQkJCQkqbmFt ZSA9IHN5bV9uYW1lKHNlYy0+bGluay0+c3RydGFiLAorCQkJCQkJCSBzeW0pOworCQkJCX0KKwkJ CQlyZXR1cm4gc3ltOworCQkJfQorCQl9CisJfQorCXJldHVybiAwOworfQorCisKICNpZiBCWVRF X09SREVSID09IExJVFRMRV9FTkRJQU4KICNkZWZpbmUgbGUxNl90b19jcHUodmFsKSAodmFsKQog I2RlZmluZSBsZTMyX3RvX2NwdSh2YWwpICh2YWwpCkBAIC01MTIsNiArNTQyLDMzIEBAIHN0YXRp YyB2b2lkIHJlYWRfcmVsb2NzKEZJTEUgKmZwKQogCX0KIH0KIAorc3RhdGljIHZvaWQgcmVhZF9n b3QoRklMRSAqZnApCit7CisJaW50IGk7CisJZm9yIChpID0gMDsgaSA8IGVoZHIuZV9zaG51bTsg aSsrKSB7CisJCXN0cnVjdCBzZWN0aW9uICpzZWMgPSAmc2Vjc1tpXTsKKwkJc2VjLT5nb3QgPSBO VUxMOworCQlpZiAoc2VjLT5zaGRyLnNoX3R5cGUgIT0gU0hUX1BST0dCSVRTIHx8CisJCSAgICBz dHJjbXAoc2VjX25hbWUoaSksICIuZ290IikpIHsKKwkJCWNvbnRpbnVlOworCQl9CisJCXNlYy0+ Z290ID0gbWFsbG9jKHNlYy0+c2hkci5zaF9zaXplKTsKKwkJaWYgKCFzZWMtPmdvdCkgeworCQkJ ZGllKCJtYWxsb2Mgb2YgJWQgYnl0ZXMgZm9yIGdvdCBmYWlsZWRcbiIsCisJCQkJc2VjLT5zaGRy LnNoX3NpemUpOworCQl9CisJCWlmIChmc2VlayhmcCwgc2VjLT5zaGRyLnNoX29mZnNldCwgU0VF S19TRVQpIDwgMCkgeworCQkJZGllKCJTZWVrIHRvICVkIGZhaWxlZDogJXNcbiIsCisJCQkJc2Vj LT5zaGRyLnNoX29mZnNldCwgc3RyZXJyb3IoZXJybm8pKTsKKwkJfQorCQlpZiAoZnJlYWQoc2Vj LT5nb3QsIDEsIHNlYy0+c2hkci5zaF9zaXplLCBmcCkKKwkJICAgICE9IHNlYy0+c2hkci5zaF9z aXplKSB7CisJCQlkaWUoIkNhbm5vdCByZWFkIGdvdDogJXNcbiIsCisJCQkJc3RyZXJyb3IoZXJy bm8pKTsKKwkJfQorCX0KK30KKwogCiBzdGF0aWMgdm9pZCBwcmludF9hYnNvbHV0ZV9zeW1ib2xz KHZvaWQpCiB7CkBAIC02NDIsNiArNjk5LDMyIEBAIHN0YXRpYyB2b2lkIGFkZF9yZWxvYyhzdHJ1 Y3QgcmVsb2NzICpyLCB1aW50MzJfdCBvZmZzZXQpCiAJci0+b2Zmc2V0W3ItPmNvdW50KytdID0g b2Zmc2V0OwogfQogCisvKgorICogVGhlIGxpbmtlciBkb2VzIG5vdCBnZW5lcmF0ZSByZWxvY2F0 aW9ucyBmb3IgdGhlIEdPVCBmb3IgdGhlIGtlcm5lbC4KKyAqIElmIGEgR09UIGlzIGZvdW5kLCBz aW11bGF0ZSB0aGUgcmVsb2NhdGlvbnMgdGhhdCBzaG91bGQgaGF2ZSBiZWVuIGluY2x1ZGVkLgor ICovCitzdGF0aWMgdm9pZCB3YWxrX2dvdF90YWJsZShpbnQgKCpwcm9jZXNzKShzdHJ1Y3Qgc2Vj dGlvbiAqc2VjLCBFbGZfUmVsICpyZWwsCisJCQkJCSAgRWxmX1N5bSAqc3ltLCBjb25zdCBjaGFy ICpzeW1uYW1lKSwKKwkJCSAgIHN0cnVjdCBzZWN0aW9uICpzZWMpCit7CisJaW50IGk7CisJRWxm X0FkZHIgZW50cnk7CisJRWxmX1N5bSAqc3ltOworCWNvbnN0IGNoYXIgKnN5bW5hbWU7CisJRWxm X1JlbCByZWw7CisKKwlmb3IgKGkgPSAwOyBpIDwgc2VjLT5zaGRyLnNoX3NpemUvc2l6ZW9mKEVs Zl9BZGRyKTsgaSsrKSB7CisJCWVudHJ5ID0gc2VjLT5nb3RbaV07CisJCXN5bSA9IHN5bV9sb29r dXBfYWRkcihlbnRyeSwgJnN5bW5hbWUpOworCQlpZiAoIXN5bSkKKwkJCWRpZSgiQ291bGQgbm90 IGZvdW5kIGdvdCBzeW1ib2wgZm9yIGVudHJ5ICVkXG4iLCBpKTsKKwkJcmVsLnJfb2Zmc2V0ID0g c2VjLT5zaGRyLnNoX2FkZHIgKyBpICogc2l6ZW9mKEVsZl9BZGRyKTsKKwkJcmVsLnJfaW5mbyA9 IEVMRl9CSVRTID09IDY0ID8gUl9YODZfNjRfR0xPQl9EQVQKKwkJCSAgICAgOiBSXzM4Nl9HTE9C X0RBVDsKKwkJcHJvY2VzcyhzZWMsICZyZWwsIHN5bSwgc3ltbmFtZSk7CisJfQorfQorCiBzdGF0 aWMgdm9pZCB3YWxrX3JlbG9jcyhpbnQgKCpwcm9jZXNzKShzdHJ1Y3Qgc2VjdGlvbiAqc2VjLCBF bGZfUmVsICpyZWwsCiAJCQlFbGZfU3ltICpzeW0sIGNvbnN0IGNoYXIgKnN5bW5hbWUpKQogewpA QCAtNjU1LDYgKzczOCw4IEBAIHN0YXRpYyB2b2lkIHdhbGtfcmVsb2NzKGludCAoKnByb2Nlc3Mp KHN0cnVjdCBzZWN0aW9uICpzZWMsIEVsZl9SZWwgKnJlbCwKIAkJc3RydWN0IHNlY3Rpb24gKnNl YyA9ICZzZWNzW2ldOwogCiAJCWlmIChzZWMtPnNoZHIuc2hfdHlwZSAhPSBTSFRfUkVMX1RZUEUp IHsKKwkJCWlmIChzZWMtPmdvdCkKKwkJCQl3YWxrX2dvdF90YWJsZShwcm9jZXNzLCBzZWMpOwog CQkJY29udGludWU7CiAJCX0KIAkJc2VjX3N5bXRhYiAgPSBzZWMtPmxpbms7CkBAIC03NjQsNiAr ODQ5LDggQEAgc3RhdGljIGludCBkb19yZWxvYzY0KHN0cnVjdCBzZWN0aW9uICpzZWMsIEVsZl9S ZWwgKnJlbCwgRWxmVyhTeW0pICpzeW0sCiAJCW9mZnNldCArPSBwZXJfY3B1X2xvYWRfYWRkcjsK IAogCXN3aXRjaCAocl90eXBlKSB7CisJY2FzZSBSX1g4Nl82NF9QTFQzMjoKKwljYXNlIFJfWDg2 XzY0X0dPVFBDUkVMOgogCWNhc2UgUl9YODZfNjRfTk9ORToKIAkJLyogTk9ORSBjYW4gYmUgaWdu b3JlZC4gKi8KIAkJYnJlYWs7CkBAIC04MDUsNyArODkyLDcgQEAgc3RhdGljIGludCBkb19yZWxv YzY0KHN0cnVjdCBzZWN0aW9uICpzZWMsIEVsZl9SZWwgKnJlbCwgRWxmVyhTeW0pICpzeW0sCiAJ CSAqIHRoZSByZWxvY2F0aW9ucyBhcmUgcHJvY2Vzc2VkLgogCQkgKiBNYWtlIHN1cmUgdGhhdCB0 aGUgb2Zmc2V0IHdpbGwgZml0LgogCQkgKi8KLQkJaWYgKChpbnQzMl90KW9mZnNldCAhPSAoaW50 NjRfdClvZmZzZXQpCisJCWlmIChyX3R5cGUgIT0gUl9YODZfNjRfNjQgJiYgKGludDMyX3Qpb2Zm c2V0ICE9IChpbnQ2NF90KW9mZnNldCkKIAkJCWRpZSgiUmVsb2NhdGlvbiBvZmZzZXQgZG9lc24n dCBmaXQgaW4gMzIgYml0c1xuIik7CiAKIAkJaWYgKHJfdHlwZSA9PSBSX1g4Nl82NF82NCkKQEAg LTgxNCw2ICs5MDEsMTAgQEAgc3RhdGljIGludCBkb19yZWxvYzY0KHN0cnVjdCBzZWN0aW9uICpz ZWMsIEVsZl9SZWwgKnJlbCwgRWxmVyhTeW0pICpzeW0sCiAJCQlhZGRfcmVsb2MoJnJlbG9jczMy LCBvZmZzZXQpOwogCQlicmVhazsKIAorCWNhc2UgUl9YODZfNjRfR0xPQl9EQVQ6CisJCWFkZF9y ZWxvYygmcmVsb2NzNjQsIG9mZnNldCk7CisJCWJyZWFrOworCiAJZGVmYXVsdDoKIAkJZGllKCJV bnN1cHBvcnRlZCByZWxvY2F0aW9uIHR5cGU6ICVzICglZClcbiIsCiAJCSAgICByZWxfdHlwZShy X3R5cGUpLCByX3R5cGUpOwpAQCAtMTA4Myw2ICsxMTc0LDcgQEAgdm9pZCBwcm9jZXNzKEZJTEUg KmZwLCBpbnQgdXNlX3JlYWxfbW9kZSwgaW50IGFzX3RleHQsCiAJcmVhZF9zdHJ0YWJzKGZwKTsK IAlyZWFkX3N5bXRhYnMoZnApOwogCXJlYWRfcmVsb2NzKGZwKTsKKwlyZWFkX2dvdChmcCk7CiAJ aWYgKEVMRl9CSVRTID09IDY0KQogCQlwZXJjcHVfaW5pdCgpOwogCWlmIChzaG93X2Fic29sdXRl X3N5bXMpIHsKLS0gCjIuMTQuMi45MjAuZ2NmMGM2Nzk3OWMtZ29vZwoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QK WGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Garnier Subject: [RFC v3 16/27] x86/relocs: Handle PIE relocations Date: Wed, 4 Oct 2017 14:19:52 -0700 Message-ID: <20171004212003.28296-17-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter Bor Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org List-Id: linux-sparse@vger.kernel.org Q2hhbmdlIHRoZSByZWxvY2F0aW9uIHRvb2wgdG8gY29ycmVjdGx5IGhhbmRsZSByZWxvY2F0aW9u cyBnZW5lcmF0ZWQgYnkKLWZQSUUgb3B0aW9uOgoKIC0gQWRkIHJlbG9jYXRpb24gZm9yIGVhY2gg ZW50cnkgb2YgdGhlIC5nb3Qgc2VjdGlvbiBnaXZlbiB0aGUgbGlua2VyIGRvZXMgbm90CiAgIGdl bmVyYXRlIFJfWDg2XzY0X0dMT0JfREFUIG9uIGEgc2ltcGxlIGxpbmsuCiAtIElnbm9yZSBSX1g4 Nl82NF9HT1RQQ1JFTCBhbmQgUl9YODZfNjRfUExUMzIuCgpTaWduZWQtb2ZmLWJ5OiBUaG9tYXMg R2FybmllciA8dGhnYXJuaWVAZ29vZ2xlLmNvbT4KLS0tCiBhcmNoL3g4Ni90b29scy9yZWxvY3Mu YyB8IDk0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0K IDEgZmlsZSBjaGFuZ2VkLCA5MyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0t Z2l0IGEvYXJjaC94ODYvdG9vbHMvcmVsb2NzLmMgYi9hcmNoL3g4Ni90b29scy9yZWxvY3MuYwpp bmRleCA3M2ViN2ZkNGFlYzQuLjVkM2ViMjc2MDE5OCAxMDA2NDQKLS0tIGEvYXJjaC94ODYvdG9v bHMvcmVsb2NzLmMKKysrIGIvYXJjaC94ODYvdG9vbHMvcmVsb2NzLmMKQEAgLTMxLDYgKzMxLDcg QEAgc3RydWN0IHNlY3Rpb24gewogCUVsZl9TeW0gICAgICAgICpzeW10YWI7CiAJRWxmX1JlbCAg ICAgICAgKnJlbHRhYjsKIAljaGFyICAgICAgICAgICAqc3RydGFiOworCUVsZl9BZGRyICAgICAg ICpnb3Q7CiB9Owogc3RhdGljIHN0cnVjdCBzZWN0aW9uICpzZWNzOwogCkBAIC0yOTIsNiArMjkz LDM1IEBAIHN0YXRpYyBFbGZfU3ltICpzeW1fbG9va3VwKGNvbnN0IGNoYXIgKnN5bW5hbWUpCiAJ cmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBFbGZfU3ltICpzeW1fbG9va3VwX2FkZHIoRWxmX0FkZHIg YWRkciwgY29uc3QgY2hhciAqKm5hbWUpCit7CisJaW50IGk7CisJZm9yIChpID0gMDsgaSA8IGVo ZHIuZV9zaG51bTsgaSsrKSB7CisJCXN0cnVjdCBzZWN0aW9uICpzZWMgPSAmc2Vjc1tpXTsKKwkJ bG9uZyBuc3ltczsKKwkJRWxmX1N5bSAqc3ltdGFiOworCQlFbGZfU3ltICpzeW07CisKKwkJaWYg KHNlYy0+c2hkci5zaF90eXBlICE9IFNIVF9TWU1UQUIpCisJCQljb250aW51ZTsKKworCQluc3lt cyA9IHNlYy0+c2hkci5zaF9zaXplL3NpemVvZihFbGZfU3ltKTsKKwkJc3ltdGFiID0gc2VjLT5z eW10YWI7CisKKwkJZm9yIChzeW0gPSBzeW10YWI7IC0tbnN5bXMgPj0gMDsgc3ltKyspIHsKKwkJ CWlmIChzeW0tPnN0X3ZhbHVlID09IGFkZHIpIHsKKwkJCQlpZiAobmFtZSkgeworCQkJCQkqbmFt ZSA9IHN5bV9uYW1lKHNlYy0+bGluay0+c3RydGFiLAorCQkJCQkJCSBzeW0pOworCQkJCX0KKwkJ CQlyZXR1cm4gc3ltOworCQkJfQorCQl9CisJfQorCXJldHVybiAwOworfQorCisKICNpZiBCWVRF X09SREVSID09IExJVFRMRV9FTkRJQU4KICNkZWZpbmUgbGUxNl90b19jcHUodmFsKSAodmFsKQog I2RlZmluZSBsZTMyX3RvX2NwdSh2YWwpICh2YWwpCkBAIC01MTIsNiArNTQyLDMzIEBAIHN0YXRp YyB2b2lkIHJlYWRfcmVsb2NzKEZJTEUgKmZwKQogCX0KIH0KIAorc3RhdGljIHZvaWQgcmVhZF9n b3QoRklMRSAqZnApCit7CisJaW50IGk7CisJZm9yIChpID0gMDsgaSA8IGVoZHIuZV9zaG51bTsg aSsrKSB7CisJCXN0cnVjdCBzZWN0aW9uICpzZWMgPSAmc2Vjc1tpXTsKKwkJc2VjLT5nb3QgPSBO VUxMOworCQlpZiAoc2VjLT5zaGRyLnNoX3R5cGUgIT0gU0hUX1BST0dCSVRTIHx8CisJCSAgICBz dHJjbXAoc2VjX25hbWUoaSksICIuZ290IikpIHsKKwkJCWNvbnRpbnVlOworCQl9CisJCXNlYy0+ Z290ID0gbWFsbG9jKHNlYy0+c2hkci5zaF9zaXplKTsKKwkJaWYgKCFzZWMtPmdvdCkgeworCQkJ ZGllKCJtYWxsb2Mgb2YgJWQgYnl0ZXMgZm9yIGdvdCBmYWlsZWRcbiIsCisJCQkJc2VjLT5zaGRy LnNoX3NpemUpOworCQl9CisJCWlmIChmc2VlayhmcCwgc2VjLT5zaGRyLnNoX29mZnNldCwgU0VF S19TRVQpIDwgMCkgeworCQkJZGllKCJTZWVrIHRvICVkIGZhaWxlZDogJXNcbiIsCisJCQkJc2Vj LT5zaGRyLnNoX29mZnNldCwgc3RyZXJyb3IoZXJybm8pKTsKKwkJfQorCQlpZiAoZnJlYWQoc2Vj LT5nb3QsIDEsIHNlYy0+c2hkci5zaF9zaXplLCBmcCkKKwkJICAgICE9IHNlYy0+c2hkci5zaF9z aXplKSB7CisJCQlkaWUoIkNhbm5vdCByZWFkIGdvdDogJXNcbiIsCisJCQkJc3RyZXJyb3IoZXJy bm8pKTsKKwkJfQorCX0KK30KKwogCiBzdGF0aWMgdm9pZCBwcmludF9hYnNvbHV0ZV9zeW1ib2xz KHZvaWQpCiB7CkBAIC02NDIsNiArNjk5LDMyIEBAIHN0YXRpYyB2b2lkIGFkZF9yZWxvYyhzdHJ1 Y3QgcmVsb2NzICpyLCB1aW50MzJfdCBvZmZzZXQpCiAJci0+b2Zmc2V0W3ItPmNvdW50KytdID0g b2Zmc2V0OwogfQogCisvKgorICogVGhlIGxpbmtlciBkb2VzIG5vdCBnZW5lcmF0ZSByZWxvY2F0 aW9ucyBmb3IgdGhlIEdPVCBmb3IgdGhlIGtlcm5lbC4KKyAqIElmIGEgR09UIGlzIGZvdW5kLCBz aW11bGF0ZSB0aGUgcmVsb2NhdGlvbnMgdGhhdCBzaG91bGQgaGF2ZSBiZWVuIGluY2x1ZGVkLgor ICovCitzdGF0aWMgdm9pZCB3YWxrX2dvdF90YWJsZShpbnQgKCpwcm9jZXNzKShzdHJ1Y3Qgc2Vj dGlvbiAqc2VjLCBFbGZfUmVsICpyZWwsCisJCQkJCSAgRWxmX1N5bSAqc3ltLCBjb25zdCBjaGFy ICpzeW1uYW1lKSwKKwkJCSAgIHN0cnVjdCBzZWN0aW9uICpzZWMpCit7CisJaW50IGk7CisJRWxm X0FkZHIgZW50cnk7CisJRWxmX1N5bSAqc3ltOworCWNvbnN0IGNoYXIgKnN5bW5hbWU7CisJRWxm X1JlbCByZWw7CisKKwlmb3IgKGkgPSAwOyBpIDwgc2VjLT5zaGRyLnNoX3NpemUvc2l6ZW9mKEVs Zl9BZGRyKTsgaSsrKSB7CisJCWVudHJ5ID0gc2VjLT5nb3RbaV07CisJCXN5bSA9IHN5bV9sb29r dXBfYWRkcihlbnRyeSwgJnN5bW5hbWUpOworCQlpZiAoIXN5bSkKKwkJCWRpZSgiQ291bGQgbm90 IGZvdW5kIGdvdCBzeW1ib2wgZm9yIGVudHJ5ICVkXG4iLCBpKTsKKwkJcmVsLnJfb2Zmc2V0ID0g c2VjLT5zaGRyLnNoX2FkZHIgKyBpICogc2l6ZW9mKEVsZl9BZGRyKTsKKwkJcmVsLnJfaW5mbyA9 IEVMRl9CSVRTID09IDY0ID8gUl9YODZfNjRfR0xPQl9EQVQKKwkJCSAgICAgOiBSXzM4Nl9HTE9C X0RBVDsKKwkJcHJvY2VzcyhzZWMsICZyZWwsIHN5bSwgc3ltbmFtZSk7CisJfQorfQorCiBzdGF0 aWMgdm9pZCB3YWxrX3JlbG9jcyhpbnQgKCpwcm9jZXNzKShzdHJ1Y3Qgc2VjdGlvbiAqc2VjLCBF bGZfUmVsICpyZWwsCiAJCQlFbGZfU3ltICpzeW0sIGNvbnN0IGNoYXIgKnN5bW5hbWUpKQogewpA QCAtNjU1LDYgKzczOCw4IEBAIHN0YXRpYyB2b2lkIHdhbGtfcmVsb2NzKGludCAoKnByb2Nlc3Mp KHN0cnVjdCBzZWN0aW9uICpzZWMsIEVsZl9SZWwgKnJlbCwKIAkJc3RydWN0IHNlY3Rpb24gKnNl YyA9ICZzZWNzW2ldOwogCiAJCWlmIChzZWMtPnNoZHIuc2hfdHlwZSAhPSBTSFRfUkVMX1RZUEUp IHsKKwkJCWlmIChzZWMtPmdvdCkKKwkJCQl3YWxrX2dvdF90YWJsZShwcm9jZXNzLCBzZWMpOwog CQkJY29udGludWU7CiAJCX0KIAkJc2VjX3N5bXRhYiAgPSBzZWMtPmxpbms7CkBAIC03NjQsNiAr ODQ5LDggQEAgc3RhdGljIGludCBkb19yZWxvYzY0KHN0cnVjdCBzZWN0aW9uICpzZWMsIEVsZl9S ZWwgKnJlbCwgRWxmVyhTeW0pICpzeW0sCiAJCW9mZnNldCArPSBwZXJfY3B1X2xvYWRfYWRkcjsK IAogCXN3aXRjaCAocl90eXBlKSB7CisJY2FzZSBSX1g4Nl82NF9QTFQzMjoKKwljYXNlIFJfWDg2 XzY0X0dPVFBDUkVMOgogCWNhc2UgUl9YODZfNjRfTk9ORToKIAkJLyogTk9ORSBjYW4gYmUgaWdu b3JlZC4gKi8KIAkJYnJlYWs7CkBAIC04MDUsNyArODkyLDcgQEAgc3RhdGljIGludCBkb19yZWxv YzY0KHN0cnVjdCBzZWN0aW9uICpzZWMsIEVsZl9SZWwgKnJlbCwgRWxmVyhTeW0pICpzeW0sCiAJ CSAqIHRoZSByZWxvY2F0aW9ucyBhcmUgcHJvY2Vzc2VkLgogCQkgKiBNYWtlIHN1cmUgdGhhdCB0 aGUgb2Zmc2V0IHdpbGwgZml0LgogCQkgKi8KLQkJaWYgKChpbnQzMl90KW9mZnNldCAhPSAoaW50 NjRfdClvZmZzZXQpCisJCWlmIChyX3R5cGUgIT0gUl9YODZfNjRfNjQgJiYgKGludDMyX3Qpb2Zm c2V0ICE9IChpbnQ2NF90KW9mZnNldCkKIAkJCWRpZSgiUmVsb2NhdGlvbiBvZmZzZXQgZG9lc24n dCBmaXQgaW4gMzIgYml0c1xuIik7CiAKIAkJaWYgKHJfdHlwZSA9PSBSX1g4Nl82NF82NCkKQEAg LTgxNCw2ICs5MDEsMTAgQEAgc3RhdGljIGludCBkb19yZWxvYzY0KHN0cnVjdCBzZWN0aW9uICpz ZWMsIEVsZl9SZWwgKnJlbCwgRWxmVyhTeW0pICpzeW0sCiAJCQlhZGRfcmVsb2MoJnJlbG9jczMy LCBvZmZzZXQpOwogCQlicmVhazsKIAorCWNhc2UgUl9YODZfNjRfR0xPQl9EQVQ6CisJCWFkZF9y ZWxvYygmcmVsb2NzNjQsIG9mZnNldCk7CisJCWJyZWFrOworCiAJZGVmYXVsdDoKIAkJZGllKCJV bnN1cHBvcnRlZCByZWxvY2F0aW9uIHR5cGU6ICVzICglZClcbiIsCiAJCSAgICByZWxfdHlwZShy X3R5cGUpLCByX3R5cGUpOwpAQCAtMTA4Myw2ICsxMTc0LDcgQEAgdm9pZCBwcm9jZXNzKEZJTEUg KmZwLCBpbnQgdXNlX3JlYWxfbW9kZSwgaW50IGFzX3RleHQsCiAJcmVhZF9zdHJ0YWJzKGZwKTsK IAlyZWFkX3N5bXRhYnMoZnApOwogCXJlYWRfcmVsb2NzKGZwKTsKKwlyZWFkX2dvdChmcCk7CiAJ aWYgKEVMRl9CSVRTID09IDY0KQogCQlwZXJjcHVfaW5pdCgpOwogCWlmIChzaG93X2Fic29sdXRl X3N5bXMpIHsKLS0gCjIuMTQuMi45MjAuZ2NmMGM2Nzk3OWMtZ29vZwoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QK WGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Garnier Date: Wed, 4 Oct 2017 14:19:52 -0700 Message-Id: <20171004212003.28296-17-thgarnie@google.com> In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Subject: [kernel-hardening] [RFC v3 16/27] x86/relocs: Handle PIE relocations To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter , Boris Ostrovsky , Alexey Dobriyan , Andrew Morton , Paul Gortmaker , Chris Metcalf , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Dou Liyang , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Masahiro Yamada , Alexei Starovoitov , Daniel Borkmann , Markus Trippelsdorf , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Rik van Riel , David Howells , Ard Biesheuvel , Waiman Long , Kyle Huey , Andrey Ryabinin , Jonathan Corbet , Matthew Wilcox , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , Rob Landley , "H . J . Lu" , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Cc: x86@kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-arch@vger.kernel.org, linux-sparse@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com List-ID: Change the relocation tool to correctly handle relocations generated by -fPIE option: - Add relocation for each entry of the .got section given the linker does not generate R_X86_64_GLOB_DAT on a simple link. - Ignore R_X86_64_GOTPCREL and R_X86_64_PLT32. Signed-off-by: Thomas Garnier --- arch/x86/tools/relocs.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index 73eb7fd4aec4..5d3eb2760198 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -31,6 +31,7 @@ struct section { Elf_Sym *symtab; Elf_Rel *reltab; char *strtab; + Elf_Addr *got; }; static struct section *secs; @@ -292,6 +293,35 @@ static Elf_Sym *sym_lookup(const char *symname) return 0; } +static Elf_Sym *sym_lookup_addr(Elf_Addr addr, const char **name) +{ + int i; + for (i = 0; i < ehdr.e_shnum; i++) { + struct section *sec = &secs[i]; + long nsyms; + Elf_Sym *symtab; + Elf_Sym *sym; + + if (sec->shdr.sh_type != SHT_SYMTAB) + continue; + + nsyms = sec->shdr.sh_size/sizeof(Elf_Sym); + symtab = sec->symtab; + + for (sym = symtab; --nsyms >= 0; sym++) { + if (sym->st_value == addr) { + if (name) { + *name = sym_name(sec->link->strtab, + sym); + } + return sym; + } + } + } + return 0; +} + + #if BYTE_ORDER == LITTLE_ENDIAN #define le16_to_cpu(val) (val) #define le32_to_cpu(val) (val) @@ -512,6 +542,33 @@ static void read_relocs(FILE *fp) } } +static void read_got(FILE *fp) +{ + int i; + for (i = 0; i < ehdr.e_shnum; i++) { + struct section *sec = &secs[i]; + sec->got = NULL; + if (sec->shdr.sh_type != SHT_PROGBITS || + strcmp(sec_name(i), ".got")) { + continue; + } + sec->got = malloc(sec->shdr.sh_size); + if (!sec->got) { + die("malloc of %d bytes for got failed\n", + sec->shdr.sh_size); + } + if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0) { + die("Seek to %d failed: %s\n", + sec->shdr.sh_offset, strerror(errno)); + } + if (fread(sec->got, 1, sec->shdr.sh_size, fp) + != sec->shdr.sh_size) { + die("Cannot read got: %s\n", + strerror(errno)); + } + } +} + static void print_absolute_symbols(void) { @@ -642,6 +699,32 @@ static void add_reloc(struct relocs *r, uint32_t offset) r->offset[r->count++] = offset; } +/* + * The linker does not generate relocations for the GOT for the kernel. + * If a GOT is found, simulate the relocations that should have been included. + */ +static void walk_got_table(int (*process)(struct section *sec, Elf_Rel *rel, + Elf_Sym *sym, const char *symname), + struct section *sec) +{ + int i; + Elf_Addr entry; + Elf_Sym *sym; + const char *symname; + Elf_Rel rel; + + for (i = 0; i < sec->shdr.sh_size/sizeof(Elf_Addr); i++) { + entry = sec->got[i]; + sym = sym_lookup_addr(entry, &symname); + if (!sym) + die("Could not found got symbol for entry %d\n", i); + rel.r_offset = sec->shdr.sh_addr + i * sizeof(Elf_Addr); + rel.r_info = ELF_BITS == 64 ? R_X86_64_GLOB_DAT + : R_386_GLOB_DAT; + process(sec, &rel, sym, symname); + } +} + static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym, const char *symname)) { @@ -655,6 +738,8 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, struct section *sec = &secs[i]; if (sec->shdr.sh_type != SHT_REL_TYPE) { + if (sec->got) + walk_got_table(process, sec); continue; } sec_symtab = sec->link; @@ -764,6 +849,8 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym, offset += per_cpu_load_addr; switch (r_type) { + case R_X86_64_PLT32: + case R_X86_64_GOTPCREL: case R_X86_64_NONE: /* NONE can be ignored. */ break; @@ -805,7 +892,7 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym, * the relocations are processed. * Make sure that the offset will fit. */ - if ((int32_t)offset != (int64_t)offset) + if (r_type != R_X86_64_64 && (int32_t)offset != (int64_t)offset) die("Relocation offset doesn't fit in 32 bits\n"); if (r_type == R_X86_64_64) @@ -814,6 +901,10 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym, add_reloc(&relocs32, offset); break; + case R_X86_64_GLOB_DAT: + add_reloc(&relocs64, offset); + break; + default: die("Unsupported relocation type: %s (%d)\n", rel_type(r_type), r_type); @@ -1083,6 +1174,7 @@ void process(FILE *fp, int use_real_mode, int as_text, read_strtabs(fp); read_symtabs(fp); read_relocs(fp); + read_got(fp); if (ELF_BITS == 64) percpu_init(); if (show_absolute_syms) { -- 2.14.2.920.gcf0c67979c-goog