database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

MDEV-10888: encryption.filekeys_emptyfile fails in buildbot with valgrind

Browse Source 
Problem was that length of the filekeys file was not checked and if
length is less than OpenSSL_prefix_len uninitialized memory was
accessed.
This commit is contained in:
Jan Lindström
2016-09-26 09:58:50 +03:00
parent d30809a3cd
commit 4e2a0c34b0
5 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/encryption/r/filekeys_tooshort.result Normal file
View File

@@ -0,0 +1,10 @@
call mtr.add_suppression("Cannot decrypt .*tooshort.enc. Not encrypted");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Cannot decrypt .*tooshort.enc. Not encrypted/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
# Test checks if opening an too short filekeys does not crash the server.

1
mysql-test/suite/encryption/t/filekeys-tooshort.enc Normal file
View File

@@ -0,0 +1 @@
Salted__

3
mysql-test/suite/encryption/t/filekeys_tooshort.opt Normal file
View File

@@ -0,0 +1,3 @@
--loose-file-key-management-filekey=secret
--loose-file-key-management-filename=$MTR_SUITE_DIR/t/filekeys-tooshort.enc

4
mysql-test/suite/encryption/t/filekeys_tooshort.test Normal file
View File

@@ -0,0 +1,4 @@
let SEARCH_PATTERN=Cannot decrypt .*tooshort.enc. Not encrypted;
source filekeys_badtest.inc;
--echo # Test checks if opening an too short filekeys does not crash the server.

2
plugin/file_key_management/parser.cc
View File

@@ -333,7 +333,7 @@ char* Parser::read_and_decrypt_file(const char *secret)
// Check for file encryption
uchar *decrypted;
if (is_prefix((char*)buffer, OpenSSL_prefix))
if (file_size > OpenSSL_prefix_len && is_prefix((char*)buffer, OpenSSL_prefix))
{
uchar key[OpenSSL_key_len];
uchar iv[OpenSSL_iv_len];