Skip to content

Commit c049ee1

Browse files
charsyamsmfrench
authored andcommitted
ksmbd: destroy tree_conn_ida in ksmbd_session_destroy()
When per-session tree_conn_ida was converted from a dynamically allocated ksmbd_ida to an embedded struct ida, ksmbd_ida_free() was removed from ksmbd_session_destroy() but no matching ida_destroy() was added. The session is therefore freed with the IDA's backing xarray still intact. The kernel IDA API expects ida_init() and ida_destroy() to be paired over an object's lifetime, so add the missing cleanup before the enclosing session is freed. Also move ida_init() to right after the session is allocated so that it is always paired with the destroy call even on the early error paths of __session_create() (ksmbd_init_file_table() or __init_smb2_session() failures), both of which jump to the error label and invoke ksmbd_session_destroy() on a partially initialised session. No leak has been observed in testing; this is a pairing fix to match the IDA lifetime rules, not a response to a reproduced regression. Fixes: d40012a ("cifsd: declare ida statically") Signed-off-by: DaeMyung Kang <[email protected]> Acked-by: Namjae Jeon <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent cc92b47 commit c049ee1

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

fs/smb/server/mgmt/user_session.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ void ksmbd_session_destroy(struct ksmbd_session *sess)
391391
free_channel_list(sess);
392392
kfree(sess->Preauth_HashValue);
393393
ksmbd_release_id(&session_ida, sess->id);
394+
ida_destroy(&sess->tree_conn_ida);
394395
kfree(sess);
395396
}
396397

@@ -665,6 +666,8 @@ static struct ksmbd_session *__session_create(int protocol)
665666
if (!sess)
666667
return NULL;
667668

669+
ida_init(&sess->tree_conn_ida);
670+
668671
if (ksmbd_init_file_table(&sess->file_table))
669672
goto error;
670673

@@ -684,8 +687,6 @@ static struct ksmbd_session *__session_create(int protocol)
684687
if (ret)
685688
goto error;
686689

687-
ida_init(&sess->tree_conn_ida);
688-
689690
down_write(&sessions_table_lock);
690691
hash_add(sessions_table, &sess->hlist, sess->id);
691692
up_write(&sessions_table_lock);

0 commit comments

Comments
 (0)