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

Commit 48c068e0 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] Fix CIFS readdir access denied when SE Linux enabled
parents 7366935a b835bebe

fs/cifs/readdir.c

+7 −4
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ static int construct_dentry(struct qstr *qstring, struct file *file, 
			if(*ptmp_inode == NULL)

				return rc;

			rc = 1;

			d_instantiate(tmp_dentry, *ptmp_inode);

		}

	} else {

		tmp_dentry = d_alloc(file->f_dentry, qstring);
@@ -99,9 +98,7 @@ static int construct_dentry(struct qstr *qstring, struct file *file, 
			tmp_dentry->d_op = &cifs_dentry_ops;

		if(*ptmp_inode == NULL)

			return rc;

		rc = 1;

		d_instantiate(tmp_dentry, *ptmp_inode);

		d_rehash(tmp_dentry);

		rc = 2;

	}



	tmp_dentry->d_time = jiffies;
@@ -871,6 +868,12 @@ static int cifs_filldir(char *pfindEntry, struct file *file, 
	else

		fill_in_inode(tmp_inode, 1 /* NT */, pfindEntry, &obj_type, rc);



	if(rc) /* new inode - needs to be tied to dentry */ {

		d_instantiate(tmp_dentry, tmp_inode);

		if(rc == 2)

			d_rehash(tmp_dentry);

	}

	

	

	rc = filldir(direntry,qstring.name,qstring.len,file->f_pos,

		     tmp_inode->i_ino,obj_type);