Merge lp:~vlad-lesin/percona-server/5.5-bug1083377 into lp:percona-server/5.5

[Vlad Lesin]

Fix for bug #1083377. The original patch can be found here: http://bazaar.launchpad.net/~maria-captains/maria/5.3/revision/2643.153.26 .

Jenkins:
http://jenkins.percona.com/view/PS 5.5/job/percona-server-5.5-param/591/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Percona-Server/mysql-test/r/information_schema.result'
--- Percona-Server/mysql-test/r/information_schema.result	2012-10-17 03:47:45 +0000
+++ Percona-Server/mysql-test/r/information_schema.result	2012-11-30 15:41:27 +0000
@@ -1757,6 +1757,10 @@
 length(CAST(b AS CHAR))
 20
 DROP TABLE ubig;
+grant usage on *.* to mysqltest_1@localhost;
+select 1 from information_schema.tables where table_schema=repeat('a', 2000);
+1
+drop user mysqltest_1@localhost;
 End of 5.1 tests.
 #
 # Additional test for WL#3726 "DDL locking for all metadata objects"
 
=== modified file 'Percona-Server/mysql-test/t/information_schema.test'
--- Percona-Server/mysql-test/t/information_schema.test	2012-07-31 05:33:11 +0000
+++ Percona-Server/mysql-test/t/information_schema.test	2012-11-30 15:41:27 +0000
@@ -1444,6 +1444,14 @@
 
 DROP TABLE ubig;
 
+#Bug 1083377
+grant usage on *.* to mysqltest_1@localhost;
+connect (con1, localhost, mysqltest_1,,);
+connection con1;
+select 1 from information_schema.tables where table_schema=repeat('a', 2000);
+connection default;
+disconnect con1;
+drop user mysqltest_1@localhost;
 
 --echo End of 5.1 tests.
 
 
=== modified file 'Percona-Server/sql/sql_acl.cc'
--- Percona-Server/sql/sql_acl.cc	2012-08-07 06:10:00 +0000
+++ Percona-Server/sql/sql_acl.cc	2012-11-30 15:41:27 +0000
@@ -1754,14 +1754,20 @@
   acl_entry *entry;
   DBUG_ENTER("acl_get");
 
-  mysql_mutex_lock(&acl_cache->lock);
-  end=strmov((tmp_db=strmov(strmov(key, ip ? ip : "")+1,user)+1),db);
+  tmp_db= strmov(strmov(key, ip ? ip : "") + 1, user) + 1;
+  end= strnmov(tmp_db, db, key + sizeof(key) - tmp_db);
+
+  if (end >= key + sizeof(key)) // db name was truncated
+    DBUG_RETURN(0);             // no privileges for an invalid db name
+
   if (lower_case_table_names)
   {
     my_casedn_str(files_charset_info, tmp_db);
     db=tmp_db;
   }
   key_length= (size_t) (end-key);
+
+  mysql_mutex_lock(&acl_cache->lock);
   if (!db_is_pattern && (entry=(acl_entry*) acl_cache->search((uchar*) key,
                                                               key_length)))
   {
@@ -5114,11 +5120,17 @@
 bool check_grant_db(THD *thd,const char *db)
 {
   Security_context *sctx= thd->security_ctx;
-  char helping [NAME_LEN+USERNAME_LENGTH+2];
+  char helping [NAME_LEN+USERNAME_LENGTH+2], *end;
   uint len;
   bool error= TRUE;
 
-  len= (uint) (strmov(strmov(helping, sctx->priv_user) + 1, db) - helping) + 1;
+  end= strmov(helping, sctx->priv_user) + 1;
+  end= strnmov(end, db, helping + sizeof(helping) - end);
+
+  if (end >= helping + sizeof(helping)) // db name was truncated
+    return 1;                           // no privileges for an invalid db name
+
+  len= (uint) (end - helping) + 1;
 
   mysql_rwlock_rdlock(&LOCK_grant);