Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PS-4561: Read after free at Binlog_crypt_data::load_latest_binlog_key() #2468

Merged
merged 1 commit into from
Aug 16, 2018
Merged

PS-4561: Read after free at Binlog_crypt_data::load_latest_binlog_key() #2468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions sql/binlog.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5214,10 +5214,6 @@ bool MYSQL_BIN_LOG::open_binlog(const char *log_name,

if (encrypt_binlog)
{
uchar nonce[Binlog_crypt_data::BINLOG_NONCE_LENGTH];
if (my_rand_buffer(nonce, sizeof(nonce)))
goto err;

if (crypto.load_latest_binlog_key())
{
sql_print_error("Failed to fetch or create percona_binlog key from/in keyring and thus "
Expand All @@ -5228,6 +5224,12 @@ bool MYSQL_BIN_LOG::open_binlog(const char *log_name,
DBUG_EXECUTE_IF("check_consecutive_binlog_key_versions",
{ static uint next_key_version = 0;
DBUG_ASSERT(crypto.get_key_version() == next_key_version++);});

uchar nonce[Binlog_crypt_data::BINLOG_NONCE_LENGTH];
memset(nonce, 0, Binlog_crypt_data::BINLOG_NONCE_LENGTH);
if (my_rand_buffer(nonce, sizeof(nonce)))
goto err;

Start_encryption_log_event sele(1, crypto.get_key_version(), nonce);
sele.common_footer->checksum_alg= s.common_footer->checksum_alg;
if (write_to_file(&sele))
Expand Down
9 changes: 5 additions & 4 deletions sql/binlog_crypt_data.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ Binlog_crypt_data& Binlog_crypt_data::operator=(Binlog_crypt_data b)
bool Binlog_crypt_data::load_latest_binlog_key()
{
free_key(key, key_length);
bool error= false;
#ifdef MYSQL_SERVER
char *system_key_type = NULL;
size_t system_key_len = 0;
Expand All @@ -98,13 +99,13 @@ bool Binlog_crypt_data::load_latest_binlog_key()
system_key == NULL)))
return true;

my_free(system_key_type);
DBUG_ASSERT(strncmp(system_key_type, "AES", 3) == 0);
my_free(system_key_type);

if (parse_system_key(system_key, system_key_len, &key_version, &key, &key_length) == reinterpret_cast<uchar*>(NullS))
return true;
error= (parse_system_key(system_key, system_key_len, &key_version, &key, &key_length) == reinterpret_cast<uchar*>(NullS));
my_free(system_key);
#endif
return false;
return error;
}

bool Binlog_crypt_data::init_with_loaded_key(uint sch, const uchar* nonce)
Expand Down