From: Christoph Hellwig <hch@lst.de>
Date: Tue, 27 Jan 2015 20:25:33 +0000 (-0800)
Subject: net: don't OOPS on socket aio
X-Git-Tag: v3.12.38~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7a5ebfe21c15d1a871587be0006f3fc31e54296;p=people%2Fms%2Flinux.git

net: don't OOPS on socket aio

[ 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>
---

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;