* [PATCH 1/3] capabilities.7: tfix
@ 2021-06-29 21:56 Kir Kolyshkin
2021-06-29 21:56 ` [PATCH 2/3] user_namespaces.7: fix a ref Kir Kolyshkin
2021-06-29 21:57 ` [PATCH 3/3] capabilities.7, user_namespaces.7: describe CAP_SETFCAP Kir Kolyshkin
0 siblings, 2 replies; 4+ messages in thread
From: Kir Kolyshkin @ 2021-06-29 21:56 UTC (permalink / raw)
To: linux-man; +Cc: Alejandro Colomar, Michael Kerrisk, Kir Kolyshkin
Add a missing comma.
Fixes: 3dcdef9437fafb
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
man7/capabilities.7 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man7/capabilities.7 b/man7/capabilities.7
index cf9dc190f..9f8f0087f 100644
--- a/man7/capabilities.7
+++ b/man7/capabilities.7
@@ -215,7 +215,7 @@ Lock memory
.BR shmctl (2));
.IP *
Allocate memory using huge pages
-.RB ( memfd_create (2)
+.RB ( memfd_create (2),
.BR mmap (2),
.BR shmctl (2)).
.PD 0
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] user_namespaces.7: fix a ref
2021-06-29 21:56 [PATCH 1/3] capabilities.7: tfix Kir Kolyshkin
@ 2021-06-29 21:56 ` Kir Kolyshkin
2021-06-29 21:57 ` [PATCH 3/3] capabilities.7, user_namespaces.7: describe CAP_SETFCAP Kir Kolyshkin
1 sibling, 0 replies; 4+ messages in thread
From: Kir Kolyshkin @ 2021-06-29 21:56 UTC (permalink / raw)
To: linux-man; +Cc: Alejandro Colomar, Michael Kerrisk, Kir Kolyshkin
The file being referred to no longer exists, as it was moved to
*.rst first (commit 20a78ae9ed297f2) and then to under
admin-guide (commit bf6b7a742e3f82b). Both those commits
are from 2019 (Linux 5.3).
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
man7/user_namespaces.7 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man7/user_namespaces.7 b/man7/user_namespaces.7
index f2e02c978..518e7a3bb 100644
--- a/man7/user_namespaces.7
+++ b/man7/user_namespaces.7
@@ -1383,4 +1383,4 @@ main(int argc, char *argv[])
.BR pid_namespaces (7)
.PP
The kernel source file
-.IR Documentation/namespaces/resource\-control.txt .
+.IR Documentation/admin\-guide/namespaces/resource\-control.rst .
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] capabilities.7, user_namespaces.7: describe CAP_SETFCAP
2021-06-29 21:56 [PATCH 1/3] capabilities.7: tfix Kir Kolyshkin
2021-06-29 21:56 ` [PATCH 2/3] user_namespaces.7: fix a ref Kir Kolyshkin
@ 2021-06-29 21:57 ` Kir Kolyshkin
2021-07-03 19:37 ` Alejandro Colomar (man-pages)
1 sibling, 1 reply; 4+ messages in thread
From: Kir Kolyshkin @ 2021-06-29 21:57 UTC (permalink / raw)
To: linux-man; +Cc: Alejandro Colomar, Michael Kerrisk, Kir Kolyshkin
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
man7/capabilities.7 | 6 ++++++
man7/user_namespaces.7 | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/man7/capabilities.7 b/man7/capabilities.7
index 9f8f0087f..2f9c9a61e 100644
--- a/man7/capabilities.7
+++ b/man7/capabilities.7
@@ -349,6 +349,12 @@ write a group ID mapping in a user namespace (see
.TP
.BR CAP_SETFCAP " (since Linux 2.6.24)"
Set arbitrary capabilities on a file.
+.IP
+.\" commit db2e718a47984b9d71ed890eb2ea36ecf150de18
+Since Linux 5.12, this capability is
+also needed to map uid 0 (as in
+.BR unshare\ -Ur ,
+.RB see unshare (1).
.TP
.B CAP_SETPCAP
If file capabilities are supported (i.e., since Linux 2.6.24):
diff --git a/man7/user_namespaces.7 b/man7/user_namespaces.7
index 518e7a3bb..3378b6057 100644
--- a/man7/user_namespaces.7
+++ b/man7/user_namespaces.7
@@ -577,6 +577,12 @@ or be in the parent user namespace of the process
The mapped user IDs (group IDs) must in turn have a mapping
in the parent user namespace.
.IP 4.
+.\" commit db2e718a47984b9d71ed890eb2ea36ecf150de18
+If a writing process is root (i.e. UID 0) trying to map host user ID 0,
+it must have
+.B CAP_SETFCAP
+capability (since Linux 5.12).
+.IP 5.
One of the following two cases applies:
.RS
.IP * 3
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 3/3] capabilities.7, user_namespaces.7: describe CAP_SETFCAP
2021-06-29 21:57 ` [PATCH 3/3] capabilities.7, user_namespaces.7: describe CAP_SETFCAP Kir Kolyshkin
@ 2021-07-03 19:37 ` Alejandro Colomar (man-pages)
0 siblings, 0 replies; 4+ messages in thread
From: Alejandro Colomar (man-pages) @ 2021-07-03 19:37 UTC (permalink / raw)
To: Kir Kolyshkin, linux-man; +Cc: Michael Kerrisk
Hi Kir,
On 6/29/21 11:57 PM, Kir Kolyshkin wrote:
> Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
I applied all 3 patches in this series (and some minor tweaks).
Thanks,
Alex
> ---
> man7/capabilities.7 | 6 ++++++
> man7/user_namespaces.7 | 6 ++++++
> 2 files changed, 12 insertions(+)
>
> diff --git a/man7/capabilities.7 b/man7/capabilities.7
> index 9f8f0087f..2f9c9a61e 100644
> --- a/man7/capabilities.7
> +++ b/man7/capabilities.7
> @@ -349,6 +349,12 @@ write a group ID mapping in a user namespace (see
> .TP
> .BR CAP_SETFCAP " (since Linux 2.6.24)"
> Set arbitrary capabilities on a file.
> +.IP
> +.\" commit db2e718a47984b9d71ed890eb2ea36ecf150de18
> +Since Linux 5.12, this capability is
> +also needed to map uid 0 (as in
> +.BR unshare\ -Ur ,
> +.RB see unshare (1).
> .TP
> .B CAP_SETPCAP
> If file capabilities are supported (i.e., since Linux 2.6.24):
> diff --git a/man7/user_namespaces.7 b/man7/user_namespaces.7
> index 518e7a3bb..3378b6057 100644
> --- a/man7/user_namespaces.7
> +++ b/man7/user_namespaces.7
> @@ -577,6 +577,12 @@ or be in the parent user namespace of the process
> The mapped user IDs (group IDs) must in turn have a mapping
> in the parent user namespace.
> .IP 4.
> +.\" commit db2e718a47984b9d71ed890eb2ea36ecf150de18
> +If a writing process is root (i.e. UID 0) trying to map host user ID 0,
> +it must have
> +.B CAP_SETFCAP
> +capability (since Linux 5.12).
> +.IP 5.
> One of the following two cases applies:
> .RS
> .IP * 3
>
--
Alejandro Colomar
Linux man-pages comaintainer; https://www.kernel.org/doc/man-pages/
http://www.alejandro-colomar.es/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-03 19:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-29 21:56 [PATCH 1/3] capabilities.7: tfix Kir Kolyshkin
2021-06-29 21:56 ` [PATCH 2/3] user_namespaces.7: fix a ref Kir Kolyshkin
2021-06-29 21:57 ` [PATCH 3/3] capabilities.7, user_namespaces.7: describe CAP_SETFCAP Kir Kolyshkin
2021-07-03 19:37 ` Alejandro Colomar (man-pages)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).