fs/pipe.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/fs/pipe.c b/fs/pipe.c index 64a494cef0a0..fdca31a34f6e 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -759,10 +759,11 @@ static int pipe_read_fasync(int fd, struct file *filp, int on) { struct inode *inode = file_inode(filp); - int retval; + int retval = 0; mutex_lock(&inode->i_mutex); - retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_readers); + if (inode->i_pipe) + retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_readers); mutex_unlock(&inode->i_mutex); return retval; @@ -773,10 +774,11 @@ static int pipe_write_fasync(int fd, struct file *filp, int on) { struct inode *inode = file_inode(filp); - int retval; + int retval = 0; mutex_lock(&inode->i_mutex); - retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_writers); + if (inode->i_pipe) + retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_writers); mutex_unlock(&inode->i_mutex); return retval; @@ -787,15 +789,18 @@ static int pipe_rdwr_fasync(int fd, struct file *filp, int on) { struct inode *inode = file_inode(filp); - struct pipe_inode_info *pipe = inode->i_pipe; - int retval; + struct pipe_inode_info *pipe; + int retval = 0; mutex_lock(&inode->i_mutex); - retval = fasync_helper(fd, filp, on, &pipe->fasync_readers); - 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); + pipe = inode->i_pipe; + if (pipe) { + retval = fasync_helper(fd, filp, on, &pipe->fasync_readers); + 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); return retval;