UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

smb: client: remove extra @chan_count check in __cifs_put_smb_ses() 

[ Upstream commit c37ed2d7d09869f30d291b9c6cba56ea4f0b0417 ]

If @ses->chan_count <= 1, then for-loop body will not be executed so
no need to check it twice.

Reviewed-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Paulo Alcantara (SUSE) <pc@manguebit.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Stable-dep-of: 24a9799aa8ef ("smb: client: fix UAF in smb2_reconnect_server()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Paulo Alcantara 2023-10-30 17:19:53 -03:00 committed by Greg Kroah-Hartman
parent ba15141605
commit fe1bad73d3
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/smb/client/connect.c
View File

@ -2015,9 +2015,10 @@ cifs_find_smb_ses(struct TCP_Server_Info *server, struct smb3_fs_context *ctx)
void __cifs_put_smb_ses(struct cifs_ses *ses) void __cifs_put_smb_ses(struct cifs_ses *ses)
{ {
unsigned int rc, xid;
unsigned int chan_count;
struct TCP_Server_Info *server = ses->server; struct TCP_Server_Info *server = ses->server;
unsigned int xid;
size_t i;
int rc;
spin_lock(&ses->ses_lock); spin_lock(&ses->ses_lock);
if (ses->ses_status == SES_EXITING) { if (ses->ses_status == SES_EXITING) {
@ -2063,20 +2064,14 @@ void __cifs_put_smb_ses(struct cifs_ses *ses)
list_del_init(&ses->smb_ses_list); list_del_init(&ses->smb_ses_list);
spin_unlock(&cifs_tcp_ses_lock); spin_unlock(&cifs_tcp_ses_lock);
chan_count = ses->chan_count;
/* close any extra channels */ /* close any extra channels */
if (chan_count > 1) { for (i = 1; i < ses->chan_count; i++) {
int i; if (ses->chans[i].iface) {
kref_put(&ses->chans[i].iface->refcount, release_iface);
for (i = 1; i < chan_count; i++) { ses->chans[i].iface = NULL;
if (ses->chans[i].iface) {
kref_put(&ses->chans[i].iface->refcount, release_iface);
ses->chans[i].iface = NULL;
}
cifs_put_tcp_session(ses->chans[i].server, 0);
ses->chans[i].server = NULL;
} }
cifs_put_tcp_session(ses->chans[i].server, 0);
ses->chans[i].server = NULL;
} }
/* we now account for primary channel in iface->refcount */ /* we now account for primary channel in iface->refcount */