diff options
author | Renato Botelho <renato@netgate.com> | 2016-11-02 10:47:24 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-11-02 10:47:24 -0200 |
commit | f3b07992fce8a61008ffdc893fde2b53fef7acba (patch) | |
tree | 28fbaae043c1906469d04a7ac2bca8a6fd982875 /sys/amd64/amd64/sys_machdep.c | |
parent | df5338698255767af680591ff274814676493ffb (diff) | |
parent | 2f81d935658287026e614a5edf74ae47f5c54f3f (diff) | |
download | FreeBSD-src-f3b07992fce8a61008ffdc893fde2b53fef7acba.zip FreeBSD-src-f3b07992fce8a61008ffdc893fde2b53fef7acba.tar.gz |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'sys/amd64/amd64/sys_machdep.c')
-rw-r--r-- | sys/amd64/amd64/sys_machdep.c | 5 |
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); } |