Merge tag 'perf_urgent_for_v6.13_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fix from Borislav Petkov:

- Fix a #GP in the perf user callchain code caused by a race between
uprobe freeing the task and the bpf profiler unwinding the task's
user stack

* tag 'perf_urgent_for_v6.13_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
uprobes: Fix race in uprobe_free_utask

+1 -1
+1 -1
kernel/events/uprobes.c
··· 1915 if (!utask) 1916 return; 1917 1918 WARN_ON_ONCE(utask->active_uprobe || utask->xol_vaddr); 1919 1920 timer_delete_sync(&utask->ri_timer); ··· 1925 ri = free_ret_instance(ri, true /* cleanup_hprobe */); 1926 1927 kfree(utask); 1928 - t->utask = NULL; 1929 } 1930 1931 #define RI_TIMER_PERIOD (HZ / 10) /* 100 ms */
··· 1915 if (!utask) 1916 return; 1917 1918 + t->utask = NULL; 1919 WARN_ON_ONCE(utask->active_uprobe || utask->xol_vaddr); 1920 1921 timer_delete_sync(&utask->ri_timer); ··· 1924 ri = free_ret_instance(ri, true /* cleanup_hprobe */); 1925 1926 kfree(utask); 1927 } 1928 1929 #define RI_TIMER_PERIOD (HZ / 10) /* 100 ms */