Commit 57cc083a authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds

coredump: add support for exe_file in core name

Now, exe_file is not proc FS dependent, so we can use it to name core
file.  So we add %E pattern for core file name cration which extract path
from mm_struct->exe_file.  Then it converts slashes to exclamation marks
and pastes the result to the core file name itself.

This is useful for environments where binary names are longer than 16
character (the current->comm limitation).  Also where there are binaries
with same name but in a different path.  Further in case the binery itself
changes its current->comm after exec.

So by doing (s/$/#/ -- # is treated as git comment):

  $ sysctl kernel.core_pattern='core.%p.%e.%E'
  $ ln /bin/cat cat45678901234567890
  $ ./cat45678901234567890
  ^Z
  $ rm cat45678901234567890
  $ fg
  ^\Quit (core dumped)
  $ ls core*

we now get:

  core.2434.cat456789012345.!root!cat45678901234567890 (deleted)
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Reviewed-by: default avatarAndi Kleen <andi@firstfloor.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 38646013
...@@ -161,7 +161,8 @@ core_pattern is used to specify a core dumpfile pattern name. ...@@ -161,7 +161,8 @@ core_pattern is used to specify a core dumpfile pattern name.
%s signal number %s signal number
%t UNIX time of dump %t UNIX time of dump
%h hostname %h hostname
%e executable filename %e executable filename (may be shortened)
%E executable path
%<OTHER> both are dropped %<OTHER> both are dropped
. If the first character of the pattern is a '|', the kernel will treat . If the first character of the pattern is a '|', the kernel will treat
the rest of the pattern as a command to run. The core dump will be the rest of the pattern as a command to run. The core dump will be
......
...@@ -1623,6 +1623,41 @@ static int cn_printf(struct core_name *cn, const char *fmt, ...) ...@@ -1623,6 +1623,41 @@ static int cn_printf(struct core_name *cn, const char *fmt, ...)
return ret; return ret;
} }
static int cn_print_exe_file(struct core_name *cn)
{
struct file *exe_file;
char *pathbuf, *path, *p;
int ret;
exe_file = get_mm_exe_file(current->mm);
if (!exe_file)
return cn_printf(cn, "(unknown)");
pathbuf = kmalloc(PATH_MAX, GFP_TEMPORARY);
if (!pathbuf) {
ret = -ENOMEM;
goto put_exe_file;
}
path = d_path(&exe_file->f_path, pathbuf, PATH_MAX);
if (IS_ERR(path)) {
ret = PTR_ERR(path);
goto free_buf;
}
for (p = path; *p; p++)
if (*p == '/')
*p = '!';
ret = cn_printf(cn, "%s", path);
free_buf:
kfree(pathbuf);
put_exe_file:
fput(exe_file);
return ret;
}
/* format_corename will inspect the pattern parameter, and output a /* format_corename will inspect the pattern parameter, and output a
* 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.
...@@ -1694,6 +1729,9 @@ static int format_corename(struct core_name *cn, long signr) ...@@ -1694,6 +1729,9 @@ static int format_corename(struct core_name *cn, long signr)
case 'e': case 'e':
err = cn_printf(cn, "%s", current->comm); err = cn_printf(cn, "%s", current->comm);
break; break;
case 'E':
err = cn_print_exe_file(cn);
break;
/* core limit size */ /* core limit size */
case 'c': case 'c':
err = cn_printf(cn, "%lu", err = cn_printf(cn, "%lu",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment