Revert "smb: client: Fix netns refcount imbalance causing leaks and use-after-free"

This reverts commit 4e7f1644f2ac6d01dc584f6301c3b1d5aac4eaef.

The commit e9f2517a3e18 ("smb: client: fix TCP timers deadlock after
rmmod") is not only a bogus fix for LOCKDEP null-ptr-deref but also
introduces a real issue, TCP sockets leak, which will be explained in
detail in the next revert.

Also, CNA assigned CVE-2024-54680 to it but is rejecting it. [0]

Thus, we are reverting the commit and its follow-up commit 4e7f1644f2ac
("smb: client: Fix netns refcount imbalance causing leaks and
use-after-free").

Link: https://lore.kernel.org/all/2025040248-tummy-smilingly-4240@gregkh/ #[0]
Fixes: 4e7f1644f2ac ("smb: client: Fix netns refcount imbalance causing leaks and use-after-free")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Cc: stable@vger.kernel.org
Signed-off-by: Steve French <stfrench@microsoft.com>

authored by

Kuniyuki Iwashima and committed by
Steve French
c707193a 262b73ef

+8 -8
+8 -8
fs/smb/client/connect.c
··· 300 300 server->ssocket->flags); 301 301 sock_release(server->ssocket); 302 302 server->ssocket = NULL; 303 - put_net(cifs_net_ns(server)); 304 303 } 305 304 server->sequence_number = 0; 306 305 server->session_estab = false; ··· 3368 3369 /* 3369 3370 * Grab netns reference for the socket. 3370 3371 * 3371 - * This reference will be released in several situations: 3372 - * - In the failure path before the cifsd thread is started. 3373 - * - In the all place where server->socket is released, it is 3374 - * also set to NULL. 3375 - * - Ultimately in clean_demultiplex_info(), during the final 3376 - * teardown. 3372 + * It'll be released here, on error, or in clean_demultiplex_info() upon server 3373 + * teardown. 3377 3374 */ 3378 3375 get_net(net); 3379 3376 ··· 3385 3390 } 3386 3391 3387 3392 rc = bind_socket(server); 3388 - if (rc < 0) 3393 + if (rc < 0) { 3394 + put_net(cifs_net_ns(server)); 3389 3395 return rc; 3396 + } 3390 3397 3391 3398 /* 3392 3399 * Eventually check for other socket options to change from ··· 3442 3445 server->rfc1001_sessinit == 1 || 3443 3446 (server->rfc1001_sessinit == -1 && sport == htons(RFC1001_PORT))) 3444 3447 rc = ip_rfc1001_connect(server); 3448 + 3449 + if (rc < 0) 3450 + put_net(cifs_net_ns(server)); 3445 3451 3446 3452 return rc; 3447 3453 }