| Message ID | 1486051189-914-1-git-send-email-ardeleanalex@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/ubusd.c b/ubusd.c index 5409b7f..f060b38 100644 --- a/ubusd.c +++ b/ubusd.c @@ -32,8 +32,15 @@ static struct ubus_msg_buf *ubus_msg_ref(struct ubus_msg_buf *ub) { - if (ub->refcount == ~0) - return ubus_msg_new(ub->data, ub->len, false); + struct ubus_msg_buf *new_ub; + if (ub->refcount == ~0) { + new_ub = ubus_msg_new(ub->data, ub->len, false); + if (!new_ub) + return NULL; + memcpy(&new_ub->hdr, &ub->hdr, sizeof(struct ubus_msghdr)); + new_ub->fd = ub->fd; + return new_ub; + } ub->refcount++; return ub;
For a shared ubus_msg_buf, the ubus_msg_ref function will create a copy for queue-ing. Problem is, that during the dequeue (especially) in client_cb, the header is 0-ed (because it's was a newly alloc-ed buffer). And during ubus_msg_writev(), the header info will be ignored by the client. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com> --- ubusd.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)