1 files changed, 21 insertions, 7 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 1d65e56594db..828518bb947b 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -2072,13 +2072,26 @@ static int bpf_map_get_fd_by_id(const union bpf_attr *attr)
 }
 
 static const struct bpf_map *bpf_map_from_imm(const struct bpf_prog *prog,
-                                              unsigned long addr)
+                                              unsigned long addr, u32 *off,
+                                              u32 *type)
 {
+        const struct bpf_map *map;
         int i;
 
-        for (i = 0; i < prog->aux->used_map_cnt; i++)
-                if (prog->aux->used_maps[i] == (void *)addr)
-                        return prog->aux->used_maps[i];
+        for (i = 0, *off = 0; i < prog->aux->used_map_cnt; i++) {
+                map = prog->aux->used_maps[i];
+                if (map == (void *)addr) {
+                        *type = BPF_PSEUDO_MAP_FD;
+                        return map;
+                }
+                if (!map->ops->map_direct_value_meta)
+                        continue;
+                if (!map->ops->map_direct_value_meta(map, addr, off)) {
+                        *type = BPF_PSEUDO_MAP_VALUE;
+                        return map;
+                }
+        }
+
         return NULL;
 }
 
@@ -2086,6 +2099,7 @@ static struct bpf_insn *bpf_insn_prepare_dump(const struct bpf_prog *prog)
 {
         const struct bpf_map *map;
         struct bpf_insn *insns;
+        u32 off, type;
         u64 imm;
         int i;
 
@@ -2113,11 +2127,11 @@ static struct bpf_insn *bpf_insn_prepare_dump(const struct bpf_prog *prog)
                         continue;
 
                 imm = ((u64)insns[i + 1].imm << 32) | (u32)insns[i].imm;
-                map = bpf_map_from_imm(prog, imm);
+                map = bpf_map_from_imm(prog, imm, &off, &type);
                 if (map) {
-                        insns[i].src_reg = BPF_PSEUDO_MAP_FD;
+                        insns[i].src_reg = type;
                         insns[i].imm = map->id;
-                        insns[i + 1].imm = 0;
+                        insns[i + 1].imm = off;
                         continue;
                 }
         }