Skip to content

MDEV-40385 use-of-uninitialized-value in Binary_string::c_ptr() #5448

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

Open
LukeYL026 wants to merge 1 commit into
base: 11.4
Choose a base branch
from
+38 −2
Open

MDEV-40385 use-of-uninitialized-value in Binary_string::c_ptr() #5448

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
22 changes: 22 additions & 0 deletions mysql-test/main/func_kdf.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,25 @@ ERROR 42000: Incorrect parameter count in the call to native function 'kdf'
#
# End of 11.3 tests
#
#
# MDEV-40385 use-of-uninitialized-value in Binary_string::c_ptr()
#
SELECT KDF('','',1000,256);
KDF('','',1000,256)
NULL
Warnings:
Warning 3047 Invalid argument error: '256' in function kdf.
SELECT KDF('secret','salt',1000,999);
KDF('secret','salt',1000,999)
NULL
Warnings:
Warning 3047 Invalid argument error: '999' in function kdf.
SELECT KDF('secret','salt',1000,'pbkdf2_hmac') IS NOT NULL;
KDF('secret','salt',1000,'pbkdf2_hmac') IS NOT NULL
1
SELECT KDF('secret','salt') IS NOT NULL;
KDF('secret','salt') IS NOT NULL
1
#
# End of 11.4 tests
#
14 changes: 14 additions & 0 deletions mysql-test/main/func_kdf.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,17 @@ select kdf();
--echo # End of 11.3 tests
--echo #

--echo #
--echo # MDEV-40385 use-of-uninitialized-value in Binary_string::c_ptr()
--echo #
# MSAN only: this test verifies the fix behaviorally (warning + NULL); the
# uninitialized read itself is only observable under an MSAN build.
SELECT KDF('','',1000,256);
SELECT KDF('secret','salt',1000,999);
SELECT KDF('secret','salt',1000,'pbkdf2_hmac') IS NOT NULL;
SELECT KDF('secret','salt') IS NOT NULL;

--echo #
--echo # End of 11.4 tests
--echo #

4 changes: 2 additions & 2 deletions sql/item_strfunc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,9 +489,9 @@ String *Item_func_kdf::val_str(String *buf)
{
if (String *s= args[3]->val_str(buf))
{
if (strcasecmp(s->c_ptr(), "hkdf") == 0)
if (strcasecmp(s->c_ptr_safe(), "hkdf") == 0)
use_hkdf= true;
else if (strcasecmp(s->c_ptr(), "pbkdf2_hmac") != 0)
else if (strcasecmp(s->c_ptr_safe(), "pbkdf2_hmac") != 0)
{
invalid_argument_error(func_name(), ErrConvStringQ(s).ptr());
goto ret_null;
Expand Down