Bug #22540394: ASSERT FAILURE IN KEYRING_FILE.SO (MEMORY_SIZE %

SIZEOF(SIZE_T) == 0)

(cherry picked from commit 5acbbaab4bf97841590a5d862b0bc6ebb9399387)

Author: Robert Golebiowski

plugin/keyring/buffered_file_io.cc

@@ -106,6 +106,8 @@ my_bool Buffered_file_io::load_keyring_into_input_buffer(File file)
   if (check_file_structure(file, file_size))
     return TRUE;
   size_t input_buffer_size= file_size - EOF_TAG_SIZE - file_version.length(); //result has to be positive
+  if (input_buffer_size % sizeof(size_t) != 0)
+    return TRUE; //buffer size in the keyring file must be multiplication of size_t
   mysql_file_seek(file, file_version.length(), MY_SEEK_SET, MYF(0)); //skip file version
   if (likely(input_buffer_size > 0))
   {

plugin/keyring/keyring_impl.cc

@@ -97,21 +97,28 @@ int check_keyring_file_data(IKeyring_io* keyring_io, unique_ptr<IKeys_container>
 
   (*(const char **) save)= NULL;
   keyring_filename= value->val_str(value, buff, &len);
+  mysql_rwlock_wrlock(&LOCK_keyring);
   if (create_keyring_dir_if_does_not_exist(keyring_filename))
   {
+    mysql_rwlock_unlock(&LOCK_keyring);
     logger->log(MY_ERROR_LEVEL, "keyring_file_data cannot be set to new value"
       " as the keyring file cannot be created/accessed in the provided path");
     return 1;
   }
   try
   {
     if (new_keys->init(keyring_io, keyring_filename))
+    {
+      mysql_rwlock_unlock(&LOCK_keyring);
       return 1;
+    }
     *reinterpret_cast<IKeys_container **>(save)= new_keys.get();
     new_keys.release();
+    mysql_rwlock_unlock(&LOCK_keyring);
   }
   catch (...)
   {
+    mysql_rwlock_unlock(&LOCK_keyring);
     return 1;
   }
   return(0);