Commit 52755808 authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Fix SMB2 readdir error handling 



SMB2 servers indicates the end of a directory search with
STATUS_NO_MORE_FILE error code that is not processed now.
This causes generic/257 xfstest to fail. Fix this by triggering
the end of search by this error code in SMB2_query_directory.

Also when negotiating CIFS protocol we tell the server to close
the search automatically at the end and there is no need to do
it itself. In the case of SMB2 protocol, we need to close it
explicitly - separate close directory checks for different
protocols.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 18f39e7b

fs/cifs/cifsglob.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -409,6 +409,8 @@ struct smb_version_operations { 
	/* get mtu credits */

	/* get mtu credits */

	int (*wait_mtu_credits)(struct TCP_Server_Info *, unsigned int,

	int (*wait_mtu_credits)(struct TCP_Server_Info *, unsigned int,

				unsigned int *, unsigned int *);

				unsigned int *, unsigned int *);

	/* check if we need to issue closedir */

	bool (*dir_needs_close)(struct cifsFileInfo *);

};

};





struct smb_version_values {

struct smb_version_values {

fs/cifs/file.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -762,7 +762,7 @@ int cifs_closedir(struct inode *inode, struct file *file) 




	cifs_dbg(FYI, "Freeing private data in close dir\n");

	cifs_dbg(FYI, "Freeing private data in close dir\n");

	spin_lock(&cifs_file_list_lock);

	spin_lock(&cifs_file_list_lock);

	if (!cfile->srch_inf.endOfSearch && !cfile->invalidHandle) {

	if (server->ops->dir_needs_close(cfile)) {

		cfile->invalidHandle = true;

		cfile->invalidHandle = true;

		spin_unlock(&cifs_file_list_lock);

		spin_unlock(&cifs_file_list_lock);

		if (server->ops->close_dir)

		if (server->ops->close_dir)

fs/cifs/readdir.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -593,7 +593,7 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos, 
		/* close and restart search */

		/* close and restart search */

		cifs_dbg(FYI, "search backing up - close and restart search\n");

		cifs_dbg(FYI, "search backing up - close and restart search\n");

		spin_lock(&cifs_file_list_lock);

		spin_lock(&cifs_file_list_lock);

		if (!cfile->srch_inf.endOfSearch && !cfile->invalidHandle) {

		if (server->ops->dir_needs_close(cfile)) {

			cfile->invalidHandle = true;

			cfile->invalidHandle = true;

			spin_unlock(&cifs_file_list_lock);

			spin_unlock(&cifs_file_list_lock);

			if (server->ops->close)

			if (server->ops->close)

fs/cifs/smb1ops.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -1015,6 +1015,12 @@ cifs_wp_retry_size(struct inode *inode) 
	return CIFS_SB(inode->i_sb)->wsize;

	return CIFS_SB(inode->i_sb)->wsize;

}

}





static bool

cifs_dir_needs_close(struct cifsFileInfo *cfile)

{

	return !cfile->srch_inf.endOfSearch && !cfile->invalidHandle;

}



struct smb_version_operations smb1_operations = {

struct smb_version_operations smb1_operations = {

	.send_cancel = send_nt_cancel,

	.send_cancel = send_nt_cancel,

	.compare_fids = cifs_compare_fids,

	.compare_fids = cifs_compare_fids,
@@ -1086,6 +1092,7 @@ struct smb_version_operations smb1_operations = { 
	.create_mf_symlink = cifs_create_mf_symlink,

	.create_mf_symlink = cifs_create_mf_symlink,

	.is_read_op = cifs_is_read_op,

	.is_read_op = cifs_is_read_op,

	.wp_retry_size = cifs_wp_retry_size,

	.wp_retry_size = cifs_wp_retry_size,

	.dir_needs_close = cifs_dir_needs_close,

#ifdef CONFIG_CIFS_XATTR

#ifdef CONFIG_CIFS_XATTR

	.query_all_EAs = CIFSSMBQAllEAs,

	.query_all_EAs = CIFSSMBQAllEAs,

	.set_EA = CIFSSMBSetEA,

	.set_EA = CIFSSMBSetEA,

fs/cifs/smb2maperror.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ static const struct status_to_posix_error smb2_error_map_table[] = { 
	{STATUS_BREAKPOINT, -EIO, "STATUS_BREAKPOINT"},

	{STATUS_BREAKPOINT, -EIO, "STATUS_BREAKPOINT"},

	{STATUS_SINGLE_STEP, -EIO, "STATUS_SINGLE_STEP"},

	{STATUS_SINGLE_STEP, -EIO, "STATUS_SINGLE_STEP"},

	{STATUS_BUFFER_OVERFLOW, -EIO, "STATUS_BUFFER_OVERFLOW"},

	{STATUS_BUFFER_OVERFLOW, -EIO, "STATUS_BUFFER_OVERFLOW"},

	{STATUS_NO_MORE_FILES, -EIO, "STATUS_NO_MORE_FILES"},

	{STATUS_NO_MORE_FILES, -ENODATA, "STATUS_NO_MORE_FILES"},

	{STATUS_WAKE_SYSTEM_DEBUGGER, -EIO, "STATUS_WAKE_SYSTEM_DEBUGGER"},

	{STATUS_WAKE_SYSTEM_DEBUGGER, -EIO, "STATUS_WAKE_SYSTEM_DEBUGGER"},

	{STATUS_HANDLES_CLOSED, -EIO, "STATUS_HANDLES_CLOSED"},

	{STATUS_HANDLES_CLOSED, -EIO, "STATUS_HANDLES_CLOSED"},

	{STATUS_NO_INHERITANCE, -EIO, "STATUS_NO_INHERITANCE"},

	{STATUS_NO_INHERITANCE, -EIO, "STATUS_NO_INHERITANCE"},

CRA Git | Maintained and supported by SUSTech CRA and CCSE