[PATCH] mlock.2, pivot_root.2, poll.2, select.2, fopen.3, capabilities.7: tfix

[PATCH] mlock.2, pivot_root.2, poll.2, select.2, fopen.3, capabilities.7: tfix

[Štěpán Němec]

Signed-off-by: Štěpán Němec <stepnem@gmail.com>
---
 man2/mlock.2        | 2 +-
 man2/pivot_root.2   | 2 +-
 man2/poll.2         | 2 +-
 man2/select.2       | 2 +-
 man3/fopen.3        | 2 +-
 man7/capabilities.7 | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/man2/mlock.2 b/man2/mlock.2
index fc138f6fdf44..da1ff69769d3 100644
--- a/man2/mlock.2
+++ b/man2/mlock.2
@@ -36,7 +36,7 @@ and
 perform the converse operation,
 unlocking part or all of the calling process's virtual
 address space, so that pages in the specified virtual address range may
-once more to be swapped out if required by the kernel memory manager.
+once more be swapped out if required by the kernel memory manager.
 .PP
 Memory locking and unlocking are performed in units of whole pages.
 .SS mlock(), mlock2(), and munlock()
diff --git a/man2/pivot_root.2 b/man2/pivot_root.2
index f2df25d127b0..ecb92c103a2c 100644
--- a/man2/pivot_root.2
+++ b/man2/pivot_root.2
@@ -60,7 +60,7 @@ must not be on the same mount as the current root.
 .IP \-
 \fIput_old\fP must be at or underneath \fInew_root\fP;
 that is, adding some nonnegative
-number of "\fI/..\fP" prefixes to the pathname pointed to by
+number of "\fI/..\fP" suffixes to the pathname pointed to by
 .I put_old
 must yield the same directory as \fInew_root\fP.
 .IP \-
diff --git a/man2/poll.2 b/man2/poll.2
index 8d2b08d63c6c..459cb383a702 100644
--- a/man2/poll.2
+++ b/man2/poll.2
@@ -577,7 +577,7 @@ main(int argc, char *argv[])
     if (pfds == NULL)
         errExit("malloc");
 
-    /* Open each file on command line, and add it \(aqpfds\(aq array. */
+    /* Open each file on command line, and add it to \(aqpfds\(aq array. */
 
     for (nfds_t j = 0; j < nfds; j++) {
         pfds[j].fd = open(argv[j + 1], O_RDONLY);
diff --git a/man2/select.2 b/man2/select.2
index 0fc075d48897..413baf3d6fef 100644
--- a/man2/select.2
+++ b/man2/select.2
@@ -547,7 +547,7 @@ On some UNIX systems,
 .BR select ()
 unblocks and returns, with an indication that the file descriptor is ready
 (a subsequent I/O operation will likely fail with an error,
-unless another process reopens file descriptor between the time
+unless another process reopens the file descriptor between the time
 .BR select ()
 returned and the I/O operation is performed).
 On Linux (and some other systems),
diff --git a/man3/fopen.3 b/man3/fopen.3
index d2fb6abeacf4..a2d3b5ab4ecc 100644
--- a/man3/fopen.3
+++ b/man3/fopen.3
@@ -123,7 +123,7 @@ called for its synchronizing side effect).
 Opening a file in append mode (\fBa\fP as the first character of
 .IR mode )
 causes all subsequent write operations to this stream to occur
-at end-of-file, as if preceded the call:
+at end-of-file, as if preceded by the call:
 .PP
 .in +4n
 .EX
diff --git a/man7/capabilities.7 b/man7/capabilities.7
index ef56c63f9a34..c991b17b5666 100644
--- a/man7/capabilities.7
+++ b/man7/capabilities.7
@@ -1040,7 +1040,7 @@ Therefore, when assigning capabilities to a file
 if we specify the effective flag as being enabled for any capability,
 then the effective flag must also be specified as enabled
 for all other capabilities for which the corresponding permitted or
-inheritable flags is enabled.
+inheritable flag is enabled.
 .\"
 .SS File capability extended attribute versioning
 To allow extensibility,
@@ -1271,7 +1271,7 @@ file permitted capabilities, then
 fails with the error
 .BR EPERM .
 This prevents possible security risks that could arise when
-a capability-dumb application is executed with less privilege that it needs.
+a capability-dumb application is executed with less privilege than it needs.
 Note that, by definition,
 the application could not itself recognize this problem,
 since it does not employ the

base-commit: bf8f5415a1dd3296d3741008936458aeaf8769fc
-- 
2.37.3

Re: [PATCH] mlock.2, pivot_root.2, poll.2, select.2, fopen.3, capabilities.7: tfix

[Alejandro Colomar]

