summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorSujatha Sivakumar <sujatha.sivakumar@oracle.com>2013-06-24 11:11:55 +0530
committerSujatha Sivakumar <sujatha.sivakumar@oracle.com>2013-06-24 11:11:55 +0530
commit318077c4f9d57e106eecd15c5e84ffeacbc799c5 (patch)
tree6903cecda6ac84e4287ab67b6ee2396aa71422f6 /sql/sql_load.cc
parenta326f9747b60d3726c09ee4979ae8782b8406237 (diff)
downloadmariadb-git-318077c4f9d57e106eecd15c5e84ffeacbc799c5.tar.gz
Bug#16753869:INCORRECT TRUNCATION OF LONG SET EXPRESSION IN
LOAD DATA CAN CAUSE SQL INJECTION Problem: ======= A long SET expression in LOAD DATA is incorrectly truncated when written to the binary log. Analysis: ======== LOAD DATA statements are reconstructed once again before they are written to the binary log. When SET clauses are specified as part of LOAD DATA statement, these SET clause user command strings need to be stored as it is inorder to reconstruct the original user command. At present these strings are stored as part of SET clause item tree's top most Item node's name itself which is incorrect. As an Item::name can be of MAX_ALIAS_NAME (256) size. Hence the name will get truncated to "255". Because of this the rewritten LOAD DATA statement will be terminated incorrectly. When this statment is read back by the mysqlbinlog tool it reads a starting single quote and continuos to read till it finds an ending quote. Hence any statement written post ending quote will be considered as a new statement. Fix: === As name field has length restriction the string value should not be stored in Item::name. A new String list is maintained to store the SET expression values and this list is read during reconstrution.
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 611c32696ea..2e85cb105b0 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -672,7 +672,8 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex,
*p= NULL;
size_t pl= 0;
List<Item> fv;
- Item *item, *val;
+ Item *item;
+ String *str;
String pfield, pfields;
int n;
const char *tbl= table_name_arg;
@@ -726,18 +727,18 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex,
if (!thd->lex->update_list.is_empty())
{
List_iterator<Item> lu(thd->lex->update_list);
- List_iterator<Item> lv(thd->lex->value_list);
+ List_iterator<String> ls(thd->lex->load_set_str_list);
pfields.append(" SET ");
n= 0;
while ((item= lu++))
{
- val= lv++;
+ str= ls++;
if (n++)
pfields.append(", ");
append_identifier(thd, &pfields, item->name, strlen(item->name));
- pfields.append(val->name);
+ pfields.append((char *)str->ptr());
}
}