|
@@ -1379,17 +1379,14 @@ EXPORT_SYMBOL(set_binfmt);
|
|
* name into corename, which must have space for at least
|
|
* name into corename, which must have space for at least
|
|
* CORENAME_MAX_SIZE bytes plus one byte for the zero terminator.
|
|
* CORENAME_MAX_SIZE bytes plus one byte for the zero terminator.
|
|
*/
|
|
*/
|
|
-static int format_corename(char *corename, const char *pattern, long signr)
|
|
|
|
|
|
+static int format_corename(char *corename, int nr_threads, long signr)
|
|
{
|
|
{
|
|
- const char *pat_ptr = pattern;
|
|
|
|
|
|
+ const char *pat_ptr = core_pattern;
|
|
|
|
+ int ispipe = (*pat_ptr == '|');
|
|
char *out_ptr = corename;
|
|
char *out_ptr = corename;
|
|
char *const out_end = corename + CORENAME_MAX_SIZE;
|
|
char *const out_end = corename + CORENAME_MAX_SIZE;
|
|
int rc;
|
|
int rc;
|
|
int pid_in_pattern = 0;
|
|
int pid_in_pattern = 0;
|
|
- int ispipe = 0;
|
|
|
|
-
|
|
|
|
- if (*pattern == '|')
|
|
|
|
- ispipe = 1;
|
|
|
|
|
|
|
|
/* Repeat as long as we have more pattern to process and more output
|
|
/* Repeat as long as we have more pattern to process and more output
|
|
space */
|
|
space */
|
|
@@ -1490,7 +1487,7 @@ static int format_corename(char *corename, const char *pattern, long signr)
|
|
* and core_uses_pid is set, then .%pid will be appended to
|
|
* and core_uses_pid is set, then .%pid will be appended to
|
|
* the filename. Do not do this for piped commands. */
|
|
* the filename. Do not do this for piped commands. */
|
|
if (!ispipe && !pid_in_pattern
|
|
if (!ispipe && !pid_in_pattern
|
|
- && (core_uses_pid || atomic_read(¤t->mm->mm_users) != 1)) {
|
|
|
|
|
|
+ && (core_uses_pid || nr_threads)) {
|
|
rc = snprintf(out_ptr, out_end - out_ptr,
|
|
rc = snprintf(out_ptr, out_end - out_ptr,
|
|
".%d", task_tgid_vnr(current));
|
|
".%d", task_tgid_vnr(current));
|
|
if (rc > out_end - out_ptr)
|
|
if (rc > out_end - out_ptr)
|
|
@@ -1753,7 +1750,7 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs)
|
|
* uses lock_kernel()
|
|
* uses lock_kernel()
|
|
*/
|
|
*/
|
|
lock_kernel();
|
|
lock_kernel();
|
|
- ispipe = format_corename(corename, core_pattern, signr);
|
|
|
|
|
|
+ ispipe = format_corename(corename, retval, signr);
|
|
unlock_kernel();
|
|
unlock_kernel();
|
|
/*
|
|
/*
|
|
* Don't bother to check the RLIMIT_CORE value if core_pattern points
|
|
* Don't bother to check the RLIMIT_CORE value if core_pattern points
|