Skip to content

Commit fd24982

Browse files
Marc Dionnetorvalds
authored andcommitted
afs: Ignore AFS_ACE_READ and AFS_ACE_WRITE for directories
The AFS_ACE_READ and AFS_ACE_WRITE permission bits should not be used to make access decisions for the directory itself. They are meant to control access for the objects contained in that directory. Reading a directory is allowed if the AFS_ACE_LOOKUP bit is set. This would cause an incorrect access denied error for a directory with AFS_ACE_LOOKUP but not AFS_ACE_READ. The AFS_ACE_WRITE bit does not allow operations that modify the directory. For a directory with AFS_ACE_WRITE but neither AFS_ACE_INSERT nor AFS_ACE_DELETE, this would result in trying operations that would ultimately be denied by the server. Signed-off-by: Marc Dionne <marc.dionne@auristor.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent f991af3 commit fd24982

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

fs/afs/security.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,11 @@ int afs_permission(struct inode *inode, int mask)
327327
if (!(access & AFS_ACE_LOOKUP))
328328
goto permission_denied;
329329
} else if (mask & MAY_READ) {
330-
if (!(access & AFS_ACE_READ))
330+
if (!(access & AFS_ACE_LOOKUP))
331331
goto permission_denied;
332332
} else if (mask & MAY_WRITE) {
333333
if (!(access & (AFS_ACE_DELETE | /* rmdir, unlink, rename from */
334-
AFS_ACE_INSERT | /* create, mkdir, symlink, rename to */
335-
AFS_ACE_WRITE))) /* chmod */
334+
AFS_ACE_INSERT))) /* create, mkdir, symlink, rename to */
336335
goto permission_denied;
337336
} else {
338337
BUG();

0 commit comments

Comments
 (0)