From owner-svn-src-user@FreeBSD.ORG Sat May 10 14:47:53 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 98A2311D;
Sat, 10 May 2014 14:47:53 +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 8663C324;
Sat, 10 May 2014 14:47:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AElrAs057025;
Sat, 10 May 2014 14:47:53 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AElr6l057024;
Sat, 10 May 2014 14:47:53 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201405101447.s4AElr6l057024@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sat, 10 May 2014 14:47:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r265820 - 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 " user"
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: Sat, 10 May 2014 14:47:53 -0000
Author: dchagin
Date: Sat May 10 14:47:53 2014
New Revision: 265820
URL: http://svnweb.freebsd.org/changeset/base/265820
Log:
Fix incorrect event_poll array indexing in epoll_kev_copyout callback.
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 Sat May 10 14:27:24 2014 (r265819)
+++ user/dchagin/lemul/sys/compat/linux/linux_event.c Sat May 10 14:47:53 2014 (r265820)
@@ -286,7 +286,7 @@ epoll_kev_copyout(void *arg, struct keve
fd = kevp[i].ident;
KASSERT(fd < emd->fdc, ("epoll user data vector"
" is too small.\n"));
- eep->data = emd->udata[fd];
+ eep[i].data = emd->udata[fd];
}
LINUX_PEM_SUNLOCK(pem);