X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=session.c;h=951201bf00f592cb43b30298cb7507278438e307;hb=e64cbdd9b405a3246abfe23d8f16bd32647b2d04;hp=fd003ac08674bd43edcf4fd83f70e571715fe2a5;hpb=967d815022082a63e1489b5eda5e7a9d7a9d5e82;p=project%2Frpcd.git

diff --git a/session.c b/session.c
index fd003ac..951201b 100644
--- a/session.c
+++ b/session.c
@@ -26,6 +26,7 @@
 #include <fnmatch.h>
 #include <glob.h>
 #include <uci.h>
+#include <limits.h>
 
 #ifdef HAVE_SHADOW
 #include <shadow.h>
@@ -39,12 +40,20 @@ static struct blob_buf buf;
 static LIST_HEAD(create_callbacks);
 static LIST_HEAD(destroy_callbacks);
 
-static const struct blobmsg_policy new_policy = {
-	.name = "timeout", .type = BLOBMSG_TYPE_INT32
+enum {
+	RPC_SN_TIMEOUT,
+	__RPC_SN_MAX,
+};
+static const struct blobmsg_policy new_policy[__RPC_SN_MAX] = {
+	[RPC_SN_TIMEOUT] = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 },
 };
 
-static const struct blobmsg_policy sid_policy = {
-	.name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING
+enum {
+	RPC_SI_SID,
+	__RPC_SI_MAX,
+};
+static const struct blobmsg_policy sid_policy[__RPC_SI_MAX] = {
+	[RPC_SI_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING },
 };
 
 enum {
@@ -137,22 +146,28 @@ static const struct blobmsg_policy login_policy[__RPC_L_MAX] = {
 		    !fnmatch((_acl)->object, (_obj), FNM_NOESCAPE) &&		\
 		    !fnmatch((_acl)->function, (_func), FNM_NOESCAPE))
 
-static void
+static int
 rpc_random(char *dest)
 {
 	unsigned char buf[16] = { 0 };
 	FILE *f;
 	int i;
+	int ret;
 
 	f = fopen("/dev/urandom", "r");
 	if (!f)
-		return;
+		return -1;
 
-	fread(buf, 1, sizeof(buf), f);
+	ret = fread(buf, 1, sizeof(buf), f);
 	fclose(f);
 
+	if (ret < 0)
+		return ret;
+
 	for (i = 0; i < sizeof(buf); i++)
 		sprintf(dest + (i<<1), "%02x", buf[i]);
+
+	return 0;
 }
 
 static void
@@ -307,7 +322,8 @@ rpc_session_create(int timeout)
 	if (!ses)
 		return NULL;
 
-	rpc_random(ses->id);
+	if (rpc_random(ses->id))
+		return NULL;
 
 	ses->timeout = timeout;
 
@@ -343,7 +359,7 @@ rpc_handle_create(struct ubus_context *ctx, struct ubus_object *obj,
 	struct blob_attr *tb;
 	int timeout = RPC_DEFAULT_SESSION_TIMEOUT;
 
-	blobmsg_parse(&new_policy, 1, &tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(new_policy, __RPC_SN_MAX, &tb, blob_data(msg), blob_len(msg));
 	if (tb)
 		timeout = blobmsg_get_u32(tb);
 
@@ -362,7 +378,7 @@ rpc_handle_list(struct ubus_context *ctx, struct ubus_object *obj,
 	struct rpc_session *ses;
 	struct blob_attr *tb;
 
-	blobmsg_parse(&sid_policy, 1, &tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(sid_policy, __RPC_SI_MAX, &tb, blob_data(msg), blob_len(msg));
 
 	if (!tb) {
 		avl_for_each_element(&sessions, ses, avl)
@@ -755,7 +771,7 @@ rpc_handle_destroy(struct ubus_context *ctx, struct ubus_object *obj,
 	struct rpc_session *ses;
 	struct blob_attr *tb;
 
-	blobmsg_parse(&sid_policy, 1, &tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(sid_policy, __RPC_SI_MAX, &tb, blob_data(msg), blob_len(msg));
 
 	if (!tb)
 		return UBUS_STATUS_INVALID_ARGUMENT;
@@ -1261,15 +1277,15 @@ int rpc_session_api_init(struct ubus_context *ctx)
 	struct rpc_session *ses;
 
 	static const struct ubus_method session_methods[] = {
-		UBUS_METHOD("create",  rpc_handle_create,  &new_policy),
-		UBUS_METHOD("list",    rpc_handle_list,    &sid_policy),
+		UBUS_METHOD("create",  rpc_handle_create,  new_policy),
+		UBUS_METHOD("list",    rpc_handle_list,    sid_policy),
 		UBUS_METHOD("grant",   rpc_handle_acl,     acl_policy),
 		UBUS_METHOD("revoke",  rpc_handle_acl,     acl_policy),
 		UBUS_METHOD("access",  rpc_handle_access,  perm_policy),
 		UBUS_METHOD("set",     rpc_handle_set,     set_policy),
 		UBUS_METHOD("get",     rpc_handle_get,     get_policy),
 		UBUS_METHOD("unset",   rpc_handle_unset,   get_policy),
-		UBUS_METHOD("destroy", rpc_handle_destroy, &sid_policy),
+		UBUS_METHOD("destroy", rpc_handle_destroy, sid_policy),
 		UBUS_METHOD("login",   rpc_handle_login,   login_policy),
 	};