]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
ucode: ubus: fix use-after-free on deferred request reply() method
authorFelix Fietkau <nbd@nbd.name>
Mon, 12 May 2025 10:46:12 +0000 (12:46 +0200)
committerFelix Fietkau <nbd@nbd.name>
Mon, 12 May 2025 10:47:20 +0000 (12:47 +0200)
Hold a reference to the defer resource as long as it is still needed

Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/utils/ucode/patches/020-ubus-fix-use-after-free-on-deferred-request-reply-me.patch [new file with mode: 0644]

diff --git a/package/utils/ucode/patches/020-ubus-fix-use-after-free-on-deferred-request-reply-me.patch b/package/utils/ucode/patches/020-ubus-fix-use-after-free-on-deferred-request-reply-me.patch
new file mode 100644 (file)
index 0000000..142595a
--- /dev/null
@@ -0,0 +1,27 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Mon, 12 May 2025 12:43:44 +0200
+Subject: [PATCH] ubus: fix use-after-free on deferred request reply() method
+
+Hold a reference to the defer resource as long as it is still needed
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/lib/ubus.c
++++ b/lib/ubus.c
+@@ -636,6 +636,7 @@ uc_ubus_call_user_cb(uc_ubus_deferred_t
+       uc_value_t *this, *func;
+       request_reg_get(defer->vm, defer->registry_index, &this, &func, NULL, NULL);
++      ucv_get(this);
+       if (ucv_is_callable(func)) {
+               uc_vm_stack_push(defer->vm, ucv_get(this));
+@@ -648,6 +649,7 @@ uc_ubus_call_user_cb(uc_ubus_deferred_t
+       }
+       request_reg_clear(defer->vm, defer->registry_index);
++      ucv_put(this);
+ }
+ static void