[PATCH 3.13.y-ckt 009/143] net: don't OOPS on socket aio
Kamal Mostafa
kamal at canonical.com
Tue Mar 31 19:46:14 UTC 2015
3.13.11-ckt18 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <hch at lst.de>
[ Upstream commit 06539d3071067ff146a9bffd1c801fa56d290909 ]
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
net/socket.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index dc57dae..404be5e 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;
--
1.9.1
More information about the kernel-team
mailing list