Skip to content

M
MariaDB
Commit a1232645 authored by Jan Lindström's avatar Jan Lindström
Browse files
Options

Add check to avoid NULL-pointer access if encryption information 

is not available. Clarify system tablespace page 0 check.
parent f341d944
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
storage/innobase/fil/fil0crypt.cc
View file @ a1232645
...@@ -662,7 +662,7 @@ fil_space_encrypt( ...@@ -662,7 +662,7 @@ fil_space_encrypt(
return src_frame; return src_frame;
} }
ut_ad(crypt_data->encryption != FIL_SPACE_ENCRYPTION_OFF); ut_a(crypt_data != NULL && crypt_data->encryption != FIL_SPACE_ENCRYPTION_OFF);
byte* tmp = fil_encrypt_buf(crypt_data, space, offset, lsn, src_frame, zip_size, dst_frame); byte* tmp = fil_encrypt_buf(crypt_data, space, offset, lsn, src_frame, zip_size, dst_frame);
...@@ -722,7 +722,7 @@ fil_space_decrypt( ...@@ -722,7 +722,7 @@ fil_space_decrypt(
} }
if (crypt_data == NULL) { if (crypt_data == NULL) {
if (space != 0 && offset != 0 && key_version != 0) { if (!(space == 0 && offset == 0) && key_version != 0) {
/* FIL_PAGE_FILE_FLUSH_LSN field i.e. /* FIL_PAGE_FILE_FLUSH_LSN field i.e.
FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION
should be only defined for the should be only defined for the
...@@ -740,7 +740,7 @@ fil_space_decrypt( ...@@ -740,7 +740,7 @@ fil_space_decrypt(
return false; return false;
} }
ut_ad(crypt_data != NULL && crypt_data->encryption != FIL_SPACE_ENCRYPTION_OFF); ut_a(crypt_data != NULL && crypt_data->encryption != FIL_SPACE_ENCRYPTION_OFF);
/* read space & lsn */ /* read space & lsn */
ulint header_len = FIL_PAGE_DATA; ulint header_len = FIL_PAGE_DATA;
......
storage/xtradb/fil/fil0crypt.cc
View file @ a1232645
...@@ -662,7 +662,7 @@ fil_space_encrypt( ...@@ -662,7 +662,7 @@ fil_space_encrypt(
return src_frame; return src_frame;
} }
ut_ad(crypt_data->encryption != FIL_SPACE_ENCRYPTION_OFF); ut_a(crypt_data != NULL && crypt_data->encryption != FIL_SPACE_ENCRYPTION_OFF);
byte* tmp = fil_encrypt_buf(crypt_data, space, offset, lsn, src_frame, zip_size, dst_frame); byte* tmp = fil_encrypt_buf(crypt_data, space, offset, lsn, src_frame, zip_size, dst_frame);
...@@ -722,7 +722,7 @@ fil_space_decrypt( ...@@ -722,7 +722,7 @@ fil_space_decrypt(
} }
if (crypt_data == NULL) { if (crypt_data == NULL) {
if (space != 0 && offset != 0 && key_version != 0) { if (!(space == 0 && offset == 0) && key_version != 0) {
/* FIL_PAGE_FILE_FLUSH_LSN field i.e. /* FIL_PAGE_FILE_FLUSH_LSN field i.e.
FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION
should be only defined for the should be only defined for the
...@@ -740,7 +740,7 @@ fil_space_decrypt( ...@@ -740,7 +740,7 @@ fil_space_decrypt(
return false; return false;
} }
ut_ad(crypt_data != NULL && crypt_data->encryption != FIL_SPACE_ENCRYPTION_OFF); ut_a(crypt_data != NULL && crypt_data->encryption != FIL_SPACE_ENCRYPTION_OFF);
/* read space & lsn */ /* read space & lsn */
ulint header_len = FIL_PAGE_DATA; ulint header_len = FIL_PAGE_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