Date: Mon, 3 Sep 2012 09:34:47 +0000 (UTC) From: Andrey Zonov <zont@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r240069 - head/sys/vm Message-ID: <201209030934.q839YljR058908@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zont Date: Mon Sep 3 09:34:46 2012 New Revision: 240069 URL: http://svn.freebsd.org/changeset/base/240069 Log: - After r240026 sgrowsiz should be used in a safer maner. Approved by: kib (mentor) MCF after: 1 week Modified: head/sys/vm/vm_map.c Modified: head/sys/vm/vm_map.c ============================================================================== --- head/sys/vm/vm_map.c Mon Sep 3 09:26:56 2012 (r240068) +++ head/sys/vm/vm_map.c Mon Sep 3 09:34:46 2012 (r240069) @@ -3245,7 +3245,7 @@ vm_map_stack(vm_map_t map, vm_offset_t a { vm_map_entry_t new_entry, prev_entry; vm_offset_t bot, top; - vm_size_t init_ssize; + vm_size_t growsize, init_ssize; int orient, rv; rlim_t vmemlim; @@ -3264,7 +3264,8 @@ vm_map_stack(vm_map_t map, vm_offset_t a addrbos + max_ssize < addrbos) return (KERN_NO_SPACE); - init_ssize = (max_ssize < sgrowsiz) ? max_ssize : sgrowsiz; + growsize = sgrowsiz; + init_ssize = (max_ssize < growsize) ? max_ssize : growsize; PROC_LOCK(curthread->td_proc); vmemlim = lim_cur(curthread->td_proc, RLIMIT_VMEM); @@ -3357,6 +3358,7 @@ vm_map_growstack(struct proc *p, vm_offs struct vmspace *vm = p->p_vmspace; vm_map_t map = &vm->vm_map; vm_offset_t end; + vm_size_t growsize; size_t grow_amount, max_grow; rlim_t stacklim, vmemlim; int is_procstack, rv; @@ -3476,8 +3478,9 @@ Retry: PROC_UNLOCK(p); #endif - /* Round up the grow amount modulo SGROWSIZ */ - grow_amount = roundup (grow_amount, sgrowsiz); + /* Round up the grow amount modulo sgrowsiz */ + growsize = sgrowsiz; + grow_amount = roundup(grow_amount, growsize); if (grow_amount > stack_entry->avail_ssize) grow_amount = stack_entry->avail_ssize; if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209030934.q839YljR058908>