Skip to content

ubus fixes #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nbd168 wants to merge 2 commits into
base: master
Choose a base branch
from
+28 −8
Open

ubus fixes #372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7766385
ubus: fix refcounting bug
nbd168 Feb 6, 2026
96c651f
ubus: avoid double close of externally owned channel fds
nbd168 Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions lib/ubus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ typedef struct {
struct ubus_context ctx;
struct blob_buf buf;
int timeout;
bool fd_handle;

uc_vm_t *vm;
uc_value_t *res;
Expand Down Expand Up @@ -739,14 +740,17 @@ uc_ubus_call_timeout_cb(struct uloop_timeout *timeout)
}

static int
get_fd(uc_vm_t *vm, uc_value_t *val)
get_fd(uc_vm_t *vm, uc_value_t *val, bool *handle)
{
uc_value_t *fn;
int64_t n;

fn = ucv_property_get(val, "fileno");

if (ucv_is_callable(fn)) {
if (handle)
*handle = true;

uc_vm_stack_push(vm, ucv_get(val));
uc_vm_stack_push(vm, ucv_get(fn));

Expand Down Expand Up @@ -816,7 +820,7 @@ uc_ubus_call_common(uc_vm_t *vm, uc_ubus_connection_t *c, uc_ubus_call_res_t *re
ucv_object_to_blob(funargs, &c->buf);

if (fd) {
fd_val = get_fd(vm, fd);
fd_val = get_fd(vm, fd, NULL);

if (fd_val < 0)
errval_return(UBUS_STATUS_INVALID_ARGUMENT,
Expand Down Expand Up @@ -938,7 +942,7 @@ uc_ubus_defer_common(uc_vm_t *vm, uc_ubus_connection_t *c, uc_ubus_call_res_t *r
ucv_object_to_blob(funargs, &c->buf);

if (fd) {
fd_val = get_fd(vm, fd);
fd_val = get_fd(vm, fd, NULL);

if (fd_val < 0)
errval_return(UBUS_STATUS_INVALID_ARGUMENT,
Expand Down Expand Up @@ -1174,7 +1178,7 @@ uc_ubus_request_set_fd(uc_vm_t *vm, size_t nargs)
if (!callctx)
err_return(UBUS_STATUS_INVALID_ARGUMENT, "Invalid call context");

fd = get_fd(vm, uc_fn_arg(0));
fd = get_fd(vm, uc_fn_arg(0), NULL);

if (fd < 0)
err_return(UBUS_STATUS_INVALID_ARGUMENT, "Invalid file descriptor");
Expand Down Expand Up @@ -2313,6 +2317,10 @@ uc_ubus_disconnect(uc_vm_t *vm, size_t nargs)
#ifdef HAVE_UBUS_FLUSH_REQUESTS
ubus_flush_requests(&c->ctx);
#endif
if (c->fd_handle) {
uloop_fd_delete(&c->ctx.sock);
c->ctx.sock.fd = -1;
}
ubus_shutdown(&c->ctx);
c->ctx.sock.fd = -1;
uc_ubus_put_res(&c->res);
Expand Down Expand Up @@ -2395,10 +2403,10 @@ uc_ubus_channel_req_cb(struct ubus_context *ctx, struct ubus_object *obj,

args = blob_array_to_ucv(c->vm, blob_data(msg), blob_len(msg), true);
reqproto = ucv_object_new(c->vm);
ucv_object_add(reqproto, "args", ucv_get(args));
ucv_object_add(reqproto, "args", args);

if (method)
ucv_object_add(reqproto, "type", ucv_get(ucv_string_new(method)));
ucv_object_add(reqproto, "type", ucv_string_new(method));

return uc_ubus_handle_reply_common(ctx, req, c->vm, c->res, func, reqproto);
}
Expand All @@ -2422,6 +2430,10 @@ uc_ubus_channel_disconnect_cb(struct ubus_context *ctx)
blob_buf_free(&c->buf);

if (c->ctx.sock.fd >= 0) {
if (c->fd_handle) {
uloop_fd_delete(&c->ctx.sock);
c->ctx.sock.fd = -1;
}
ubus_shutdown(&c->ctx);
c->ctx.sock.fd = -1;
}
Expand Down Expand Up @@ -2486,6 +2498,7 @@ uc_ubus_channel_connect(uc_vm_t *vm, size_t nargs)
{
#ifdef HAVE_UBUS_CHANNEL_SUPPORT
uc_value_t *fd, *cb, *disconnect_cb, *timeout;
bool handle = false;
uc_ubus_connection_t *c;
int fd_val;

Expand All @@ -2495,7 +2508,7 @@ uc_ubus_channel_connect(uc_vm_t *vm, size_t nargs)
"disconnect_cb", UC_CLOSURE, true, &disconnect_cb,
"timeout", UC_INTEGER, true, &timeout);

fd_val = get_fd(vm, fd);
fd_val = get_fd(vm, fd, &handle);

if (fd_val < 0)
err_return(UBUS_STATUS_INVALID_ARGUMENT, "Invalid file descriptor argument");
Expand All @@ -2505,6 +2518,8 @@ uc_ubus_channel_connect(uc_vm_t *vm, size_t nargs)
if (!c)
return NULL;

c->fd_handle = handle;

if (ubus_channel_connect(&c->ctx, fd_val, cb ? uc_ubus_channel_req_cb : NULL)) {
ucv_put(c->res);
err_return(UBUS_STATUS_UNKNOWN_ERROR, "Unable to create ubus channel");
Expand Down Expand Up @@ -2602,8 +2617,13 @@ static void free_connection(void *ud) {

blob_buf_free(&conn->buf);

if (conn->ctx.sock.fd >= 0)
if (conn->ctx.sock.fd >= 0) {
if (conn->fd_handle) {
uloop_fd_delete(&conn->ctx.sock);
conn->ctx.sock.fd = -1;
}
ubus_shutdown(&conn->ctx);
}
}

static void free_deferred(void *ud) {
Expand Down