]> git.ipfire.org Git - people/ms/linux.git/commitdiff
net: don't OOPS on socket aio
authorChristoph Hellwig <hch@lst.de>
Tue, 27 Jan 2015 20:25:33 +0000 (12:25 -0800)
committerJiri Slaby <jslaby@suse.cz>
Tue, 10 Feb 2015 10:16:51 +0000 (11:16 +0100)
[ 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

index c8ca896a9a5a1c8f67c053b10de88cd6fe941192..3afb43efd3e58b4652fb2ca2ad8865a3aa4a61ba 100644 (file)
@@ -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;