Merge tag '5.10-rc6-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 (509a1542) · Commits · 戴 / test

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()

fs/cifs/connect.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);

fs/cifs/transport.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message