]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
uprobes: don't abuse get_utask() in pre_ssout() and prepare_uretprobe()
authorOleg Nesterov <oleg@redhat.com>
Sun, 29 Sep 2024 14:42:30 +0000 (16:42 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Mon, 7 Oct 2024 07:28:44 +0000 (09:28 +0200)
handle_swbp() calls get_utask() before prepare_uretprobe() or pre_ssout()
can be called, they can simply use current->utask which can't be NULL.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240929144230.GA9468@redhat.com
kernel/events/uprobes.c

index 5106dc181387282ba23e496aac3cee74f76f6f9a..15e91a38d327f279637573db72e9a27078efd6d7 100644 (file)
@@ -1905,18 +1905,14 @@ static void cleanup_return_instances(struct uprobe_task *utask, bool chained,
 
 static void prepare_uretprobe(struct uprobe *uprobe, struct pt_regs *regs)
 {
-       struct return_instance *ri;
-       struct uprobe_task *utask;
+       struct uprobe_task *utask = current->utask;
        unsigned long orig_ret_vaddr, trampoline_vaddr;
+       struct return_instance *ri;
        bool chained;
 
        if (!get_xol_area())
                return;
 
-       utask = get_utask();
-       if (!utask)
-               return;
-
        if (utask->depth >= MAX_URETPROBE_DEPTH) {
                printk_ratelimited(KERN_INFO "uprobe: omit uretprobe due to"
                                " nestedness limit pid/tgid=%d/%d\n",
@@ -1977,14 +1973,10 @@ fail:
 static int
 pre_ssout(struct uprobe *uprobe, struct pt_regs *regs, unsigned long bp_vaddr)
 {
-       struct uprobe_task *utask;
+       struct uprobe_task *utask = current->utask;
        unsigned long xol_vaddr;
        int err;
 
-       utask = get_utask();
-       if (!utask)
-               return -ENOMEM;
-
        if (!try_get_uprobe(uprobe))
                return -EINVAL;