Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 518a1c2f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cifs fixes from Steve French:
 "Six small SMB3 fixes, two for stable"

* tag '5.3-rc3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  SMB3: Kernel oops mounting a encryptData share with CONFIG_DEBUG_VIRTUAL
  smb3: update TODO list of missing features
  smb3: send CAP_DFS capability during session setup
  SMB3: Fix potential memory leak when processing compound chain
  SMB3: Fix deadlock in validate negotiate hits reconnect
  cifs: fix rmmod regression in cifs.ko caused by force_sig changes
parents ecb095bf ee9d6618

Documentation/filesystems/cifs/TODO

+16 −10
Original line number Original line Diff line number Diff line
@@ -13,7 +13,8 @@ a) SMB3 (and SMB3.1.1) missing optional features: 
   - T10 copy offload ie "ODX" (copy chunk, and "Duplicate Extents" ioctl

   - T10 copy offload ie "ODX" (copy chunk, and "Duplicate Extents" ioctl

     currently the only two server side copy mechanisms supported)

     currently the only two server side copy mechanisms supported)





b) improved sparse file support

b) improved sparse file support (fiemap and SEEK_HOLE are implemented

but additional features would be supportable by the protocol).





c) Directory entry caching relies on a 1 second timer, rather than

c) Directory entry caching relies on a 1 second timer, rather than

using Directory Leases, currently only the root file handle is cached longer

using Directory Leases, currently only the root file handle is cached longer
@@ -21,9 +22,13 @@ using Directory Leases, currently only the root file handle is cached longer 
d) quota support (needs minor kernel change since quota calls

d) quota support (needs minor kernel change since quota calls

to make it to network filesystems or deviceless filesystems)

to make it to network filesystems or deviceless filesystems)





e) Additional use cases where we use "compoounding" (e.g. open/query/close

e) Additional use cases can be optimized to use "compounding"

and open/setinfo/close) to reduce the number of roundtrips, and also

(e.g. open/query/close and open/setinfo/close) to reduce the number

open to reduce redundant opens (using deferred close and reference counts more).

of roundtrips to the server and improve performance. Various cases

(stat, statfs, create, unlink, mkdir) already have been improved by

using compounding but more can be done.  In addition we could significantly

reduce redundant opens by using deferred close (with handle caching leases)

and better using reference counters on file handles.





f) Finish inotify support so kde and gnome file list windows

f) Finish inotify support so kde and gnome file list windows

will autorefresh (partially complete by Asser). Needs minor kernel

will autorefresh (partially complete by Asser). Needs minor kernel
@@ -43,18 +48,17 @@ mount or a per server basis to client UIDs or nobody if no mapping 
exists. Also better integration with winbind for resolving SID owners

exists. Also better integration with winbind for resolving SID owners





k) Add tools to take advantage of more smb3 specific ioctls and features

k) Add tools to take advantage of more smb3 specific ioctls and features

(passthrough ioctl/fsctl for sending various SMB3 fsctls to the server

(passthrough ioctl/fsctl is now implemented in cifs.ko to allow sending

is in progress, and a passthrough query_info call is already implemented

various SMB3 fsctls and query info and set info calls directly from user space)

in cifs.ko to allow smb3 info levels queries to be sent from userspace)

Add tools to make setting various non-POSIX metadata attributes easier

from tools (e.g. extending what was done in smb-info tool).





l) encrypted file support

l) encrypted file support





m) improved stats gathering tools (perhaps integration with nfsometer?)

m) improved stats gathering tools (perhaps integration with nfsometer?)

to extend and make easier to use what is currently in /proc/fs/cifs/Stats

to extend and make easier to use what is currently in /proc/fs/cifs/Stats





n) allow setting more NTFS/SMB3 file attributes remotely (currently limited to compressed

n) Add support for claims based ACLs ("DAC")

file attribute via chflags) and improve user space tools for managing and

viewing them.





o) mount helper GUI (to simplify the various configuration options on mount)

o) mount helper GUI (to simplify the various configuration options on mount)
@@ -82,6 +86,8 @@ so far). 
w) Add support for additional strong encryption types, and additional spnego

w) Add support for additional strong encryption types, and additional spnego

authentication mechanisms (see MS-SMB2)

authentication mechanisms (see MS-SMB2)





x) Finish support for SMB3.1.1 compression



KNOWN BUGS

KNOWN BUGS

====================================

====================================

See http://bugzilla.samba.org - search on product "CifsVFS" for

See http://bugzilla.samba.org - search on product "CifsVFS" for

