]> xenbits.xensource.com Git - people/iwj/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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Feb 2015 01:50:11 +0000 (17:50 -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 a19ae1968d379d70ad36e51039d79469cfe30d18..1b2c2d62ff201d6080407363415f6584b19503ed 100644 (file)
@@ -886,9 +886,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;