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

Restore the data array in coredump(), but use a different style to

Browse Source 
calculate the length.

Requested by:	kib
This commit is contained in:
Rui Paulo 2015-02-11 00:58:15 +00:00
parent a66ff38cec
commit 6fbc0f7d98
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/kern_sig.c
View File

@ -3261,9 +3261,11 @@ coredump(struct thread *td)
void *rl_cookie; void *rl_cookie;
off_t limit; off_t limit;
int compress; int compress;
char data[MAXPATHLEN * 2 + 16]; /* space for devctl notification */ char *data = NULL;
char *fullpath, *freepath = NULL; char *fullpath, *freepath = NULL;
size_t len; size_t len;
static const char comm_name[] = "comm=";
static const char core_name[] = "core=";
#ifdef COMPRESS_USER_CORES #ifdef COMPRESS_USER_CORES
compress = compress_user_cores; compress = compress_user_cores;
@ -3357,25 +3359,31 @@ close:
*/ */
if (coredump_devctl == 0) if (coredump_devctl == 0)
goto out; goto out;
len = MAXPATHLEN * 2 + sizeof(comm_name) - 1 +
sizeof(' ') + sizeof(core_name) - 1;
data = malloc(len, M_TEMP, M_WAITOK);
if (data == NULL)
goto out;
if (vn_fullpath_global(td, p->p_textvp, &fullpath, &freepath) != 0) if (vn_fullpath_global(td, p->p_textvp, &fullpath, &freepath) != 0)
goto out; goto out;
if (!coredump_sanitise_path(fullpath)) if (!coredump_sanitise_path(fullpath))
goto out; goto out;
snprintf(data, sizeof(data), "comm=%s ", fullpath); snprintf(data, len, "%s%s ", comm_name, fullpath);
free(freepath, M_TEMP); free(freepath, M_TEMP);
freepath = NULL; freepath = NULL;
if (vn_fullpath_global(td, vp, &fullpath, &freepath) != 0) if (vn_fullpath_global(td, vp, &fullpath, &freepath) != 0)
goto out; goto out;
if (!coredump_sanitise_path(fullpath)) if (!coredump_sanitise_path(fullpath))
goto out; goto out;
strlcat(data, "core=", sizeof(data)); strlcat(data, core_name, len);
len = strlcat(data, fullpath, sizeof(data)); strlcat(data, fullpath, len);
devctl_notify("kernel", "signal", "coredump", data); devctl_notify("kernel", "signal", "coredump", data);
out: out:
#ifdef AUDIT #ifdef AUDIT
audit_proc_coredump(td, name, error); audit_proc_coredump(td, name, error);
#endif #endif
free(freepath, M_TEMP); free(freepath, M_TEMP);
free(data, M_TEMP);
free(name, M_TEMP); free(name, M_TEMP);
return (error); return (error);
} }