Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754128AbbBSOAu (ORCPT ); Thu, 19 Feb 2015 09:00:50 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:39263 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753630AbbBSNwp (ORCPT ); Thu, 19 Feb 2015 08:52:45 -0500 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Christoph Hellwig , "David S. Miller" , Luis Henriques Subject: [PATCH 3.16.y-ckt 33/58] net: don't OOPS on socket aio Date: Thu, 19 Feb 2015 13:52:03 +0000 Message-Id: <1424353948-31863-34-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1424353948-31863-1-git-send-email-luis.henriques@canonical.com> References: <1424353948-31863-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1083 Lines: 37 3.16.7-ckt7 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Christoph Hellwig commit 06539d3071067ff146a9bffd1c801fa56d290909 upstream. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller Signed-off-by: Luis Henriques --- net/socket.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/socket.c b/net/socket.c index abf56b2a14f9..7050240a951b 100644 --- a/net/socket.c +++ b/net/socket.c @@ -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; -- 2.1.4 -- 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/