netdev - Re: [PATCH net-next v2 1/2] Introduce sk_set_prio

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <6726d23863738_2980c729459@willemb.c.googlers.com.notmuch>
Date: Sat, 02 Nov 2024 21:30:32 -0400
From: Willem de Bruijn <willemdebruijn.kernel@...il.com>
To: Anna Emese Nyiri <annaemesenyiri@...il.com>, 
 netdev@...r.kernel.org
Cc: fejes@....elte.hu, 
 annaemesenyiri@...il.com, 
 edumazet@...gle.com, 
 kuba@...nel.org, 
 pabeni@...hat.com, 
 willemdebruijn.kernel@...il.com
Subject: Re: [PATCH net-next v2 1/2] Introduce sk_set_prio_allowed helper
 function

Anna Emese Nyiri wrote:
> Simplifies the priority setting permissions through
> `sk_set_prio_allowed` function. No functional changes.

tiny, only because asking for changes in patch 2/2: please use
imperative mood: "Simplify". And maybe mention that this is in
anticipation of a second caller in a following patch.
 
> Suggested-by: Willem de Bruijn <willemdebruijn.kernel@...il.com>
> Signed-off-by: Anna Emese Nyiri <annaemesenyiri@...il.com>
> ---
>  net/core/sock.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/net/core/sock.c b/net/core/sock.c
> index 7f398bd07fb7..5ecf6f1a470c 100644
> --- a/net/core/sock.c
> +++ b/net/core/sock.c
> @@ -454,6 +454,13 @@ static int sock_set_timeout(long *timeo_p, sockptr_t optval, int optlen,
>  	return 0;
>  }
>  
> +static bool sk_set_prio_allowed(const struct sock *sk, int val)
> +{
> +	return ((val >= TC_PRIO_BESTEFFORT && val <= TC_PRIO_INTERACTIVE) ||
> +		sockopt_ns_capable(sock_net(sk)->user_ns, CAP_NET_RAW) ||
> +		sockopt_ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN));
> +}
> +
>  static bool sock_needs_netstamp(const struct sock *sk)
>  {
>  	switch (sk->sk_family) {
> @@ -1187,9 +1194,7 @@ int sk_setsockopt(struct sock *sk, int level, int optname,
>  	/* handle options which do not require locking the socket. */
>  	switch (optname) {
>  	case SO_PRIORITY:
> -		if ((val >= 0 && val <= 6) ||
> -		    sockopt_ns_capable(sock_net(sk)->user_ns, CAP_NET_RAW) ||
> -		    sockopt_ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) {
> +		if (sk_set_prio_allowed(sk, val)) {
>  			sock_set_priority(sk, val);
>  			return 0;
>  		}
> -- 
> 2.43.0
>