1 files changed, 7 insertions, 1 deletions

diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
index e42f8789b7ea..6502115e8f55 100644
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@ -206,10 +206,16 @@ BPF_CALL_2(bpf_get_local_storage, struct bpf_map *, map, u64, flags)
          */
         enum bpf_cgroup_storage_type stype = cgroup_storage_type(map);
         struct bpf_cgroup_storage *storage;
+        void *ptr;
 
         storage = this_cpu_read(bpf_cgroup_storage[stype]);
 
-        return (unsigned long)&READ_ONCE(storage->buf)->data[0];
+        if (stype == BPF_CGROUP_STORAGE_SHARED)
+                ptr = &READ_ONCE(storage->buf)->data[0];
+        else
+                ptr = this_cpu_ptr(storage->percpu_buf);
+
+        return (unsigned long)ptr;
 }
 
 const struct bpf_func_proto bpf_get_local_storage_proto = {