[-- Attachment #1.1: Type: text/plain, Size: 4476 bytes --]

Hi Štěpán,

On 9/21/22 17:46, Štěpán Němec wrote:
> Signed-off-by: Štěpán Němec <stepnem@gmail.com>
> ---
>   man2/mlock.2        | 2 +-
>   man2/pivot_root.2   | 2 +-
>   man2/poll.2         | 2 +-
>   man2/select.2       | 2 +-
>   man3/fopen.3        | 2 +-
>   man7/capabilities.7 | 4 ++--
>   6 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/man2/mlock.2 b/man2/mlock.2
> index fc138f6fdf44..da1ff69769d3 100644
> --- a/man2/mlock.2
> +++ b/man2/mlock.2
> @@ -36,7 +36,7 @@ and
>   perform the converse operation,
>   unlocking part or all of the calling process's virtual
>   address space, so that pages in the specified virtual address range may
> -once more to be swapped out if required by the kernel memory manager.
> +once more be swapped out if required by the kernel memory manager.
>   .PP
>   Memory locking and unlocking are performed in units of whole pages.
>   .SS mlock(), mlock2(), and munlock()
> diff --git a/man2/pivot_root.2 b/man2/pivot_root.2
> index f2df25d127b0..ecb92c103a2c 100644
> --- a/man2/pivot_root.2
> +++ b/man2/pivot_root.2
> @@ -60,7 +60,7 @@ must not be on the same mount as the current root.
>   .IP \-
>   \fIput_old\fP must be at or underneath \fInew_root\fP;
>   that is, adding some nonnegative
> -number of "\fI/..\fP" prefixes to the pathname pointed to by
> +number of "\fI/..\fP" suffixes to the pathname pointed to by

I'd like this change to be separate from the rest, as it's not an 
obvious writing typo, but rather one that needs understanding the context.

Would you mind splitting into a separate patch?

Thanks,

Alex

>   .I put_old
>   must yield the same directory as \fInew_root\fP.
>   .IP \-
> diff --git a/man2/poll.2 b/man2/poll.2
> index 8d2b08d63c6c..459cb383a702 100644
> --- a/man2/poll.2
> +++ b/man2/poll.2
> @@ -577,7 +577,7 @@ main(int argc, char *argv[])
>       if (pfds == NULL)
>           errExit("malloc");
>   
> -    /* Open each file on command line, and add it \(aqpfds\(aq array. */
> +    /* Open each file on command line, and add it to \(aqpfds\(aq array. */
>   
>       for (nfds_t j = 0; j < nfds; j++) {
>           pfds[j].fd = open(argv[j + 1], O_RDONLY);
> diff --git a/man2/select.2 b/man2/select.2
> index 0fc075d48897..413baf3d6fef 100644
> --- a/man2/select.2
> +++ b/man2/select.2
> @@ -547,7 +547,7 @@ On some UNIX systems,
>   .BR select ()
>   unblocks and returns, with an indication that the file descriptor is ready
>   (a subsequent I/O operation will likely fail with an error,
> -unless another process reopens file descriptor between the time
> +unless another process reopens the file descriptor between the time
>   .BR select ()
>   returned and the I/O operation is performed).
>   On Linux (and some other systems),
> diff --git a/man3/fopen.3 b/man3/fopen.3
> index d2fb6abeacf4..a2d3b5ab4ecc 100644
> --- a/man3/fopen.3
> +++ b/man3/fopen.3
> @@ -123,7 +123,7 @@ called for its synchronizing side effect).
>   Opening a file in append mode (\fBa\fP as the first character of
>   .IR mode )
>   causes all subsequent write operations to this stream to occur
> -at end-of-file, as if preceded the call:
> +at end-of-file, as if preceded by the call:
>   .PP
>   .in +4n
>   .EX
> diff --git a/man7/capabilities.7 b/man7/capabilities.7
> index ef56c63f9a34..c991b17b5666 100644
> --- a/man7/capabilities.7
> +++ b/man7/capabilities.7
> @@ -1040,7 +1040,7 @@ Therefore, when assigning capabilities to a file
>   if we specify the effective flag as being enabled for any capability,
>   then the effective flag must also be specified as enabled
>   for all other capabilities for which the corresponding permitted or
> -inheritable flags is enabled.
> +inheritable flag is enabled.
>   .\"
>   .SS File capability extended attribute versioning
>   To allow extensibility,
> @@ -1271,7 +1271,7 @@ file permitted capabilities, then
>   fails with the error
>   .BR EPERM .
>   This prevents possible security risks that could arise when
> -a capability-dumb application is executed with less privilege that it needs.
> +a capability-dumb application is executed with less privilege than it needs.
>   Note that, by definition,
>   the application could not itself recognize this problem,
>   since it does not employ the
> 
> base-commit: bf8f5415a1dd3296d3741008936458aeaf8769fc

-- 
<http://www.alejandro-colomar.es/>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH v1 0/2] Fix typos

[Štěpán Němec]

On Sat, 08 Oct 2022 02:17:56 +0200
Alejandro Colomar wrote:

>> --- a/man2/pivot_root.2
>> +++ b/man2/pivot_root.2
>> @@ -60,7 +60,7 @@ must not be on the same mount as the current root.
>>   .IP \-
>>   \fIput_old\fP must be at or underneath \fInew_root\fP;
>>   that is, adding some nonnegative
>> -number of "\fI/..\fP" prefixes to the pathname pointed to by
>> +number of "\fI/..\fP" suffixes to the pathname pointed to by
>
> I'd like this change to be separate from the rest, as it's not an 
> obvious writing typo, but rather one that needs understanding the context.
>
> Would you mind splitting into a separate patch?

Here it is. (I wanted to test the waters of submitting accumulated
trivial fixes as a single patch, as I think it saves both some electrons
and the resources of everyone else involved.)

I took this opportunity to squash in another missing article to the
trivial typo patch (1/2).

Thanks,

  Štěpán

Štěpán Němec (2):
  memfd_create.2, mlock.2, poll.2, select.2, fopen.3, capabilities.7: tfix
  pivot_root.2: Fix a typo/thinko

 man2/memfd_create.2 | 2 +-
 man2/mlock.2        | 2 +-
 man2/pivot_root.2   | 2 +-
 man2/poll.2         | 2 +-
 man2/select.2       | 2 +-
 man3/fopen.3        | 2 +-
 man7/capabilities.7 | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)


