diff mbox series

afs: Revert "afs: Hide silly-rename files from userspace"

Message ID 3085695.1710328121@warthog.procyon.org.uk (mailing list archive)
State New, archived
Headers show
Series afs: Revert "afs: Hide silly-rename files from userspace" | expand

Commit Message

David Howells March 13, 2024, 11:08 a.m. UTC
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>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
---
 fs/afs/dir.c |   10 ----------
 1 file changed, 10 deletions(-)

Comments

Randy Dunlap March 13, 2024, 3:16 p.m. UTC | #1
On 3/13/24 04:08, David Howells wrote:
>     
> 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/008102html

Not Found

The requested URL was not found on this server.

> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Marc Dionne <marc.dionne@auristor.com>
> cc: linux-afs@lists.infradead.org
> ---
>  fs/afs/dir.c |   10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/fs/afs/dir.c b/fs/afs/dir.c
> index 8a67fc427e74..67afe68972d5 100644
> --- a/fs/afs/dir.c
> +++ b/fs/afs/dir.c
> @@ -474,16 +474,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),
> 
>
Jeffrey E Altman March 13, 2024, 3:20 p.m. UTC | #2
On 3/13/2024 11:16 AM, Randy Dunlap wrote:
> On 3/13/24 04:08, David Howells wrote:
>>      
>> 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/008102html
> Not Found
>
> The requested URL was not found on this server.

The dot before the "html" extension is missing.
Christian Brauner March 14, 2024, 10:54 a.m. UTC | #3
On Wed, 13 Mar 2024 11:08:41 +0000, David Howells wrote:
> 
> 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.
> 
> [...]

Applied to the vfs.fixes branch of the vfs/vfs.git tree.
Patches in the vfs.fixes branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a
new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the
patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase,
trailer updates or similar. If in doubt, please check the listed branch.

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs.fixes

[1/1] afs: Revert "afs: Hide silly-rename files from userspace"
      https://git.kernel.org/vfs/vfs/c/c38cecdf5360
David Howells March 14, 2024, 10:55 a.m. UTC | #4
Randy Dunlap <rdunlap@infradead.org> wrote:

> > Link: https://lists.infradead.org/pipermail/linux-afs/2024-February/008102html
> 
> Not Found
> 
> The requested URL was not found on this server.

Erm.  Not sure how you came by that.  You lost a dot somehow.  It's in the
original submission:

https://lore.kernel.org/linux-fsdevel/3085695.1710328121@warthog.procyon.org.uk/

David
Jeffrey E Altman March 14, 2024, 12:47 p.m. UTC | #5
On 3/13/2024 7:08 AM, David Howells wrote:
>      
> 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>
> cc: Marc Dionne <marc.dionne@auristor.com>
> cc: linux-afs@lists.infradead.org
> ---
>   fs/afs/dir.c |   10 ----------
>   1 file changed, 10 deletions(-)
>
> diff --git a/fs/afs/dir.c b/fs/afs/dir.c
> index 8a67fc427e74..67afe68972d5 100644
> --- a/fs/afs/dir.c
> +++ b/fs/afs/dir.c
> @@ -474,16 +474,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),

Reviewed-by: Jeffrey E Altman<jaltman@auristor.com>
Randy Dunlap March 14, 2024, 2:24 p.m. UTC | #6
On 3/14/24 03:55, David Howells wrote:
> Randy Dunlap <rdunlap@infradead.org> wrote:
> 
>>> Link: https://lists.infradead.org/pipermail/linux-afs/2024-February/008102html
>>
>> Not Found
>>
>> The requested URL was not found on this server.
> 
> Erm.  Not sure how you came by that.  You lost a dot somehow.  It's in the
> original submission:

Nor am I. Guess I'll blame it on thunderbird.

> https://lore.kernel.org/linux-fsdevel/3085695.1710328121@warthog.procyon.org.uk/

Yep. Thanks.
diff mbox series

Patch

diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index 8a67fc427e74..67afe68972d5 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -474,16 +474,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),