[PATCH 19.07 ubus 1/3] libubus: use list_empty/list_first_entry in ubus_process_pending_msg
Petr Štetiar
ynezz at true.cz
Wed Feb 16 02:43:36 PST 2022
From: Felix Fietkau <nbd at nbd.name>
Simplifies checks and avoids potential list corruption on recursive calls
Signed-off-by: Felix Fietkau <nbd at nbd.name>
(cherry picked from commit 2099bb3ad9972c6188c38fd885ae74f3323fcacc)
---
libubus.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libubus.c b/libubus.c
index 91f317c59867..7ce454eabc64 100644
--- a/libubus.c
+++ b/libubus.c
@@ -115,12 +115,13 @@ ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf, int fd)
static void ubus_process_pending_msg(struct uloop_timeout *timeout)
{
struct ubus_context *ctx = container_of(timeout, struct ubus_context, pending_timer);
- struct ubus_pending_msg *pending, *tmp;
+ struct ubus_pending_msg *pending;
- list_for_each_entry_safe(pending, tmp, &ctx->pending, list) {
+ while (!list_empty(&ctx->pending)) {
if (ctx->stack_depth)
break;
+ pending = list_first_entry(&ctx->pending, struct ubus_pending_msg, list);
list_del(&pending->list);
ubus_process_msg(ctx, &pending->hdr, -1);
free(pending);
More information about the openwrt-devel
mailing list