do_coredump: fix the "ispipe" error check
authorOleg Nesterov <[email protected]>
Tue, 26 Jul 2011 23:08:34 +0000 (16:08 -0700)
committerLinus Torvalds <[email protected]>
Tue, 26 Jul 2011 23:49:43 +0000 (16:49 -0700)
do_coredump() assumes that if format_corename() fails it should return
-ENOMEM.  This is not true, for example cn_print_exe_file() can propagate
the error from d_path.  Even if it was true, this is too fragile.  Change
the code to check "ispipe < 0".

Signed-off-by: Oleg Nesterov <[email protected]>
Signed-off-by: Jiri Slaby <[email protected]>
Reviewed-by: Neil Horman <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
fs/exec.c

index 27d487f913d34af51d8bc1afcfbcc1598a439097..f8fad7fc0e5fbfe454876de69288576bcb81dce4 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -2133,16 +2133,16 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
 
        ispipe = format_corename(&cn, signr);
 
-       if (ispipe == -ENOMEM) {
-               printk(KERN_WARNING "format_corename failed\n");
-               printk(KERN_WARNING "Aborting core\n");
-               goto fail_corename;
-       }
-
        if (ispipe) {
                int dump_count;
                char **helper_argv;
 
+               if (ispipe < 0) {
+                       printk(KERN_WARNING "format_corename failed\n");
+                       printk(KERN_WARNING "Aborting core\n");
+                       goto fail_corename;
+               }
+
                if (cprm.limit == 1) {
                        /*
                         * Normally core limits are irrelevant to pipes, since