Attachment 14125 Details for Bug 13107 – possible fix - needs more testing

[patch] possible fix - needs more testing

0001-SMB3-Fix-missing-files-when-server-doesn-t-return-.-.patch (text/plain), 2.19 KB, created by Steve French on 2018-04-12 05:59:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve French

Created: 2018-04-12 05:59:37 UTC

Size: 2.19 KB

patch

obsolete

>From 73101ab3ac801638efaa143f2b4d5a244c8d1fed Mon Sep 17 00:00:00 2001
>From: Steve French <smfrench@gmail.com>
>Date: Thu, 12 Apr 2018 00:52:49 -0500
>Subject: [PATCH] SMB3: Fix missing files when server doesn't return . and ..
>
>If the server doesn't return . or .. then the starting file
>returned is wrong and the first two files from the
>directory will be skipped.  You can see this on mounts to Windows
>shares that are on the root of a drive for example.
>
>Fixes https://bugzilla.samba.org/show_bug.cgi?id=13107
>
>CC: Stable <stable@vger.kernel.org>
>Signed-off-by: Steve French <smfrench@gmail.com>
>---
> fs/cifs/readdir.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
>index a27fc8791551..3325cabe0850 100644
>--- a/fs/cifs/readdir.c
>+++ b/fs/cifs/readdir.c
>@@ -779,6 +779,7 @@ int cifs_readdir(struct file *file, struct dir_context *ctx)
> 	struct cifsFileInfo *cifsFile = NULL;
> 	char *current_entry;
> 	int num_to_fill = 0;
>+	loff_t first_entry;
> 	char *tmp_buf = NULL;
> 	char *end_of_smb;
> 	unsigned int max_len;
>@@ -796,6 +797,7 @@ int cifs_readdir(struct file *file, struct dir_context *ctx)
> 			goto rddir2_exit;
> 	}
> 
>+	first_entry = ctx->pos;
> 	if (!dir_emit_dots(file, ctx))
> 		goto rddir2_exit;
> 
>@@ -817,7 +819,7 @@ int cifs_readdir(struct file *file, struct dir_context *ctx)
> 	} */
> 
> 	tcon = tlink_tcon(cifsFile->tlink);
>-	rc = find_cifs_entry(xid, tcon, ctx->pos, file, &current_entry,
>+	rc = find_cifs_entry(xid, tcon, first_entry, file, &current_entry,
> 			     &num_to_fill);
> 	if (rc) {
> 		cifs_dbg(FYI, "fce error %d\n", rc);
>@@ -848,8 +850,8 @@ int cifs_readdir(struct file *file, struct dir_context *ctx)
> 			break;
> 		}
> 		/*
>-		 * if buggy server returns . and .. late do we want to
>-		 * check for that here?
>+		 * if buggy server returns . and .. late
>+		 * it will be skipped in cifs_filldir
> 		 */
> 		*tmp_buf = 0;
> 		rc = cifs_filldir(current_entry, file, ctx,
>@@ -861,7 +863,7 @@ int cifs_readdir(struct file *file, struct dir_context *ctx)
> 		}
> 
> 		ctx->pos++;
>-		if (ctx->pos ==
>+		if (ctx->pos == 2 +
> 			cifsFile->srch_inf.index_of_last_entry) {
> 			cifs_dbg(FYI, "last entry in buf at pos %lld %s\n",
> 				 ctx->pos, tmp_buf);
>-- 
>2.14.1
>

Actions: View

Attachments on bug 13107: 14125