diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2016-10-25 17:11:11 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2016-10-25 17:11:11 +0000 |
| commit | 5b8145031bc378f69708568b1ca9b231f7fe6fba (patch) | |
| tree | df542924a8747ba29b55bef583a2dac1c9ad83e4 | |
| parent | a4dba4499eb53b4fc523136f83d9d89e0679bbad (diff) | |
| download | src-5b8145031bc378f69708568b1ca9b231f7fe6fba.tar.gz src-5b8145031bc378f69708568b1ca9b231f7fe6fba.zip | |
Revised SA-16:15. The initial patch didn't cover all possible overflows
based on passing incorrect parameters to sysarch(2).
Security: SA-16:15
Approved by: so
Notes
Notes:
svn path=/releng/10.2/; revision=307933
| -rw-r--r-- | UPDATING | 4 | ||||
| -rw-r--r-- | sys/amd64/amd64/sys_machdep.c | 5 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20161025 p24 FreeBSD-SA-16:15.sysarch [revised] + + Fix incorrect argument validation in sysarch(2). [SA-16:15] + 20161010 p23 FreeBSD-SA-16:29.bspatch FreeBSD-SA-16:30.portsnap FreeBSD-SA-16:31.libarchive diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index ff3bd3edcf8b..5c85272792e7 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -617,6 +617,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)) @@ -629,7 +631,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); } diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index c8220d022545..697f5c4677d2 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.2" -BRANCH="RELEASE-p23" +BRANCH="RELEASE-p24" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |