diff options
| author | David Howells <dhowells@redhat.com> | 2024-01-08 18:22:36 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2024-01-22 23:29:48 +0100 |
| commit | 57e9d49c54528c49b8bffe6d99d782ea051ea534 (patch) | |
| tree | 6a340f5d5dc23c8daf8d958b7decf2c0f3d4632b /fs/afs | |
| parent | cachefiles, erofs: Fix NULL deref in when cachefiles is not doing ondemand-mode (diff) | |
| download | linux-57e9d49c54528c49b8bffe6d99d782ea051ea534.tar.xz linux-57e9d49c54528c49b8bffe6d99d782ea051ea534.zip | |
afs: Hide silly-rename files from userspace
There appears to be a race between silly-rename files being created/removed
and various userspace tools iterating over the contents of a directory,
leading to such errors as:
find: './kernel/.tmp_cpio_dir/include/dt-bindings/reset/.__afs2080': No such file or directory
tar: ./include/linux/greybus/.__afs3C95: File removed before we read it
when building a kernel.
Fix afs_readdir() so that it doesn't return .__afsXXXX silly-rename files
to userspace. This doesn't stop them being looked up directly by name as
we need to be able to look them up from within the kernel as part of the
silly-rename algorithm.
Fixes: 79ddbfa500b3 ("afs: Implement sillyrename for unlink and rename")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Diffstat (limited to 'fs/afs')
| -rw-r--r-- | fs/afs/dir.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/afs/dir.c b/fs/afs/dir.c index 3f73d61f7c8a..eface67ccc06 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c @@ -474,6 +474,14 @@ 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) + continue; + /* found the next entry */ if (!dir_emit(ctx, dire->u.name, nlen, ntohl(dire->u.vnode), |