diff options
| author |   art <art@openbsd.org> | 2005-07-26 07:11:55 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2005-07-26 07:11:55 +0000 |
| commit | 676bc291fdfe882f41e71be2e9cb16683d4614cf (patch) | |
| tree | bfabe677f3e9a3d5306fcda91ab737b28b613706 /sys/uvm/uvm_unix.c | |
| parent | - setup -> set up (diff) | |
| download | wireguard-openbsd-676bc291fdfe882f41e71be2e9cb16683d4614cf.tar.xz wireguard-openbsd-676bc291fdfe882f41e71be2e9cb16683d4614cf.zip | |
- Make a UVM_OBJ_IS_DEVICE macro.
- Use it to skip device mappings while dumping core.
- Ignore EFAULT errors while dumping core since they can happen
even for valid mappings. Just skip that part of the core file and
let it get automagically zero-filled.
This fixes the broken X core dumps that people have been seeing and also
fixes some other potential problems that could prevent core dumps (mmaps
beyond EOF, etc.).
tedu@ ok
Diffstat (limited to 'sys/uvm/uvm_unix.c')
| -rw-r--r-- | sys/uvm/uvm_unix.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sys/uvm/uvm_unix.c b/sys/uvm/uvm_unix.c index e53a882b597..21ef2c69449 100644 --- a/sys/uvm/uvm_unix.c +++ b/sys/uvm/uvm_unix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_unix.c,v 1.26 2003/03/04 18:24:05 mickey Exp $ */ +/* $OpenBSD: uvm_unix.c,v 1.27 2005/07/26 07:11:55 art Exp $ */ /* $NetBSD: uvm_unix.c,v 1.18 2000/09/13 15:00:25 thorpej Exp $ */ /* @@ -206,6 +206,13 @@ uvm_coredump(p, vp, cred, chdr) if (!(entry->protection & VM_PROT_WRITE)) continue; + /* + * Don't dump mmaped devices. + */ + if (entry->object.uvm_obj != NULL && + UVM_OBJ_IS_DEVICE(entry->object.uvm_obj)) + continue; + start = entry->start; end = entry->end; @@ -243,7 +250,11 @@ uvm_coredump(p, vp, cred, chdr) (caddr_t)&cseg, chdr->c_seghdrsize, offset, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, NULL, p); - if (error) + /* + * We might get an EFAULT on objects mapped beyond + * EOF. Ignore the error. + */ + if (error && error != EFAULT) break; offset += chdr->c_seghdrsize; |