Commit 1e407ee3 authored Apr 25, 2016 by Khem Raj Committed by Michael Ellerman Jun 06, 2016

powerpc/ptrace: Fix out of bounds array access warning



gcc-6 correctly warns about a out of bounds access

arch/powerpc/kernel/ptrace.c:407:24: warning: index 32 denotes an offset greater than size of 'u64[32][1] {aka long long unsigned int[32][1]}' [-Warray-bounds]
        offsetof(struct thread_fp_state, fpr[32][0]));
                        ^

check the end of array instead of beginning of next element to fix this

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Segher Boessenkool <segher@kernel.crashing.org>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 7cc85103

arch/powerpc/kernel/ptrace.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -377,7 +377,7 @@ static int fpr_get(struct task_struct target, const struct user_regset regset,

		#else
		BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
		offsetof(struct thread_fp_state, fpr[32][0]));
		offsetof(struct thread_fp_state, fpr[32]));

		return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
		&target->thread.fp_state, 0, -1);
		@@ -405,7 +405,7 @@ static int fpr_set(struct task_struct target, const struct user_regset regset,
		return 0;
		#else
		BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
		offsetof(struct thread_fp_state, fpr[32][0]));
		offsetof(struct thread_fp_state, fpr[32]));

		return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
		&target->thread.fp_state, 0, -1);