Fix: Disable IBT around indirect function calls

[lttng-modules.git] / src / wrapper / irqdesc.c

diff --git a/src/wrapper/irqdesc.c b/src/wrapper/irqdesc.c
index 5212082ff63b77242b60e9d9afb537be9d6f57ed..b77b044b7d8fe543d8af450bfd0b3c93b706273f 100644 (file)
--- a/src/wrapper/irqdesc.c
+++ b/src/wrapper/irqdesc.c
@@ -13,8 +13,7 @@
 #include <linux/module.h>
 
 #if (defined(CONFIG_KALLSYMS) && \
-       ((LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) || \
-        (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))))
+       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)))
 
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>
@@ -30,7 +29,13 @@ struct irq_desc *wrapper_irq_to_desc(unsigned int irq)
        if (!irq_to_desc_sym)
                irq_to_desc_sym = (void *) kallsyms_lookup_funcptr("irq_to_desc");
        if (irq_to_desc_sym) {
-               return irq_to_desc_sym(irq);
+               struct irq_ibt_state irq_ibt_state;
+               struct irq_desc *ret;
+
+               irq_ibt_state = wrapper_irq_ibt_save();
+               ret = irq_to_desc_sym(irq);
+               wrapper_irq_ibt_restore(irq_ibt_state);
+               return ret;
        } else {
                printk_once(KERN_WARNING "LTTng: irq_to_desc symbol lookup failed.\n");
                return NULL;