[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20090118032649.GA19301@redhat.com>
Date: Sun, 18 Jan 2009 04:26:49 +0100
From: Oleg Nesterov <oleg@...hat.com>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Al Viro <viro@...IV.linux.org.uk>,
Andi Kleen <andi@...stfloor.org>,
Jonathan Corbet <corbet@....net>, linux-kernel@...r.kernel.org
Subject: [PATCH] pipe_rdwr_fasync: fix the error handling to prevent the
leak/crash
If the second fasync_helper() fails, pipe_rdwr_fasync() returns the error
but leaves the file on ->fasync_readers.
This was always wrong, but since 233e70f4228e78eb2f80dc6650f65d3ae3dbf17c
"saner FASYNC handling on file close" we have the new problem. Because in
this case setfl() doesn't set FASYNC bit, __fput() will not do ->fasync(0),
and we leak fasync_struct with ->fa_file pointing to the freed file.
Signed-off-by: Oleg Nesterov <oleg@...hat.com>
--- CUR/fs/pipe.c~PIPE_FASYNC 2009-01-12 23:07:47.000000000 +0100
+++ CUR/fs/pipe.c 2009-01-18 03:51:41.000000000 +0100
@@ -699,12 +699,13 @@ pipe_rdwr_fasync(int fd, struct file *fi
int retval;
mutex_lock(&inode->i_mutex);
-
retval = fasync_helper(fd, filp, on, &pipe->fasync_readers);
- if (retval >= 0)
+ if (retval >= 0) {
retval = fasync_helper(fd, filp, on, &pipe->fasync_writers);
-
+ if (retval < 0) /* this can happen only if on == T */
+ fasync_helper(-1, filp, 0, &pipe->fasync_readers);
+ }
mutex_unlock(&inode->i_mutex);
if (retval < 0)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists