From owner-svn-src-all@freebsd.org Tue Aug 11 08:44:20 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4640199FCB1; Tue, 11 Aug 2015 08:44:20 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org (repo.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 37AFFDDA; Tue, 11 Aug 2015 08:44:20 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7B8iKSc026753; Tue, 11 Aug 2015 08:44:20 GMT (envelope-from ed@FreeBSD.org) Received: (from ed@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7B8iKfo026752; Tue, 11 Aug 2015 08:44:20 GMT (envelope-from ed@FreeBSD.org) Message-Id: <201508110844.t7B8iKfo026752@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org using -f From: Ed Schouten Date: Tue, 11 Aug 2015 08:44:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286619 - head/sys/compat/cloudabi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2015 08:44:20 -0000 Author: ed Date: Tue Aug 11 08:44:19 2015 New Revision: 286619 URL: https://svnweb.freebsd.org/changeset/base/286619 Log: Make cap_rights_limit() work for CloudABI processes. Call into the recently introduced kern_cap_rights_limit() function to restrict rights. Modified: head/sys/compat/cloudabi/cloudabi_fd.c Modified: head/sys/compat/cloudabi/cloudabi_fd.c ============================================================================== --- head/sys/compat/cloudabi/cloudabi_fd.c Tue Aug 11 08:43:50 2015 (r286618) +++ head/sys/compat/cloudabi/cloudabi_fd.c Tue Aug 11 08:44:19 2015 (r286619) @@ -523,6 +523,7 @@ cloudabi_sys_fd_stat_put(struct thread * struct cloudabi_sys_fd_stat_put_args *uap) { cloudabi_fdstat_t fsb; + cap_rights_t rights; int error, oflags; error = copyin(uap->buf, &fsb, sizeof(fsb)); @@ -540,6 +541,13 @@ cloudabi_sys_fd_stat_put(struct thread * CLOUDABI_FDFLAG_DSYNC | CLOUDABI_FDFLAG_RSYNC)) oflags |= O_SYNC; return (kern_fcntl(td, uap->fd, F_SETFL, oflags)); + } else if (uap->flags == CLOUDABI_FDSTAT_RIGHTS) { + /* Convert rights. */ + error = cloudabi_convert_rights( + fsb.fs_rights_base | fsb.fs_rights_inheriting, &rights); + if (error != 0) + return (error); + return (kern_cap_rights_limit(td, uap->fd, &rights)); } return (EINVAL); }