projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kvm instrumentation: Fix kvm_mmio event NULL pointer dereference
[lttng-modules.git]
/
src
/
probes
/
lttng-probe-kvm-x86-mmu.c
diff --git
a/src/probes/lttng-probe-kvm-x86-mmu.c
b/src/probes/lttng-probe-kvm-x86-mmu.c
index f301a16e3a8964170e9605fa9feb02ab4480b4b8..7901b7349d46e22b111ed0b49f62ca74ec2984aa 100644
(file)
--- a/
src/probes/lttng-probe-kvm-x86-mmu.c
+++ b/
src/probes/lttng-probe-kvm-x86-mmu.c
@@
-12,11
+12,7
@@
#include <lttng/tracer.h>
#include <lttng/kernel-version.h>
#include <lttng/tracer.h>
#include <lttng/kernel-version.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0))
#include <kvm/iodev.h>
#include <kvm/iodev.h>
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) */
-#include <../../virt/kvm/iodev.h>
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) */
/*
* Create the tracepoint static inlines from the kernel to validate that our
/*
* Create the tracepoint static inlines from the kernel to validate that our
@@
-24,14
+20,16
@@
*/
#include <wrapper/tracepoint.h>
*/
#include <wrapper/tracepoint.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \
+ LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
#include <../../arch/x86/kvm/mmu/mmu_internal.h>
#include <../../arch/x86/kvm/mmu/mmutrace.h>
#else
#include <../../arch/x86/kvm/mmutrace.h>
#endif
#include <../../arch/x86/kvm/mmu/mmu_internal.h>
#include <../../arch/x86/kvm/mmu/mmutrace.h>
#else
#include <../../arch/x86/kvm/mmutrace.h>
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0) || \
+ LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
#include <../arch/x86/kvm/mmu.h>
#include <../arch/x86/kvm/mmu/spte.h>
#endif
#include <../arch/x86/kvm/mmu.h>
#include <../arch/x86/kvm/mmu/spte.h>
#endif
This page took
0.023641 seconds
and
4
git commands to generate.