Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=323211371073ce4a99b6efc69379589d6a640d35
Commit:     323211371073ce4a99b6efc69379589d6a640d35
Parent:     74aadce986052f20088c2678f589ea0e8d3a4b59
Author:     Neil Horman <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 23:26:36 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 08:42:50 2007 -0700

    core_pattern: fix up a few miscellaneous bugs
    
    Fix do_coredump to detect a crash in the user mode helper process and abort
    the attempt to recursively dump core to another copy of the helper process,
    potentially ad-infinitum.
    
    [EMAIL PROTECTED]: cleanups]
    Signed-off-by: Neil Horman <[EMAIL PROTECTED]>
    Cc: <[EMAIL PROTECTED]>
    Cc: <[EMAIL PROTECTED]>
    Cc: Jeremy Fitzhardinge <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 fs/exec.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/fs/exec.c b/fs/exec.c
index 6450157..cbd183d 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1762,14 +1762,27 @@ int do_coredump(long signr, int exit_code, struct 
pt_regs * regs)
                goto fail_unlock;
 
        if (ispipe) {
-               core_limit = RLIM_INFINITY;
                helper_argv = argv_split(GFP_KERNEL, corename+1, &helper_argc);
                /* Terminate the string before the first option */
                delimit = strchr(corename, ' ');
                if (delimit)
                        *delimit = '\0';
+               delimit = strrchr(helper_argv[0], '/');
+               if (delimit)
+                       delimit++;
+               else
+                       delimit = helper_argv[0];
+               if (!strcmp(delimit, current->comm)) {
+                       printk(KERN_NOTICE "Recursive core dump detected, "
+                                       "aborting\n");
+                       goto fail_unlock;
+               }
+
+               core_limit = RLIM_INFINITY;
+
                /* SIGPIPE can happen, but it's just never processed */
-               if(call_usermodehelper_pipe(corename+1, helper_argv, NULL, 
&file)) {
+               if (call_usermodehelper_pipe(corename+1, helper_argv, NULL,
+                               &file)) {
                        printk(KERN_INFO "Core dump to %s pipe failed\n",
                               corename);
                        goto fail_unlock;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to