Unverified Commit 8557cdf9 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15655 cifs: Revert two patches to prevent statistics leakage on the lo device. 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Zhaolong <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/GKTSTAALJK3IZZRKR773SD23QPPIDOCZ/ 
Wang Zhaolong (2):
  Revert "smb: client: Fix netns refcount imbalance causing leaks and
    use-after-free"
  Revert "smb: client: fix TCP timers deadlock after rmmod"

 
https://gitee.com/src-openeuler/kernel/issues/IBWJP6 
 
Link:https://gitee.com/openeuler/kernel/pulls/15655

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents afadf562 2ae9010e

fs/cifs/connect.c

+9 −24
Original line number Diff line number Diff line
@@ -429,7 +429,6 @@ cifs_reconnect(struct TCP_Server_Info *server) 
			 server->ssocket->state, server->ssocket->flags);

		sock_release(server->ssocket);

		server->ssocket = NULL;

		put_net(cifs_net_ns(server));

	}

	server->sequence_number = 0;

	server->session_estab = false;
@@ -812,9 +811,6 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server) 
	if (server->ssocket) {

		sock_release(server->ssocket);

		server->ssocket = NULL;



		/* Release netns reference for the socket. */

		put_net(cifs_net_ns(server));

	}



	if (!list_empty(&server->pending_mid_q)) {
@@ -863,7 +859,6 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server) 
		 */

	}



	/* Release netns reference for this server. */

	put_net(cifs_net_ns(server));

	kfree(server->hostname);

	kfree(server);
@@ -2532,8 +2527,6 @@ cifs_get_tcp_session(struct smb_vol *volume_info) 


	tcp_ses->ops = volume_info->ops;

	tcp_ses->vals = volume_info->vals;



	/* Grab netns reference for this server. */

	cifs_set_net_ns(tcp_ses, get_net(current->nsproxy->net_ns));

	tcp_ses->hostname = extract_hostname(volume_info->UNC);

	if (IS_ERR(tcp_ses->hostname)) {
@@ -2635,17 +2628,14 @@ cifs_get_tcp_session(struct smb_vol *volume_info) 
out_err_crypto_release:

	cifs_crypto_secmech_release(tcp_ses);



	/* Release netns reference for this server. */

	put_net(cifs_net_ns(tcp_ses));



out_err:

	if (tcp_ses) {

		if (!IS_ERR(tcp_ses->hostname))

			kfree(tcp_ses->hostname);

		if (tcp_ses->ssocket) {

		if (tcp_ses->ssocket)

			sock_release(tcp_ses->ssocket);

			put_net(cifs_net_ns(tcp_ses));

		}

		kfree(tcp_ses);

	}

	return ERR_PTR(rc);
@@ -3640,26 +3630,22 @@ generic_ip_connect(struct TCP_Server_Info *server) 


	if (socket == NULL) {

		struct net *net = cifs_net_ns(server);

		struct sock *sk;



		rc = sock_create_kern(net, sfamily, SOCK_STREAM,

				   IPPROTO_TCP, &socket);

		rc = __sock_create(net, sfamily, SOCK_STREAM,

				   IPPROTO_TCP, &socket, 1);

		if (rc < 0) {

			cifs_dbg(VFS, "Error %d creating socket\n", rc);

			server->ssocket = NULL;

			return rc;

		}



		/*

		 * Grab netns reference for the socket.

		 *

		 * This reference will be released in several situations:

		 * - In the failure path before the cifsd is started

		 * - In the all place where server->socket is released, it is

		 *   also set to NULL.

		 * - Ultimately in clean_demultiplex_info(), during the final

		 *   teardown.

		 */

		sk = socket->sk;

		sk->sk_net_refcnt = 1;

		get_net(net);

#ifdef CONFIG_PROC_FS

		this_cpu_add(*net->core.sock_inuse, 1);

#endif



		/* BB other socket options to set KEEPALIVE, NODELAY? */

		cifs_dbg(FYI, "Socket created\n");
@@ -3707,7 +3693,6 @@ generic_ip_connect(struct TCP_Server_Info *server) 
	rc = socket->ops->connect(socket, saddr, slen, 0);

	if (rc < 0) {

		cifs_dbg(FYI, "Error %d connecting to server\n", rc);

		put_net(cifs_net_ns(server));

		sock_release(socket);

		server->ssocket = NULL;

		return rc;