netdev - [PATCH] net/ipv4: Fix circular deadlock in do_ip

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: <20240917235027.218692-2-srikarananta01@gmail.com>
Date: Tue, 17 Sep 2024 19:50:28 -0400
From: AnantaSrikar <srikarananta01@...il.com>
To: syzbot+e4c27043b9315839452d@...kaller.appspotmail.com
Cc: alibuda@...ux.alibaba.com,
	davem@...emloft.net,
	dsahern@...nel.org,
	dust.li@...ux.alibaba.com,
	edumazet@...gle.com,
	kuba@...nel.org,
	linux-kernel@...r.kernel.org,
	netdev@...r.kernel.org,
	pabeni@...hat.com,
	schnelle@...ux.ibm.com,
	srikarananta01@...il.com,
	syzkaller-bugs@...glegroups.com,
	wenjia@...ux.ibm.com
Subject: [PATCH] net/ipv4: Fix circular deadlock in do_ip_setsockop

Fixed the circular lock dependency reported by syzkaller.

Signed-off-by: AnantaSrikar <srikarananta01@...il.com>
Reported-by: syzbot+e4c27043b9315839452d@...kaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=e4c27043b9315839452d
Fixes: d2bafcf224f3 ("Merge tag 'cgroup-for-6.11-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup")
---
 net/ipv4/ip_sockglue.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index cf377377b52d..a8f46d1ba62b 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -1073,9 +1073,11 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname,
 	}
 
 	err = 0;
+
+	sockopt_lock_sock(sk);
+
 	if (needs_rtnl)
 		rtnl_lock();
-	sockopt_lock_sock(sk);
 
 	switch (optname) {
 	case IP_OPTIONS:
-- 
2.43.0