Commit 6221ddd0 authored Oct 01, 2010 by Suresh Jayaraman Committed by Steve French Oct 15, 2010

cifs: handle FindFirst failure gracefully

FindFirst failure due to permission errors or any other errors are silently
ignored by cifs_readdir(). This could cause problem to applications that depend
on the error to do further processing.

Reproducer:
  - mount a cifs share
  - mkdir tdir;touch tdir/1 tdir/2 tdir/3
  - chmod -x tdir
  - ls tdir

Currently, we start calling filldir() for '.' and '..' before we know we
whether FindFirst could succeed or not. If FindFirst fails later, there is no
way to notify VFS by setting buf.error and so VFS won't be able to catch this.
Fix this by moving the call to initiate_cifs_search() before we start doing
filldir().

This fixes https://bugzilla.samba.org/show_bug.cgi?id=7535



Reported-by: Tom Dexter <digitalaudiorock@gmail.com>
Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: Steve French <sfrench@us.ibm.com>

parent 5d0d2882

fs/cifs/readdir.c

+11 −8

Original line number	Diff line number	Diff line
		@@ -790,6 +790,17 @@ int cifs_readdir(struct file file, void direntry, filldir_t filldir)

		cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);

		/*
		* Ensure FindFirst doesn't fail before doing filldir() for '.' and
		* '..'. Otherwise we won't be able to notify VFS in case of failure.
		*/
		if (file->private_data == NULL) {
		rc = initiate_cifs_search(xid, file);
		cFYI(1, "initiate cifs search rc %d", rc);
		if (rc)
		goto rddir2_exit;
		}

		switch ((int) file->f_pos) {
		case 0:
		if (filldir(direntry, ".", 1, file->f_pos,
		@@ -813,14 +824,6 @@ int cifs_readdir(struct file file, void direntry, filldir_t filldir)
		if it before then restart search
		if after then keep searching till find it */

		if (file->private_data == NULL) {
		rc = initiate_cifs_search(xid, file);
		cFYI(1, "initiate cifs search rc %d", rc);
		if (rc) {
		FreeXid(xid);
		return rc;
		}
		}
		if (file->private_data == NULL) {
		rc = -EINVAL;
		FreeXid(xid);

Admin message