Bug#23149683: ROTATE INNODB MASTER KEY WITH KEYRING_OKV_CONF_DIR MISSING: SIGSEGV; SIGNAL 11

--This is actual fix for Bug#23149683. The previous commit (dacd4edac18da1b7c114a3ce9ccfda8d49bed558 5.7 tree)
which message indicates it is fix for Bug#23149683 is actually a fix for this bug:
Bug#23227113: SERVER CRASH ON KEYRING_KEY_GENERATE

(cherry picked from commit 608b265d4fc51adc5b8307df969841d48b2a2cc5)

Author: Robert Golebiowski

plugin/keyring/keys_container.cc

@@ -77,8 +77,8 @@ my_bool Keys_container::store_key_in_hash(IKey *key)
 
 my_bool Keys_container::store_key(IKeyring_io* keyring_io, IKey* key)
 {
-  keyring_io->open(&keyring_storage_url);
-  if (flush_to_backup(keyring_io) || store_key_in_hash(key))
+  if (keyring_io->open(&keyring_storage_url) || flush_to_backup(keyring_io) ||
+      store_key_in_hash(key))
     return TRUE;//keyring_io destructor will take care of removing the backup(if exists)
   if (flush_to_keyring(keyring_io, key, STORE_KEY) || keyring_io->close())
   {
@@ -127,9 +127,8 @@ my_bool Keys_container::remove_key_from_hash(IKey *key)
 
 my_bool Keys_container::remove_key(IKeyring_io *keyring_io, IKey *key)
 {
-  keyring_io->open(&keyring_storage_url);
   IKey* fetched_key_to_delete= get_key_from_hash(key);
-  if(fetched_key_to_delete == NULL)
+  if(fetched_key_to_delete == NULL || keyring_io->open(&keyring_storage_url))
     return TRUE;
   if (flush_to_backup(keyring_io) || remove_key_from_hash(fetched_key_to_delete))
     return TRUE;//keyring_io destructor will take care of removing the backup(if exists)

storage/innobase/os/os0file.cc

@@ -8683,14 +8683,14 @@ Encryption::create_master_key(byte** master_key)
 			   reinterpret_cast<void**>(master_key),
 			   &key_len);
 
-	if (ret) {
+	if (ret || *master_key == NULL) {
 		ib::error() << "Encryption can't find master key, please check"
 				" the keyring plugin is loaded.";
 		*master_key = NULL;
+	} else {
+		master_key_id++;
 	}
 
-	master_key_id++;
-
 	if (key_type) {
 		my_free(key_type);
 	}

unittest/gunit/keyring/keys_container-t.cc

@@ -894,6 +894,23 @@ namespace keyring__keys_container_unittest
     delete sample_key;
   }
 
+  TEST_F(Keys_container_with_mocked_io_test, ErrorFromIOFlushWhileOpenningIOForKeyStore)
+  {
+    keyring_io= new Mock_keyring_io();
+    ILogger *logger= new Mock_logger();
+    keys_container= new Keys_container(logger);
+    expect_calls_on_init();
+    EXPECT_EQ(keys_container->init(keyring_io, file_name), 0);
+
+    EXPECT_CALL(*keyring_io, open(Pointee(StrEq(file_name)))).WillOnce(Return(1));
+
+    EXPECT_EQ(keys_container->store_key(keyring_io, sample_key), 1);
+    ASSERT_TRUE(keys_container->get_number_of_keys() == 0);
+    delete logger;
+    delete keyring_io;
+    delete sample_key;
+  }
+
   int main(int argc, char **argv) {
     if (mysql_rwlock_init(key_LOCK_keyring, &LOCK_keyring))
       return TRUE;