Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix segmentation fault when random token
[src/app-framework-binder.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
d099e1f
..
bffcb38
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-29,6
+29,10
@@
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/wait.h>
+#if !defined(NO_CALL_PERSONALITY)
+#include <sys/personality.h>
+#endif
+
#include <json-c/json.h>
#include <systemd/sd-daemon.h>
#include <json-c/json.h>
#include <systemd/sd-daemon.h>
@@
-49,6
+53,8
@@
#include "afb-monitor.h"
#include "afb-hook.h"
#include "sd-fds.h"
#include "afb-monitor.h"
#include "afb-hook.h"
#include "sd-fds.h"
+#include "afb-debug.h"
+#include "process-name.h"
/*
if SELF_PGROUP == 0 the launched command is the group leader
/*
if SELF_PGROUP == 0 the launched command is the group leader
@@
-346,7
+352,7
@@
static char *instanciate_string(char *arg, const char *port, const char *token)
switch(*++it) {
case 'p': wr = stpcpy(wr, port); break;
case 't': wr = stpcpy(wr, token); break;
switch(*++it) {
case 'p': wr = stpcpy(wr, port); break;
case 't': wr = stpcpy(wr, token); break;
- default: *wr++ = SUBST_CHAR;
+ default: *wr++ = SUBST_CHAR;
/*@fallthrough@*/
case SUBST_CHAR: *wr++ = *it;
}
arg = ++it;
case SUBST_CHAR: *wr++ = *it;
}
arg = ++it;
@@
-391,6
+397,7
@@
static int execute_command()
{
struct sigaction siga;
char port[20];
{
struct sigaction siga;
char port[20];
+ const char *token;
int rc;
/* check whether a command is to execute or not */
int rc;
/* check whether a command is to execute or not */
@@
-421,8
+428,9
@@
static int execute_command()
}
else {
/* instanciate arguments and environment */
}
else {
/* instanciate arguments and environment */
- if (instanciate_command_args(port, config->token) >= 0
- && instanciate_environ(port, config->token) >= 0) {
+ token = afb_session_initial_token();
+ if (instanciate_command_args(port, token) >= 0
+ && instanciate_environ(port, token) >= 0) {
/* run */
if (!SELF_PGROUP)
setpgid(0, 0);
/* run */
if (!SELF_PGROUP)
setpgid(0, 0);
@@
-533,6
+541,8
@@
static void start(int signum)
{
struct afb_hsrv *hsrv;
{
struct afb_hsrv *hsrv;
+ afb_debug("start-entry");
+
if (signum) {
ERROR("start aborted: received signal %s", strsignal(signum));
exit(1);
if (signum) {
ERROR("start aborted: received signal %s", strsignal(signum));
exit(1);
@@
-582,10
+592,12
@@
static void start(int signum)
afb_hook_create_evt(NULL, config->traceevt, NULL, NULL);
/* load bindings */
afb_hook_create_evt(NULL, config->traceevt, NULL, NULL);
/* load bindings */
+ afb_debug("start-load");
+ apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
apiset_start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
apiset_start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
apiset_start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
apiset_start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
- apiset_start_list(config->ldpaths, afb_api_so_add_pathset, "the binding path set");
- apiset_start_list(config->
so_bindings, afb_api_so_add_binding, "the binding
");
+ apiset_start_list(config->ldpaths, afb_api_so_add_pathset
_fails
, "the binding path set");
+ apiset_start_list(config->
weak_ldpaths, afb_api_so_add_pathset_nofails, "the weak binding path set
");
apiset_start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
apiset_start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
apiset_start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
apiset_start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
@@
-593,10
+605,15
@@
static void start(int signum)
DEBUG("Init config done");
/* start the services */
DEBUG("Init config done");
/* start the services */
+ afb_debug("start-start");
+#if !defined(NO_CALL_PERSONALITY)
+ personality((unsigned long)-1L);
+#endif
if (afb_apiset_start_all_services(main_apiset, 1) < 0)
goto error;
/* start the HTTP server */
if (afb_apiset_start_all_services(main_apiset, 1) < 0)
goto error;
/* start the HTTP server */
+ afb_debug("start-http");
if (!config->noHttpd) {
hsrv = start_http_server();
if (hsrv == NULL)
if (!config->noHttpd) {
hsrv = start_http_server();
if (hsrv == NULL)
@@
-604,9
+621,11
@@
static void start(int signum)
}
/* run the startup calls */
}
/* run the startup calls */
+ afb_debug("start-call");
run_startup_calls();
/* run the command */
run_startup_calls();
/* run the command */
+ afb_debug("start-exec");
if (execute_command() < 0)
goto error;
if (execute_command() < 0)
goto error;
@@
-624,6
+643,8
@@
error:
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
+ afb_debug("main-entry");
+
// let's run this program with a low priority
nice(20);
// let's run this program with a low priority
nice(20);
@@
-631,6
+652,12
@@
int main(int argc, char *argv[])
// ------------- Build session handler & init config -------
config = afb_config_parse_arguments(argc, argv);
// ------------- Build session handler & init config -------
config = afb_config_parse_arguments(argc, argv);
+ if (config->name) {
+ verbose_set_name(config->name, 0);
+ process_name_set_name(config->name);
+ process_name_replace_cmdline(argv, config->name);
+ }
+ afb_debug("main-args");
// --------- run -----------
if (config->background) {
// --------- run -----------
if (config->background) {
@@
-646,6
+673,8
@@
int main(int argc, char *argv[])
/* set the daemon environment */
setup_daemon();
/* set the daemon environment */
setup_daemon();
+ afb_debug("main-start");
+
/* enter job processing */
jobs_start(3, 0, 50, start);
WARNING("hoops returned from jobs_enter! [report bug]");
/* enter job processing */
jobs_start(3, 0, 50, start);
WARNING("hoops returned from jobs_enter! [report bug]");