Skip to content

M
mariadb
Commit b3438f24 authored by Jan Lindström's avatar Jan Lindström
Browse files
Options

MDEV-7803: Encryption metadata (crypt_data) is written to InnoDB file space... 

MDEV-7803: Encryption metadata (crypt_data) is written to InnoDB file space page 0 even when encryption is not enabled
parent bab0bdbb
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 14 deletions
storage/innobase/fil/fil0crypt.cc
View file @ b3438f24
/*****************************************************************************
Copyright (C) 2013, 2015, Google Inc. All Rights Reserved.
Copyright (C) 2014, 2015, MariaDB Corporation. All Rights Reserved.
......@@ -546,7 +545,12 @@ fil_space_write_crypt_data(ulint space, byte* page, ulint offset,
ulint maxsize, mtr_t* mtr)
{
fil_space_crypt_t* crypt_data = fil_space_get_crypt_data(space);
if (crypt_data == NULL) {
ibool page_encrypted = fil_space_is_page_encrypted(space);
/* If no crypt data is stored on memory cache for this space
or space is not encrypted and encryption is not enabled, then
do not continue writing crypt data to page 0. */
if (crypt_data == NULL || (!page_encrypted && !srv_encrypt_tables)) {
return;
}
......@@ -1136,11 +1140,22 @@ fil_crypt_start_encrypting_space(ulint space, bool *recheck) {
bool pending_op = true;
mutex_enter(&fil_crypt_threads_mutex);
fil_space_crypt_t *crypt_data = fil_space_get_crypt_data(space);
ibool page_encrypted = fil_space_is_page_encrypted(space);
/*If spage is not encrypted and encryption is not enabled, then
do not continue encrypting the space. */
if (!page_encrypted && !srv_encrypt_tables) {
mutex_exit(&fil_crypt_threads_mutex);
return pending_op;
}
if (crypt_data != NULL || fil_crypt_start_converting) {
/* someone beat us to it */
if (fil_crypt_start_converting)
if (fil_crypt_start_converting) {
*recheck = true;
}
mutex_exit(&fil_crypt_threads_mutex);
return pending_op;
......@@ -1281,8 +1296,9 @@ static bool
fil_crypt_space_needs_rotation(uint space, const key_state_t *key_state,
bool *recheck)
{
if (fil_space_get_type(space) != FIL_TABLESPACE)
if (fil_space_get_type(space) != FIL_TABLESPACE) {
return false;
}
if (fil_inc_pending_ops(space, true)) {
/* tablespace being dropped */
......@@ -1293,13 +1309,16 @@ fil_crypt_space_needs_rotation(uint space, const key_state_t *key_state,
bool pending_op = true;
fil_space_crypt_t *crypt_data = fil_space_get_crypt_data(space);
if (crypt_data == NULL) {
/**
* space has no crypt data
* start encrypting it...
*/
pending_op = fil_crypt_start_encrypting_space(space, recheck);
crypt_data = fil_space_get_crypt_data(space);
if (crypt_data == NULL) {
if (pending_op) {
fil_decr_pending_ops(space);
......@@ -1309,6 +1328,7 @@ fil_crypt_space_needs_rotation(uint space, const key_state_t *key_state,
}
mutex_enter(&crypt_data->mutex);
do {
/* prevent threads from starting to rotate space */
if (crypt_data->rotate_state.starting) {
......@@ -1817,8 +1837,9 @@ fil_crypt_rotate_page(
ulint sleeptime_ms = 0;
/* check if tablespace is closing before reading page */
if (fil_crypt_is_closing(space))
if (fil_crypt_is_closing(space)) {
return;
}
if (space == TRX_SYS_SPACE && offset == TRX_SYS_PAGE_NO) {
/* don't encrypt this as it contains address to dblwr buffer */
......
storage/innobase/fil/fil0fil.cc
View file @ b3438f24
/*****************************************************************************
Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2013, 2014, MariaDB Corporation. All Rights Reserved.
Copyright (c) 2013, 2015, MariaDB Corporation. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
......@@ -3519,6 +3519,7 @@ fil_create_new_single_table_tablespace(
success = fil_space_create(tablename, space_id, flags, FIL_TABLESPACE,
fil_space_create_crypt_data());
if (!success || !fil_node_create(path, size, space_id, FALSE)) {
err = DB_ERROR;
goto error_exit_1;
......@@ -6935,6 +6936,7 @@ fil_space_get_crypt_data(
mutex_enter(&fil_system->mutex);
space = fil_space_get_by_id(id);
if (space != NULL) {
crypt_data = space->crypt_data;
}
......@@ -6961,8 +6963,8 @@ fil_space_set_crypt_data(
mutex_enter(&fil_system->mutex);
space = fil_space_get_by_id(id);
if (space != NULL) {
if (space != NULL) {
if (space->crypt_data != NULL) {
ut_a(!fil_space_crypt_compare(crypt_data,
space->crypt_data));
......
storage/xtradb/fil/fil0crypt.cc
View file @ b3438f24
/*****************************************************************************
Copyright (C) 2013, 2015, Google Inc. All Rights Reserved.
Copyright (C) 2014, 2015, MariaDB Corporation. All Rights Reserved.
......@@ -546,7 +545,12 @@ fil_space_write_crypt_data(ulint space, byte* page, ulint offset,
ulint maxsize, mtr_t* mtr)
{
fil_space_crypt_t* crypt_data = fil_space_get_crypt_data(space);
if (crypt_data == NULL) {
ibool page_encrypted = fil_space_is_page_encrypted(space);
/* If no crypt data is stored on memory cache for this space
or space is not encrypted and encryption is not enabled, then
do not continue writing crypt data to page 0. */
if (crypt_data == NULL || (!page_encrypted && !srv_encrypt_tables)) {
return;
}
......@@ -1136,11 +1140,22 @@ fil_crypt_start_encrypting_space(ulint space, bool *recheck) {
bool pending_op = true;
mutex_enter(&fil_crypt_threads_mutex);
fil_space_crypt_t *crypt_data = fil_space_get_crypt_data(space);
ibool page_encrypted = fil_space_is_page_encrypted(space);
/*If spage is not encrypted and encryption is not enabled, then
do not continue encrypting the space. */
if (!page_encrypted && !srv_encrypt_tables) {
mutex_exit(&fil_crypt_threads_mutex);
return pending_op;
}
if (crypt_data != NULL || fil_crypt_start_converting) {
/* someone beat us to it */
if (fil_crypt_start_converting)
if (fil_crypt_start_converting) {
*recheck = true;
}
mutex_exit(&fil_crypt_threads_mutex);
return pending_op;
......@@ -1281,8 +1296,9 @@ static bool
fil_crypt_space_needs_rotation(uint space, const key_state_t *key_state,
bool *recheck)
{
if (fil_space_get_type(space) != FIL_TABLESPACE)
if (fil_space_get_type(space) != FIL_TABLESPACE) {
return false;
}
if (fil_inc_pending_ops(space, true)) {
/* tablespace being dropped */
......@@ -1293,13 +1309,16 @@ fil_crypt_space_needs_rotation(uint space, const key_state_t *key_state,
bool pending_op = true;
fil_space_crypt_t *crypt_data = fil_space_get_crypt_data(space);
if (crypt_data == NULL) {
/**
* space has no crypt data
* start encrypting it...
*/
pending_op = fil_crypt_start_encrypting_space(space, recheck);
crypt_data = fil_space_get_crypt_data(space);
if (crypt_data == NULL) {
if (pending_op) {
fil_decr_pending_ops(space);
......@@ -1309,6 +1328,7 @@ fil_crypt_space_needs_rotation(uint space, const key_state_t *key_state,
}
mutex_enter(&crypt_data->mutex);
do {
/* prevent threads from starting to rotate space */
if (crypt_data->rotate_state.starting) {
......@@ -1817,8 +1837,9 @@ fil_crypt_rotate_page(
ulint sleeptime_ms = 0;
/* check if tablespace is closing before reading page */
if (fil_crypt_is_closing(space))
if (fil_crypt_is_closing(space)) {
return;
}
if (space == TRX_SYS_SPACE && offset == TRX_SYS_PAGE_NO) {
/* don't encrypt this as it contains address to dblwr buffer */
......
storage/xtradb/fil/fil0fil.cc
View file @ b3438f24
/*****************************************************************************
Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2013, 2014, MariaDB Corporation. All Rights Reserved.
Copyright (c) 2013, 2015, MariaDB Corporation. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
......@@ -3552,6 +3552,7 @@ fil_create_new_single_table_tablespace(
success = fil_space_create(tablename, space_id, flags, FIL_TABLESPACE,
fil_space_create_crypt_data());
if (!success || !fil_node_create(path, size, space_id, FALSE)) {
err = DB_ERROR;
goto error_exit_1;
......@@ -7071,6 +7072,7 @@ fil_space_get_crypt_data(
mutex_enter(&fil_system->mutex);
space = fil_space_get_by_id(id);
if (space != NULL) {
crypt_data = space->crypt_data;
}
......@@ -7097,8 +7099,8 @@ fil_space_set_crypt_data(
mutex_enter(&fil_system->mutex);
space = fil_space_get_by_id(id);
if (space != NULL) {
if (space != NULL) {
if (space->crypt_data != NULL) {
ut_a(!fil_space_crypt_compare(crypt_data,
space->crypt_data));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7