diff --git a/fs/pipe.c b/fs/pipe.c
index 50c8a8596b52..ea8ac428a78f 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -253,7 +253,7 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
 	size_t total_len = iov_iter_count(to);
 	struct file *filp = iocb->ki_filp;
 	struct pipe_inode_info *pipe = filp->private_data;
-	bool was_full, wake_next_reader = false;
+	bool was_full, empty, wake_next_reader = false;
 	ssize_t ret;
 
 	/* Null read succeeds. */
@@ -394,17 +394,31 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
 		was_full = pipe_full(pipe->head, pipe->tail, pipe->max_usage);
 		wake_next_reader = true;
 	}
-	if (pipe_empty(pipe->head, pipe->tail))
+	if (empty = pipe_empty(pipe->head, pipe->tail))
 		wake_next_reader = false;
+
 	mutex_unlock(&pipe->mutex);
 
+	if (pipe->fasync_readers && empty && (ret==0) && ((!pipe->writers) && (!pipe->fasync_writers)))
+		kill_fasync(&pipe->fasync_readers, SIGIO, POLL_HUP);
+
 	if (was_full)
 		wake_up_interruptible_sync_poll(&pipe->wr_wait, EPOLLOUT | EPOLLWRNORM);
+
 	if (wake_next_reader)
 		wake_up_interruptible_sync_poll(&pipe->rd_wait, EPOLLIN | EPOLLRDNORM);
-	kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
-	if (ret > 0)
+
+	if (pipe->fasync_writers)
+	{
+		if( ret == 0 )
+			kill_fasync(&pipe->fasync_writers, SIGIO, POLL_HUP);
+	        else
+			kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
+	}
+
+	if ( ret > 0 )
 		file_accessed(filp);
+
 	return ret;
 }
 
@@ -600,7 +614,8 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
 	 */
 	if (was_empty || pipe->poll_usage)
 		wake_up_interruptible_sync_poll(&pipe->rd_wait, EPOLLIN | EPOLLRDNORM);
-	kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
+	if(pipe->fasync_readers)
+		kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
 	if (wake_next_writer)
 		wake_up_interruptible_sync_poll(&pipe->wr_wait, EPOLLOUT | EPOLLWRNORM);
 	if (ret > 0 && sb_start_write_trylock(file_inode(filp)->i_sb)) {
@@ -734,8 +749,19 @@ pipe_release(struct inode *inode, struct file *file)
 	if (!pipe->readers != !pipe->writers) {
 		wake_up_interruptible_all(&pipe->rd_wait);
 		wake_up_interruptible_all(&pipe->wr_wait);
-		kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
-		kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
+
+		unsigned int head, tail;
+
+		head = READ_ONCE(pipe->head);
+		tail = READ_ONCE(pipe->tail);
+		if ( pipe_empty(head,tail)  && (!pipe->writers) && pipe->fasync_readers )
+			kill_fasync(&pipe->fasync_readers, SIGIO, POLL_HUP);
+		else if (pipe->fasync_readers)
+			kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
+		if ( (!pipe->readers) && pipe->fasync_writers)
+			kill_fasync(&pipe->fasync_writers, SIGIO, POLL_HUP);
+		else if (pipe->fasync_writers)
+			kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
 	}
 	mutex_unlock(&pipe->mutex);