1 files changed, 16 insertions, 5 deletions

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 64fcab1d8cd9..44c17f47d94c 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -279,7 +279,8 @@ static const char *const bpf_jmp_string[16] = {
         [BPF_EXIT >> 4] = "exit",
 };
 
-static void print_bpf_insn(struct bpf_insn *insn)
+static void print_bpf_insn(const struct bpf_verifier_env *env,
+                           const struct bpf_insn *insn)
 {
         u8 class = BPF_CLASS(insn->code);
 
@@ -343,9 +344,19 @@ static void print_bpf_insn(struct bpf_insn *insn)
                                 insn->code,
                                 bpf_ldst_string[BPF_SIZE(insn->code) >> 3],
                                 insn->src_reg, insn->imm);
-                } else if (BPF_MODE(insn->code) == BPF_IMM) {
-                        verbose("(%02x) r%d = 0x%x\n",
-                                insn->code, insn->dst_reg, insn->imm);
+                } else if (BPF_MODE(insn->code) == BPF_IMM &&
+                           BPF_SIZE(insn->code) == BPF_DW) {
+                        /* At this point, we already made sure that the second
+                         * part of the ldimm64 insn is accessible.
+                         */
+                        u64 imm = ((u64)(insn + 1)->imm << 32) | (u32)insn->imm;
+                        bool map_ptr = insn->src_reg == BPF_PSEUDO_MAP_FD;
+
+                        if (map_ptr && !env->allow_ptr_leaks)
+                                imm = 0;
+
+                        verbose("(%02x) r%d = 0x%llx\n", insn->code,
+                                insn->dst_reg, (unsigned long long)imm);
                 } else {
                         verbose("BUG_ld_%02x\n", insn->code);
                         return;
@@ -2674,7 +2685,7 @@ static int do_check(struct bpf_verifier_env *env)
 
                 if (log_level) {
                         verbose("%d: ", insn_idx);
-                        print_bpf_insn(insn);
+                        print_bpf_insn(env, insn);
                 }
 
                 err = ext_analyzer_insn_hook(env, insn_idx, prev_insn_idx);