DGNum/rpcd
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uci: tighten uci add operation error handling

Browse source 
- Return UBUS_STATUS_INVALID_ARGUMENT for invalid section or option names
- Return UBUS_STATUS_NOT_FOUND if a section name could not be resolved

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-08-08 23:55:07 +02:00
parent 51980c687b
commit 948bb51875
1 changed files with 40 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
uci.c
View file

@ -687,7 +687,7 @@ rpc_uci_add(struct ubus_context *ctx, struct ubus_object *obj,
struct uci_package *p = NULL; struct uci_package *p = NULL;
struct uci_section *s; struct uci_section *s;
struct uci_ptr ptr = { 0 }; struct uci_ptr ptr = { 0 };
int rem, rem2; int rem, rem2, err = 0;
blobmsg_parse(rpc_uci_add_policy, __RPC_A_MAX, tb, blobmsg_parse(rpc_uci_add_policy, __RPC_A_MAX, tb,
blob_data(msg), blob_len(msg)); blob_data(msg), blob_len(msg));
@ -738,37 +738,68 @@ rpc_uci_add(struct ubus_context *ctx, struct ubus_object *obj,
ptr.option = blobmsg_name(cur); ptr.option = blobmsg_name(cur);
if (!rpc_uci_verify_name(ptr.option)) if (!rpc_uci_verify_name(ptr.option))
{
if (!err)
err = UBUS_STATUS_INVALID_ARGUMENT;
continue; continue;
}
if (rpc_uci_lookup(&ptr) || !ptr.s) if (rpc_uci_lookup(&ptr) || !ptr.s)
{
if (!err)
err = UBUS_STATUS_NOT_FOUND;
continue; continue;
}
switch (blobmsg_type(cur)) switch (blobmsg_type(cur))
{ {
case BLOBMSG_TYPE_ARRAY: case BLOBMSG_TYPE_ARRAY:
blobmsg_for_each_attr(elem, cur, rem2) blobmsg_for_each_attr(elem, cur, rem2)
if (rpc_uci_format_blob(elem, &ptr.value)) {
uci_add_list(cursor, &ptr); if (!rpc_uci_format_blob(elem, &ptr.value))
{
if (!err)
err = UBUS_STATUS_INVALID_ARGUMENT;
continue;
}
uci_add_list(cursor, &ptr);
}
break; break;
default: default:
if (rpc_uci_format_blob(cur, &ptr.value)) if (!rpc_uci_format_blob(cur, &ptr.value))
{
if (!err)
err = UBUS_STATUS_INVALID_ARGUMENT;
}
else
{
uci_set(cursor, &ptr); uci_set(cursor, &ptr);
}
break; break;
} }
} }
} }
uci_save(cursor, p); if (!err)
{
uci_save(cursor, p);
blob_buf_init(&buf, 0); blob_buf_init(&buf, 0);
blobmsg_add_string(&buf, "section", ptr.section); blobmsg_add_string(&buf, "section", ptr.section);
ubus_send_reply(ctx, req, buf.head); ubus_send_reply(ctx, req, buf.head);
}
out: out:
uci_unload(cursor, p); uci_unload(cursor, p);
return rpc_uci_status(); return err ? err : rpc_uci_status();
} }
/* /*