]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ksmbd: smbd: fix kernel oops during server shutdown
authorHyunchul Lee <hyc.lee@gmail.com>
Thu, 12 Aug 2021 01:23:08 +0000 (10:23 +0900)
committerNamjae Jeon <namjae.jeon@samsung.com>
Thu, 12 Aug 2021 23:18:13 +0000 (08:18 +0900)
if server shutdown happens in the situation that
there are connections, workqueue could be destroyed
before queueing disconnect work.

Signed-off-by: Hyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/ksmbd/transport_rdma.c

index f2ae6bae83f11a54eac9038ad656ce2b8898e0e0..58f530056ac010b801b89d75d455d2f5ea154e47 100644 (file)
@@ -329,7 +329,8 @@ static void smb_direct_disconnect_rdma_work(struct work_struct *work)
 static void
 smb_direct_disconnect_rdma_connection(struct smb_direct_transport *t)
 {
-       queue_work(smb_direct_wq, &t->disconnect_work);
+       if (t->status == SMB_DIRECT_CS_CONNECTED)
+               queue_work(smb_direct_wq, &t->disconnect_work);
 }
 
 static void smb_direct_send_immediate_work(struct work_struct *work)
@@ -1415,7 +1416,7 @@ static void smb_direct_disconnect(struct ksmbd_transport *t)
 
        ksmbd_debug(RDMA, "Disconnecting cm_id=%p\n", st->cm_id);
 
-       smb_direct_disconnect_rdma_connection(st);
+       smb_direct_disconnect_rdma_work(&st->disconnect_work);
        wait_event_interruptible(st->wait_status,
                                 st->status == SMB_DIRECT_CS_DISCONNECTED);
        free_transport(st);