[PATCH 3.16.y-ckt 33/58] net: don't OOPS on socket aio

From: Luis Henriques
Date: Thu Feb 19 2015 - 09:00:53 EST

3.16.7-ckt7 -stable review patch. If anyone has any objections, please let me know.


From: Christoph Hellwig <hch@xxxxxx>

commit 06539d3071067ff146a9bffd1c801fa56d290909 upstream.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Luis Henriques <luis.henriques@xxxxxxxxxxxxx>
net/socket.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/net/socket.c b/net/socket.c
index abf56b2a14f9..7050240a951b 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -887,9 +887,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;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/