1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-19582 Out-of-bounds memory accesses by WolfSSL

Browse Source 
Fix errors caught by clang-7 in the encrypted variants of the tests
innodb.innodb-table-online innodb.innodb-index-online
This commit is contained in:
Marko Mäkelä 2019-05-27 10:16:23 +03:00
parent f465ec8c45
commit e32212c63c
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/CMakeLists.txt
View File

@ -161,6 +161,8 @@ IF(NOT TARGET innobase)
RETURN() RETURN()
ENDIF() ENDIF()
ADD_DEFINITIONS(${SSL_DEFINES})
# A GCC bug causes crash when compiling these files on ARM64 with -O1+ # A GCC bug causes crash when compiling these files on ARM64 with -O1+
# Compile them with -O0 as a workaround. # Compile them with -O0 as a workaround.
IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64"

12
storage/innobase/row/row0log.cc
View File

@ -301,7 +301,8 @@ row_log_block_allocate(
); );
log_buf.block = ut_allocator<byte>(mem_key_row_log_buf) log_buf.block = ut_allocator<byte>(mem_key_row_log_buf)
.allocate_large(srv_sort_buf_size, &log_buf.block_pfx); .allocate_large(srv_sort_buf_size + WOLFSSL_PAD_SIZE,
&log_buf.block_pfx);
if (log_buf.block == NULL) { if (log_buf.block == NULL) {
DBUG_RETURN(false); DBUG_RETURN(false);
@ -321,7 +322,8 @@ row_log_block_free(
DBUG_ENTER("row_log_block_free"); DBUG_ENTER("row_log_block_free");
if (log_buf.block != NULL) { if (log_buf.block != NULL) {
ut_allocator<byte>(mem_key_row_log_buf).deallocate_large( ut_allocator<byte>(mem_key_row_log_buf).deallocate_large(
log_buf.block, &log_buf.block_pfx, log_buf.size); log_buf.block, &log_buf.block_pfx,
log_buf.size + WOLFSSL_PAD_SIZE);
log_buf.block = NULL; log_buf.block = NULL;
} }
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
@ -3273,11 +3275,13 @@ row_log_free(
row_merge_file_destroy_low(log->fd); row_merge_file_destroy_low(log->fd);
if (log->crypt_head) { if (log->crypt_head) {
os_mem_free_large(log->crypt_head, srv_sort_buf_size + WOLFSSL_PAD_SIZE); os_mem_free_large(log->crypt_head, srv_sort_buf_size
+ WOLFSSL_PAD_SIZE);
} }
if (log->crypt_tail) { if (log->crypt_tail) {
os_mem_free_large(log->crypt_tail, srv_sort_buf_size + WOLFSSL_PAD_SIZE); os_mem_free_large(log->crypt_tail, srv_sort_buf_size
+ WOLFSSL_PAD_SIZE);
} }
mutex_free(&log->mutex); mutex_free(&log->mutex);

13
storage/innobase/row/row0merge.cc
View File

@ -61,6 +61,14 @@ float my_log2f(float n)
# define posix_fadvise(fd, offset, len, advice) /* nothing */ # define posix_fadvise(fd, offset, len, advice) /* nothing */
#endif /* _WIN32 */ #endif /* _WIN32 */
#ifdef HAVE_WOLFSSL
// Workaround for MDEV-19582
// (WolfSSL accesses memory out of bounds)
# define WOLFSSL_PAD_SIZE MY_AES_BLOCK_SIZE
#else
# define WOLFSSL_PAD_SIZE 0
#endif
/* Whether to disable file system cache */ /* Whether to disable file system cache */
char srv_disable_sort_file_cache; char srv_disable_sort_file_cache;
@ -4628,7 +4636,7 @@ row_merge_build_indexes(
if (log_tmp_is_encrypted()) { if (log_tmp_is_encrypted()) {
crypt_block = static_cast<row_merge_block_t*>( crypt_block = static_cast<row_merge_block_t*>(
alloc.allocate_large(block_size, alloc.allocate_large(block_size + WOLFSSL_PAD_SIZE,
&crypt_pfx)); &crypt_pfx));
if (crypt_block == NULL) { if (crypt_block == NULL) {
@ -4998,7 +5006,8 @@ func_exit:
alloc.deallocate_large(block, &block_pfx, block_size); alloc.deallocate_large(block, &block_pfx, block_size);
if (crypt_block) { if (crypt_block) {
alloc.deallocate_large(crypt_block, &crypt_pfx, block_size); alloc.deallocate_large(crypt_block, &crypt_pfx,
block_size + WOLFSSL_PAD_SIZE);
} }
DICT_TF2_FLAG_UNSET(new_table, DICT_TF2_FTS_ADD_DOC_ID); DICT_TF2_FLAG_UNSET(new_table, DICT_TF2_FTS_ADD_DOC_ID);