base-commit: a4a073ae7737fb8f20c390a60b8555a7cfdace98
-- 
2.38.0

[PATCH v1 1/2] memfd_create.2, mlock.2, poll.2, select.2, fopen.3, capabilities.7: tfix

[Štěpán Němec]

Signed-off-by: Štěpán Němec <stepnem@smrk.net>
---
v1: squashed in a missing article in memfd_create(2)

 man2/memfd_create.2 | 2 +-
 man2/mlock.2        | 2 +-
 man2/poll.2         | 2 +-
 man2/select.2       | 2 +-
 man3/fopen.3        | 2 +-
 man7/capabilities.7 | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/man2/memfd_create.2 b/man2/memfd_create.2
index 2668a79d8acd..d672a20515ae 100644
--- a/man2/memfd_create.2
+++ b/man2/memfd_create.2
@@ -360,7 +360,7 @@ of which the first two are required.
 The first argument is the name to associate with the file,
 the second argument is the size to be set for the file,
 and the optional third argument is a string of characters that specify
-seals to be set on file.
+seals to be set on the file.
 .PP
 The second program,
 .IR t_get_seals.c ,
diff --git a/man2/mlock.2 b/man2/mlock.2
index fc138f6fdf44..da1ff69769d3 100644
--- a/man2/mlock.2
+++ b/man2/mlock.2
@@ -36,7 +36,7 @@ and
 perform the converse operation,
 unlocking part or all of the calling process's virtual
 address space, so that pages in the specified virtual address range may
-once more to be swapped out if required by the kernel memory manager.
+once more be swapped out if required by the kernel memory manager.
 .PP
 Memory locking and unlocking are performed in units of whole pages.
 .SS mlock(), mlock2(), and munlock()
diff --git a/man2/poll.2 b/man2/poll.2
index 8d2b08d63c6c..459cb383a702 100644
--- a/man2/poll.2
+++ b/man2/poll.2
@@ -577,7 +577,7 @@ main(int argc, char *argv[])
     if (pfds == NULL)
         errExit("malloc");
 
-    /* Open each file on command line, and add it \(aqpfds\(aq array. */
+    /* Open each file on command line, and add it to \(aqpfds\(aq array. */
 
     for (nfds_t j = 0; j < nfds; j++) {
         pfds[j].fd = open(argv[j + 1], O_RDONLY);
diff --git a/man2/select.2 b/man2/select.2
index 0fc075d48897..413baf3d6fef 100644
--- a/man2/select.2
+++ b/man2/select.2
@@ -547,7 +547,7 @@ On some UNIX systems,
 .BR select ()
 unblocks and returns, with an indication that the file descriptor is ready
 (a subsequent I/O operation will likely fail with an error,
-unless another process reopens file descriptor between the time
+unless another process reopens the file descriptor between the time
 .BR select ()
 returned and the I/O operation is performed).
 On Linux (and some other systems),
diff --git a/man3/fopen.3 b/man3/fopen.3
index d2fb6abeacf4..a2d3b5ab4ecc 100644
--- a/man3/fopen.3
+++ b/man3/fopen.3
@@ -123,7 +123,7 @@ called for its synchronizing side effect).
 Opening a file in append mode (\fBa\fP as the first character of
 .IR mode )
 causes all subsequent write operations to this stream to occur
