diff options
| author | kamil <kamil@NetBSD.org> | 2019-05-28 03:52:08 +0000 |
|---|---|---|
| committer | kamil <kamil@NetBSD.org> | 2019-05-28 03:52:08 +0000 |
| commit | dfeab3192ca77619583ceed889034f13deff749c (patch) | |
| tree | 267843904f11dc223a45915f57e8f16f2197c078 /sys | |
| parent | f276127fa12cea27e0a52cf721e52de923fb019b (diff) | |
Replace misaligned operations with memcpy() calls in kobj_machdep.c
Detected with kUBSan.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/kobj_machdep.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/amd64/amd64/kobj_machdep.c b/sys/arch/amd64/amd64/kobj_machdep.c index b58c5379ea4..9dfa5f5924e 100644 --- a/sys/arch/amd64/amd64/kobj_machdep.c +++ b/sys/arch/amd64/amd64/kobj_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: kobj_machdep.c,v 1.7 2018/12/24 21:48:52 christos Exp $ */ +/* $NetBSD: kobj_machdep.c,v 1.8 2019/05/28 03:52:08 kamil Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.7 2018/12/24 21:48:52 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.8 2019/05/28 03:52:08 kamil Exp $"); #define ELFSIZE ARCH_ELFSIZE @@ -115,7 +115,7 @@ kobj_reloc(kobj_t ko, uintptr_t relocbase, const void *data, if (error) return -1; val = addr + addend; - *where = val; + memcpy(where, &val, sizeof(val)); break; case R_X86_64_PC32: /* S + A - P */ @@ -125,7 +125,7 @@ kobj_reloc(kobj_t ko, uintptr_t relocbase, const void *data, return -1; where32 = (Elf32_Addr *)where; val32 = (Elf32_Addr)(addr + addend - (Elf64_Addr)where); - *where32 = val32; + memcpy(where32, &val32, sizeof(val32)); break; case R_X86_64_32: /* S + A */ @@ -135,7 +135,7 @@ kobj_reloc(kobj_t ko, uintptr_t relocbase, const void *data, return -1; val32 = (Elf32_Addr)(addr + addend); where32 = (Elf32_Addr *)where; - *where32 = val32; + memcpy(where32, &val32, sizeof(val32)); break; case R_X86_64_GLOB_DAT: /* S */ @@ -143,13 +143,13 @@ kobj_reloc(kobj_t ko, uintptr_t relocbase, const void *data, error = kobj_sym_lookup(ko, symidx, &addr); if (error) return -1; - *where = addr; + memcpy(where, &addr, sizeof(addr)); break; case R_X86_64_RELATIVE: /* B + A */ addr = relocbase + addend; val = addr; - *where = val; + memcpy(where, &val, sizeof(val)); break; default: |
