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

bpf: convert __bpf_prog_get() to CLASS(fd, ...) 



Irregularity here is fdput() not in the same scope as fdget();
just fold ____bpf_prog_get() into its (only) caller and that's
it...

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

kernel/bpf/syscall.c

+9 −22
Original line number Diff line number Diff line
@@ -2407,18 +2407,6 @@ int bpf_prog_new_fd(struct bpf_prog *prog) 
				O_RDWR | O_CLOEXEC);

}



static struct bpf_prog *____bpf_prog_get(struct fd f)

{

	if (!fd_file(f))

		return ERR_PTR(-EBADF);

	if (fd_file(f)->f_op != &bpf_prog_fops) {

		fdput(f);

		return ERR_PTR(-EINVAL);

	}



	return fd_file(f)->private_data;

}



void bpf_prog_add(struct bpf_prog *prog, int i)

{

	atomic64_add(i, &prog->aux->refcnt);
@@ -2474,20 +2462,19 @@ bool bpf_prog_get_ok(struct bpf_prog *prog, 
static struct bpf_prog *__bpf_prog_get(u32 ufd, enum bpf_prog_type *attach_type,

				       bool attach_drv)

{

	struct fd f = fdget(ufd);

	CLASS(fd, f)(ufd);

	struct bpf_prog *prog;



	prog = ____bpf_prog_get(f);

	if (IS_ERR(prog))

		return prog;

	if (!bpf_prog_get_ok(prog, attach_type, attach_drv)) {

		prog = ERR_PTR(-EINVAL);

		goto out;

	}

	if (fd_empty(f))

		return ERR_PTR(-EBADF);

	if (fd_file(f)->f_op != &bpf_prog_fops)

		return ERR_PTR(-EINVAL);



	prog = fd_file(f)->private_data;

	if (!bpf_prog_get_ok(prog, attach_type, attach_drv))

		return ERR_PTR(-EINVAL);



	bpf_prog_inc(prog);

out:

	fdput(f);

	return prog;

}