FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-02 23:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

powerpc: Explicitly copy elements of pt_regs

Browse Source 
Gcc 4.3 produced this warning:

arch/powerpc/kernel/signal_64.c: In function 'restore_sigcontext':
arch/powerpc/kernel/signal_64.c:161: warning: array subscript is above array bounds

This is caused by us copying to aliases of elements of the pt_regs
structure.  Make those explicit.

This adds one extra __get_user and unrolls a loop.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell 2008-06-27 16:18:27 +10:00 committed by Paul Mackerras
parent 3420b5daff
commit fcbc5a976b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/powerpc/kernel/signal_64.c
View File

@ -170,29 +170,29 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
#endif #endif
unsigned long err = 0; unsigned long err = 0;
unsigned long save_r13 = 0; unsigned long save_r13 = 0;
elf_greg_t *gregs = (elf_greg_t *)regs;
unsigned long msr; unsigned long msr;
int i;
/* If this is not a signal return, we preserve the TLS in r13 */ /* If this is not a signal return, we preserve the TLS in r13 */
if (!sig) if (!sig)
save_r13 = regs->gpr[13]; save_r13 = regs->gpr[13];
/* copy everything before MSR */ /* copy the GPRs */
err |= __copy_from_user(regs, &sc->gp_regs, err |= __copy_from_user(regs->gpr, sc->gp_regs, sizeof(regs->gpr));
PT_MSR*sizeof(unsigned long)); err |= __get_user(regs->nip, &sc->gp_regs[PT_NIP]);
/* get MSR separately, transfer the LE bit if doing signal return */ /* get MSR separately, transfer the LE bit if doing signal return */
err |= __get_user(msr, &sc->gp_regs[PT_MSR]); err |= __get_user(msr, &sc->gp_regs[PT_MSR]);
if (sig) if (sig)
regs->msr = (regs->msr & ~MSR_LE) | (msr & MSR_LE); regs->msr = (regs->msr & ~MSR_LE) | (msr & MSR_LE);
err |= __get_user(regs->orig_gpr3, &sc->gp_regs[PT_ORIG_R3]);
err |= __get_user(regs->ctr, &sc->gp_regs[PT_CTR]);
err |= __get_user(regs->link, &sc->gp_regs[PT_LNK]);
err |= __get_user(regs->xer, &sc->gp_regs[PT_XER]);
err |= __get_user(regs->ccr, &sc->gp_regs[PT_CCR]);
/* skip SOFTE */ /* skip SOFTE */
for (i = PT_MSR+1; i <= PT_RESULT; i++) { err |= __get_user(regs->trap, &sc->gp_regs[PT_TRAP]);
if (i == PT_SOFTE) err |= __get_user(regs->dar, &sc->gp_regs[PT_DAR]);
continue; err |= __get_user(regs->dsisr, &sc->gp_regs[PT_DSISR]);
err |= __get_user(gregs[i], &sc->gp_regs[i]); err |= __get_user(regs->result, &sc->gp_regs[PT_RESULT]);
}
if (!sig) if (!sig)
regs->gpr[13] = save_r13; regs->gpr[13] = save_r13;