fs/cifs/connect.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1113,6 +1113,7 @@ cifs_demultiplex_thread(void *p) 
		mempool_resize(cifs_req_poolp, length + cifs_min_rcv);

		mempool_resize(cifs_req_poolp, length + cifs_min_rcv);





	set_freezable();

	set_freezable();

	allow_signal(SIGKILL);

	while (server->tcpStatus != CifsExiting) {

	while (server->tcpStatus != CifsExiting) {

		if (try_to_freeze())

		if (try_to_freeze())

			continue;

			continue;

fs/cifs/smb2ops.c

+26 −13
Original line number Original line Diff line number Diff line
@@ -3489,7 +3489,15 @@ fill_transform_hdr(struct smb2_transform_hdr *tr_hdr, unsigned int orig_len, 
static inline void smb2_sg_set_buf(struct scatterlist *sg, const void *buf,

static inline void smb2_sg_set_buf(struct scatterlist *sg, const void *buf,

				   unsigned int buflen)

				   unsigned int buflen)

{

{

	sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));

	void *addr;

	/*

	 * VMAP_STACK (at least) puts stack into the vmalloc address space

	 */

	if (is_vmalloc_addr(buf))

		addr = vmalloc_to_page(buf);

	else

		addr = virt_to_page(buf);

	sg_set_page(sg, addr, buflen, offset_in_page(buf));

}

}





/* Assumes the first rqst has a transform header as the first iov.

/* Assumes the first rqst has a transform header as the first iov.
@@ -4070,7 +4078,6 @@ receive_encrypted_standard(struct TCP_Server_Info *server, 
{

{

	int ret, length;

	int ret, length;

	char *buf = server->smallbuf;

	char *buf = server->smallbuf;

	char *tmpbuf;

	struct smb2_sync_hdr *shdr;

	struct smb2_sync_hdr *shdr;

	unsigned int pdu_length = server->pdu_size;

	unsigned int pdu_length = server->pdu_size;

	unsigned int buf_size;

	unsigned int buf_size;
@@ -4103,15 +4110,12 @@ receive_encrypted_standard(struct TCP_Server_Info *server, 
one_more:

one_more:

	shdr = (struct smb2_sync_hdr *)buf;

	shdr = (struct smb2_sync_hdr *)buf;

	if (shdr->NextCommand) {

	if (shdr->NextCommand) {

		if (next_is_large) {

		if (next_is_large)

			tmpbuf = server->bigbuf;

			next_buffer = (char *)cifs_buf_get();

			next_buffer = (char *)cifs_buf_get();

		} else {

		else

			tmpbuf = server->smallbuf;

			next_buffer = (char *)cifs_small_buf_get();

			next_buffer = (char *)cifs_small_buf_get();

		}

		memcpy(next_buffer,

		memcpy(next_buffer,

		       tmpbuf + le32_to_cpu(shdr->NextCommand),

		       buf + le32_to_cpu(shdr->NextCommand),

		       pdu_length - le32_to_cpu(shdr->NextCommand));

		       pdu_length - le32_to_cpu(shdr->NextCommand));

	}

	}
@@ -4140,12 +4144,21 @@ receive_encrypted_standard(struct TCP_Server_Info *server, 
		pdu_length -= le32_to_cpu(shdr->NextCommand);

		pdu_length -= le32_to_cpu(shdr->NextCommand);

		server->large_buf = next_is_large;

		server->large_buf = next_is_large;

		if (next_is_large)

		if (next_is_large)

			server->bigbuf = next_buffer;

			server->bigbuf = buf = next_buffer;

		else

		else

			server->smallbuf = next_buffer;

			server->smallbuf = buf = next_buffer;



		buf += le32_to_cpu(shdr->NextCommand);

		goto one_more;

		goto one_more;

	} else if (ret != 0) {

		/*

		 * ret != 0 here means that we didn't get to handle_mid() thus

		 * server->smallbuf and server->bigbuf are still valid. We need

		 * to free next_buffer because it is not going to be used

		 * anywhere.

		 */

		if (next_is_large)

			free_rsp_buf(CIFS_LARGE_BUFFER, next_buffer);

		else

			free_rsp_buf(CIFS_SMALL_BUFFER, next_buffer);

	}

	}





	return ret;

	return ret;

fs/cifs/smb2pdu.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -252,7 +252,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon) 
	if (tcon == NULL)

	if (tcon == NULL)

		return 0;

		return 0;





	if (smb2_command == SMB2_TREE_CONNECT)

	if (smb2_command == SMB2_TREE_CONNECT || smb2_command == SMB2_IOCTL)

		return 0;

		return 0;





	if (tcon->tidStatus == CifsExiting) {

	if (tcon->tidStatus == CifsExiting) {
@@ -1196,7 +1196,12 @@ SMB2_sess_alloc_buffer(struct SMB2_sess_data *sess_data) 
	else

	else

		req->SecurityMode = 0;

		req->SecurityMode = 0;





#ifdef CONFIG_CIFS_DFS_UPCALL

	req->Capabilities = cpu_to_le32(SMB2_GLOBAL_CAP_DFS);

#else

	req->Capabilities = 0;

	req->Capabilities = 0;

#endif /* DFS_UPCALL */



	req->Channel = 0; /* MBZ */

	req->Channel = 0; /* MBZ */





	sess_data->iov[0].iov_base = (char *)req;

	sess_data->iov[0].iov_base = (char *)req;