Skip to content

i#2717 shrink static DR library: do not initialize dynamo_options sta… #2797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nilayvaish wants to merge 9 commits into
base: master
Choose a base branch
from
Open

i#2717 shrink static DR library: do not initialize dynamo_options sta… #2797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc09128
i#2717 shrink static DR library: do not initialize dynamo_options sta…
nilayvaish Jan 7, 2018
ce94baf
Merge branch 'master' of https://github.com/DynamoRIO/dynamorio into …
nilayvaish Jan 15, 2018
ae5ef84
i#2717 shrink static DR library: do not set dynamo_options statically
nilayvaish Jan 16, 2018
80800ac
Merge branch 'master' of https://github.com/DynamoRIO/dynamorio into …
nilayvaish Jan 19, 2018
60842f2
Fixes problems due to options not being readable.
nilayvaish Jan 20, 2018
e4984be
Use already defined functions for making options readonly and writable.
nilayvaish Jan 20, 2018
25a77b1
Merge branch 'master' of https://github.com/DynamoRIO/dynamorio into …
nilayvaish Jan 24, 2018
5c9763e
Trying to fix the broken tests on Windows.
nilayvaish Jan 24, 2018
4ae534e
Merge branch 'master' of https://github.com/DynamoRIO/dynamorio into …
nilayvaish Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions core/dynamo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,10 +853,6 @@ standalone_init(void)
standalone_library = true;
/* We have release-build stats now so this is not just DEBUG */
stats = &nonshared_stats;
#if defined(INTERNAL) && defined(DEADLOCK_AVOIDANCE)
/* avoid issues w/ GLOBAL_DCONTEXT instead of thread dcontext */
dynamo_options.deadlock_avoidance = false;
#endif
#ifdef UNIX
os_page_size_init((const char **)our_environ);
#endif
Expand All @@ -865,6 +861,10 @@ standalone_init(void)
if (!syscalls_init())
return NULL; /* typically b/c of unsupported OS version */
#endif
#ifdef DEBUG
nonshared_stats.logmask = LOG_ALL;
#endif

config_init();
options_init();
vmm_heap_init();
Expand All @@ -887,8 +887,6 @@ standalone_init(void)

# ifdef DEBUG
/* FIXME: share code w/ main init routine? */
nonshared_stats.logmask = LOG_ALL;
options_init();
if (stats->loglevel > 0) {
char initial_options[MAX_OPTIONS_STRING];
main_logfile = open_log_file(main_logfile_name(), NULL, 0);
Expand Down
19 changes: 13 additions & 6 deletions core/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,8 @@ char option_string[MAX_OPTIONS_STRING] = {0,};
# define ASSERT_OWN_OPTIONS_LOCK(b, l) ASSERT_OWN_WRITE_LOCK(b, l)
# define CORE_STATIC static
/* official options */
options_t dynamo_options = {
# include "optionsx.h"
};
options_t dynamo_options;

/* Temporary string, static to save stack space in synchronize_dynamic_options().
* FIXME case 8074: should protect this better as w/o DR dll randomization attacker
* can repeatedly try to clobber. Move to heap? Or shrink stack space elsewhere
Expand Down Expand Up @@ -2440,11 +2439,19 @@ options_init()
{
int ret = 0, retval;

/* .lspdata pages start out writable so no unprotect needed here */
write_lock(&options_lock);
/* Apart from when we start of, we might end up here due to post processing.
* When here due to post processing, dynamo_options would not be writable.
* So we make them writable first.
*/
options_make_writable();
ASSERT(sizeof(dynamo_options) == sizeof(options_t));
/* Set to default options. */
set_dynamo_options_defaults(&dynamo_options);
#if defined(INTERNAL) && defined(DEADLOCK_AVOIDANCE)
/* avoid issues w/ GLOBAL_DCONTEXT instead of thread dcontext */
dynamo_options.deadlock_avoidance = false;
#endif
/* get dynamo options */
adjust_defaults_for_page_size(&dynamo_options);
retval = get_parameter(PARAM_STR(DYNAMORIO_VAR_OPTIONS), option_string,
sizeof(option_string));
if (IS_GET_PARAMETER_SUCCESS(retval))
Expand Down