Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-4
+7
-4
fs/cifs/readdir.c
+7
-4
fs/cifs/readdir.c
···
82
82
if(*ptmp_inode == NULL)
83
83
return rc;
84
84
rc = 1;
85
-
d_instantiate(tmp_dentry, *ptmp_inode);
86
85
}
87
86
} else {
88
87
tmp_dentry = d_alloc(file->f_dentry, qstring);
···
98
99
tmp_dentry->d_op = &cifs_dentry_ops;
99
100
if(*ptmp_inode == NULL)
100
101
return rc;
101
-
rc = 1;
102
-
d_instantiate(tmp_dentry, *ptmp_inode);
103
-
d_rehash(tmp_dentry);
102
+
rc = 2;
104
103
}
105
104
106
105
tmp_dentry->d_time = jiffies;
···
867
870
pfindEntry, &obj_type, rc);
868
871
else
869
872
fill_in_inode(tmp_inode, 1 /* NT */, pfindEntry, &obj_type, rc);
873
+
874
+
if(rc) /* new inode - needs to be tied to dentry */ {
875
+
d_instantiate(tmp_dentry, tmp_inode);
876
+
if(rc == 2)
877
+
d_rehash(tmp_dentry);
878
+
}
870
879
871
880
872
881
rc = filldir(direntry,qstring.name,qstring.len,file->f_pos,