Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
2a54a530
Commit
2a54a530
authored
Aug 08, 2016
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-10465 general_log_file can be abused
followup
parent
a7c43a68
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
7 deletions
+15
-7
mysql-test/suite/sys_vars/r/general_log_file_basic.result
mysql-test/suite/sys_vars/r/general_log_file_basic.result
+2
-0
mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
+2
-0
mysql-test/suite/sys_vars/t/general_log_file_basic.test
mysql-test/suite/sys_vars/t/general_log_file_basic.test
+2
-0
mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
+2
-0
sql/sys_vars.cc
sql/sys_vars.cc
+7
-7
No files found.
mysql-test/suite/sys_vars/r/general_log_file_basic.result
View file @
2a54a530
...
@@ -18,6 +18,8 @@ SET @@global.general_log_file = '/tmp/my.cnf';
...
@@ -18,6 +18,8 @@ SET @@global.general_log_file = '/tmp/my.cnf';
ERROR 42000: Variable 'general_log_file' can't be set to the value of '/tmp/my.cnf'
ERROR 42000: Variable 'general_log_file' can't be set to the value of '/tmp/my.cnf'
SET @@global.general_log_file = '.my.cnf';
SET @@global.general_log_file = '.my.cnf';
ERROR 42000: Variable 'general_log_file' can't be set to the value of '.my.cnf'
ERROR 42000: Variable 'general_log_file' can't be set to the value of '.my.cnf'
SET @@global.general_log_file = 'my.cnf\0foo';
ERROR 42000: Variable 'general_log_file' can't be set to the value of 'my.cnf'
'#----------------------FN_DYNVARS_004_03------------------------#'
'#----------------------FN_DYNVARS_004_03------------------------#'
SELECT @@global.general_log_file = VARIABLE_VALUE
SELECT @@global.general_log_file = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
...
...
mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
View file @
2a54a530
...
@@ -15,6 +15,8 @@ SET @@global.slow_query_log_file = '/tmp/my.cnf';
...
@@ -15,6 +15,8 @@ SET @@global.slow_query_log_file = '/tmp/my.cnf';
ERROR 42000: Variable 'slow_query_log_file' can't be set to the value of '/tmp/my.cnf'
ERROR 42000: Variable 'slow_query_log_file' can't be set to the value of '/tmp/my.cnf'
SET @@global.general_log_file = '.my.cnf';
SET @@global.general_log_file = '.my.cnf';
ERROR 42000: Variable 'general_log_file' can't be set to the value of '.my.cnf'
ERROR 42000: Variable 'general_log_file' can't be set to the value of '.my.cnf'
SET @@global.general_log_file = 'my.cnf\0foo';
ERROR 42000: Variable 'general_log_file' can't be set to the value of 'my.cnf'
'#----------------------FN_DYNVARS_004_03------------------------#'
'#----------------------FN_DYNVARS_004_03------------------------#'
SELECT @@global.slow_query_log_file = VARIABLE_VALUE
SELECT @@global.slow_query_log_file = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
...
...
mysql-test/suite/sys_vars/t/general_log_file_basic.test
View file @
2a54a530
...
@@ -67,6 +67,8 @@ SET @@global.general_log_file = 'my.cnf';
...
@@ -67,6 +67,8 @@ SET @@global.general_log_file = 'my.cnf';
SET
@@
global
.
general_log_file
=
'/tmp/my.cnf'
;
SET
@@
global
.
general_log_file
=
'/tmp/my.cnf'
;
--
error
ER_WRONG_VALUE_FOR_VAR
--
error
ER_WRONG_VALUE_FOR_VAR
SET
@@
global
.
general_log_file
=
'.my.cnf'
;
SET
@@
global
.
general_log_file
=
'.my.cnf'
;
--
error
ER_WRONG_VALUE_FOR_VAR
SET
@@
global
.
general_log_file
=
'my.cnf\0foo'
;
--
echo
'#----------------------FN_DYNVARS_004_03------------------------#'
--
echo
'#----------------------FN_DYNVARS_004_03------------------------#'
...
...
mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
View file @
2a54a530
...
@@ -65,6 +65,8 @@ SET @@global.slow_query_log_file = 'my.cnf';
...
@@ -65,6 +65,8 @@ SET @@global.slow_query_log_file = 'my.cnf';
SET
@@
global
.
slow_query_log_file
=
'/tmp/my.cnf'
;
SET
@@
global
.
slow_query_log_file
=
'/tmp/my.cnf'
;
--
error
ER_WRONG_VALUE_FOR_VAR
--
error
ER_WRONG_VALUE_FOR_VAR
SET
@@
global
.
general_log_file
=
'.my.cnf'
;
SET
@@
global
.
general_log_file
=
'.my.cnf'
;
--
error
ER_WRONG_VALUE_FOR_VAR
SET
@@
global
.
general_log_file
=
'my.cnf\0foo'
;
--
echo
'#----------------------FN_DYNVARS_004_03------------------------#'
--
echo
'#----------------------FN_DYNVARS_004_03------------------------#'
##############################################################################
##############################################################################
...
...
sql/sys_vars.cc
View file @
2a54a530
...
@@ -3033,19 +3033,19 @@ static bool check_log_path(sys_var *self, THD *thd, set_var *var)
...
@@ -3033,19 +3033,19 @@ static bool check_log_path(sys_var *self, THD *thd, set_var *var)
return
true
;
return
true
;
}
}
static
const
LEX_CSTRING
my_cnf
=
{
STRING_WITH_LEN
(
"my.cnf"
)
};
if
(
val
->
length
>=
my_cnf
.
length
)
{
if
(
strcasecmp
(
val
->
str
+
val
->
length
-
my_cnf
.
length
,
my_cnf
.
str
)
==
0
)
return
true
;
// log file name ends with "my.cnf"
}
char
path
[
FN_REFLEN
];
char
path
[
FN_REFLEN
];
size_t
path_length
=
unpack_filename
(
path
,
val
->
str
);
size_t
path_length
=
unpack_filename
(
path
,
val
->
str
);
if
(
!
path_length
)
if
(
!
path_length
)
return
true
;
return
true
;
static
const
LEX_CSTRING
my_cnf
=
{
STRING_WITH_LEN
(
"my.cnf"
)
};
if
(
path_length
>=
my_cnf
.
length
)
{
if
(
strcasecmp
(
path
+
path_length
-
my_cnf
.
length
,
my_cnf
.
str
)
==
0
)
return
true
;
// log file name ends with "my.cnf"
}
MY_STAT
f_stat
;
MY_STAT
f_stat
;
if
(
my_stat
(
path
,
&
f_stat
,
MYF
(
0
)))
if
(
my_stat
(
path
,
&
f_stat
,
MYF
(
0
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment