From owner-svn-src-user@FreeBSD.ORG Wed May 7 07:42:48 2014 Return-Path: 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 D6C1E27A; Wed, 7 May 2014 07:42:48 +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 B48AD1B3; Wed, 7 May 2014 07:42:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s477gms2024554; Wed, 7 May 2014 07:42:48 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s477gm7T024551; Wed, 7 May 2014 07:42:48 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <201405070742.s477gm7T024551@svn.freebsd.org> From: Dmitry Chagin Date: Wed, 7 May 2014 07:42:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r265517 - in user/dchagin/lemul/sys: compat/linux kern sys 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2014 07:42:48 -0000 Author: dchagin Date: Wed May 7 07:42:47 2014 New Revision: 265517 URL: http://svnweb.freebsd.org/changeset/base/265517 Log: Be a bit secure. To avoid a double fp lookup add a kern_kevent_fp counterpart for kern_kevent with file pointer parameter instead of file descriptor an pass the buck to it. Suggested by: mjg Modified: user/dchagin/lemul/sys/compat/linux/linux_event.c user/dchagin/lemul/sys/kern/kern_event.c user/dchagin/lemul/sys/sys/syscallsubr.h Modified: user/dchagin/lemul/sys/compat/linux/linux_event.c ============================================================================== --- user/dchagin/lemul/sys/compat/linux/linux_event.c Wed May 7 07:41:58 2014 (r265516) +++ user/dchagin/lemul/sys/compat/linux/linux_event.c Wed May 7 07:42:47 2014 (r265517) @@ -345,14 +345,13 @@ linux_epoll_ctl(struct thread *td, struc return (error); } - cap_rights_init(&rights, CAP_POLL_EVENT); - - error = fget(td, args->epfd, &rights, &epfp); + error = fget(td, args->epfd, + cap_rights_init(&rights, CAP_KQUEUE_CHANGE), &epfp); if (error != 0) return (error); /* Protect user data vector from incorrectly supplied fd. */ - error = fget(td, args->fd, &rights, &fp); + error = fget(td, args->fd, cap_rights_init(&rights, CAP_POLL_EVENT), &fp); if (error != 0) goto leave1; @@ -390,13 +389,14 @@ linux_epoll_ctl(struct thread *td, struc goto leave0; } - error = epoll_to_kevent(td, epfp, args->fd, &le, &kev_flags, kev, &nchanges); + error = epoll_to_kevent(td, epfp, args->fd, &le, &kev_flags, + kev, &nchanges); if (error) goto leave0; epoll_fd_install(td, args->fd, le.data); - error = kern_kevent(td, args->epfd, nchanges, 0, &k_ops, NULL); + error = kern_kevent_fp(td, epfp, nchanges, 0, &k_ops, NULL); leave0: fdrop(fp, td); @@ -424,7 +424,8 @@ linux_epoll_wait(struct thread *td, stru if (args->maxevents <= 0 || args->maxevents > LINUX_MAX_EVENTS) return (EINVAL); - error = fget(td, args->epfd, cap_rights_init(&rights, CAP_POLL_EVENT), &epfp); + error = fget(td, args->epfd, + cap_rights_init(&rights, CAP_KQUEUE_EVENT), &epfp); if (error != 0) return (error); @@ -446,7 +447,7 @@ linux_epoll_wait(struct thread *td, stru tsp = NULL; } - error = kern_kevent(td, args->epfd, 0, args->maxevents, &k_ops, tsp); + error = kern_kevent_fp(td, epfp, 0, args->maxevents, &k_ops, tsp); if (error == 0 && coargs.error != 0) error = coargs.error; Modified: user/dchagin/lemul/sys/kern/kern_event.c ============================================================================== --- user/dchagin/lemul/sys/kern/kern_event.c Wed May 7 07:41:58 2014 (r265516) +++ user/dchagin/lemul/sys/kern/kern_event.c Wed May 7 07:42:47 2014 (r265517) @@ -859,12 +859,9 @@ int kern_kevent(struct thread *td, int fd, int nchanges, int nevents, struct kevent_copyops *k_ops, const struct timespec *timeout) { - struct kevent keva[KQ_NEVENTS]; - struct kevent *kevp, *changes; - struct kqueue *kq; - struct file *fp; cap_rights_t rights; - int i, n, nerrors, error; + struct file *fp; + int error; cap_rights_init(&rights); if (nchanges > 0) @@ -875,9 +872,24 @@ kern_kevent(struct thread *td, int fd, i if (error != 0) return (error); + error = kern_kevent_fp(td, fp, nchanges, nevents, k_ops, timeout); + fdrop(fp, td); + + return (error); +} + +int +kern_kevent_fp(struct thread *td, struct file *fp, int nchanges, int nevents, + struct kevent_copyops *k_ops, const struct timespec *timeout) +{ + struct kevent keva[KQ_NEVENTS]; + struct kevent *kevp, *changes; + struct kqueue *kq; + int i, n, nerrors, error; + error = kqueue_acquire(fp, &kq); if (error != 0) - goto done_norel; + return (error); nerrors = 0; @@ -917,8 +929,6 @@ kern_kevent(struct thread *td, int fd, i error = kqueue_scan(kq, nevents, k_ops, timeout, keva, td); done: kqueue_release(kq, 0); -done_norel: - fdrop(fp, td); return (error); } Modified: user/dchagin/lemul/sys/sys/syscallsubr.h ============================================================================== --- user/dchagin/lemul/sys/sys/syscallsubr.h Wed May 7 07:41:58 2014 (r265516) +++ user/dchagin/lemul/sys/sys/syscallsubr.h Wed May 7 07:42:47 2014 (r265517) @@ -124,6 +124,9 @@ int kern_jail_get(struct thread *td, str int kern_jail_set(struct thread *td, struct uio *options, int flags); int kern_kevent(struct thread *td, int fd, int nchanges, int nevents, struct kevent_copyops *k_ops, const struct timespec *timeout); +int kern_kevent_fp(struct thread *td, struct file *fp, int nchanges, + int nevents, struct kevent_copyops *k_ops, + const struct timespec *timeout); int kern_kqueue(struct thread *td, int flags); int kern_kldload(struct thread *td, const char *file, int *fileid); int kern_kldstat(struct thread *td, int fileid, struct kld_file_stat *stat);