From patchwork Wed Oct 11 20:30:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 10000537 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6820E6037F for ; Wed, 11 Oct 2017 20:33:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C4E828B37 for ; Wed, 11 Oct 2017 20:33:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 501EB28B6A; Wed, 11 Oct 2017 20:33:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C1A4928B37 for ; Wed, 11 Oct 2017 20:33:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2NfC-0000ge-Vv; Wed, 11 Oct 2017 20:31:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2NfB-0000dl-FP for xen-devel@lists.xenproject.org; Wed, 11 Oct 2017 20:31:33 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id C2/7D-28571-4AF7ED95; Wed, 11 Oct 2017 20:31:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJIsWRWlGSWpSXmKPExsVyMfTARt3F9fc iDZ7dNLX4vmUykwOjx+EPV1gCGKNYM/OS8isSWDMObz7JXrBSteLhna1MDYxNcl2MXBxCAjMZ JRrmnWEGcVgEXrFI/LzWyQjiSAj0s0o07HrM3sXICeRkSWzfOYkNwk6TuLX7FVS8QmL2k02sI LaQgJLE1g1LmSHsf4wSL+a7gdhsAloSexrmM4EMFRE4ISyx6cNvsA3MAmeYJI73nQTq5uAQFr CR2H5OCKSBRUBV4trqHrBlvAKWEqeWdkMttpA4duwwC4jNCRT/vvEQ1DILiZWzzrNOYBRcwMi wilGjOLWoLLVI18hYL6koMz2jJDcxM0fX0MBYLze1uDgxPTUnMalYLzk/dxMjMOjqGRgYdzD2 7fU7xCjJwaQkyvsw5l6kEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQneu3VAOcGi1PTUirTMHGD4w 6QlOHiURHibQNK8xQWJucWZ6RCpU4yWHBfuXPrDxHFgzy0g2XHz7h8mIZa8/LxUKXHeUpAGAZ CGjNI8uHGwGL3EKCslzMvIwMAgxFOQWpSbWYIq/4pRnINRSZj3MMgUnsy8Eritr4AOYgI6SDT tDshBJYkIKakGRiZthizZ86e7XjVwhXLbfrz6urkk3elilbjeG4ukLewJz+aXJGsKX2GIMeVZ V3Dv5hONBP9V7prGOy88y7qwZYNBWe0WlqMLjJvXRS1deFnNlItfNNM12ilH7nFff9eRhfKlL l8VvdQ9Pyex8VtkOqlyq12t/3HZlu9s+z+TvSpntH9u552mxFKckWioxVxUnAgAzmQzycwCAA A= X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1507753890!102255749!1 X-Originating-IP: [209.85.192.177] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61882 invoked from network); 11 Oct 2017 20:31:31 -0000 Received: from mail-pf0-f177.google.com (HELO mail-pf0-f177.google.com) (209.85.192.177) by server-16.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 11 Oct 2017 20:31:31 -0000 Received: by mail-pf0-f177.google.com with SMTP id m28so1937929pfi.11 for ; Wed, 11 Oct 2017 13:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BgBM1U2YaGwgM2/fFDDxQuKTLjqLCB+H6RfR3Er7pzE=; b=f98y6eBDDWV9LXiWlVUqhg6nRPqUUTSZTt6lDka8zhYMrGLq5LDeM82pq/imwMTjgo n3KDcCTKrx6ohCGpHwH10XreNIIV7K2QtFekIxGg1MsHgXN7rLRqvIgPBYvsPQAY7QUG 7Lr3ggsJx7f12MaO6Gq1BnLeM6H4sTEeSJKN3klMsRC5U58peJO/JTBF3KLVQgPoHmWo U7TBOvddEI6EAvMJ8WVnrvYNrpbvMDRGqCBXqNiieSl1IdZuEz2NPO0XVaahZ6irLQaB 8fQD7Cwbg2guudhFPnpdI3qsZwvQ3rSqtAB5g9n6ce99xlf2r5cJnZOZ4wG13DlEEuV/ BiDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BgBM1U2YaGwgM2/fFDDxQuKTLjqLCB+H6RfR3Er7pzE=; b=KSSAmQcRRMVD8niDZY9gZ7KaOSPL+gpGTndZHaoHfd0g6YZvmiso3CBsDiqAtFxlxG NW2+ry4SpFxIpyt+oveVAFtFqKEGKtHV+CmTn4oQvRWcfJBeAPkETctv4A9DOrSY/SBn J842q6J0naqFU/GjRcPCXkJMf4gwa7cl7btANr7q+WNjLPjbLMaGRVsjQCjlLf3yazkn nA/IEUQgB7FqY9VLEU68wWuY2OPyzuZsmtOOmTCHtDNkNAQYAlApq/gw+Q9MURvL7UU9 MTLh321XAoVa9/8Q287ulPUteNPCH+cs04++EmG7eKBIr9lyzuy1aFVl2ss3kZ3W/2uj xpJQ== X-Gm-Message-State: AMCzsaV/JaTOOeo2txmIX+UB6xNaftB14IIvSVyy6/8Pay31FHYp+rDM j13yvTZzIlHIQUuFhbsds59TvA== X-Google-Smtp-Source: AOwi7QDXNb15jlwxc/zONuAXmG7tbl1Z7kKdqnIbcgOyeDvajzc8sgc2xdNMJetGQHJ8cE765RE+aA== X-Received: by 10.159.197.66 with SMTP id d2mr189747plo.130.1507753889308; Wed, 11 Oct 2017 13:31:29 -0700 (PDT) Received: from skynet.sea.corp.google.com ([172.31.92.33]) by smtp.gmail.com with ESMTPSA id n12sm20691913pfb.149.2017.10.11.13.31.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Oct 2017 13:31:28 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Arnd Bergmann , Thomas Garnier , Kees Cook , Andrey Ryabinin , 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 , Paul Gortmaker , Andrew Morton , Alexey Dobriyan , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Mika Westerberg , Dou Liyang , "Rafael J . Wysocki" , 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 , Jonathan Corbet , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , "H . J . Lu" , Rob Landley , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Date: Wed, 11 Oct 2017 13:30:16 -0700 Message-Id: <20171011203027.11248-17-thgarnie@google.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog In-Reply-To: <20171011203027.11248-1-thgarnie@google.com> References: <20171011203027.11248-1-thgarnie@google.com> 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 Subject: [Xen-devel] [PATCH v1 16/27] x86/relocs: Handle PIE relocations X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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) {