From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christoph Hellwig , "David S. Miller" Subject: [PATCH 3.18 11/20] net: dont OOPS on socket aio Date: Tue, 24 Feb 2015 18:10:26 -0800 Message-Id: <20150225020854.559396705@linuxfoundation.org> In-Reply-To: <20150225020854.096477776@linuxfoundation.org> References: <20150225020854.096477776@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christoph Hellwig [ Upstream commit 06539d3071067ff146a9bffd1c801fa56d290909 ] Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/socket.c | 3 --- 1 file changed, 3 deletions(-) --- a/net/socket.c +++ b/net/socket.c @@ -892,9 +892,6 @@ static ssize_t sock_splice_read(struct f 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;