github
/
mysql-audit
mirror of https://github.com/mcafee-enterprise/mysql-audit
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15 from mitans02/master 

Fixed some compile errors
pull/18/merge
Guy Lichtman 2012-10-28 02:50:58 -07:00
parent 6542b9c5c2 3ad7e5e2a2
commit 9c01f96cf5
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/audit_handler.h
View File

@ -158,8 +158,8 @@ public:
return NULL; return NULL;
#else #else
*len = thd->query_length; *len = thd->query_length();
return thd->query; return thd->query();
#endif #endif
} }

2
src/audit_handler.cc
View File

@ -200,7 +200,7 @@ void Audit_file_handler::handler_start()
{ {
sql_print_error( sql_print_error(
"%s unable to write to %s: %s. Disabling audit handler.", "%s unable to write to %s: %s. Disabling audit handler.",
AUDIT_LOG_PREFIX, m_log_file, strerror(errno)); AUDIT_LOG_PREFIX, m_filename, strerror(errno));
close_file(); close_file();
m_enabled = false; m_enabled = false;
} }

12
src/audit_plugin.cc
View File

@ -1371,7 +1371,7 @@ static void setup_record_objs_array()
{ {
record_empty_objs_set = true; record_empty_objs_set = true;
} }
sql_print_information("%s Set num_record_objs: %d record objs: %s", log_prefix, num_record_objs, record_objs_array); sql_print_information("%s Set num_record_objs: %d record objs: %s", log_prefix, num_record_objs, *record_objs_array);
} }
__attribute__ ((noinline)) static void trampoline_dummy_func_for_mem() __attribute__ ((noinline)) static void trampoline_dummy_func_for_mem()
@ -1400,12 +1400,12 @@ static int do_hot_patch(void ** trampoline_func_pp, unsigned int * trampoline_si
{ {
//hot patch failed. //hot patch failed.
sql_print_error("%s unable to hot patch %s (0x%lx). res: %d. Aborting.", sql_print_error("%s unable to hot patch %s (0x%lx). res: %d. Aborting.",
log_prefix, func_name, res); log_prefix, func_name, (unsigned long)target_function, res);
return 1; return 1;
} }
sql_print_information( sql_print_information(
"%s hot patch for: %s (0x%lx) complete. Audit func: 0x%lx, Trampoline address: 0x%lx size: %u.", "%s hot patch for: %s (0x%lx) complete. Audit func: 0x%lx, Trampoline address: 0x%lx size: %u.",
log_prefix, func_name, target_function, audit_function, *trampoline_func_pp, *trampoline_size); log_prefix, func_name, (unsigned long)target_function, (unsigned long)audit_function, (unsigned long)*trampoline_func_pp, *trampoline_size);
trampoline_mem_free = (void *)(((DATATYPE_ADDRESS)*trampoline_func_pp) + *trampoline_size + jump_size()); trampoline_mem_free = (void *)(((DATATYPE_ADDRESS)*trampoline_func_pp) + *trampoline_size + jump_size());
return 0; return 0;
} }
@ -1488,21 +1488,21 @@ static int do_hot_patch(void ** trampoline_func_pp, unsigned int * trampoline_si
trampoline_mem = (void*)(addrs & ~(page_size - 1)); trampoline_mem = (void*)(addrs & ~(page_size - 1));
sql_print_information( sql_print_information(
"%s mem func addr: 0x%lx mem start addr: 0x%lx page size: %ld", "%s mem func addr: 0x%lx mem start addr: 0x%lx page size: %ld",
log_prefix, trampoline_dummy_func_for_mem, trampoline_mem, page_size); log_prefix, (unsigned long)trampoline_dummy_func_for_mem, (unsigned long)trampoline_mem, page_size);
} }
else //big pages for some reason. allocate mem using mmap else //big pages for some reason. allocate mem using mmap
{ {
trampoline_mem = mmap(NULL, page_size, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); trampoline_mem = mmap(NULL, page_size, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
if(MAP_FAILED == trampoline_mem) if(MAP_FAILED == trampoline_mem)
{ {
sql_print_error("%s unable to mmap memory size: %d, errno: %d. Aborting.", sql_print_error("%s unable to mmap memory size: %lu, errno: %d. Aborting.",
log_prefix, page_size, errno); log_prefix, page_size, errno);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
else else
{ {
sql_print_information( sql_print_information(
"%s mem via mmap: 0x%lx page size: %ld", log_prefix, trampoline_mem, page_size); "%s mem via mmap: 0x%lx page size: %ld", log_prefix, (unsigned long)trampoline_mem, page_size);
} }
} }
trampoline_mem_free = trampoline_mem; trampoline_mem_free = trampoline_mem;

8
src/hot_patch.cc
View File

@ -30,7 +30,7 @@ static int unprotect(void *addr, size_t len)
{ {
sql_print_information( sql_print_information(
"%s unable to unprotect. Page: 0x%lx, Size: %d, errno: %d. Using NO EXEC mode.", "%s unable to unprotect. Page: 0x%lx, Size: %d, errno: %d. Using NO EXEC mode.",
log_prefix, addr, len, errno); log_prefix, (unsigned long)addr, len, errno);
use_exec_prot = false; use_exec_prot = false;
} }
else //all is good else //all is good
@ -43,7 +43,7 @@ static int unprotect(void *addr, size_t len)
{ {
sql_print_error( sql_print_error(
"%s unable to unprotect. Page: 0x%lx, Size: %d, errno: %d. Error.", "%s unable to unprotect. Page: 0x%lx, Size: %d, errno: %d. Error.",
log_prefix, addr, len, errno); log_prefix, (unsigned long)addr, len, errno);
} }
return res; return res;
} }
@ -201,7 +201,7 @@ static void UnhookFunction(ULONG_PTR Function,ULONG_PTR trampolineFunction , uns
int hot_patch_function (void* targetFunction, void* newFunction, void * trampolineFunction, unsigned int *trampolinesize, bool info_print) int hot_patch_function (void* targetFunction, void* newFunction, void * trampolineFunction, unsigned int *trampolinesize, bool info_print)
{ {
DATATYPE_ADDRESS trampolinePage = get_page_address(trampolineFunction); DATATYPE_ADDRESS trampolinePage = get_page_address(trampolineFunction);
cond_info_print(info_print, "%s hot patching function: 0x%lx, trampolineFunction: 0x%lx trampolinePage: 0x%lx",log_prefix, targetFunction, trampolineFunction, trampolinePage); cond_info_print(info_print, "%s hot patching function: 0x%lx, trampolineFunction: 0x%lx trampolinePage: 0x%lx",log_prefix, (unsigned long)targetFunction, (unsigned long)trampolineFunction, (unsigned long)trampolinePage);
if (HookFunction((ULONG_PTR) targetFunction, (ULONG_PTR) newFunction, if (HookFunction((ULONG_PTR) targetFunction, (ULONG_PTR) newFunction,
(ULONG_PTR) trampolineFunction, trampolinesize)) (ULONG_PTR) trampolineFunction, trampolinesize))
{ {
@ -230,7 +230,7 @@ void remove_hot_patch_function (void* targetFunction, void * trampolineFunction,
return; return;
} }
DATATYPE_ADDRESS targetPage = get_page_address(targetFunction); DATATYPE_ADDRESS targetPage = get_page_address(targetFunction);
cond_info_print(info_print, "%s removing hot patching function: 0x%lx targetPage: 0x%lx trampolineFunction: 0x%lx",log_prefix, targetFunction, targetPage, trampolineFunction); cond_info_print(info_print, "%s removing hot patching function: 0x%lx targetPage: 0x%lx trampolineFunction: 0x%lx",log_prefix, (unsigned long)targetFunction, (unsigned long)targetPage, (unsigned long)trampolineFunction);
UnhookFunction ((ULONG_PTR) targetFunction, (ULONG_PTR)trampolineFunction,trampolinesize); UnhookFunction ((ULONG_PTR) targetFunction, (ULONG_PTR)trampolineFunction,trampolinesize);
return; return;
} }