mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-38246 aria_read index failed on encrypted database during backup

Browse source 
Skip an all-zero pages in the index file.
They can happen normally if the ma_checkpoint_background
thread flushes some later page first (e.g. page 50 before page 48).

Also:
* don't do alloca() in a loop
* correct the check in ma_crypt_index_post_read_hook(),
  the page can be completely full
* compilation failure in ma_open.c:1289:
  comparison is always false due to limited range of data type
This commit is contained in:
Sergei Golubchik 2026-01-30 16:17:55 +01:00
commit a2b62fe572
3 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

48
storage/maria/ma_backup.c
View file

@ -190,11 +190,10 @@ uchar *_ma_base_info_read(uchar *ptr, MARIA_BASE_INFO *base)
/**
@brief Copy an index block with re-read if checksum doesn't match
@param dfile data file (.MAD)
@param kfile index file (.MAI)
@param cap aria capabilities from aria_get_capabilities
@param block block number to read (0, 1, 2, 3...)
@param buffer read data to this buffer
@param bytes_read number of bytes actually read (in case of end of file)
@return 0 ok
@return HA_ERR_END_OF_FILE ; End of file
@ -208,6 +207,7 @@ int aria_read_index(File kfile, ARIA_TABLE_CAPABILITIES *cap, ulonglong block,
{
MARIA_SHARE share;
int retry= 0, error= 0;
void *alloca_ptr= 0;
DBUG_ENTER("aria_read_index");
share.keypage_header= cap->keypage_header;
@ -220,21 +220,43 @@ int aria_read_index(File kfile, ARIA_TABLE_CAPABILITIES *cap, ulonglong block,
block * cap->block_size, MYF(0))) != cap->block_size)
{
if (length == 0)
DBUG_RETURN(HA_ERR_END_OF_FILE);
{
error= HA_ERR_END_OF_FILE;
goto end;
}
if (length == (size_t) -1)
DBUG_RETURN(my_errno ? my_errno : -1);
{
error= my_errno ? my_errno : -1;
goto end;
}
/* Assume we got a half read; Do a re-read */
}
/* If not transactional or key file header, there are no checksums */
if (!cap->online_backup_safe ||
block < cap->header_size/ cap->block_size)
DBUG_RETURN(length == cap->block_size ? 0 : HA_ERR_CRASHED);
{
error= length == cap->block_size ? 0 : HA_ERR_CRASHED;
goto end;
}
/*
skip an all-zero page. it can happen if the ma_checkpoint_background
thread flushes the later page before ever flushing this one.
*/
if (!_ma_check_if_zero(buffer, share.block_size))
{
error= 0;
goto end;
}
if (length == cap->block_size)
{
length= _ma_get_page_used(&share, buffer);
if (length > cap->block_size - CRC_SIZE)
DBUG_RETURN(HA_ERR_CRASHED);
{
error= HA_ERR_CRASHED;
goto end;
}
if (cap->encrypted)
{
@ -243,7 +265,9 @@ int aria_read_index(File kfile, ARIA_TABLE_CAPABILITIES *cap, ulonglong block,
my_bool crypt_error;
io_arg.data= (void*) &share;
io_arg.page= buffer;
io_arg.crypt_buf= (uchar*) my_alloca(cap->block_size);
if (!alloca_ptr)
alloca_ptr= my_alloca(cap->block_size);
io_arg.crypt_buf= (uchar*) alloca_ptr;
io_arg.pageno= block;
share.crypt_data= cap->crypt_data;
share.silence_encryption_errors= 1;
@ -251,9 +275,11 @@ int aria_read_index(File kfile, ARIA_TABLE_CAPABILITIES *cap, ulonglong block,
share.open_file_name.str= cap->filename;
crypt_error= ma_crypt_index_post_read_hook(0, &io_arg);
my_afree(io_arg.crypt_buf);
if (!crypt_error)
DBUG_RETURN(0); /* ok */
{
error= 0;
goto end;
}
error= my_errno;
if (error == HA_ERR_DECRYPTION_FAILED ||
error == HA_ERR_WRONG_CRC)
@ -265,7 +291,7 @@ int aria_read_index(File kfile, ARIA_TABLE_CAPABILITIES *cap, ulonglong block,
MARIA_NO_CRC_NORMAL_PAGE,
(int) length);
if (error == 0)
DBUG_RETURN(0);
goto end;
if ((error= my_errno) != HA_ERR_WRONG_CRC)
break;
}
@ -281,6 +307,8 @@ int aria_read_index(File kfile, ARIA_TABLE_CAPABILITIES *cap, ulonglong block,
"Error %d reading index file %s block %lld",
MYF(ME_FATAL|ME_ERROR_LOG),
error, cap->filename, block);
end:
my_afree(alloca_ptr);
DBUG_RETURN(error);
}

2
storage/maria/ma_crypt.c
View file

@ -375,7 +375,7 @@ my_bool ma_crypt_index_post_read_hook(int res,
if (res ||
page_used < share->keypage_header ||
page_used >= block_size - CRC_SIZE)
page_used > block_size - CRC_SIZE)
{
res= 1;
my_errno= HA_ERR_DECRYPTION_FAILED;

2
storage/maria/ma_open.c
View file

@ -1286,7 +1286,7 @@ my_bool maria_read_crypt_data(File kfile, MARIA_SHARE *share)
(key_segs + unique_key_parts)*HA_KEYSEG_SIZE+
columns*(MARIA_COLUMNDEF_SIZE + 2));
crypt_length= mi_uint2korr(share->state.header.header_length) - info_length;
if ((longlong) crypt_length < 0 || crypt_length > 1024)
if (crypt_length > 1024)
{
my_errno=HA_ERR_NOT_A_TABLE;
DBUG_RETURN(1);