Skip to contentSkip to conversation

capabilities.7: tfix

PATCH In review Kir Kolyshkin 2 participants 4 messages Jun 29, 2021 – Jul 3, 2021 Man-pages: manual pages for Linux -- Sections 2, 3, 4, 5, and 7

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 capabilities.7: tfix

Add a missing comma.

Fixes 3dcdef9437fafb
---
 man7/capabilities.7 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
man7/capabilities.7 +1 -1
index cf9dc190f..9f8f0087f 100644
@@ -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
Signature · 1 line
2.31.1
#1 lore raw

PATCH 2/3 user_namespaces.7: fix a ref

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).

---
 man7/user_namespaces.7 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
man7/user_namespaces.7 +1 -1
index f2e02c978..518e7a3bb 100644
@@ -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 .
Signature · 1 line
2.31.1
#2 lore raw

PATCH 3/3 capabilities.7, user_namespaces.7: describe CAP_SETFCAP

In reply to Kir Kolyshkin
---
 man7/capabilities.7    | 6 ++++++
 man7/user_namespaces.7 | 6 ++++++
 2 files changed, 12 insertions(+)
man7/capabilities.7 +6 -0
index 9f8f0087f..2f9c9a61e 100644
@@ -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):
man7/user_namespaces.7 +6 -0
index 518e7a3bb..3378b6057 100644
@@ -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
Signature · 1 line
2.31.1
#3 lore raw

Re: [PATCH 3/3] capabilities.7, user_namespaces.7: describe CAP_SETFCAP

Hi Kir,

Quoted 1 line · Kir Kolyshkin

I applied all 3 patches in this series (and some minor tweaks).

Thanks,

Alex

Quoted 40 lines
---
 man7/capabilities.7    | 6 ++++++
 man7/user_namespaces.7 | 6 ++++++
 2 files changed, 12 insertions(+)
man7/capabilities.7 +6 -0
index 9f8f0087f..2f9c9a61e 100644
@@ -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):
man7/user_namespaces.7 +6 -0
index 518e7a3bb..3378b6057 100644
@@ -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
Signature · 3 lines
Alejandro Colomar
Linux man-pages comaintainer; https://www.kernel.org/doc/man-pages/
http://www.alejandro-colomar.es/