netdev - [PATCH net-next v7 1/4] sock: 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: <20241213084457.45120-2-annaemesenyiri@gmail.com>
Date: Fri, 13 Dec 2024 09:44:54 +0100
From: Anna Emese Nyiri <annaemesenyiri@...il.com>
To: netdev@...r.kernel.org
Cc: fejes@....elte.hu,
	edumazet@...gle.com,
	kuba@...nel.org,
	pabeni@...hat.com,
	willemb@...gle.com,
	idosch@...sch.org,
	horms@...nel.org,
	dsahern@...nel.org,
	linux-can@...r.kernel.org,
	socketcan@...tkopp.net,
	mkl@...gutronix.de,
	linux-kselftest@...r.kernel.org,
	shuah@...nel.org,
	tsbogend@...ha.franken.de,
	kaiyuanz@...gle.com,
	James.Bottomley@...senPartnership.com,
	richard.henderson@...aro.org,
	arnd@...db.de,
	almasrymina@...gle.com,
	asml.silence@...il.com,
	linux-mips@...r.kernel.org,
	andreas@...sler.com,
	mattst88@...il.com,
	kerneljasonxing@...il.com,
	sparclinux@...r.kernel.org,
	linux-alpha@...r.kernel.org,
	linux-arch@...r.kernel.org,
	deller@....de,
	vadim.fedorenko@...ux.dev,
	linux-parisc@...r.kernel.org,
	Anna Emese Nyiri <annaemesenyiri@...il.com>
Subject: [PATCH net-next v7 1/4] sock: Introduce sk_set_prio_allowed helper function

Simplify priority setting permissions with the 'sk_set_prio_allowed'
function, centralizing the validation logic. This change is made in
anticipation of a second caller in a following patch.
No functional changes.

Reviewed-by: Willem de Bruijn <willemb@...gle.com>
Reviewed-by: Eric Dumazet <edumazet@...gle.com>

Suggested-by: Willem de Bruijn <willemb@...gle.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 74729d20cd00..9016f984d44e 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) {
@@ -1193,9 +1200,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