From nobody Fri Mar 24 06:40:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjXf40QhTz419Lx; Fri, 24 Mar 2023 06:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjXf375kBz4CqC; Fri, 24 Mar 2023 06:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679640044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PwJIkobwvYPj03R2VjxUUvKItS4ei5L7QfSj2MN+/XY=; b=DqvyGkaOkyw/2tdfU3ZGjWA0hb9arQFsz9eGh2Fq/C3S4N7/Ch2WNm1G7q2VAn6/tInqcw kfp3ke0akj87l1zHyUnJmM8VnX1YwIrBeZhqIVkQPvwABw73kssvrgmT89zUKmr6WWsvT8 +pb4quntL4PjEnYEZMupMzQY5lBExOfVAOpVoJtGyZNFQGC6KkLgQGXbWzzmNsOheoDcZK zH2fOh9zVn6+Xs2ENDdnxnJGml6pHK6FcQ8hVFoiFaO5FxI1zZQ4uq8ftba9uF42xZ9pz4 LwEME1j53e2QZRCAxZKclRPqzcgjt943m1HwkZa84Z8YI7Gojtgsr3y7Fv0MsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679640044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PwJIkobwvYPj03R2VjxUUvKItS4ei5L7QfSj2MN+/XY=; b=BJMXVTiqmYqcxa9KZfXDfhAlBBl50mF/G3nNvxTHalQ4A6I0kj/3OkRmFKNSJ/jZ+n9bAG N/5kONC+biNpr6hB82oUPqNDtVTfFu0cfXWl+l4PwXU+/milQJ9YD2PmNb4Im7K9ueAKjl KicSubLJGjp7PYRXabFLo8ZyjqjBJ4L8bRE7gBu4jVUU07ZC0DDVoPeLzE1pqqUuFb8R6b Eqj1WSWk1/3DULw5E5+xIj+8wfljkuthGLFPWLtXKAp/qWrUptl/aUb41Fzu3oxy1sfpFT 4x37FXNvXC393/FNXoTM4c/27zvwPNi1lckPzeJ08NHuYTzlE51bfKAxV9jxvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679640044; a=rsa-sha256; cv=none; b=ZdrmjSV4lnliGWnInumVhIjyci4sFvNXeWjQNIjX9axbRc06duF0MeEx7RzXDOlrPVD3M+ dCEgvLGtD9Mwfq2Pd+mLIELsLw2cQVtIoJSx7U0v3gOCmpKIDvbgP9tk01EJUhtuixQc9D QXMYgr2qX2BUIKg4ObVYNcarzUxcWYeVixDjTHkBySS1ASO3RRvvl+3NJDBCMiKAvGeU+y Xa8NEJUnEu05+h9DSjj0NtI+DnLxQN0aRFpfd3+dXY3cHye74G+7lpF2vBy4FdfRhtv+r0 fVTjAqoQaEpwTsch407ZCwGsvLGKIFRMrIu7wysgpVyj9DkW3OeOQDekC9UO3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjXf364Jnz16kx; Fri, 24 Mar 2023 06:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32O6ehQZ083074; Fri, 24 Mar 2023 06:40:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32O6ehgN083073; Fri, 24 Mar 2023 06:40:43 GMT (envelope-from git) Date: Fri, 24 Mar 2023 06:40:43 GMT Message-Id: <202303240640.32O6ehgN083073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: e68521de19d4 - stable/12 - cap_*(2): Document ENOSYS behavior. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e68521de19d4661b9ed8a6432039eaf882cfb4c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=e68521de19d4661b9ed8a6432039eaf882cfb4c2 commit e68521de19d4661b9ed8a6432039eaf882cfb4c2 Author: Xin LI AuthorDate: 2023-03-10 02:10:50 +0000 Commit: Xin LI CommitDate: 2023-03-24 06:40:31 +0000 cap_*(2): Document ENOSYS behavior. Summary: All cap_* system calls would fail when capability mode support is not present. Reviewed by: emaste, pauamma Differential Revision: https://reviews.freebsd.org/D38976 (cherry picked from commit 75798f9b01055261881938326a5c77e55f79c7f7) --- lib/libc/sys/cap_enter.2 | 7 +++---- lib/libc/sys/cap_fcntls_limit.2 | 5 ++++- lib/libc/sys/cap_ioctls_limit.2 | 29 ++++++++++++++--------------- lib/libc/sys/cap_rights_limit.2 | 5 ++++- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/lib/libc/sys/cap_enter.2 b/lib/libc/sys/cap_enter.2 index 428e0b0bcd09..56fc78a4b4f2 100644 --- a/lib/libc/sys/cap_enter.2 +++ b/lib/libc/sys/cap_enter.2 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_ENTER 2 .Os .Sh NAME @@ -113,9 +113,8 @@ system calls will fail if: .Bl -tag -width Er .It Bq Er ENOSYS -The kernel is compiled without: -.Pp -.Cd "options CAPABILITY_MODE" +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . .El .Pp The diff --git a/lib/libc/sys/cap_fcntls_limit.2 b/lib/libc/sys/cap_fcntls_limit.2 index b09aebbe78f0..b7b38ba2ab51 100644 --- a/lib/libc/sys/cap_fcntls_limit.2 +++ b/lib/libc/sys/cap_fcntls_limit.2 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_FCNTLS_LIMIT 2 .Os .Sh NAME @@ -111,6 +111,9 @@ argument is not a valid descriptor. The .Fa fcntlrightsp argument points at an invalid address. +.It Bq Er ENOSYS +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . .El .Sh SEE ALSO .Xr cap_ioctls_limit 2 , diff --git a/lib/libc/sys/cap_ioctls_limit.2 b/lib/libc/sys/cap_ioctls_limit.2 index 0cf5ea8ca038..6696434e0bac 100644 --- a/lib/libc/sys/cap_ioctls_limit.2 +++ b/lib/libc/sys/cap_ioctls_limit.2 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_IOCTLS_LIMIT 2 .Os .Sh NAME @@ -110,8 +110,11 @@ On failure the value .Va -1 is returned and the global variable errno is set to indicate the error. .Sh ERRORS +The .Fn cap_ioctls_limit -succeeds unless: +and +.Fn cap_ioctls_get +system calls will fail if: .Bl -tag -width Er .It Bq Er EBADF The @@ -121,6 +124,15 @@ argument is not a valid descriptor. The .Fa cmds argument points at an invalid address. +.It Bq Er ENOSYS +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . +.El +.Pp +The +.Fn cap_ioctls_limit +system call may also return the following errors: +.Bl -tag -width Er .It Bq Er EINVAL The .Fa ncmds @@ -132,19 +144,6 @@ would expand the list of allowed .Xr ioctl 2 commands. .El -.Pp -.Fn cap_ioctls_get -succeeds unless: -.Bl -tag -width Er -.It Bq Er EBADF -The -.Fa fd -argument is not a valid descriptor. -.It Bq Er EFAULT -The -.Fa cmds -argument points at invalid address. -.El .Sh SEE ALSO .Xr cap_fcntls_limit 2 , .Xr cap_rights_limit 2 , diff --git a/lib/libc/sys/cap_rights_limit.2 b/lib/libc/sys/cap_rights_limit.2 index 37f311143a28..f08d5520b66e 100644 --- a/lib/libc/sys/cap_rights_limit.2 +++ b/lib/libc/sys/cap_rights_limit.2 @@ -32,7 +32,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_RIGHTS_LIMIT 2 .Os .Sh NAME @@ -120,6 +120,9 @@ argument is not a valid active descriptor. .It Bq Er EINVAL An invalid right has been requested in .Fa rights . +.It Bq Er ENOSYS +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . .It Bq Er ENOTCAPABLE The .Fa rights