-at end-of-file, as if preceded the call:
+at end-of-file, as if preceded by the call:
 .PP
 .in +4n
 .EX
diff --git a/man7/capabilities.7 b/man7/capabilities.7
index ef56c63f9a34..c991b17b5666 100644
--- a/man7/capabilities.7
+++ b/man7/capabilities.7
@@ -1040,7 +1040,7 @@ Therefore, when assigning capabilities to a file
 if we specify the effective flag as being enabled for any capability,
 then the effective flag must also be specified as enabled
 for all other capabilities for which the corresponding permitted or
-inheritable flags is enabled.
+inheritable flag is enabled.
 .\"
 .SS File capability extended attribute versioning
 To allow extensibility,
@@ -1271,7 +1271,7 @@ file permitted capabilities, then
 fails with the error
 .BR EPERM .
 This prevents possible security risks that could arise when
-a capability-dumb application is executed with less privilege that it needs.
+a capability-dumb application is executed with less privilege than it needs.
 Note that, by definition,
 the application could not itself recognize this problem,
 since it does not employ the
-- 
2.38.0

[PATCH v1 2/2] pivot_root.2: Fix a typo/thinko

[Štěpán Němec]

(To obtain a prefix of a given pathname, we have to append (suffix)
'/..' at its end.)

Signed-off-by: Štěpán Němec <stepnem@smrk.net>
---
v1: split out from <20220921154602.446336-1-stepnem@gmail.com> per
    Alejandro's preference; added explanation to commit message; no
    diff changes

 man2/pivot_root.2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man2/pivot_root.2 b/man2/pivot_root.2
index f2df25d127b0..ecb92c103a2c 100644
--- a/man2/pivot_root.2
+++ b/man2/pivot_root.2
@@ -60,7 +60,7 @@ must not be on the same mount as the current root.
 .IP \-
 \fIput_old\fP must be at or underneath \fInew_root\fP;
 that is, adding some nonnegative
-number of "\fI/..\fP" prefixes to the pathname pointed to by
+number of "\fI/..\fP" suffixes to the pathname pointed to by
 .I put_old
 must yield the same directory as \fInew_root\fP.
 .IP \-
-- 
2.38.0

Re: [PATCH v1 0/2] Fix typos

[Alejandro Colomar]

[-- Attachment #1.1: Type: text/plain, Size: 1788 bytes --]



On 10/8/22 16:05, Štěpán Němec wrote:
> On Sat, 08 Oct 2022 02:17:56 +0200
> Alejandro Colomar wrote:
> 
>>> --- a/man2/pivot_root.2
>>> +++ b/man2/pivot_root.2
>>> @@ -60,7 +60,7 @@ must not be on the same mount as the current root.
>>>    .IP \-
>>>    \fIput_old\fP must be at or underneath \fInew_root\fP;
>>>    that is, adding some nonnegative
>>> -number of "\fI/..\fP" prefixes to the pathname pointed to by
>>> +number of "\fI/..\fP" suffixes to the pathname pointed to by
>>
>> I'd like this change to be separate from the rest, as it's not an
>> obvious writing typo, but rather one that needs understanding the context.
>>
>> Would you mind splitting into a separate patch?
> 
> Here it is. (I wanted to test the waters of submitting accumulated
> trivial fixes as a single patch, as I think it saves both some electrons
> and the resources of everyone else involved.)

Except that I don't agree on that one being that trivial :)
But yes, if you find many trivial typos, you can file them as a single 
patch.

> 
> I took this opportunity to squash in another missing article to the
> trivial typo patch (1/2).
> 

That's fine.
Patch set applied.

Cheers,
Alex

> Thanks,
> 
>    Štěpán
> 
> Štěpán Němec (2):
>    memfd_create.2, mlock.2, poll.2, select.2, fopen.3, capabilities.7: tfix
>    pivot_root.2: Fix a typo/thinko
> 
>   man2/memfd_create.2 | 2 +-
>   man2/mlock.2        | 2 +-
>   man2/pivot_root.2   | 2 +-
>   man2/poll.2         | 2 +-
>   man2/select.2       | 2 +-
>   man3/fopen.3        | 2 +-
>   man7/capabilities.7 | 4 ++--
>   7 files changed, 8 insertions(+), 8 deletions(-)
> 
> 
> base-commit: a4a073ae7737fb8f20c390a60b8555a7cfdace98

-- 
<http://www.alejandro-colomar.es/>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]