Date: Wed, 28 May 2014 06:02:05 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r266784 - user/dchagin/lemul/sys/compat/linux Message-ID: <201405280602.s4S625S2065988@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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]; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405280602.s4S625S2065988>