X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=sys.c;h=3691dfbd1f50aac3f5bb33764c07ffb62c1c743c;hp=b90aa6b894aba29e8be4884c160a7c34ee0ca646;hb=26c98ec94d7aa6d5d3fe6c3fccc78b26a2bf11d4;hpb=f4089654a399fbea6b8fd25844fbb43d259e0332 diff --git a/sys.c b/sys.c index b90aa6b..3691dfb 100644 --- a/sys.c +++ b/sys.c @@ -76,6 +76,8 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj, int fd, fds[2]; struct stat s; struct blob_attr *tb[__RPC_P_MAX]; + ssize_t n; + int ret; blobmsg_parse(rpc_password_policy, __RPC_P_MAX, tb, blob_data(msg), blob_len(msg)); @@ -113,7 +115,9 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj, close(fd); } - chdir("/"); + ret = chdir("/"); + if (ret < 0) + return rpc_errno_status(); if (execl("/usr/bin/passwd", "/usr/bin/passwd", blobmsg_data(tb[RPC_P_USER]), NULL)) @@ -122,15 +126,24 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj, default: close(fds[0]); - write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]), + n = write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]), blobmsg_data_len(tb[RPC_P_PASSWORD]) - 1); - write(fds[1], "\n", 1); + if (n < 0) + return rpc_errno_status(); + + n = write(fds[1], "\n", 1); + if (n < 0) + return rpc_errno_status(); usleep(100 * 1000); - write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]), + n = write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]), blobmsg_data_len(tb[RPC_P_PASSWORD]) - 1); - write(fds[1], "\n", 1); + if (n < 0) + return rpc_errno_status(); + n = write(fds[1], "\n", 1); + if (n < 0) + return rpc_errno_status(); close(fds[1]);