From: Eric Dumazet <edumazet@google.com>
Date: Mon, 11 Sep 2023 17:05:29 +0000 (+0000)
Subject: net: sock_release_ownership() cleanup
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=11445469dec803730ac7f78a5ad2a5ed131fa941;p=users%2Fjedix%2Flinux-maple.git

net: sock_release_ownership() cleanup

sock_release_ownership() should only be called by user
owning the socket lock.

After prior commit, we can remove one condition.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---

diff --git a/include/net/sock.h b/include/net/sock.h
index b770261fbdaf5..676146e9d1811 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1823,12 +1823,11 @@ static inline bool sock_owned_by_user_nocheck(const struct sock *sk)
 
 static inline void sock_release_ownership(struct sock *sk)
 {
-	if (sock_owned_by_user_nocheck(sk)) {
-		sk->sk_lock.owned = 0;
+	DEBUG_NET_WARN_ON_ONCE(!sock_owned_by_user_nocheck(sk));
+	sk->sk_lock.owned = 0;
 
-		/* The sk_lock has mutex_unlock() semantics: */
-		mutex_release(&sk->sk_lock.dep_map, _RET_IP_);
-	}
+	/* The sk_lock has mutex_unlock() semantics: */
+	mutex_release(&sk->sk_lock.dep_map, _RET_IP_);
 }
 
 /* no reclassification while locks are held */