2024-01-16 11:05:12

by Petr Vorel

[permalink] [raw]
Subject: [PATCH 1/1] socket.7: Mention CAP_NET_RAW on SO_MARK

Added in 079925cce1d0 ("net: allow SO_MARK with CAP_NET_RAW") in v5.17.

Signed-off-by: Petr Vorel <[email protected]>
---
man7/socket.7 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/man7/socket.7 b/man7/socket.7
index 3ff8fe51b..3ebfc770b 100644
--- a/man7/socket.7
+++ b/man7/socket.7
@@ -614,7 +614,9 @@ Changing the mark can be used for mark-based
routing without netfilter or for packet filtering.
Setting this option requires the
.B CAP_NET_ADMIN
-capability.
+or
+.B CAP_NET_RAW
+(since Linux 5.17) capability.
.TP
.B SO_OOBINLINE
If this option is enabled,
--
2.43.0



2024-01-16 15:14:20

by Alejandro Colomar

[permalink] [raw]
Subject: Re: [PATCH 1/1] socket.7: Mention CAP_NET_RAW on SO_MARK

Hi Petr,

On Tue, Jan 16, 2024 at 12:04:18PM +0100, Petr Vorel wrote:
> Added in 079925cce1d0 ("net: allow SO_MARK with CAP_NET_RAW") in v5.17.
>
> Signed-off-by: Petr Vorel <[email protected]>

Patch applied. Thanks!

Have a lovely day,
Alex

> ---
> man7/socket.7 | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/man7/socket.7 b/man7/socket.7
> index 3ff8fe51b..3ebfc770b 100644
> --- a/man7/socket.7
> +++ b/man7/socket.7
> @@ -614,7 +614,9 @@ Changing the mark can be used for mark-based
> routing without netfilter or for packet filtering.
> Setting this option requires the
> .B CAP_NET_ADMIN
> -capability.
> +or
> +.B CAP_NET_RAW
> +(since Linux 5.17) capability.
> .TP
> .B SO_OOBINLINE
> If this option is enabled,
> --
> 2.43.0
>

--
<https://www.alejandro-colomar.es/>
Looking for a remote C programming job at the moment.


Attachments:
(No filename) (910.00 B)
signature.asc (849.00 B)
Download all attachments

2024-01-17 09:15:13

by Petr Vorel

[permalink] [raw]
Subject: Re: [PATCH 1/1] socket.7: Mention CAP_NET_RAW on SO_MARK

Hi Alex,

> Hi Petr,

> On Tue, Jan 16, 2024 at 12:04:18PM +0100, Petr Vorel wrote:
> > Added in 079925cce1d0 ("net: allow SO_MARK with CAP_NET_RAW") in v5.17.

> > Signed-off-by: Petr Vorel <[email protected]>

> Patch applied. Thanks!

Thank you! BTW I don't see this patch in git tree [1], maybe you just haven't
push yet.

Kind regards,
Petr

[1] https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/


> Have a lovely day,
> Alex

> > ---
> > man7/socket.7 | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)

> > diff --git a/man7/socket.7 b/man7/socket.7
> > index 3ff8fe51b..3ebfc770b 100644
> > --- a/man7/socket.7
> > +++ b/man7/socket.7
> > @@ -614,7 +614,9 @@ Changing the mark can be used for mark-based
> > routing without netfilter or for packet filtering.
> > Setting this option requires the
> > .B CAP_NET_ADMIN
> > -capability.
> > +or
> > +.B CAP_NET_RAW
> > +(since Linux 5.17) capability.
> > .TP
> > .B SO_OOBINLINE
> > If this option is enabled,
> > --
> > 2.43.0

2024-01-17 12:02:34

by Alejandro Colomar

[permalink] [raw]
Subject: Re: [PATCH 1/1] socket.7: Mention CAP_NET_RAW on SO_MARK

Hi Petr,

