Commit b5013d08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs updates from Steve French:

 - reconnect fix for stable

 - minor mount option fix

 - debugging improvement for (TCP) connection issues

 - refactoring of common code to help ksmbd

* tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: add dynamic trace points for socket connection
  cifs: Move SMB2_Create definitions to the shared area
  cifs: Move more definitions into the shared area
  cifs: move NEGOTIATE_PROTOCOL definitions out into the common area
  cifs: Create a new shared file holding smb2 pdu definitions
  cifs: add mount parameter tcpnodelay
  cifs: To match file servers, make sure the server hostname matches
parents 2acda754 d7171cd1

fs/cifs/cifsfs.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <linux/key-type.h>

#include "cifs_spnego.h"

#include "fscache.h"

#include "smb2pdu.h"

#ifdef CONFIG_CIFS_DFS_UPCALL

#include "dfs_cache.h"

#endif

fs/cifs/cifsglob.h

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <crypto/internal/hash.h>

#include <linux/scatterlist.h>

#include <uapi/linux/cifs/cifs_mount.h>

#include "../smbfs_common/smb2pdu.h"

#include "smb2pdu.h"



#define CIFS_MAGIC_NUMBER 0xFF534D42      /* the first four bytes of SMB PDUs */
@@ -776,7 +777,7 @@ revert_current_mid(struct TCP_Server_Info *server, const unsigned int val) 


static inline void

revert_current_mid_from_hdr(struct TCP_Server_Info *server,

			    const struct smb2_sync_hdr *shdr)

			    const struct smb2_hdr *shdr)

{

	unsigned int num = le16_to_cpu(shdr->CreditCharge);

fs/cifs/connect.c

+15 −11
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ dequeue_mid(struct mid_q_entry *mid, bool malformed) 
static unsigned int

smb2_get_credits_from_hdr(char *buffer, struct TCP_Server_Info *server)

{

	struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)buffer;

	struct smb2_hdr *shdr = (struct smb2_hdr *)buffer;



	/*

	 * SMB1 does not use credits.
@@ -794,7 +794,6 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server) 
		 */

	}



	kfree(server->hostname);

	kfree(server);



	length = atomic_dec_return(&tcpSesAllocCount);
@@ -878,7 +877,7 @@ cifs_handle_standard(struct TCP_Server_Info *server, struct mid_q_entry *mid) 
static void

smb2_add_credits_from_hdr(char *buffer, struct TCP_Server_Info *server)

