diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-12-23 15:52:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-12-23 15:52:13 +0100 |
| commit | d2e9f53ac5dd76dadc0b5f04f6c27640604ce2af (patch) | |
| tree | bf82d9fbfdc2ce67630fdacc18c2231f3d17876a /kernel/bpf/memalloc.c | |
| parent | 418146e39891ef1fb2284dee4cabbfe616cd21cf (diff) | |
| parent | ceb6a6f023fd3e8b07761ed900352ef574010bcb (diff) | |
Merge tag 'v6.7-rc6' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/bpf/memalloc.c')
| -rw-r--r-- | kernel/bpf/memalloc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/bpf/memalloc.c b/kernel/bpf/memalloc.c index 63b909d277d4..6a51cfe4c2d6 100644 --- a/kernel/bpf/memalloc.c +++ b/kernel/bpf/memalloc.c @@ -978,6 +978,8 @@ void notrace *bpf_mem_cache_alloc_flags(struct bpf_mem_alloc *ma, gfp_t flags) memcg = get_memcg(c); old_memcg = set_active_memcg(memcg); ret = __alloc(c, NUMA_NO_NODE, GFP_KERNEL | __GFP_NOWARN | __GFP_ACCOUNT); + if (ret) + *(struct bpf_mem_cache **)ret = c; set_active_memcg(old_memcg); mem_cgroup_put(memcg); } |