diff options
| author | Borislav Petkov <bp@suse.de> | 2021-10-04 17:37:22 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-10-04 17:37:22 +0200 |
| commit | c7419a6e1aa3219ff62045ab6e56e37d5ad2d292 (patch) | |
| tree | a5145db864629e50196ba0f13e0b1c80f7d4331a /arch/x86/lib | |
| parent | x86: Increase exception stack sizes (diff) | |
| parent | treewide: Replace the use of mem_encrypt_active() with cc_platform_has() (diff) | |
| download | linux-c7419a6e1aa3219ff62045ab6e56e37d5ad2d292.tar.xz linux-c7419a6e1aa3219ff62045ab6e56e37d5ad2d292.zip | |
Merge branch x86/cc into x86/core
Pick up dependent cc_platform_has() changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/insn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c index 058f19b20465..c565def611e2 100644 --- a/arch/x86/lib/insn.c +++ b/arch/x86/lib/insn.c @@ -37,10 +37,10 @@ ((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr) #define __get_next(t, insn) \ - ({ t r = *(t*)insn->next_byte; insn->next_byte += sizeof(t); leXX_to_cpu(t, r); }) + ({ t r; memcpy(&r, insn->next_byte, sizeof(t)); insn->next_byte += sizeof(t); leXX_to_cpu(t, r); }) #define __peek_nbyte_next(t, insn, n) \ - ({ t r = *(t*)((insn)->next_byte + n); leXX_to_cpu(t, r); }) + ({ t r; memcpy(&r, (insn)->next_byte + n, sizeof(t)); leXX_to_cpu(t, r); }) #define get_next(t, insn) \ ({ if (unlikely(!validate_next(t, insn, 0))) goto err_out; __get_next(t, insn); }) |