[linux-yocto] [PATCH 2/8] powerpc/ptrace: Fix out of bounds array access warning

[Daniel Dragomir]

From: Khem Raj <raj.khem at gmail.com>

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 at gmail.com>
Cc: Kees Cook <keescook at chromium.org>
Cc: Michael Ellerman <mpe at ellerman.id.au>
Cc: Segher Boessenkool <segher at kernel.crashing.org>
Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
---
 arch/powerpc/kernel/ptrace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 2e3d2bf..fdebd6b 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -376,7 +376,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);
@@ -404,7 +404,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);
-- 
2.7.4