]> git.hungrycats.org Git - linux/commitdiff
net: don't OOPS on socket aio
authorChristoph Hellwig <hch@lst.de>
Tue, 27 Jan 2015 20:25:33 +0000 (12:25 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Feb 2015 01:49:01 +0000 (17:49 -0800)
[ Upstream commit 06539d3071067ff146a9bffd1c801fa56d290909 ]

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/socket.c

index fe20c319a0bb37dd475b7a8a32dccd57ac4e15d9..cf9ebf10c84158e107037299c76aff228094e21d 100644 (file)
@@ -892,9 +892,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;