From: Kuniyuki Iwashima <kuniyu@amazon.com>
Date: Fri, 13 Dec 2024 11:08:47 +0000 (+0900)
Subject: af_unix: Defer sock_put() to clean up path in unix_dgram_sendmsg().
X-Git-Tag: v6.14-rc1~162^2~204^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=689c398885cc;p=thirdparty%2Flinux.git

af_unix: Defer sock_put() to clean up path in unix_dgram_sendmsg().

When other has SOCK_DEAD in unix_dgram_sendmsg(), we call sock_put() for
it first and then set NULL to other before jumping to the error path.

This is to skip sock_put() in the error path.

Let's not set NULL to other and defer the sock_put() to the error path
to clean up the labels later.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 513d0fd12e6a9..b8adfb41d11bc 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2075,7 +2075,6 @@ restart_locked:
 		 *	datagram error
 		 */
 		unix_state_unlock(other);
-		sock_put(other);
 
 		if (!sk_locked)
 			unix_state_lock(sk);
@@ -2104,7 +2103,6 @@ restart_locked:
 				err = -ECONNRESET;
 		}
 
-		other = NULL;
 		if (err)
 			goto out_free;