summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2016-10-25 17:11:20 +0000
committerglebius <glebius@FreeBSD.org>2016-10-25 17:11:20 +0000
commit166093516c6aacc3b4828524e9ddc45bfbdd279c (patch)
tree3fc6fc37e3e5716d0163bc1ffee79a626d821657 /sys/amd64
parent1649f1572fc22ec9708f6f62c0fff2b55ac40096 (diff)
downloadFreeBSD-src-166093516c6aacc3b4828524e9ddc45bfbdd279c.zip
FreeBSD-src-166093516c6aacc3b4828524e9ddc45bfbdd279c.tar.gz
Revised SA-16:15. The initial patch didn't cover all possible overflows
based on passing incorrect parameters to sysarch(2). [1] Fix unchecked array reference in the VGA device emulation code. [2] Security: SA-16:15 [1] Security: SA-16:32 [2] Approved by: so
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/sys_machdep.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 4f85e1f..24009db 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -608,6 +608,8 @@ amd64_set_ldt(td, uap, descs)
largest_ld = uap->start + uap->num;
if (largest_ld > max_ldt_segment)
largest_ld = max_ldt_segment;
+ if (largest_ld < uap->start)
+ return (EINVAL);
i = largest_ld - uap->start;
mtx_lock(&dt_lock);
bzero(&((struct user_segment_descriptor *)(pldt->ldt_base))
@@ -620,7 +622,8 @@ amd64_set_ldt(td, uap, descs)
/* verify range of descriptors to modify */
largest_ld = uap->start + uap->num;
if (uap->start >= max_ldt_segment ||
- largest_ld > max_ldt_segment)
+ largest_ld > max_ldt_segment ||
+ largest_ld < uap->start)
return (EINVAL);
}
OpenPOWER on IntegriCloud