diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 13:00:57 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 13:00:57 -0400 |
| commit | e5d2b59a54ed583e456f7f9ec26aa9bcfb32529e (patch) | |
| tree | ab1253bf8c342fadbd3a5fc4adb8479817e410c6 | |
| parent | c7fed1fd100b2adf7cef38a3a769b369a10bc447 (diff) | |
| download | longterm-queue-5.2-e5d2b59a54ed583e456f7f9ec26aa9bcfb32529e.tar.gz | |
bpf: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/bpf-Fix-map-leak-in-HASH_OF_MAPS-map.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/queue/bpf-Fix-map-leak-in-HASH_OF_MAPS-map.patch b/queue/bpf-Fix-map-leak-in-HASH_OF_MAPS-map.patch index 1cf70d06..70bedc68 100644 --- a/queue/bpf-Fix-map-leak-in-HASH_OF_MAPS-map.patch +++ b/queue/bpf-Fix-map-leak-in-HASH_OF_MAPS-map.patch @@ -1,4 +1,4 @@ -From 1d4e1eab456e1ee92a94987499b211db05f900ea Mon Sep 17 00:00:00 2001 +From 5fad41d49e581f77dc40ba1613507da27b087f68 Mon Sep 17 00:00:00 2001 From: Andrii Nakryiko <andriin@fb.com> Date: Tue, 28 Jul 2020 21:09:12 -0700 Subject: [PATCH] bpf: Fix map leak in HASH_OF_MAPS map @@ -17,11 +17,11 @@ Acked-by: Song Liu <songliubraving@fb.com> Link: https://lore.kernel.org/bpf/20200729040913.2815687-1-andriin@fb.com diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c -index b4b288a3c3c9..b32cc8ce8ff6 100644 +index 583df5cb302d..09ba58465758 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c -@@ -779,15 +779,20 @@ static void htab_elem_free_rcu(struct rcu_head *head) - htab_elem_free(htab, l); +@@ -679,15 +679,20 @@ static void htab_elem_free_rcu(struct rcu_head *head) + preempt_enable(); } -static void free_htab_elem(struct bpf_htab *htab, struct htab_elem *l) @@ -44,7 +44,7 @@ index b4b288a3c3c9..b32cc8ce8ff6 100644 if (htab_is_prealloc(htab)) { __pcpu_freelist_push(&htab->freelist, &l->fnode); -@@ -839,6 +844,7 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, +@@ -739,6 +744,7 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, */ pl_new = this_cpu_ptr(htab->extra_elems); l_new = *pl_new; |