database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-13060 Server Audit Plugin Crashes with AWS KMS plugin

Browse Source 
don't do auditing if thd is NULL.

Collaterals:
* copy-paste bugs server_audit.c
* uninitialized user field when thd in NULL
This commit is contained in:
Sergei Golubchik
2017-06-26 20:06:12 +02:00
parent 47687eef41
commit 2bf017c210
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/server_audit/server_audit.c
View File

@ -1145,7 +1145,7 @@ static void setup_connection_initdb(struct connection_info *cn,
} }
else else
{ {
get_str_n(cn->user, &cn->user_length, sizeof(cn->db), get_str_n(cn->user, &cn->user_length, sizeof(cn->user),
uh_buffer, user_len); uh_buffer, user_len);
get_str_n(cn->host, &cn->host_length, sizeof(cn->host), get_str_n(cn->host, &cn->host_length, sizeof(cn->host),
uh_buffer+user_len+1, host_len); uh_buffer+user_len+1, host_len);
@ -1196,7 +1196,7 @@ static void setup_connection_query(struct connection_info *cn,
} }
else else
{ {
get_str_n(cn->user, &cn->user_length, sizeof(cn->db), get_str_n(cn->user, &cn->user_length, sizeof(cn->user),
uh_buffer, user_len); uh_buffer, user_len);
get_str_n(cn->host, &cn->host_length, sizeof(cn->host), get_str_n(cn->host, &cn->host_length, sizeof(cn->host),
uh_buffer+user_len+1, host_len); uh_buffer+user_len+1, host_len);
@ -1956,7 +1956,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
/* That one is important as this function can be called with */ /* That one is important as this function can be called with */
/* &lock_operations locked when the server logs an error reported */ /* &lock_operations locked when the server logs an error reported */
/* by this plugin. */ /* by this plugin. */
if (internal_stop_logging) if (!thd || internal_stop_logging)
return; return;
flogger_mutex_lock(&lock_operations); flogger_mutex_lock(&lock_operations);

2
sql/sql_audit.h
View File

@ -170,6 +170,8 @@ void mysql_audit_general(THD *thd, uint event_subtype,
} }
else else
{ {
event.general_user= NULL;
event.general_user_length= 0;
event.general_thread_id= 0; event.general_thread_id= 0;
event.general_query= NULL; event.general_query= NULL;
event.general_query_length= 0; event.general_query_length= 0;