From owner-p4-projects@FreeBSD.ORG Wed Mar 5 18:16:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 058301065673; Wed, 5 Mar 2008 18:16:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA3091065670 for ; Wed, 5 Mar 2008 18:16:45 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A7C898FC14 for ; Wed, 5 Mar 2008 18:16:45 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m25IGjKm081957 for ; Wed, 5 Mar 2008 18:16:45 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m25IGjeX081955 for perforce@freebsd.org; Wed, 5 Mar 2008 18:16:45 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 5 Mar 2008 18:16:45 GMT Message-Id: <200803051816.m25IGjeX081955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 136936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2008 18:16:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=136936 Change 136936 by rdivacky@rdivacky_witten on 2008/03/05 18:16:33 Check for sane maxevents parameter. Noticed by: netchild Affected files ... .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.c#11 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.h#5 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.c#11 (text+ko) ==== @@ -29,6 +29,7 @@ #include "opt_compat.h" +#include #include #include #include @@ -228,6 +229,9 @@ linux_kev_copyin}; int error; + if (args->maxevents <= 0 || args->maxevents > LINUX_MAX_EVENTS) + return (EINVAL); + /* Convert from miliseconds to timespec. */ ts.tv_sec = args->timeout / 1000000; ts.tv_nsec = (args->timeout % 1000000) * 1000; ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.h#5 (text+ko) ==== @@ -50,4 +50,6 @@ #define LINUX_EPOLL_CTL_DEL 2 #define LINUX_EPOLL_CTL_MOD 3 +#define LINUX_MAX_EVENTS (INT_MAX / sizeof(struct linux_epoll_event)) + #endif /* !_LINUX_EPOLL_H_ */