CVS commit: src/sys/arch/i386/i386

[Maxime Villard]

Module Name:    src
Committed By:   maxv
Date:           Sat Dec 17 14:27:53 UTC 2016

Modified Files:
        src/sys/arch/i386/i386: gdt.c machdep.c

Log Message:
Put a limit in the percpu segment, so we can detect overflows on %fs.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/i386/i386/gdt.c
cvs rdiff -u -r1.768 -r1.769 src/sys/arch/i386/i386/machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/i386/i386/gdt.c
diff -u src/sys/arch/i386/i386/gdt.c:1.55 src/sys/arch/i386/i386/gdt.c:1.56
--- src/sys/arch/i386/i386/gdt.c:1.55	Sat Aug 20 19:46:54 2016
+++ src/sys/arch/i386/i386/gdt.c	Sat Dec 17 14:27:53 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.c,v 1.55 2016/08/20 19:46:54 christos Exp $	*/
+/*	$NetBSD: gdt.c,v 1.56 2016/12/17 14:27:53 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.55 2016/08/20 19:46:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.56 2016/12/17 14:27:53 maxv Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -144,8 +144,8 @@ gdt_init(void)
 	pmap_update(pmap_kernel());
 	memcpy(gdt, old_gdt, NGDT * sizeof(gdt[0]));
 	ci->ci_gdt = gdt;
-	setsegment(&ci->ci_gdt[GCPU_SEL].sd, ci, 0xfffff,
-	    SDT_MEMRWA, SEL_KPL, 1, 1);
+	setsegment(&ci->ci_gdt[GCPU_SEL].sd, ci,
+	    sizeof(struct cpu_info) - 1, SDT_MEMRWA, SEL_KPL, 1, 0);
 
 	gdt_init_cpu(ci);
 }
@@ -175,8 +175,8 @@ gdt_alloc_cpu(struct cpu_info *ci)
 	pmap_update(pmap_kernel());
 	memset(ci->ci_gdt, 0, min_len);
 	memcpy(ci->ci_gdt, gdt, gdt_count[0] * sizeof(gdt[0]));
-	setsegment(&ci->ci_gdt[GCPU_SEL].sd, ci, 0xfffff,
-	    SDT_MEMRWA, SEL_KPL, 1, 1);
+	setsegment(&ci->ci_gdt[GCPU_SEL].sd, ci,
+	    sizeof(struct cpu_info) - 1, SDT_MEMRWA, SEL_KPL, 1, 0);
 }
 
 

Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.768 src/sys/arch/i386/i386/machdep.c:1.769
--- src/sys/arch/i386/i386/machdep.c:1.768	Fri Dec 16 19:52:22 2016
+++ src/sys/arch/i386/i386/machdep.c	Sat Dec 17 14:27:53 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.768 2016/12/16 19:52:22 maxv Exp $	*/
+/*	$NetBSD: machdep.c,v 1.769 2016/12/17 14:27:53 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.768 2016/12/16 19:52:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.769 2016/12/17 14:27:53 maxv Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -988,8 +988,8 @@ initgdt(union descriptor *tgdt)
 	setsegment(&gdt[GBIOSDATA_SEL].sd, 0, 0xfffff, SDT_MEMRWA, SEL_KPL, 0,
 	    0);
 #endif
-	setsegment(&gdt[GCPU_SEL].sd, &cpu_info_primary, 0xfffff,
-	    SDT_MEMRWA, SEL_KPL, 1, 1);
+	setsegment(&gdt[GCPU_SEL].sd, &cpu_info_primary,
+	    sizeof(struct cpu_info) - 1, SDT_MEMRWA, SEL_KPL, 1, 0);
 
 #ifndef XEN
 	setregion(&region, gdt, NGDT * sizeof(gdt[0]) - 1);