diff options
| author | alfred <alfred@FreeBSD.org> | 2010-04-30 03:13:24 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2010-04-30 03:13:24 +0000 |
| commit | 993bf6ff365b34234950ca83a90ffc5c04d5ca1a (patch) | |
| tree | 37138510f8ffc8679a777efebacc7e1cb0d52d5e /sys/kern/imgact_elf.c | |
| parent | 20fdc94b9e6b94282e3e136276daf05c45b18edb (diff) | |
| download | FreeBSD-src-993bf6ff365b34234950ca83a90ffc5c04d5ca1a.zip FreeBSD-src-993bf6ff365b34234950ca83a90ffc5c04d5ca1a.tar.gz | |
Don't leak core_buf or gzfile if doing a compressed core file and we
hit an error condition.
Obtained from: Juniper Networks
Diffstat (limited to 'sys/kern/imgact_elf.c')
| -rw-r--r-- | sys/kern/imgact_elf.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 236894f..c48e0f5 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1088,8 +1088,10 @@ __elfN(coredump)(struct thread *td, struct vnode *vp, off_t limit, int flags) hdrsize = 0; __elfN(puthdr)(td, (void *)NULL, &hdrsize, seginfo.count); - if (hdrsize + seginfo.size >= limit) - return (EFAULT); + if (hdrsize + seginfo.size >= limit) { + error = EFAULT; + goto done; + } /* * Allocate memory for building the header, fill it up, @@ -1097,7 +1099,8 @@ __elfN(coredump)(struct thread *td, struct vnode *vp, off_t limit, int flags) */ hdr = malloc(hdrsize, M_TEMP, M_WAITOK); if (hdr == NULL) { - return (EINVAL); + error = EINVAL; + goto done; } error = __elfN(corehdr)(td, vp, cred, seginfo.count, hdr, hdrsize, gzfile); @@ -1125,8 +1128,8 @@ __elfN(coredump)(struct thread *td, struct vnode *vp, off_t limit, int flags) curproc->p_comm, error); } -#ifdef COMPRESS_USER_CORES done: +#ifdef COMPRESS_USER_CORES if (core_buf) free(core_buf, M_TEMP); if (gzfile) |
