浏览代码

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

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>
Mark Rutland 7 年之前
父节点
当前提交
14d6e289a8
共有 1 个文件被更改,包括 11 次插入8 次删除
  1. 11 8
      arch/arm64/kernel/ptrace.c

+ 11 - 8
arch/arm64/kernel/ptrace.c

@@ -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) {
-			tsk->thread.debug.hbp_break[idx] = bp;
-			err = 0;
-		}
+		if (idx >= ARM_MAX_BRP)
+			goto out;
+		idx = array_index_nospec(idx, ARM_MAX_BRP);
+		tsk->thread.debug.hbp_break[idx] = bp;
+		err = 0;
 		break;
 		break;
 	case NT_ARM_HW_WATCH:
 	case NT_ARM_HW_WATCH:
-		if (idx < ARM_MAX_WRP) {
-			tsk->thread.debug.hbp_watch[idx] = bp;
-			err = 0;
-		}
+		if (idx >= ARM_MAX_WRP)
+			goto out;
+		idx = array_index_nospec(idx, ARM_MAX_WRP);
+		tsk->thread.debug.hbp_watch[idx] = bp;
+		err = 0;
 		break;
 		break;
 	}
 	}
 
 
+out:
 	return err;
 	return err;
 }
 }