From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757324AbZENWzk (ORCPT ); Thu, 14 May 2009 18:55:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756863AbZENWmt (ORCPT ); Thu, 14 May 2009 18:42:49 -0400 Received: from kroah.org ([198.145.64.141]:52585 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756481AbZENWm2 (ORCPT ); Thu, 14 May 2009 18:42:28 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Thu May 14 15:35:26 2009 Message-Id: <20090514223526.425937347@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Thu, 14 May 2009 15:33:12 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Davide Libenzi , , rohit verma , Ulrich Drepper Subject: [patch 37/51] epoll: fix size check in epoll_create() References: <20090514223235.348540705@mini.kroah.org> Content-Disposition: inline; filename=epoll-fix-size-check-in-epoll_create.patch In-Reply-To: <20090514223755.GA27019@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.29-stable review patch. If anyone has any objections, please let us know. ------------------ From: Davide Libenzi commit bfe3891a5f5d3b78146a45f40e435d14f5ae39dd upstream. Fix a size check WRT the manual pages. This was inadvertently broken by commit 9fe5ad9c8cef9ad5873d8ee55d1cf00d9b607df0 ("flag parameters add-on: remove epoll_create size param"). Signed-off-by: Davide Libenzi Cc: Cc: rohit verma Cc: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- fs/eventpoll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1136,7 +1136,7 @@ error_return: SYSCALL_DEFINE1(epoll_create, int, size) { - if (size < 0) + if (size <= 0) return -EINVAL; return sys_epoll_create1(0);