Merge tag '5.10-rc6-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

torvalds · torvalds · commit 509a15421674 · 2020-12-01T15:43:53.000-08:00
Pull cifs fixes from Steve French:
 "Two smb3 fixes for stable"

* tag '5.10-rc6-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix potential use-after-free in cifs_echo_request()
  cifs: allow syscalls to be restarted in __smb_send_rqst()
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
@@ -876,6 +876,8 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server)
 	list_del_init(&server->tcp_ses_list);
 	spin_unlock(&cifs_tcp_ses_lock);
 
+	cancel_delayed_work_sync(&server->echo);
+
 	spin_lock(&GlobalMid_Lock);
 	server->tcpStatus = CifsExiting;
 	spin_unlock(&GlobalMid_Lock);
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
@@ -339,8 +339,8 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
 		return -EAGAIN;
 
 	if (signal_pending(current)) {
-		cifs_dbg(FYI, "signal is pending before sending any data\n");
-		return -EINTR;
+		cifs_dbg(FYI, "signal pending before send request\n");
+		return -ERESTARTSYS;
 	}
 
 	/* cork the socket */

Original file line number	Diff line number	Diff line change
`@@ -339,8 +339,8 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,`
`339`	`339`	`return -EAGAIN;`
`340`	`340`
`341`	`341`	`if (signal_pending(current)) {`
`342`		`- cifs_dbg(FYI, "signal is pending before sending any data\n");`
`343`		`- return -EINTR;`
	`342`	`+ cifs_dbg(FYI, "signal pending before send request\n");`
	`343`	`+ return -ERESTARTSYS;`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`/* cork the socket */`