The document reads "%e" should be "executable filename" while actually it could be changed by things like pr_ctl PR_SET_NAME. People who uses "%e" in core_pattern get surprised when they find out they get thread name instead of executable filename. This is either a bug of document or a bug of code. Since the behavior of "%e" is there for long time, it could bring another surprise for users if we "fix" the code. So we just "fix" the document. And more, for users who really need the "executable filename" in core_pattern, we introduce a new "%f" for the real executable filename. We already have "%E" for executable path in kernel, so just reuse most of its code for the new added "%f" format.
Unified · Split
| @@ -164,7 +164,8 @@ core_pattern · 163 unmodified lines | ||
| 164 | 164 | %s signal number |
| 165 | 165 | %t UNIX time of dump |
| 166 | 166 | %h hostname |
| 167 | − %e executable filename (may be shortened) | |
| 167 | + %e executable filename (may be shortened, could be changed by prctl etc) | |
| 168 | + %f executable filename | |
| 168 | 169 | %E executable path |
| 169 | 170 | %c maximum size of core file by resource limit RLIMIT_CORE |
| 170 | 171 | %<OTHER> both are dropped |
| @@ -153,10 +153,10 @@ int cn_esc_printf(struct core_name *cn, const char *fmt, ...) · 152 unmodified lines | ||
| 153 | 153 | return ret; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | −static int cn_print_exe_file(struct core_name *cn) | |
| 156 | +static int cn_print_exe_file(struct core_name *cn, bool name_only) | |
| 157 | 157 | { |
| 158 | 158 | struct file *exe_file; |
| 159 | − char *pathbuf, *path; | |
| 159 | + char *pathbuf, *path, *ptr; | |
| 160 | 160 | int ret; |
| 161 | 161 | |
| 162 | 162 | exe_file = get_mm_exe_file(current->mm); |
| @@ -175,6 +175,11 @@ static int cn_print_exe_file(struct core_name *cn) · 12 unmodified lines | ||
| 175 | 175 | goto free_buf; |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | + if (name_only) { | |
| 179 | + ptr = strrchr(path, '/'); | |
| 180 | + if (ptr) | |
| 181 | + path = ptr + 1; | |
| 182 | + } | |
| 178 | 183 | ret = cn_esc_printf(cn, "%s", path); |
| 179 | 184 | |
| 180 | 185 | free_buf: |
| @@ -301,12 +306,16 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm, · 120 unmodified lines | ||
| 301 | 306 | utsname()->nodename); |
| 302 | 307 | up_read(&uts_sem); |
| 303 | 308 | break; |
| 304 | − /* executable */ | |
| 309 | + /* executable, could be changed by prctl PR_SET_NAME etc */ | |
| 305 | 310 | case 'e': |
| 306 | 311 | err = cn_esc_printf(cn, "%s", current->comm); |
| 307 | 312 | break; |
| 313 | + /* file name of executable */ | |
| 314 | + case 'f': | |
| 315 | + err = cn_print_exe_file(cn, true); | |
| 316 | + break; | |
| 308 | 317 | case 'E': |
| 309 | − err = cn_print_exe_file(cn); | |
| 318 | + err = cn_print_exe_file(cn, false); | |
| 310 | 319 | break; |
| 311 | 320 | /* core limit size */ |
| 312 | 321 | case 'c': |