Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177837479
D56863.1795398929.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None
D56863.1795398929.diff
View Options
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -4723,6 +4723,11 @@
return (rv);
}
+static bool report_stackoverflow = true;
+SYSCTL_BOOL(_vm, OID_AUTO, report_stackoverflow, CTLFLAG_RWTUN,
+ &report_stackoverflow, 0,
+ "uprintf() on stack overflow");
+
/*
* Attempts to grow a vm stack entry. Returns KERN_SUCCESS if we
* successfully grow the stack.
@@ -4731,6 +4736,7 @@
vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry)
{
vm_map_entry_t stack_entry;
+ struct thread *td;
struct proc *p;
struct vmspace *vm;
vm_offset_t gap_end, gap_start, grow_start;
@@ -4746,7 +4752,8 @@
int error __diagused;
#endif
- p = curproc;
+ td = curthread;
+ p = td->td_proc;
vm = p->p_vmspace;
/*
@@ -4760,9 +4767,9 @@
MPASS(!vm_map_is_system(map));
- lmemlim = lim_cur(curthread, RLIMIT_MEMLOCK);
- stacklim = lim_cur(curthread, RLIMIT_STACK);
- vmemlim = lim_cur(curthread, RLIMIT_VMEM);
+ lmemlim = lim_cur(td, RLIMIT_MEMLOCK);
+ stacklim = lim_cur(td, RLIMIT_STACK);
+ vmemlim = lim_cur(td, RLIMIT_VMEM);
retry:
/* If addr is not in a hole for a stack grow area, no need to grow. */
if (gap_entry == NULL && !vm_map_lookup_entry(map, addr, &gap_entry))
@@ -4778,15 +4785,19 @@
} else {
return (KERN_FAILURE);
}
- guard = ((curproc->p_flag2 & P2_STKGAP_DISABLE) != 0 ||
- (curproc->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 :
+ guard = ((p->p_flag2 & P2_STKGAP_DISABLE) != 0 ||
+ (p->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 :
gap_entry->next_read;
max_grow = gap_entry->end - gap_entry->start;
if (guard > max_grow)
return (KERN_NO_SPACE);
max_grow -= guard;
- if (grow_amount > max_grow)
+ if (grow_amount > max_grow) {
+ if (report_stackoverflow)
+ uprintf("pid %d comm %s tid %d stack overflow\n",
+ p->p_pid, p->p_comm, td->td_tid);
return (KERN_NO_SPACE);
+ }
/*
* If this is the main process stack, see if we're over the stack
@@ -4794,8 +4805,12 @@
*/
is_procstack = addr >= (vm_offset_t)vm->vm_maxsaddr &&
addr < (vm_offset_t)vm->vm_stacktop;
- if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim))
+ if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) {
+ if (report_stackoverflow)
+ uprintf("pid %d comm %s tid %d stack overflow\n",
+ p->p_pid, p->p_comm, td->td_tid);
return (KERN_NO_SPACE);
+ }
#ifdef RACCT
if (racct_enable) {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 23, 1:55 AM (5 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41920272
Default Alt Text
D56863.1795398929.diff (2 KB)
Attached To
Mode
D56863: vm_map_growstack(): give a hint to user that stack was blown out
Attached
Detach File
Event Timeline