{

	struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)buffer;

	struct smb2_hdr *shdr = (struct smb2_hdr *)buffer;

	int scredits, in_flight;



	/*
@@ -1235,6 +1234,9 @@ static int match_server(struct TCP_Server_Info *server, struct smb3_fs_context * 
	if (!net_eq(cifs_net_ns(server), current->nsproxy->net_ns))

		return 0;



	if (strcasecmp(server->hostname, ctx->server_hostname))

		return 0;



	if (!match_address(server, addr,

			   (struct sockaddr *)&ctx->srcaddr))

		return 0;
@@ -1336,6 +1338,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) 
	kfree(server->session_key.response);

	server->session_key.response = NULL;

	server->session_key.len = 0;

	kfree(server->hostname);



	task = xchg(&server->tsk, NULL);

	if (task)
@@ -1361,14 +1364,15 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx) 
		goto out_err;

	}



	tcp_ses->hostname = kstrdup(ctx->server_hostname, GFP_KERNEL);

	if (!tcp_ses->hostname) {

		rc = -ENOMEM;

		goto out_err;

	}



	tcp_ses->ops = ctx->ops;

	tcp_ses->vals = ctx->vals;

	cifs_set_net_ns(tcp_ses, get_net(current->nsproxy->net_ns));

	tcp_ses->hostname = extract_hostname(ctx->UNC);

	if (IS_ERR(tcp_ses->hostname)) {

		rc = PTR_ERR(tcp_ses->hostname);

		goto out_err_crypto_release;

	}



	tcp_ses->conn_id = atomic_inc_return(&tcpSesNextId);

	tcp_ses->noblockcnt = ctx->rootfs;
@@ -1497,7 +1501,6 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx) 


out_err:

	if (tcp_ses) {

		if (!IS_ERR(tcp_ses->hostname))

		kfree(tcp_ses->hostname);

		if (tcp_ses->ssocket)

			sock_release(tcp_ses->ssocket);
@@ -2646,11 +2649,12 @@ generic_ip_connect(struct TCP_Server_Info *server) 
		rc = 0;

	if (rc < 0) {

		cifs_dbg(FYI, "Error %d connecting to server\n", rc);

		trace_smb3_connect_err(server->hostname, server->conn_id, &server->dstaddr, rc);

		sock_release(socket);

		server->ssocket = NULL;

		return rc;

	}



	trace_smb3_connect_done(server->hostname, server->conn_id, &server->dstaddr);

	if (sport == htons(RFC1001_PORT))

		rc = ip_rfc1001_connect(server);

fs/cifs/fs_context.c

+16 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ const struct fs_parameter_spec smb3_fs_parameters[] = { 
	fsparam_flag("nosharesock", Opt_nosharesock),

	fsparam_flag_no("persistenthandles", Opt_persistent),

	fsparam_flag_no("resilienthandles", Opt_resilient),

	fsparam_flag_no("tcpnodelay", Opt_tcp_nodelay),

	fsparam_flag("domainauto", Opt_domainauto),

	fsparam_flag("rdma", Opt_rdma),

	fsparam_flag("modesid", Opt_modesid),
@@ -318,6 +319,7 @@ smb3_fs_context_dup(struct smb3_fs_context *new_ctx, struct smb3_fs_context *ctx 
	DUP_CTX_STR(mount_options);

	DUP_CTX_STR(username);

	DUP_CTX_STR(password);

	DUP_CTX_STR(server_hostname);

	DUP_CTX_STR(UNC);

	DUP_CTX_STR(source);

	DUP_CTX_STR(domainname);
@@ -456,6 +458,11 @@ smb3_parse_devname(const char *devname, struct smb3_fs_context *ctx) 
	if (!pos)

		return -EINVAL;



	/* record the server hostname */

	ctx->server_hostname = kstrndup(devname + 2, pos - devname - 2, GFP_KERNEL);

	if (!ctx->server_hostname)

		return -ENOMEM;



	/* skip past delimiter */

	++pos;
@@ -1383,6 +1390,13 @@ static int smb3_fs_context_parse_param(struct fs_context *fc, 
			}

		}

		break;

	case Opt_tcp_nodelay:

		/* tcp nodelay should not usually be needed since we CORK/UNCORK the socket */

		if (result.negated)

			ctx->sockopt_tcp_nodelay = false;

		else

			ctx->sockopt_tcp_nodelay = true;

		break;

	case Opt_domainauto:

		ctx->domainauto = true;

		break;
@@ -1496,6 +1510,8 @@ smb3_cleanup_fs_context_contents(struct smb3_fs_context *ctx) 
	ctx->username = NULL;

	kfree_sensitive(ctx->password);

	ctx->password = NULL;

	kfree(ctx->server_hostname);

	ctx->server_hostname = NULL;

	kfree(ctx->UNC);

	ctx->UNC = NULL;

	kfree(ctx->source);

fs/cifs/fs_context.h

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ enum cifs_param { 
	Opt_nosharesock,

	Opt_persistent,

	Opt_resilient,

	Opt_tcp_nodelay,

	Opt_domainauto,

	Opt_rdma,

	Opt_modesid,
@@ -166,6 +167,7 @@ struct smb3_fs_context { 
	char *password;

	char *domainname;

	char *source;

	char *server_hostname;

	char *UNC;

	char *nodename;

	char *iocharset;  /* local code page for mapping to and from Unicode */