CVS commit: src/sys

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sat Sep  3 12:20:58 UTC 2016

Modified Files:
        src/sys/kern: kern_pax.c
        src/sys/sys: pax.h

Log Message:
vsize_t is not always u_long :-)


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/kern/kern_pax.c
cvs rdiff -u -r1.24 -r1.25 src/sys/sys/pax.h

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


Modified files:

Index: src/sys/kern/kern_pax.c
diff -u src/sys/kern/kern_pax.c:1.55 src/sys/kern/kern_pax.c:1.56
--- src/sys/kern/kern_pax.c:1.55	Fri May 27 12:35:16 2016
+++ src/sys/kern/kern_pax.c	Sat Sep  3 08:20:58 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_pax.c,v 1.55 2016/05/27 16:35:16 christos Exp $	*/
+/*	$NetBSD: kern_pax.c,v 1.56 2016/09/03 12:20:58 christos Exp $	*/
 
 /*
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.55 2016/05/27 16:35:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.56 2016/09/03 12:20:58 christos Exp $");
 
 #include "opt_pax.h"
 
@@ -632,7 +632,7 @@ pax_aslr_rtld_offset(struct exec_package
 }
 
 void
-pax_aslr_stack(struct exec_package *epp, u_long *max_stack_size)
+pax_aslr_stack(struct exec_package *epp, vsize_t *max_stack_size)
 {
 	if (!pax_aslr_epp_active(epp))
 		return;

Index: src/sys/sys/pax.h
diff -u src/sys/sys/pax.h:1.24 src/sys/sys/pax.h:1.25
--- src/sys/sys/pax.h:1.24	Wed May 25 16:07:54 2016
+++ src/sys/sys/pax.h	Sat Sep  3 08:20:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pax.h,v 1.24 2016/05/25 20:07:54 christos Exp $ */
+/* $NetBSD: pax.h,v 1.25 2016/09/03 12:20:58 christos Exp $ */
 
 /*-
  * Copyright (c) 2006 Elad Efrat <e...@netbsd.org>
@@ -88,7 +88,7 @@ int pax_segvguard(struct lwp *, struct v
 
 #ifdef PAX_ASLR
 void pax_aslr_init_vm(struct lwp *, struct vmspace *, struct exec_package *);
-void pax_aslr_stack(struct exec_package *, u_long *);
+void pax_aslr_stack(struct exec_package *, vsize_t *);
 uint32_t pax_aslr_stack_gap(struct exec_package *);
 vaddr_t pax_aslr_exec_offset(struct exec_package *, vaddr_t);
 voff_t pax_aslr_rtld_offset(struct exec_package *, vaddr_t, int);