Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761717AbZCNBvi (ORCPT ); Fri, 13 Mar 2009 21:51:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753176AbZCNBVk (ORCPT ); Fri, 13 Mar 2009 21:21:40 -0400 Received: from kroah.org ([198.145.64.141]:35623 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754761AbZCNBVG (ORCPT ); Fri, 13 Mar 2009 21:21:06 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Fri Mar 13 18:10:43 2009 Message-Id: <20090314011043.790685951@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Fri, 13 Mar 2009 18:11:01 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Oleg Nesterov , Al Viro , Andi Kleen , Jonathan Corbet Subject: [patch 084/114] pipe_rdwr_fasync: fix the error handling to prevent the leak/crash References: <20090314010937.416083662@mini.kroah.org> Content-Disposition: inline; filename=pipe_rdwr_fasync-fix-the-error-handling-to-prevent-the-leak-crash.patch In-Reply-To: <20090314011649.GA26170@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1751 Lines: 45 2.6.28-stable review patch. If anyone has any objections, please let us know. ------------------ From: Oleg Nesterov commit e5bc49ba7439b9726006d031d440cba96819f0f8 upstream. 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 Cc: Al Viro Cc: Andi Kleen Cc: Jonathan Corbet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- fs/pipe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/fs/pipe.c +++ b/fs/pipe.c @@ -699,12 +699,12 @@ 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/