Commit eedf8e88 authored by Dan Carpenter's avatar Dan Carpenter Committed by Steve French
Browse files

cifs: Unlock on errors in cifs_swn_reconnect() 



There are three error paths which need to unlock before returning.

Fixes: 121d947d ("cifs: Handle witness client move notification")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarSamuel Cabrero <scabrero@suse.de>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 6a29ab57

fs/cifs/cifs_swn.c

+7 −6
Original line number Diff line number Diff line
@@ -480,16 +480,16 @@ static int cifs_swn_store_swn_addr(const struct sockaddr_storage *new, 


static int cifs_swn_reconnect(struct cifs_tcon *tcon, struct sockaddr_storage *addr)

{

	int ret = 0;



	/* Store the reconnect address */

	mutex_lock(&tcon->ses->server->srv_mutex);

	if (!cifs_sockaddr_equal(&tcon->ses->server->dstaddr, addr)) {

		int ret;



		ret = cifs_swn_store_swn_addr(addr, &tcon->ses->server->dstaddr,

				&tcon->ses->server->swn_dstaddr);

		if (ret < 0) {

			cifs_dbg(VFS, "%s: failed to store address: %d\n", __func__, ret);

			return ret;

			goto unlock;

		}

		tcon->ses->server->use_swn_dstaddr = true;
@@ -500,7 +500,7 @@ static int cifs_swn_reconnect(struct cifs_tcon *tcon, struct sockaddr_storage *a 
		if (ret < 0) {

			cifs_dbg(VFS, "%s: Failed to unregister for witness notifications: %d\n",

					__func__, ret);

			return ret;

			goto unlock;

		}



		/*
@@ -511,7 +511,7 @@ static int cifs_swn_reconnect(struct cifs_tcon *tcon, struct sockaddr_storage *a 
		if (ret < 0) {

			cifs_dbg(VFS, "%s: Failed to register for witness notifications: %d\n",

					__func__, ret);

			return ret;

			goto unlock;

		}



		spin_lock(&GlobalMid_Lock);
@@ -519,9 +519,10 @@ static int cifs_swn_reconnect(struct cifs_tcon *tcon, struct sockaddr_storage *a 
			tcon->ses->server->tcpStatus = CifsNeedReconnect;

		spin_unlock(&GlobalMid_Lock);

	}

unlock:

	mutex_unlock(&tcon->ses->server->srv_mutex);



	return 0;

	return ret;

}



static int cifs_swn_client_move(struct cifs_swn_reg *swnreg, struct sockaddr_storage *addr)

CRA Git | Maintained and supported by SUSTech CRA and CCSE