raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-07 18:40:10 +00:00
Code Issues Projects Releases Wiki Activity

arm64: fix possible spectre-v1 write in ptrace_hbp_set_event()

Browse Source 
[ Upstream commit 14d6e289a8 ]

It's possible for userspace to control idx. Sanitize idx when using it
as an array index, to inhibit the potential spectre-v1 write gadget.

Found by smatch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mark Rutland
2018-07-10 19:01:22 +01:00
committed by Greg Kroah-Hartman
parent e635ed205a
commit cf29c5b3d3
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm64/kernel/ptrace.c
View File

@@ -277,19 +277,22 @@ static int ptrace_hbp_set_event(unsigned int note_type,
switch (note_type) { switch (note_type) {
case NT_ARM_HW_BREAK: case NT_ARM_HW_BREAK:
if (idx < ARM_MAX_BRP) { if (idx >= ARM_MAX_BRP)
goto out;
idx = array_index_nospec(idx, ARM_MAX_BRP);
tsk->thread.debug.hbp_break[idx] = bp; tsk->thread.debug.hbp_break[idx] = bp;
err = 0; err = 0;
}
break; break;
case NT_ARM_HW_WATCH: case NT_ARM_HW_WATCH:
if (idx < ARM_MAX_WRP) { if (idx >= ARM_MAX_WRP)
goto out;
idx = array_index_nospec(idx, ARM_MAX_WRP);
tsk->thread.debug.hbp_watch[idx] = bp; tsk->thread.debug.hbp_watch[idx] = bp;
err = 0; err = 0;
}
break; break;
} }
out:
return err; return err;
} }