iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cifs: Unlock on errors in cifs_swn_reconnect()

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

Fixes: 121d947d4fe1 ("cifs: Handle witness client move notification")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Samuel Cabrero <scabrero@suse.de>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Dan Carpenter 2020-12-17 14:02:29 +03:00 committed by Steve French
parent 6a29ab57f4
commit eedf8e88e5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/cifs/cifs_swn.c
View File

@ -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) static int cifs_swn_reconnect(struct cifs_tcon *tcon, struct sockaddr_storage *addr)
{ {
int ret = 0;
/* Store the reconnect address */ /* Store the reconnect address */
mutex_lock(&tcon->ses->server->srv_mutex); mutex_lock(&tcon->ses->server->srv_mutex);
if (!cifs_sockaddr_equal(&tcon->ses->server->dstaddr, addr)) { if (!cifs_sockaddr_equal(&tcon->ses->server->dstaddr, addr)) {
int ret;
ret = cifs_swn_store_swn_addr(addr, &tcon->ses->server->dstaddr, ret = cifs_swn_store_swn_addr(addr, &tcon->ses->server->dstaddr,
&tcon->ses->server->swn_dstaddr); &tcon->ses->server->swn_dstaddr);
if (ret < 0) { if (ret < 0) {
cifs_dbg(VFS, "%s: failed to store address: %d\n", __func__, ret); cifs_dbg(VFS, "%s: failed to store address: %d\n", __func__, ret);
return ret; goto unlock;
} }
tcon->ses->server->use_swn_dstaddr = true; 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) { if (ret < 0) {
cifs_dbg(VFS, "%s: Failed to unregister for witness notifications: %d\n", cifs_dbg(VFS, "%s: Failed to unregister for witness notifications: %d\n",
__func__, ret); __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) { if (ret < 0) {
cifs_dbg(VFS, "%s: Failed to register for witness notifications: %d\n", cifs_dbg(VFS, "%s: Failed to register for witness notifications: %d\n",
__func__, ret); __func__, ret);
return ret; goto unlock;
} }
spin_lock(&GlobalMid_Lock); 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; tcon->ses->server->tcpStatus = CifsNeedReconnect;
spin_unlock(&GlobalMid_Lock); spin_unlock(&GlobalMid_Lock);
} }
unlock:
mutex_unlock(&tcon->ses->server->srv_mutex); 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) static int cifs_swn_client_move(struct cifs_swn_reg *swnreg, struct sockaddr_storage *addr)