]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 10 Feb 2015 13:38:49 +0000 (13:38 +0000)
commit 06539d3071067ff146a9bffd1c801fa56d290909 upstream.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
net/socket.c

index abf56b2a14f9bc0a9f7c83fbcabaa2e97b3eca37..7050240a951b55ff5e73b4bb7b55c17250942fcd 100644 (file)
@@ -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;