Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d24f7c7f authored by Hannes Frederic Sowa's avatar Hannes Frederic Sowa Committed by David S. Miller
Browse files

bpf: bpf_lock on kallsysms doesn't need to be irqsave 



Hannes rightfully spotted that the bpf_lock doesn't need to be
irqsave variant. We never perform any such updates where this
would be necessary (neither right now nor in future), therefore
relax this further.

Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 728a853a

kernel/bpf/core.c

+4 −8
Original line number Diff line number Diff line
@@ -394,27 +394,23 @@ static bool bpf_prog_kallsyms_verify_off(const struct bpf_prog *fp) 


void bpf_prog_kallsyms_add(struct bpf_prog *fp)

{

	unsigned long flags;



	if (!bpf_prog_kallsyms_candidate(fp) ||

	    !capable(CAP_SYS_ADMIN))

		return;



	spin_lock_irqsave(&bpf_lock, flags);

	spin_lock_bh(&bpf_lock);

	bpf_prog_ksym_node_add(fp->aux);

	spin_unlock_irqrestore(&bpf_lock, flags);

	spin_unlock_bh(&bpf_lock);

}



void bpf_prog_kallsyms_del(struct bpf_prog *fp)

{

	unsigned long flags;



	if (!bpf_prog_kallsyms_candidate(fp))

		return;



	spin_lock_irqsave(&bpf_lock, flags);

	spin_lock_bh(&bpf_lock);

	bpf_prog_ksym_node_del(fp->aux);

	spin_unlock_irqrestore(&bpf_lock, flags);

	spin_unlock_bh(&bpf_lock);

}



static struct bpf_prog *bpf_prog_kallsyms_find(unsigned long addr)