Date: Tue, 25 Oct 2016 18:17:03 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r307945 - in user/cperciva/freebsd-update-build/patches: 10.1-RELEASE 10.2-RELEASE 11.0-RELEASE 9.3-RELEASE Message-ID: <201610251817.u9PIH3SX099931@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Tue Oct 25 18:17:03 2016 New Revision: 307945 URL: https://svnweb.freebsd.org/changeset/base/307945 Log: SA-16:15 and SA-16:32. Added: user/cperciva/freebsd-update-build/patches/10.1-RELEASE/41-SA-16:15.sysarch user/cperciva/freebsd-update-build/patches/10.2-RELEASE/24-SA-16:15.sysarch user/cperciva/freebsd-update-build/patches/11.0-RELEASE/2-SA-16:15.sysarch user/cperciva/freebsd-update-build/patches/11.0-RELEASE/2-SA-16:32.bhyve user/cperciva/freebsd-update-build/patches/9.3-RELEASE/49-SA-16:15.sysarch Added: user/cperciva/freebsd-update-build/patches/10.1-RELEASE/41-SA-16:15.sysarch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/10.1-RELEASE/41-SA-16:15.sysarch Tue Oct 25 18:17:03 2016 (r307945) @@ -0,0 +1,21 @@ +--- sys/amd64/amd64/sys_machdep.c.orig ++++ sys/amd64/amd64/sys_machdep.c +@@ -608,6 +608,8 @@ + 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 @@ + /* 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); + } + Added: user/cperciva/freebsd-update-build/patches/10.2-RELEASE/24-SA-16:15.sysarch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/10.2-RELEASE/24-SA-16:15.sysarch Tue Oct 25 18:17:03 2016 (r307945) @@ -0,0 +1,21 @@ +--- sys/amd64/amd64/sys_machdep.c.orig ++++ sys/amd64/amd64/sys_machdep.c +@@ -608,6 +608,8 @@ + 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 @@ + /* 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); + } + Added: user/cperciva/freebsd-update-build/patches/11.0-RELEASE/2-SA-16:15.sysarch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/11.0-RELEASE/2-SA-16:15.sysarch Tue Oct 25 18:17:03 2016 (r307945) @@ -0,0 +1,21 @@ +--- sys/amd64/amd64/sys_machdep.c.orig ++++ sys/amd64/amd64/sys_machdep.c +@@ -608,6 +608,8 @@ + 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 @@ + /* 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); + } + Added: user/cperciva/freebsd-update-build/patches/11.0-RELEASE/2-SA-16:32.bhyve ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/11.0-RELEASE/2-SA-16:32.bhyve Tue Oct 25 18:17:03 2016 (r307945) @@ -0,0 +1,17 @@ +--- usr.sbin/bhyve/vga.c.orig ++++ usr.sbin/bhyve/vga.c +@@ -161,10 +161,10 @@ + */ + struct { + uint8_t dac_state; +- int dac_rd_index; +- int dac_rd_subindex; +- int dac_wr_index; +- int dac_wr_subindex; ++ uint8_t dac_rd_index; ++ uint8_t dac_rd_subindex; ++ uint8_t dac_wr_index; ++ uint8_t dac_wr_subindex; + uint8_t dac_palette[3 * 256]; + uint32_t dac_palette_rgb[256]; + } vga_dac; Added: user/cperciva/freebsd-update-build/patches/9.3-RELEASE/49-SA-16:15.sysarch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/9.3-RELEASE/49-SA-16:15.sysarch Tue Oct 25 18:17:03 2016 (r307945) @@ -0,0 +1,21 @@ +--- sys/amd64/amd64/sys_machdep.c.orig ++++ sys/amd64/amd64/sys_machdep.c +@@ -608,6 +608,8 @@ + 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 @@ + /* 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); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610251817.u9PIH3SX099931>