]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
afs: Revert "afs: Hide silly-rename files from userspace"
authorDavid Howells <dhowells@redhat.com>
Wed, 13 Mar 2024 11:08:41 +0000 (11:08 +0000)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:22:01 +0000 (18:22 -0400)
[ Upstream commit 0aec3847d044273733285dcff90afda89ad461d2 ]

This reverts commit 57e9d49c54528c49b8bffe6d99d782ea051ea534.

This undoes the hiding of .__afsXXXX silly-rename files.  The problem with
hiding them is that rm can't then manually delete them.

This also reverts commit 5f7a07646655fb4108da527565dcdc80124b14c4 ("afs: Fix
endless loop in directory parsing") as that's a bugfix for the above.

Fixes: 57e9d49c5452 ("afs: Hide silly-rename files from userspace")
Reported-by: Markus Suvanto <markus.suvanto@gmail.com>
Link: https://lists.infradead.org/pipermail/linux-afs/2024-February/008102.html
Signed-off-by: David Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/3085695.1710328121@warthog.procyon.org.uk
Reviewed-by: Jeffrey E Altman <jaltman@auristor.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/afs/dir.c

index 88f0e719c6ac0979494e8e90c3a9b432660c75b3..a59d6293a32b2f141073d65222c64a6cf5fadb45 100644 (file)
@@ -418,16 +418,6 @@ static int afs_dir_iterate_block(struct afs_vnode *dvnode,
                        continue;
                }
 
-               /* Don't expose silly rename entries to userspace. */
-               if (nlen > 6 &&
-                   dire->u.name[0] == '.' &&
-                   ctx->actor != afs_lookup_filldir &&
-                   ctx->actor != afs_lookup_one_filldir &&
-                   memcmp(dire->u.name, ".__afs", 6) == 0) {
-                       ctx->pos = blkoff + next * sizeof(union afs_xdr_dirent);
-                       continue;
-               }
-
                /* found the next entry */
                if (!dir_emit(ctx, dire->u.name, nlen,
                              ntohl(dire->u.vnode),