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

MDEV-16896 encryption.innodb-checksum-algorithm crashes

Browse Source 
buf_page_is_corrupted(): Read the global variable srv_checksum_algorithm
only once in order to avoid a race condition when
SET GLOBAL innodb_checksum_algorithm=...;
is being executed concurrently with this function.
This commit is contained in:
Marko Mäkelä 2019-02-03 17:00:39 +02:00
parent 213ece2f2e
commit 955c7b3222
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
storage/innobase/buf/buf0buf.cc
View File

@ -2,7 +2,7 @@
Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, Google Inc. Copyright (c) 2008, Google Inc.
Copyright (c) 2013, 2018, MariaDB Corporation. Copyright (c) 2013, 2019, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted by Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described Google, Inc. Those modifications are gratefully acknowledged and are described
@ -925,7 +925,10 @@ buf_page_is_corrupted(
/* Check whether the checksum fields have correct values */ /* Check whether the checksum fields have correct values */
if (srv_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_NONE) { const srv_checksum_algorithm_t curr_algo =
static_cast<srv_checksum_algorithm_t>(srv_checksum_algorithm);
if (curr_algo == SRV_CHECKSUM_ALGORITHM_NONE) {
return(false); return(false);
} }
@ -957,9 +960,6 @@ buf_page_is_corrupted(
return(false); return(false);
} }
const srv_checksum_algorithm_t curr_algo =
static_cast<srv_checksum_algorithm_t>(srv_checksum_algorithm);
switch (curr_algo) { switch (curr_algo) {
case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32: case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
return !buf_page_is_checksum_valid_crc32( return !buf_page_is_checksum_valid_crc32(
@ -988,9 +988,7 @@ buf_page_is_corrupted(
for writing checksums because we assume that the for writing checksums because we assume that the
chance of it matching is higher. */ chance of it matching is higher. */
if (srv_checksum_algorithm if (curr_algo == SRV_CHECKSUM_ALGORITHM_CRC32) {
== SRV_CHECKSUM_ALGORITHM_CRC32) {
crc32 = buf_calc_page_crc32(read_buf); crc32 = buf_calc_page_crc32(read_buf);
crc32_inited = true; crc32_inited = true;
@ -1000,7 +998,7 @@ buf_page_is_corrupted(
return true; return true;
} }
} else { } else {
ut_ad(srv_checksum_algorithm ut_ad(curr_algo
== SRV_CHECKSUM_ALGORITHM_INNODB); == SRV_CHECKSUM_ALGORITHM_INNODB);
if (checksum_field2 if (checksum_field2
@ -1029,8 +1027,7 @@ buf_page_is_corrupted(
for writing checksums because we assume that the for writing checksums because we assume that the
chance of it matching is higher. */ chance of it matching is higher. */
if (srv_checksum_algorithm if (curr_algo == SRV_CHECKSUM_ALGORITHM_CRC32) {
== SRV_CHECKSUM_ALGORITHM_CRC32) {
if (!crc32_inited) { if (!crc32_inited) {
crc32 = buf_calc_page_crc32(read_buf); crc32 = buf_calc_page_crc32(read_buf);
@ -1043,7 +1040,7 @@ buf_page_is_corrupted(
return true; return true;
} }
} else { } else {
ut_ad(srv_checksum_algorithm ut_ad(curr_algo
== SRV_CHECKSUM_ALGORITHM_INNODB); == SRV_CHECKSUM_ALGORITHM_INNODB);
if (checksum_field1 if (checksum_field1

21
storage/xtradb/buf/buf0buf.cc
View File

@ -2,7 +2,7 @@
Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, Google Inc. Copyright (c) 2008, Google Inc.
Copyright (c) 2013, 2018, MariaDB Corporation. Copyright (c) 2013, 2019, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted by Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described Google, Inc. Those modifications are gratefully acknowledged and are described
@ -924,7 +924,10 @@ buf_page_is_corrupted(
/* Check whether the checksum fields have correct values */ /* Check whether the checksum fields have correct values */
if (srv_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_NONE) { const srv_checksum_algorithm_t curr_algo =
static_cast<srv_checksum_algorithm_t>(srv_checksum_algorithm);
if (curr_algo == SRV_CHECKSUM_ALGORITHM_NONE) {
return(false); return(false);
} }
@ -956,9 +959,6 @@ buf_page_is_corrupted(
return(false); return(false);
} }
const srv_checksum_algorithm_t curr_algo =
static_cast<srv_checksum_algorithm_t>(srv_checksum_algorithm);
switch (curr_algo) { switch (curr_algo) {
case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32: case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
return !buf_page_is_checksum_valid_crc32( return !buf_page_is_checksum_valid_crc32(
@ -987,9 +987,7 @@ buf_page_is_corrupted(
for writing checksums because we assume that the for writing checksums because we assume that the
chance of it matching is higher. */ chance of it matching is higher. */
if (srv_checksum_algorithm if (curr_algo == SRV_CHECKSUM_ALGORITHM_CRC32) {
== SRV_CHECKSUM_ALGORITHM_CRC32) {
crc32 = buf_calc_page_crc32(read_buf); crc32 = buf_calc_page_crc32(read_buf);
crc32_inited = true; crc32_inited = true;
@ -999,7 +997,7 @@ buf_page_is_corrupted(
return true; return true;
} }
} else { } else {
ut_ad(srv_checksum_algorithm ut_ad(curr_algo
== SRV_CHECKSUM_ALGORITHM_INNODB); == SRV_CHECKSUM_ALGORITHM_INNODB);
if (checksum_field2 if (checksum_field2
@ -1028,8 +1026,7 @@ buf_page_is_corrupted(
for writing checksums because we assume that the for writing checksums because we assume that the
chance of it matching is higher. */ chance of it matching is higher. */
if (srv_checksum_algorithm if (curr_algo == SRV_CHECKSUM_ALGORITHM_CRC32) {
== SRV_CHECKSUM_ALGORITHM_CRC32) {
if (!crc32_inited) { if (!crc32_inited) {
crc32 = buf_calc_page_crc32(read_buf); crc32 = buf_calc_page_crc32(read_buf);
@ -1042,7 +1039,7 @@ buf_page_is_corrupted(
return true; return true;
} }
} else { } else {
ut_ad(srv_checksum_algorithm ut_ad(curr_algo
== SRV_CHECKSUM_ALGORITHM_INNODB); == SRV_CHECKSUM_ALGORITHM_INNODB);
if (checksum_field1 if (checksum_field1