Skip to content
Permalink
Browse files

MDEV-13060 Server Audit Plugin Crashes with AWS KMS plugin

don't do auditing if thd is NULL.

Collaterals:
* copy-paste bugs server_audit.c
* uninitialized user field when thd in NULL
  • Loading branch information...
vuvova committed Jun 26, 2017
1 parent 47687ee commit 2bf017c210d00e3cea281aee9f241a01a3f85b7f
Showing with 5 additions and 3 deletions.
  1. +3 −3 plugin/server_audit/server_audit.c
  2. +2 −0 sql/sql_audit.h
@@ -1145,7 +1145,7 @@ static void setup_connection_initdb(struct connection_info *cn,
}
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);
get_str_n(cn->host, &cn->host_length, sizeof(cn->host),
uh_buffer+user_len+1, host_len);
@@ -1196,7 +1196,7 @@ static void setup_connection_query(struct connection_info *cn,
}
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);
get_str_n(cn->host, &cn->host_length, sizeof(cn->host),
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 */
/* &lock_operations locked when the server logs an error reported */
/* by this plugin. */
if (internal_stop_logging)
if (!thd || internal_stop_logging)
return;

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

0 comments on commit 2bf017c

Please sign in to comment.
You can’t perform that action at this time.