From owner-svn-src-user@FreeBSD.ORG  Wed May 28 06:02:05 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3E498B35;
 Wed, 28 May 2014 06:02:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2C8A52EE4;
 Wed, 28 May 2014 06:02:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4S625ic065989;
 Wed, 28 May 2014 06:02:05 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4S625S2065988;
 Wed, 28 May 2014 06:02:05 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201405280602.s4S625S2065988@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Wed, 28 May 2014 06:02:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r266784 - user/dchagin/lemul/sys/compat/linux
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 May 2014 06:02:05 -0000

Author: dchagin
Date: Wed May 28 06:02:04 2014
New Revision: 266784
URL: http://svnweb.freebsd.org/changeset/base/266784

Log:
  fdc in epoll_emuladta is not a counter it is a max index of udata vector.

Modified:
  user/dchagin/lemul/sys/compat/linux/linux_event.c

Modified: user/dchagin/lemul/sys/compat/linux/linux_event.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_event.c	Wed May 28 06:00:55 2014	(r266783)
+++ user/dchagin/lemul/sys/compat/linux/linux_event.c	Wed May 28 06:02:04 2014	(r266784)
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
 typedef uint64_t	epoll_udata_t;
 
 struct epoll_emuldata {
-	uint32_t	fdc;		/* epoll udata count */
+	uint32_t	fdc;		/* epoll udata max index */
 	epoll_udata_t	udata[1];	/* epoll user data vector */
 };
 
@@ -337,7 +337,7 @@ epoll_kev_copyout(void *arg, struct keve
 		kevent_to_epoll(&kevp[i], &eep[i]);
 
 		fd = kevp[i].ident;
-		KASSERT(fd < emd->fdc, ("epoll user data vector"
+		KASSERT(fd <= emd->fdc, ("epoll user data vector"
 						    " is too small.\n"));
 		eep[i].data = emd->udata[fd];
 	}