netdev - [PATCH net] inet_diag: fix inet_diag_msg_attrs_fill() for net

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-next>] [day] [month] [year] [list]

Message-Id: <20230508033232.69793-1-patryk.sondej@gmail.com>
Date: Mon,  8 May 2023 05:32:33 +0200
From: Patryk Sondej <patryk.sondej@...il.com>
To: netdev@...r.kernel.org
Cc: Patryk Sondej <patryk.sondej@...il.com>
Subject: [PATCH net] inet_diag: fix inet_diag_msg_attrs_fill() for net_cls cgroup

This commit fixes inet_diag_msg_attrs_fill() function in the ipv4/inet_diag.c file.
The problem was that the function was using CONFIG_SOCK_CGROUP_DATA to check for the net_cls cgroup.
However, the net_cls cgroup is defined by CONFIG_CGROUP_NET_CLASSID instead.

Therefore, this commit updates the #ifdef statement to CONFIG_CGROUP_NET_CLASSID,
and uses the sock_cgroup_classid() function to retrieve the classid from the socket cgroup.

This change ensures that the function correctly retrieves the classid for the net_cls cgroup
and fixes any issues related to the use of the function in this context.

Signed-off-by: Patryk Sondej <patryk.sondej@...il.com>
---
 net/ipv4/inet_diag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index b812eb36f0e3..7017f88911a6 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -157,7 +157,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,
 	    ext & (1 << (INET_DIAG_TCLASS - 1))) {
 		u32 classid = 0;

-#ifdef CONFIG_SOCK_CGROUP_DATA
+#ifdef CONFIG_CGROUP_NET_CLASSID
 		classid = sock_cgroup_classid(&sk->sk_cgrp_data);
 #endif
 		/* Fallback to socket priority if class id isn't set.
-- 
2.37.1 (Apple Git-137.1)