Commit 51a1ca93 authored by Al Viro's avatar Al Viro Committed by Andrii Nakryiko
Browse files

bpf: switch fdget_raw() uses to CLASS(fd_raw, ...) 



Swith fdget_raw() use cases in bpf_inode_storage.c to CLASS(fd_raw).

Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parent d7197370

kernel/bpf/bpf_inode_storage.c

+8 −16
Original line number Diff line number Diff line
@@ -78,13 +78,12 @@ void bpf_inode_storage_free(struct inode *inode) 
static void *bpf_fd_inode_storage_lookup_elem(struct bpf_map *map, void *key)

{

	struct bpf_local_storage_data *sdata;

	struct fd f = fdget_raw(*(int *)key);

	CLASS(fd_raw, f)(*(int *)key);



	if (!fd_file(f))

	if (fd_empty(f))

		return ERR_PTR(-EBADF);



	sdata = inode_storage_lookup(file_inode(fd_file(f)), map, true);

	fdput(f);

	return sdata ? sdata->data : NULL;

}
@@ -92,19 +91,16 @@ static long bpf_fd_inode_storage_update_elem(struct bpf_map *map, void *key, 
					     void *value, u64 map_flags)

{

	struct bpf_local_storage_data *sdata;

	struct fd f = fdget_raw(*(int *)key);

	CLASS(fd_raw, f)(*(int *)key);



	if (!fd_file(f))

	if (fd_empty(f))

		return -EBADF;

	if (!inode_storage_ptr(file_inode(fd_file(f)))) {

		fdput(f);

	if (!inode_storage_ptr(file_inode(fd_file(f))))

		return -EBADF;

	}



	sdata = bpf_local_storage_update(file_inode(fd_file(f)),

					 (struct bpf_local_storage_map *)map,

					 value, map_flags, GFP_ATOMIC);

	fdput(f);

	return PTR_ERR_OR_ZERO(sdata);

}
@@ -123,15 +119,11 @@ static int inode_storage_delete(struct inode *inode, struct bpf_map *map) 


static long bpf_fd_inode_storage_delete_elem(struct bpf_map *map, void *key)

{

	struct fd f = fdget_raw(*(int *)key);

	int err;

	CLASS(fd_raw, f)(*(int *)key);



	if (!fd_file(f))

	if (fd_empty(f))

		return -EBADF;



	err = inode_storage_delete(file_inode(fd_file(f)), map);

	fdput(f);

	return err;

	return inode_storage_delete(file_inode(fd_file(f)), map);

}



/* *gfp_flags* is a hidden argument provided by the verifier */