Skip to content

Commit

Permalink
cifs: fix possible uninitialized access and race on iface_list
Browse files Browse the repository at this point in the history
iface[0] was accessed regardless of the count value and without
locking.

* check count before accessing any ifaces
* make copy of iface list (it's a simple POD array) and use it without
  locking.

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
  • Loading branch information
Aurelien Aptel authored and Steve French committed Dec 4, 2019
1 parent 3345bb4 commit 9a7d5a9
Showing 1 changed file with 26 additions and 3 deletions.
29 changes: 26 additions & 3 deletions fs/cifs/sess.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ int cifs_try_adding_channels(struct cifs_ses *ses)
int i = 0;
int rc = 0;
int tries = 0;
struct cifs_server_iface *ifaces = NULL;
size_t iface_count;

if (left <= 0) {
cifs_dbg(FYI,
Expand All @@ -90,6 +92,26 @@ int cifs_try_adding_channels(struct cifs_ses *ses)
return 0;
}

/*
* Make a copy of the iface list at the time and use that
* instead so as to not hold the iface spinlock for opening
* channels
*/
spin_lock(&ses->iface_lock);
iface_count = ses->iface_count;
if (iface_count <= 0) {
spin_unlock(&ses->iface_lock);
cifs_dbg(FYI, "no iface list available to open channels\n");
return 0;
}
ifaces = kmemdup(ses->iface_list, iface_count*sizeof(*ifaces),
GFP_ATOMIC);
if (!ifaces) {
spin_unlock(&ses->iface_lock);
return 0;
}
spin_unlock(&ses->iface_lock);

/*
* Keep connecting to same, fastest, iface for all channels as
* long as its RSS. Try next fastest one if not RSS or channel
Expand All @@ -105,17 +127,17 @@ int cifs_try_adding_channels(struct cifs_ses *ses)
break;
}

iface = &ses->iface_list[i];
iface = &ifaces[i];
if (is_ses_using_iface(ses, iface) && !iface->rss_capable) {
i = (i+1) % ses->iface_count;
i = (i+1) % iface_count;
continue;
}

rc = cifs_ses_add_channel(ses, iface);
if (rc) {
cifs_dbg(FYI, "failed to open extra channel on iface#%d rc=%d\n",
i, rc);
i = (i+1) % ses->iface_count;
i = (i+1) % iface_count;
continue;
}

Expand All @@ -124,6 +146,7 @@ int cifs_try_adding_channels(struct cifs_ses *ses)
left--;
}

kfree(ifaces);
return ses->chan_count - old_chan_count;
}

Expand Down

0 comments on commit 9a7d5a9

Please sign in to comment.