d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't leak core_buf or gzfile if doing a compressed core file and we

Browse Source 
hit an error condition.

Obtained from: Juniper Networks
This commit is contained in:
Alfred Perlstein 2010-04-30 03:13:24 +00:00
parent feb112c552
commit fba6b1af2e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/imgact_elf.c
View File

@ -1088,8 +1088,10 @@ __elfN(coredump)(struct thread *td, struct vnode *vp, off_t limit, int flags)
hdrsize = 0; hdrsize = 0;
__elfN(puthdr)(td, (void *)NULL, &hdrsize, seginfo.count); __elfN(puthdr)(td, (void *)NULL, &hdrsize, seginfo.count);
if (hdrsize + seginfo.size >= limit) if (hdrsize + seginfo.size >= limit) {
return (EFAULT); error = EFAULT;
goto done;
}
/* /*
* Allocate memory for building the header, fill it up, * 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); hdr = malloc(hdrsize, M_TEMP, M_WAITOK);
if (hdr == NULL) { if (hdr == NULL) {
return (EINVAL); error = EINVAL;
goto done;
} }
error = __elfN(corehdr)(td, vp, cred, seginfo.count, hdr, hdrsize, error = __elfN(corehdr)(td, vp, cred, seginfo.count, hdr, hdrsize,
gzfile); gzfile);
@ -1125,8 +1128,8 @@ __elfN(coredump)(struct thread *td, struct vnode *vp, off_t limit, int flags)
curproc->p_comm, error); curproc->p_comm, error);
} }
#ifdef COMPRESS_USER_CORES
done: done:
#ifdef COMPRESS_USER_CORES
if (core_buf) if (core_buf)
free(core_buf, M_TEMP); free(core_buf, M_TEMP);
if (gzfile) if (gzfile)