Skip to content

Commit ddfdad9

Browse files
virtuosoIngo Molnar
authored andcommitted
perf/x86/intel/pt: Fix kernel address filter's offset validation
The kernel_ip() filter is used mostly by the DS/LBR code to look at the branch addresses, but Intel PT also uses it to validate the address filter offsets for kernel addresses, for which it is not sufficient: supplying something in bits 64:48 that's not a sign extension of the lower address bits (like 0xf00d000000000000) throws a #GP. This patch adds address validation for the user supplied kernel filters. Reported-by: Adrian Hunter <[email protected]> Signed-off-by: Alexander Shishkin <[email protected]> Acked-by: Peter Zijlstra <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Vince Weaver <[email protected]> Cc: [email protected] # v4.7 Cc: [email protected]#v4.7 Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 95f6008 commit ddfdad9

File tree

1 file changed

+6
-1
lines changed
  • arch/x86/events/intel

1 file changed

+6
-1
lines changed

arch/x86/events/intel/pt.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,6 +1074,11 @@ static void pt_addr_filters_fini(struct perf_event *event)
10741074
event->hw.addr_filters = NULL;
10751075
}
10761076

1077+
static inline bool valid_kernel_ip(unsigned long ip)
1078+
{
1079+
return virt_addr_valid(ip) && kernel_ip(ip);
1080+
}
1081+
10771082
static int pt_event_addr_filters_validate(struct list_head *filters)
10781083
{
10791084
struct perf_addr_filter *filter;
@@ -1084,7 +1089,7 @@ static int pt_event_addr_filters_validate(struct list_head *filters)
10841089
if (!filter->range || !filter->size)
10851090
return -EOPNOTSUPP;
10861091

1087-
if (!filter->inode && !kernel_ip(filter->offset))
1092+
if (!filter->inode && !valid_kernel_ip(filter->offset))
10881093
return -EINVAL;
10891094

10901095
if (++range > pt_cap_get(PT_CAP_num_address_ranges))

0 commit comments

Comments
 (0)