diff options
| author | Ingo Molnar | 2020-07-28 13:18:01 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2020-07-28 13:18:01 +0200 |
| commit | e89d4ca1df630378bde3e36c42001b755b0044fe (patch) | |
| tree | d953ccecb8365acab65d0075e674f7e9a9bd9880 /kernel/kprobes.c | |
| parent | 2ac5413e5edca6910d2ae157187a889e94be2b62 (diff) | |
| parent | 92ed301919932f777713b9172e525674157e983d (diff) | |
Merge tag 'v5.8-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/kprobes.c')
| -rw-r--r-- | kernel/kprobes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 0924397d9d59..146c648eb943 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -2505,7 +2505,7 @@ static void report_probe(struct seq_file *pi, struct kprobe *p, else kprobe_type = "k"; - if (!kallsyms_show_value()) + if (!kallsyms_show_value(pi->file->f_cred)) addr = NULL; if (sym) @@ -2597,7 +2597,7 @@ static int kprobe_blacklist_seq_show(struct seq_file *m, void *v) * If /proc/kallsyms is not showing kernel address, we won't * show them here either. */ - if (!kallsyms_show_value()) + if (!kallsyms_show_value(m->file->f_cred)) seq_printf(m, "0x%px-0x%px\t%ps\n", NULL, NULL, (void *)ent->start_addr); else |