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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: use CreationTime like an i_generation field
  cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo
  cifs: show "acl" in DebugData Features when it's compiled in
  cifs: move "ntlmssp" and "local_leases" options out of experimental code
  cifs: replace some hardcoded values with preprocessor constants
  cifs: remove unnecessary locking around sequence_number
  [CIFS] Fix minor merge conflict in fs/cifs/dir.c
  CIFS: Simplify cifs_open code
  CIFS: Simplify non-posix open stuff (try #2)
  CIFS: Add match_port check during looking for an existing connection (try #4)
  CIFS: Simplify ipv*_connect functions into one (try #4)
  cifs: Support NTLM2 session security during NTLMSSP authentication [try #5]
  cifs: don't overwrite dentry name in d_revalidate
parents f9f265f3 20054bd6

fs/cifs/cache.c

+9 −7
Original line number Diff line number Diff line
@@ -64,7 +64,9 @@ static uint16_t cifs_server_get_key(const void *cookie_netfs_data, 
				   void *buffer, uint16_t maxbuf)

{

	const struct TCP_Server_Info *server = cookie_netfs_data;

	const struct sockaddr *sa = (struct sockaddr *) &server->addr.sockAddr;

	const struct sockaddr *sa = (struct sockaddr *) &server->dstaddr;

	const struct sockaddr_in *addr = (struct sockaddr_in *) sa;

	const struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) sa;

	struct cifs_server_key *key = buffer;

	uint16_t key_len = sizeof(struct cifs_server_key);
@@ -76,16 +78,16 @@ static uint16_t cifs_server_get_key(const void *cookie_netfs_data, 
	 */

	switch (sa->sa_family) {

	case AF_INET:

		key->family = server->addr.sockAddr.sin_family;

		key->port = server->addr.sockAddr.sin_port;

		key->addr[0].ipv4_addr = server->addr.sockAddr.sin_addr;

		key->family = sa->sa_family;

		key->port = addr->sin_port;

		key->addr[0].ipv4_addr = addr->sin_addr;

		key_len += sizeof(key->addr[0].ipv4_addr);

		break;



	case AF_INET6:

		key->family = server->addr.sockAddr6.sin6_family;

		key->port = server->addr.sockAddr6.sin6_port;

		key->addr[0].ipv6_addr = server->addr.sockAddr6.sin6_addr;

		key->family = sa->sa_family;

		key->port = addr6->sin6_port;

		key->addr[0].ipv6_addr = addr6->sin6_addr;

		key_len += sizeof(key->addr[0].ipv6_addr);

		break;

fs/cifs/cifs_debug.c

+10 −12
Original line number Diff line number Diff line
@@ -122,26 +122,24 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
	seq_printf(m, "Features:");

#ifdef CONFIG_CIFS_DFS_UPCALL

	seq_printf(m, " dfs");

	seq_putc(m, ' ');

#endif

#ifdef CONFIG_CIFS_FSCACHE

	seq_printf(m, " fscache");

	seq_putc(m, ' ');

#endif

#ifdef CONFIG_CIFS_WEAK_PW_HASH

	seq_printf(m, " lanman");

	seq_putc(m, ' ');

#endif

#ifdef CONFIG_CIFS_POSIX

	seq_printf(m, " posix");

	seq_putc(m, ' ');

#endif

#ifdef CONFIG_CIFS_UPCALL

	seq_printf(m, " spnego");

	seq_putc(m, ' ');

#endif

#ifdef CONFIG_CIFS_XATTR

	seq_printf(m, " xattr");

#endif

#ifdef CONFIG_CIFS_ACL

	seq_printf(m, " acl");

#endif

	seq_putc(m, '\n');

	seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);

fs/cifs/cifs_spnego.c

+6 −4
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ struct key * 
cifs_get_spnego_key(struct cifsSesInfo *sesInfo)

{

	struct TCP_Server_Info *server = sesInfo->server;

	struct sockaddr_in *sa = (struct sockaddr_in *) &server->dstaddr;

	struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) &server->dstaddr;

	char *description, *dp;

	size_t desc_len;

	struct key *spnego_key;
@@ -127,10 +129,10 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo) 
	dp = description + strlen(description);



	/* add the server address */

	if (server->addr.sockAddr.sin_family == AF_INET)

		sprintf(dp, "ip4=%pI4", &server->addr.sockAddr.sin_addr);

	else if (server->addr.sockAddr.sin_family == AF_INET6)

		sprintf(dp, "ip6=%pI6", &server->addr.sockAddr6.sin6_addr);

	if (server->dstaddr.ss_family == AF_INET)

		sprintf(dp, "ip4=%pI4", &sa->sin_addr);

	else if (server->dstaddr.ss_family == AF_INET6)

		sprintf(dp, "ip6=%pI6", &sa6->sin6_addr);

	else

		goto out;

fs/cifs/cifsencrypt.c

+2 −4
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static int cifs_calculate_signature(const struct smb_hdr *cifs_pdu, 
	return 0;

}



/* must be called with server->srv_mutex held */

int cifs_sign_smb(struct smb_hdr *cifs_pdu, struct TCP_Server_Info *server,

		  __u32 *pexpected_response_sequence_number)

{
@@ -84,14 +85,12 @@ int cifs_sign_smb(struct smb_hdr *cifs_pdu, struct TCP_Server_Info *server, 
	if ((cifs_pdu->Flags2 & SMBFLG2_SECURITY_SIGNATURE) == 0)

		return rc;



	spin_lock(&GlobalMid_Lock);

	cifs_pdu->Signature.Sequence.SequenceNumber =

			cpu_to_le32(server->sequence_number);

	cifs_pdu->Signature.Sequence.Reserved = 0;



	*pexpected_response_sequence_number = server->sequence_number++;

	server->sequence_number++;

	spin_unlock(&GlobalMid_Lock);



	rc = cifs_calculate_signature(cifs_pdu, server, smb_signature);

	if (rc)
@@ -149,6 +148,7 @@ static int cifs_calc_signature2(const struct kvec *iov, int n_vec, 
	return rc;

}



/* must be called with server->srv_mutex held */

int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *server,

		   __u32 *pexpected_response_sequence_number)

{
@@ -162,14 +162,12 @@ int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *server, 
	if ((cifs_pdu->Flags2 & SMBFLG2_SECURITY_SIGNATURE) == 0)

		return rc;



	spin_lock(&GlobalMid_Lock);

	cifs_pdu->Signature.Sequence.SequenceNumber =

				cpu_to_le32(server->sequence_number);

	cifs_pdu->Signature.Sequence.Reserved = 0;



	*pexpected_response_sequence_number = server->sequence_number++;

	server->sequence_number++;

	spin_unlock(&GlobalMid_Lock);



	rc = cifs_calc_signature2(iov, n_vec, server, smb_signature);

	if (rc)

fs/cifs/cifsfs.c

+10 −7
Original line number Diff line number Diff line
@@ -329,6 +329,8 @@ cifs_alloc_inode(struct super_block *sb) 
	cifs_inode->invalid_mapping = false;

	cifs_inode->vfs_inode.i_blkbits = 14;  /* 2**14 = CIFS_MAX_MSGSIZE */

	cifs_inode->server_eof = 0;

	cifs_inode->uniqueid = 0;

	cifs_inode->createtime = 0;



	/* Can not set i_flags here - they get immediately overwritten

	   to zero by the VFS */
@@ -361,18 +363,19 @@ cifs_evict_inode(struct inode *inode) 
static void

cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server)

{

	struct sockaddr_in *sa = (struct sockaddr_in *) &server->dstaddr;

	struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) &server->dstaddr;



	seq_printf(s, ",addr=");



	switch (server->addr.sockAddr.sin_family) {

	switch (server->dstaddr.ss_family) {

	case AF_INET:

		seq_printf(s, "%pI4", &server->addr.sockAddr.sin_addr.s_addr);

		seq_printf(s, "%pI4", &sa->sin_addr.s_addr);

		break;

	case AF_INET6:

		seq_printf(s, "%pI6",

			   &server->addr.sockAddr6.sin6_addr.s6_addr);

		if (server->addr.sockAddr6.sin6_scope_id)

			seq_printf(s, "%%%u",

				   server->addr.sockAddr6.sin6_scope_id);

		seq_printf(s, "%pI6", &sa6->sin6_addr.s6_addr);

		if (sa6->sin6_scope_id)

			seq_printf(s, "%%%u", sa6->sin6_scope_id);

		break;

	default:

		seq_printf(s, "(unknown)");

CRA Git | Maintained and supported by SUSTech CRA and CCSE