Date: Wed, 26 Jun 2019 16:38:46 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r349425 - stable/12/lib/libcapsicum Message-ID: <201906261638.x5QGckQS051285@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Wed Jun 26 16:38:46 2019 New Revision: 349425 URL: https://svnweb.freebsd.org/changeset/base/349425 Log: MFC r340130, r340134: r340130: (by oshogbo) libcapsicum: Introduce caph_{rights,ioctls,fcntls}_limit The idea behind those functions is not to force consumers to remember that there is a need to check errno on failure. We already have a caph_enter(3) function which does the same for cap_enter(2). r340134: (by oshogbo) Fix a recusive call introduce in the r340130. Modified: stable/12/lib/libcapsicum/Makefile stable/12/lib/libcapsicum/capsicum_helpers.3 stable/12/lib/libcapsicum/capsicum_helpers.h Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libcapsicum/Makefile ============================================================================== --- stable/12/lib/libcapsicum/Makefile Wed Jun 26 16:38:30 2019 (r349424) +++ stable/12/lib/libcapsicum/Makefile Wed Jun 26 16:38:46 2019 (r349425) @@ -8,6 +8,7 @@ MAN+= capsicum_helpers.3 MLINKS+=capsicum_helpers.3 caph_enter.3 MLINKS+=capsicum_helpers.3 caph_enter_casper.3 +MLINKS+=capsicum_helpers.3 caph_rights_limit.3 MLINKS+=capsicum_helpers.3 caph_limit_stream.3 MLINKS+=capsicum_helpers.3 caph_limit_stdin.3 MLINKS+=capsicum_helpers.3 caph_limit_stderr.3 Modified: stable/12/lib/libcapsicum/capsicum_helpers.3 ============================================================================== --- stable/12/lib/libcapsicum/capsicum_helpers.3 Wed Jun 26 16:38:30 2019 (r349424) +++ stable/12/lib/libcapsicum/capsicum_helpers.3 Wed Jun 26 16:38:46 2019 (r349425) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 18, 2018 +.Dd November 4, 2018 .Dt CAPSICUM_HELPERS 3 .Os .Sh NAME @@ -34,7 +34,12 @@ .Nm caph_limit_stdout , .Nm caph_limit_stdio , .Nm caph_cache_tzdata , -.Nm caph_cache_catpages +.Nm caph_cache_catpages , +.Nm caph_enter , +.Nm caph_enter_casper , +.Nm caph_rights_limit , +.Nm caph_ioctls_limit , +.Nm caph_fcntls_limit .Nd "set of the capsicum helpers, part of the libcapsicum" .Sh LIBRARY .Lb libcapsicum @@ -45,8 +50,12 @@ .Ft int .Fn caph_enter_casper "void" .Ft int -.Fn caph_limit_stream "int fd" "int flags" +.Fn caph_rights_limit "inf fd" "const cap_righst_t *rights" .Ft int +.Fn caph_ioctls_limit "inf fd" "const unsigned long *cmds" "size_t ncmds" +.Ft int +.Fn caph_fcntls_limit "inf fd" "uint32_t fcntlrights" +.Ft int .Fn caph_limit_stdin "void" .Ft int .Fn caph_limit_stderr "void" @@ -60,9 +69,17 @@ .Fn caph_cache_catpages "void" .Sh DESCRIPTION The -.Nm caph_enter -is equivalent to the -.Xr cap_enter 2 +.Nm caph_enter , +.Nm caph_rights_limit , +.Nm caph_ioctls_limit +and +.Nm caph_fcntls_limit +are respectively equivalent to +.Xr cap_enter 2 , +.Xr cap_rights_limit 2 , +.Xr cap_ioctls_limit 2 +and +.Xr cap_fcntls_limit 2 , it returns success when the kernel is built without support of the capability mode. .Pp @@ -125,4 +142,5 @@ among others. .Ed .Sh SEE ALSO .Xr cap_enter 2 , +.Xr cap_rights_limit 2 , .Xr rights 4 Modified: stable/12/lib/libcapsicum/capsicum_helpers.h ============================================================================== --- stable/12/lib/libcapsicum/capsicum_helpers.h Wed Jun 26 16:38:30 2019 (r349424) +++ stable/12/lib/libcapsicum/capsicum_helpers.h Wed Jun 26 16:38:46 2019 (r349425) @@ -136,6 +136,35 @@ caph_enter(void) return (0); } +static __inline int +caph_rights_limit(int fd, const cap_rights_t *rights) +{ + + if (cap_rights_limit(fd, rights) < 0 && errno != ENOSYS) + return (-1); + + return (0); +} + +static __inline int +caph_ioctls_limit(int fd, const unsigned long *cmds, size_t ncmds) +{ + + if (cap_ioctls_limit(fd, cmds, ncmds) < 0 && errno != ENOSYS) + return (-1); + + return (0); +} + +static __inline int +caph_fcntls_limit(int fd, uint32_t fcntlrights) +{ + + if (cap_fcntls_limit(fd, fcntlrights) < 0 && errno != ENOSYS) + return (-1); + + return (0); +} static __inline int caph_enter_casper(void)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906261638.x5QGckQS051285>