cifs: fix panic in smb2_reconnect
Subsystems (2)
PATCH 1/1 cifs: fix panic in smb2_reconnect
RH Bugzilla: 1702264
We need to protect so that the call to smb2_reconnect() in smb2_reconnect_server() does not end up freeing the session because it can lead to a use after free and crash.
Signed-off-by Ronnie Sahlberg <[email protected]>
--- fs/cifs/smb2pdu.c | 3 +++ 1 file changed, 3 insertions(+)
fs/cifs/smb2pdu.c +3 -0
@@ -3116,6 +3116,7 @@ void smb2_reconnect_server(struct work_struct *work)if (ses->tcon_ipc && ses->tcon_ipc->need_reconnect) {list_add_tail (&ses->tcon_ipc->rlist, &tmp_list); tcon_exist = true; + ses->ses_count++; } }/*
@@ -3134,6 +3135,8 @@ void smb2_reconnect_server(struct work_struct *work)else resched = true;list_del_init (&tcon->rlist); +if (tcon->ipc) +cifs_put_smb_ses (tcon->ses);cifs_put_tcon (tcon); }
Signature · 1 line
2.13.6
fs/cifs/smb2pdu.c void smb2_reconnect_server(struct work_struct *work)
Quoted 5 lines · Ronnie Sahlberg
fs/cifs/smb2pdu.c +0
-0@@ -3116,6 +3116,7 @@ void smb2_reconnect_server(struct work_struct *work)
I would add a comment here. Something like:
/* IPC has the same lifetime as its session and uses its
refcount */Quoted 8 lines
fs/cifs/smb2pdu.c +1
-0if (ses->tcon_ipc && ses->tcon_ipc->need_reconnect) {list_add_tail (&ses->tcon_ipc->rlist, &tmp_list); tcon_exist = true; + ses->ses_count++; } }/*
fs/cifs/smb2pdu.c void smb2_reconnect_server(struct work_struct *work) · line 3140
Quoted 6 lines
fs/cifs/smb2pdu.c +2
-0@@ -3134,6 +3135,8 @@ void smb2_reconnect_server(struct work_struct *work)else resched = true;list_del_init (&tcon->rlist); +if (tcon->ipc) +cifs_put_smb_ses (tcon->ses);cifs_put_tcon (tcon);
Since cifs_put_tcon() is a noop on IPC this looks correct but I think an putting it in an "else" would make the logic clearer.
Reviewed-by Aurelien Aptel <[email protected]>
Signature · 4 lines
Aurélien Aptel / SUSE Labs Samba Team GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3 SUSE Linux GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)