1 files changed, 6 insertions, 2 deletions

diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 8191a7db2777..66088a9e9b9e 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -890,7 +890,8 @@ int bpf_jit_get_func_addr(const struct bpf_prog *prog,
 
 static int bpf_jit_blind_insn(const struct bpf_insn *from,
                               const struct bpf_insn *aux,
-                              struct bpf_insn *to_buff)
+                              struct bpf_insn *to_buff,
+                              bool emit_zext)
 {
         struct bpf_insn *to = to_buff;
         u32 imm_rnd = get_random_int();
@@ -1005,6 +1006,8 @@ static int bpf_jit_blind_insn(const struct bpf_insn *from,
         case 0: /* Part 2 of BPF_LD | BPF_IMM | BPF_DW. */
                 *to++ = BPF_ALU32_IMM(BPF_MOV, BPF_REG_AX, imm_rnd ^ aux[0].imm);
                 *to++ = BPF_ALU32_IMM(BPF_XOR, BPF_REG_AX, imm_rnd);
+                if (emit_zext)
+                        *to++ = BPF_ZEXT_REG(BPF_REG_AX);
                 *to++ = BPF_ALU64_REG(BPF_OR,  aux[0].dst_reg, BPF_REG_AX);
                 break;
 
@@ -1088,7 +1091,8 @@ struct bpf_prog *bpf_jit_blind_constants(struct bpf_prog *prog)
                     insn[1].code == 0)
                         memcpy(aux, insn, sizeof(aux));
 
-                rewritten = bpf_jit_blind_insn(insn, aux, insn_buff);
+                rewritten = bpf_jit_blind_insn(insn, aux, insn_buff,
+                                                clone->aux->verifier_zext);
                 if (!rewritten)
                         continue;