diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-02 12:01:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-02 12:01:26 -0700 |
| commit | 6daa0839235df0d8933b7d72aee2b956b72d3c1b (patch) | |
| tree | 4213723e56971366c13a3ccdb60e3a5b6cd83b03 | |
| parent | Merge tag 'spdx_identifiers-4.14-rc8' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | arm64: ensure __dump_instr() checks addr_limit (diff) | |
| download | linux-6daa0839235df0d8933b7d72aee2b956b72d3c1b.tar.gz linux-6daa0839235df0d8933b7d72aee2b956b72d3c1b.zip | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas:
"Check addr_limit in arm64 __dump_instr()"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: ensure __dump_instr() checks addr_limit
| -rw-r--r-- | arch/arm64/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 5ea4b85aee0e..8383af15a759 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -118,7 +118,7 @@ static void __dump_instr(const char *lvl, struct pt_regs *regs) for (i = -4; i < 1; i++) { unsigned int val, bad; - bad = __get_user(val, &((u32 *)addr)[i]); + bad = get_user(val, &((u32 *)addr)[i]); if (!bad) p += sprintf(p, i == 0 ? "(%08x) " : "%08x ", val); |