Merge tag '6.2-rc5-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6

torvalds · torvalds · commit 5af6ce704936 · 2023-01-27T17:41:47.000-08:00
Pull cifs fix from Steve French:
 "Fix for reconnect oops in smbdirect (RDMA), also is marked for stable"

* tag '6.2-rc5-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Fix oops due to uncleared server-&gt;smbd_conn in reconnect
diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
@@ -1405,6 +1405,7 @@ void smbd_destroy(struct TCP_Server_Info *server)
 	destroy_workqueue(info->workqueue);
 	log_rdma_event(INFO,  "rdma session destroyed\n");
 	kfree(info);
+	server->smbd_conn = NULL;
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -1405,6 +1405,7 @@ void smbd_destroy(struct TCP_Server_Info *server)`
`1405`	`1405`	`destroy_workqueue(info->workqueue);`
`1406`	`1406`	`log_rdma_event(INFO, "rdma session destroyed\n");`
`1407`	`1407`	`kfree(info);`
	`1408`	`+ server->smbd_conn = NULL;`
`1408`	`1409`	`}`
`1409`	`1410`
`1410`	`1411`	`/*`