oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kernel: apply x86 copy overflow check to ARM

Browse Source 
Apply the x86 overflow check from git-d09f72c to ARM code as well.
Not just stack traces, but also system services can trigger this
case, possibly as a result of being handed bad pointers by userland,
ending in a kernel panic.

Change-Id: Ib817e8b682fafec8edb486a094319ad11eda7081
This commit is contained in:
David van Moolenbroek 2015-12-29 15:58:24 +00:00 committed by Lionel Sambuc
parent f12160c14d
commit 59f1f7ecdd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
minix/kernel/arch/earm/memory.c
View File

@ -193,9 +193,13 @@ static int lin_lin_copy(struct proc *srcproc, vir_bytes srclinaddr,
/* Set up 1MB ranges. */
srcptr = createpde(srcproc, srclinaddr, &chunk, 0, &changed);
dstptr = createpde(dstproc, dstlinaddr, &chunk, 1, &changed);
if(changed) {
if(changed)
reload_ttbr0();
}
/* Check for overflow. */
if (srcptr + chunk < srcptr) return EFAULT_SRC;
if (dstptr + chunk < dstptr) return EFAULT_DST;
/* Copy pages. */
PHYS_COPY_CATCH(srcptr, dstptr, chunk, addr);