Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db4d24bc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

net: don't OOPS on socket aio 



[ Upstream commit 06539d3071067ff146a9bffd1c801fa56d290909 ]

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3b175f6

net/socket.c

+0 −3
Original line number Diff line number Diff line
@@ -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;