]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
ucode: add ubus refcounting fix
authorFelix Fietkau <nbd@nbd.name>
Fri, 20 Jun 2025 20:54:12 +0000 (22:54 +0200)
committerFelix Fietkau <nbd@nbd.name>
Fri, 20 Jun 2025 20:54:32 +0000 (22:54 +0200)
Fixes a regression in the last ucode update

Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/utils/ucode/patches/010-ubus-fix-refcount-issue-in-uc_ubus_object_notify.patch [new file with mode: 0644]

diff --git a/package/utils/ucode/patches/010-ubus-fix-refcount-issue-in-uc_ubus_object_notify.patch b/package/utils/ucode/patches/010-ubus-fix-refcount-issue-in-uc_ubus_object_notify.patch
new file mode 100644 (file)
index 0000000..92b955a
--- /dev/null
@@ -0,0 +1,39 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Wed, 18 Jun 2025 17:26:49 +0200
+Subject: [PATCH] ubus: fix refcount issue in uc_ubus_object_notify
+
+uc_ubus_object_notify_complete_cb will clear the reference in notify_ctx->res,
+so in the synchronous case, an extra ucv_get call is needed.
+Fixes an accidental double-unref bug
+
+Fixes: 94ad17d13a0d ("ubus: use ucv_resource_create_ex for ubus.notify resources")
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/lib/ubus.c
++++ b/lib/ubus.c
+@@ -1290,7 +1290,6 @@ uc_ubus_object_notify(uc_vm_t *vm, size_
+       notifyctx->vm = vm;
+       notifyctx->ctx = uuobj->ctx;
+-      notifyctx->res = res;
+       blob_buf_init(&buf, 0);
+@@ -1306,6 +1305,7 @@ uc_ubus_object_notify(uc_vm_t *vm, size_
+               err_return(rv, "Failed to send notification");
+       }
++      notifyctx->res = ucv_get(res);
+       notifyctx->req.data_cb = uc_ubus_object_notify_data_cb;
+       notifyctx->req.status_cb = uc_ubus_object_notify_status_cb;
+       notifyctx->req.complete_cb = uc_ubus_object_notify_complete_cb;
+@@ -1326,7 +1326,7 @@ uc_ubus_object_notify(uc_vm_t *vm, size_
+       ucv_resource_persistent_set(res, true);
+       ubus_complete_request_async(uuobj->ctx, &notifyctx->req.req);
+-      ok_return(ucv_get(res));
++      ok_return(res);
+ }