diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-03 18:01:26 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-03 18:01:26 -0200 |
| commit | af0758169e63a4e7f6024c241d9254a8bc09908d (patch) | |
| tree | a31903fc62c875e8d23a391beb8ae57ed0092c45 /sys/boot/common/load_elf.c | |
| parent | 79f27b5150f7b79a6f1bcd30e9233f1abb9c3e36 (diff) | |
| parent | 6114d518f71115abacc5d610c4d668ef6e0b2f37 (diff) | |
| download | FreeBSD-src-af0758169e63a4e7f6024c241d9254a8bc09908d.zip FreeBSD-src-af0758169e63a4e7f6024c241d9254a8bc09908d.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/boot/common/load_elf.c')
| -rw-r--r-- | sys/boot/common/load_elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c index 200a29c..6a88e39 100644 --- a/sys/boot/common/load_elf.c +++ b/sys/boot/common/load_elf.c @@ -856,7 +856,7 @@ __elfN(parse_modmetadata)(struct preloaded_file *fp, elf_file_t ef, error = __elfN(reloc_ptr)(fp, ef, v, &md, sizeof(md)); if (error == EOPNOTSUPP) { md.md_cval += ef->off; - md.md_data += ef->off; + md.md_data = (void *)((uintptr_t)md.md_data + ef->off); } else if (error != 0) return (error); #endif |
