1 files changed, 16 insertions, 4 deletions

diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 01e6b3a38871..7f9691c86b6e 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -738,8 +738,7 @@ static const struct bpf_func_proto *pe_prog_func_proto(enum bpf_func_id func_id)
 static bool pe_prog_is_valid_access(int off, int size, enum bpf_access_type type,
                                     struct bpf_insn_access_aux *info)
 {
-        const int size_sp = FIELD_SIZEOF(struct bpf_perf_event_data,
-                                         sample_period);
+        const int size_u64 = sizeof(u64);
 
         if (off < 0 || off >= sizeof(struct bpf_perf_event_data))
                 return false;
@@ -750,8 +749,13 @@ static bool pe_prog_is_valid_access(int off, int size, enum bpf_access_type type
 
         switch (off) {
         case bpf_ctx_range(struct bpf_perf_event_data, sample_period):
-                bpf_ctx_record_field_size(info, size_sp);
-                if (!bpf_ctx_narrow_access_ok(off, size, size_sp))
+                bpf_ctx_record_field_size(info, size_u64);
+                if (!bpf_ctx_narrow_access_ok(off, size, size_u64))
+                        return false;
+                break;
+        case bpf_ctx_range(struct bpf_perf_event_data, addr):
+                bpf_ctx_record_field_size(info, size_u64);
+                if (!bpf_ctx_narrow_access_ok(off, size, size_u64))
                         return false;
                 break;
         default:
@@ -778,6 +782,14 @@ static u32 pe_prog_convert_ctx_access(enum bpf_access_type type,
                                       bpf_target_off(struct perf_sample_data, period, 8,
                                                      target_size));
                 break;
+        case offsetof(struct bpf_perf_event_data, addr):
+                *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_perf_event_data_kern,
+                                                       data), si->dst_reg, si->src_reg,
+                                      offsetof(struct bpf_perf_event_data_kern, data));
+                *insn++ = BPF_LDX_MEM(BPF_DW, si->dst_reg, si->dst_reg,
+                                      bpf_target_off(struct perf_sample_data, addr, 8,
+                                                     target_size));
+                break;
         default:
                 *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_perf_event_data_kern,
                                                        regs), si->dst_reg, si->src_reg,