bpf: Fix the irq and nmi check in bpf_sk_storage for tracing usage
Subsystems (3)
PATCH 1/1 bpf: Fix the irq and nmi check in bpf_sk_storage for tracing usage
The intention of the current check is to avoid using bpf_sk_storage in irq and nmi. Jakub pointed out that the current check cannot do that. For example, in_serving_softirq() returns true if the softirq handling is interrupted by hard irq.
--- net/core/bpf_sk_storage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/bpf_sk_storage.c +2 -2
@@ -415,7 +415,7 @@ static bool bpf_sk_storage_tracing_allowed(const struct bpf_prog *prog) BPF_CALL_4(bpf_sk_storage_get_tracing, struct bpf_map *, map, struct sock *, sk, void *, value, u64, flags) { -if (!in_serving_softirq () && !in_task ()) +if (in_irq () ||in_nmi ())return (unsigned long )NULL ;return (unsigned long )____bpf_sk_storage_get (map, sk, value, flags);
@@ -424,7 +424,7 @@ BPF_CALL_4(bpf_sk_storage_get_tracing, struct bpf_map *, map, struct sock *, sk, BPF_CALL_2(bpf_sk_storage_delete_tracing, struct bpf_map *, map, struct sock *, sk) { -if (!in_serving_softirq () && !in_task ()) +if (in_irq () ||in_nmi ())return -EPERM ;return ____bpf_sk_storage_delete (map, sk);
Signature · 1 line
2.24.1
This patch was applied to bpf/bpf-next.git (refs/heads/master):
Hello:
This patch was applied to bpf/bpf-next.git (refs/heads/master):
Quoted 10 lines · On Mon, 16 Nov 2020 12:01:13 -0800 you wrote:
The intention of the current check is to avoid using
bpf_sk_storagein irq and nmi. Jakub pointed out that the current check cannot do that. For example,in_serving_softirq()returns true if the softirq handling is interrupted by hard irq.Fixes 8e4597c627fb ("bpf: Allow using bpf_sk_storage in FENTRY/FEXIT/RAW_TP")Suggested-by Jakub Kicinski <[email protected]>Signed-off-by Martin KaFai Lau <[email protected]>[...]
Here is the summary with links:
- [bpf-next] bpf: Fix the irq and nmi check in bpf_sk_storage for tracing usage
https://git.kernel.org/bpf/bpf-next/c/b93ef089d35c
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html