On Wed, Jan 17, 2024 at 10:14:52AM +0100, Petr Vorel wrote:
> Hi Alex,
>
> > Hi Petr,
>
> > On Tue, Jan 16, 2024 at 12:04:18PM +0100, Petr Vorel wrote:
> > > Added in 079925cce1d0 ("net: allow SO_MARK with CAP_NET_RAW") in v5.17.
>
> > > Signed-off-by: Petr Vorel <[email protected]>
>
> > Patch applied. Thanks!
>
> Thank you! BTW I don't see this patch in git tree [1], maybe you just haven't
> push yet.

That's it. I'm first pushing them to a 'contrib' branch (similar to
Linux 'next') in my own server[1], and after one day or so I push to
master. That buffering allows me to catch some mistakes.

[1]: <https://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git/log/?h=contrib>

$ git log --all --graph --oneline -10
* 0c118822f (alx/contrib, contrib) open.2: srcfix
* 24347d22a syscalls.2: ffix
* 9e04cb40f mremap.2: wfix
* 3a271d5b8 fts.3, div_t.3type: ffix
* 527f31b9f socket.7: Mention CAP_NET_RAW on SO_MARK
| * 71c25f15d (alx/MR, MR) man*/: ffix (MR.sed)
|/
* d82ce270c (HEAD -> master, korg/master, alx/main, main) locale.5: tfix
* f65154cba cpuid.4: Note which CPUs don't support CPUID and what happens
* f98168310 sched_getcpu.3: tfix
* 26cdb3ebb faccessat(2), utimensat(2): Document AT_EMPTY_PATH flag

I'll push in a moment to master.

Have a lovely day,
Alex

--
<https://www.alejandro-colomar.es/>
Looking for a remote C programming job at the moment.


Attachments:
(No filename) (1.42 kB)
signature.asc (849.00 B)
Download all attachments

2024-01-17 12:08:40

by Petr Vorel

[permalink] [raw]
Subject: Re: [PATCH 1/1] socket.7: Mention CAP_NET_RAW on SO_MARK

> Hi Petr,

> On Wed, Jan 17, 2024 at 10:14:52AM +0100, Petr Vorel wrote:
> > Hi Alex,

> > > Hi Petr,

> > > On Tue, Jan 16, 2024 at 12:04:18PM +0100, Petr Vorel wrote:
> > > > Added in 079925cce1d0 ("net: allow SO_MARK with CAP_NET_RAW") in v5.17.

> > > > Signed-off-by: Petr Vorel <[email protected]>

> > > Patch applied. Thanks!

> > Thank you! BTW I don't see this patch in git tree [1], maybe you just haven't
> > push yet.

> That's it. I'm first pushing them to a 'contrib' branch (similar to
> Linux 'next') in my own server[1], and after one day or so I push to
> master. That buffering allows me to catch some mistakes.

Thanks a lot for info!

> [1]: <https://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git/log/?h=contrib>

Ah, maybe my patch to MAINTAINERS was wrong, please push the correct tree
https://lore.kernel.org/linux-man/[email protected]/

> $ git log --all --graph --oneline -10
> * 0c118822f (alx/contrib, contrib) open.2: srcfix
> * 24347d22a syscalls.2: ffix
> * 9e04cb40f mremap.2: wfix
> * 3a271d5b8 fts.3, div_t.3type: ffix
> * 527f31b9f socket.7: Mention CAP_NET_RAW on SO_MARK
> | * 71c25f15d (alx/MR, MR) man*/: ffix (MR.sed)
> |/
> * d82ce270c (HEAD -> master, korg/master, alx/main, main) locale.5: tfix
> * f65154cba cpuid.4: Note which CPUs don't support CPUID and what happens
> * f98168310 sched_getcpu.3: tfix
> * 26cdb3ebb faccessat(2), utimensat(2): Document AT_EMPTY_PATH flag

> I'll push in a moment to master.

Thanks!

Kind regards,
Petr

> Have a lovely day,
> Alex