diff options
| author | Tejun Heo <tj@kernel.org> | 2009-02-06 00:48:02 +0900 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 20:25:43 +0100 |
| commit | 56fc82c5360cdf0b250b5eb74f38657b0402faa5 (patch) | |
| tree | d574e2561849aa76a5caac6cf2e791f524e33b7b | |
| parent | 130ace11a9dc682541336d1fe5cb3bc7771a149e (diff) | |
modpost: NOBITS sections may point beyond the end of the file
Impact: fix link failure on certain toolchains with specific configs
Recent percpu change made x86_64 split .data.init section into three
separate segments - data.init, percpu and data.init2. data.init2 gets
.data.nosave and .bss.* and is followed by .notes segment. Depending
on configuration both segments might contain no data, in which case
the tool chain makes the section header to contain offset beyond the
end of the file.
modpost isn't too happy about it and fails build - as reported by
Pawel Dziekonski:
Building modules, stage 2.
MODPOST 416 modules
FATAL: vmlinux is truncated. sechdrs[i].sh_offset=10354688 >
sizeof(*hrd)=64
make[1]: *** [__modpost] Error 1
Teach modpost that NOBITS section may point beyond the end of the file
and that .modinfo can't be NOBITS.
Reported-by: Pawel Dziekonski <dzieko@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | scripts/mod/modpost.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 88921611b22..7e62303133d 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -415,8 +415,9 @@ static int parse_elf(struct elf_info *info, const char *filename) const char *secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; const char *secname; + int nobits = sechdrs[i].sh_type == SHT_NOBITS; - if (sechdrs[i].sh_offset > info->size) { + if (!nobits && sechdrs[i].sh_offset > info->size) { fatal("%s is truncated. sechdrs[i].sh_offset=%lu > " "sizeof(*hrd)=%zu\n", filename, (unsigned long)sechdrs[i].sh_offset, @@ -425,6 +426,8 @@ static int parse_elf(struct elf_info *info, const char *filename) } secname = secstrings + sechdrs[i].sh_name; if (strcmp(secname, ".modinfo") == 0) { + if (nobits) + fatal("%s has NOBITS .modinfo\n", filename); info->modinfo = (void *)hdr + sechdrs[i].sh_offset; info->modinfo_len = sechdrs[i].sh_size; } else if (strcmp(secname, "__ksymtab") == 0) |