| From | Jiri Slaby <> | Subject | [PATCH 3.12 086/122] net: don't OOPS on socket aio | Date | Tue, 17 Feb 2015 12:34:33 +0100 |
| |
From: Christoph Hellwig <hch@lst.de>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
[ Upstream commit 06539d3071067ff146a9bffd1c801fa56d290909 ]
Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Jiri Slaby <jslaby@suse.cz> --- net/socket.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/net/socket.c b/net/socket.c index c8ca896a9a5a..3afb43efd3e5 100644 --- a/net/socket.c +++ b/net/socket.c @@ -885,9 +885,6 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos, static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb, struct sock_iocb *siocb) { - if (!is_sync_kiocb(iocb)) - BUG(); - siocb->kiocb = iocb; iocb->private = siocb; return siocb; -- 2.2.2
|