On Wed, Dec 20, 2023 at 02:38:05PM +0100, Daniel Borkmann wrote:
> For a clean, conflict-free revert of the token-related patches in commit
> d17aff807f84 ("Revert BPF token-related functionality"), the bpf fs commit
> 750e785796bb ("bpf: Support uid and gid when mounting bpffs") was undone
> temporarily as well.
>
> This patch manually re-adds the functionality from the original one back
> in 750e785796bb, no other functional changes intended.
>
> Testing:
>
> # mount -t bpf -o uid=65534,gid=65534 bpffs ./foo
> # ls -la . | grep foo
> drwxrwxrwt 2 nobody nogroup 0 Dec 20 13:16 foo
> # mount -t bpf
> bpffs on /root/foo type bpf (rw,relatime,uid=65534,gid=65534)
>
> Also, passing invalid arguments for uid/gid are properly rejected as expected.
>
> Fixes: d17aff807f84 ("Revert BPF token-related functionality")
> Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
> Cc: Christian Brauner <brauner@xxxxxxxxxx>
> Cc: Jie Jiang <jiejiang@xxxxxxxxxxxx>
> Cc: Andrii Nakryiko <andrii@xxxxxxxxxx>
> Cc: linux-fsdevel@xxxxxxxxxxxxxxx
> ---
Reviewed-by: Christian Brauner <brauner@xxxxxxxxxx>
