summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-11-02 10:47:46 -0200
committerRenato Botelho <renato@netgate.com>2016-11-02 10:47:46 -0200
commit01e4dee209c13f5a3343e3cc887c2f920a69dd65 (patch)
treeb19966b3c263495a3f07f891adba668c508ba31b /sys/amd64
parent5fc1b195c4ab71aaf651429b2c50ee5cc5e7c5fb (diff)
parent2f81d935658287026e614a5edf74ae47f5c54f3f (diff)
downloadFreeBSD-src-RELENG_2_3_2.zip
FreeBSD-src-RELENG_2_3_2.tar.gz
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3_2RELENG_2_3_2
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 ff3bd3e..5c85272 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);
}
OpenPOWER on IntegriCloud