diff options
author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-13 15:42:03 -0600 |
---|---|---|
committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-13 15:42:03 -0600 |
commit | c5df3d0f11ca3b170da878cdd4782fc603c15460 (patch) | |
tree | 8b6e061b2541f563a4393ef37dd69d20a350681d /sys/boot/common/load_elf.c | |
parent | 3469b6e4cbedf6789ee84a4ad5ce13a9286c971e (diff) | |
parent | a3f0577ed04b6c469cd8c282522893364bebcf3f (diff) | |
download | FreeBSD-src-c5df3d0f11ca3b170da878cdd4782fc603c15460.zip FreeBSD-src-c5df3d0f11ca3b170da878cdd4782fc603c15460.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 6a88e39..e352ef7 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 = (void *)((uintptr_t)md.md_data + ef->off); + md.md_data = (void *)((uintptr_t)md.md_data + (uintptr_t)ef->off); } else if (error != 0) return (error); #endif |