Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753377AbbBYCQb (ORCPT ); Tue, 24 Feb 2015 21:16:31 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:43477 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753324AbbBYCQZ (ORCPT ); Tue, 24 Feb 2015 21:16:25 -0500 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.14 11/17] net: dont OOPS on socket aio Date: Tue, 24 Feb 2015 18:10:13 -0800 Message-Id: <20150225020835.207129689@linuxfoundation.org> X-Mailer: git-send-email 2.3.0 In-Reply-To: <20150225020834.736559433@linuxfoundation.org> References: <20150225020834.736559433@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 969 Lines: 34 3.14-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 @@ -886,9 +886,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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/