Skip to content

Commit e1dc890

Browse files
Dave Martingregkh
authored andcommitted
h8300/ptrace: Fix incorrect register transfer count
commit 502585c7555083d4a949c08350306b9ec196779e upstream. regs_set() and regs_get() are vulnerable to an off-by-1 buffer overrun if CONFIG_CPU_H8S is set, since this adds an extra entry to register_offset[] but not to user_regs_struct. So, iterate over user_regs_struct based on its actual size, not based on the length of register_offset[]. Signed-off-by: Dave Martin <Dave.Martin@arm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6e174bb commit e1dc890

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

arch/h8300/kernel/ptrace.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ static int regs_get(struct task_struct *target,
9595
long *reg = (long *)&regs;
9696

9797
/* build user regs in buffer */
98-
for (r = 0; r < ARRAY_SIZE(register_offset); r++)
98+
BUILD_BUG_ON(sizeof(regs) % sizeof(long) != 0);
99+
for (r = 0; r < sizeof(regs) / sizeof(long); r++)
99100
*reg++ = h8300_get_reg(target, r);
100101

101102
return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
@@ -113,7 +114,8 @@ static int regs_set(struct task_struct *target,
113114
long *reg;
114115

115116
/* build user regs in buffer */
116-
for (reg = (long *)&regs, r = 0; r < ARRAY_SIZE(register_offset); r++)
117+
BUILD_BUG_ON(sizeof(regs) % sizeof(long) != 0);
118+
for (reg = (long *)&regs, r = 0; r < sizeof(regs) / sizeof(long); r++)
117119
*reg++ = h8300_get_reg(target, r);
118120

119121
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
@@ -122,7 +124,7 @@ static int regs_set(struct task_struct *target,
122124
return ret;
123125

124126
/* write back to pt_regs */
125-
for (reg = (long *)&regs, r = 0; r < ARRAY_SIZE(register_offset); r++)
127+
for (reg = (long *)&regs, r = 0; r < sizeof(regs) / sizeof(long); r++)
126128
h8300_put_reg(target, r, *reg++);
127129
return 0;
128130
}

0 commit comments

Comments
 (0)