Bug#22522079: CRASH WHEN SETTING KEYRING_FILE_DATA=NULL

Issue : A NULL string for keyring_file_data was not handled properly Solution : Added required check.

Author: harinvadodaria

mysql-test/suite/auth_sec/r/key_rotation_qa.result

@@ -2,6 +2,7 @@ call mtr.add_suppression("\\[Error\\] InnoDB: Encryption can't find master key,
 call mtr.add_suppression("\\[Error\\] Plugin keyring_file reported: 'keyring_file initialization failure.");
 call mtr.add_suppression("\\[Error\\] Function 'keyring_file' already exists");
 call mtr.add_suppression("\\[Error\\] Couldn't load plugin named 'keyring_file' with soname 'keyring_file.so'.");
+call mtr.add_suppression("\\[ERROR\\] Couldn't load plugin named 'keyring_file' with soname 'keyring_file.dll'.");
 call mtr.add_suppression("\\[Error\\] InnoDB: Can't generate new master key, please check the keyring plugin is loaded.");
 call mtr.add_suppression("\\[Error\\] InnoDB: Encryption information in datafile");
 call mtr.add_suppression("\\[Error\\] InnoDB: Operating system error number 2 in a file operation.");

mysql-test/suite/auth_sec/r/keyring_file_data.result

@@ -9,6 +9,8 @@ SELECT @@global.keyring_file_data;
 MYSQL_TMP_DIR/new_keyring_file_data
 SET @@global.keyring_file_data= '../../../../../bad_dir/bad_keyring_file_data/';
 ERROR 42000: Variable 'keyring_file_data' can't be set to the value of '../../../../../bad_dir/bad_keyring_file_data/'
+SET @@global.keyring_file_data=NULL;
+ERROR 42000: Variable 'keyring_file_data' can't be set to the value of 'NULL'
 SELECT @@global.keyring_file_data;
 @@global.keyring_file_data
 MYSQL_TMP_DIR/new_keyring_file_data

mysql-test/suite/auth_sec/t/key_rotation_qa.test

@@ -10,6 +10,7 @@ call mtr.add_suppression("\\[Error\\] InnoDB: Encryption can't find master key,
 call mtr.add_suppression("\\[Error\\] Plugin keyring_file reported: 'keyring_file initialization failure.");
 call mtr.add_suppression("\\[Error\\] Function 'keyring_file' already exists");
 call mtr.add_suppression("\\[Error\\] Couldn't load plugin named 'keyring_file' with soname 'keyring_file.so'.");
+call mtr.add_suppression("\\[ERROR\\] Couldn't load plugin named 'keyring_file' with soname 'keyring_file.dll'.");
 call mtr.add_suppression("\\[Error\\] InnoDB: Can't generate new master key, please check the keyring plugin is loaded.");
 call mtr.add_suppression("\\[Error\\] InnoDB: Encryption information in datafile");
 call mtr.add_suppression("\\[Error\\] InnoDB: Operating system error number 2 in a file operation.");

mysql-test/suite/auth_sec/t/keyring_file_data.test

@@ -13,6 +13,8 @@ eval SET @@global.keyring_file_data= '$MYSQL_TMP_DIR/new_keyring_file_data';
 SELECT @@global.keyring_file_data;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.keyring_file_data= '../../../../../bad_dir/bad_keyring_file_data/';
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.keyring_file_data=NULL;
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 SELECT @@global.keyring_file_data;
 

plugin/keyring/keyring_impl.cc

@@ -62,7 +62,7 @@ my_bool init_keyring_locks()
 
 my_bool create_keyring_dir_if_does_not_exist(const char *keyring_file_path)
 {
- if (strlen(keyring_file_path) == 0)
+ if (!keyring_file_path || strlen(keyring_file_path) == 0)
  return TRUE;
  char keyring_dir[FN_REFLEN];
  size_t keyring_dir_length;