Commit 5abbaaf3 authored by akhil.mohan@oracle.com's avatar akhil.mohan@oracle.com Committed by Akhil Mohan

applying patch for BUG15912213

parent e5d2a53b
...@@ -1356,11 +1356,20 @@ ulong acl_get(const char *host, const char *ip, ...@@ -1356,11 +1356,20 @@ ulong acl_get(const char *host, const char *ip,
{ {
ulong host_access= ~(ulong)0, db_access= 0; ulong host_access= ~(ulong)0, db_access= 0;
uint i; uint i;
size_t key_length; size_t key_length, copy_length;
char key[ACL_KEY_LENGTH],*tmp_db,*end; char key[ACL_KEY_LENGTH],*tmp_db,*end;
acl_entry *entry; acl_entry *entry;
DBUG_ENTER("acl_get"); DBUG_ENTER("acl_get");
copy_length= (size_t) (strlen(ip ? ip : "") +
strlen(user ? user : "") +
strlen(db ? db : ""));
/*
Make sure that strmov() operations do not result in buffer overflow.
*/
if (copy_length >= ACL_KEY_LENGTH)
DBUG_RETURN(0);
VOID(pthread_mutex_lock(&acl_cache->lock)); VOID(pthread_mutex_lock(&acl_cache->lock));
end=strmov((tmp_db=strmov(strmov(key, ip ? ip : "")+1,user)+1),db); end=strmov((tmp_db=strmov(strmov(key, ip ? ip : "")+1,user)+1),db);
if (lower_case_table_names) if (lower_case_table_names)
...@@ -4340,6 +4349,16 @@ bool check_grant_db(THD *thd,const char *db) ...@@ -4340,6 +4349,16 @@ bool check_grant_db(THD *thd,const char *db)
char helping [NAME_LEN+USERNAME_LENGTH+2]; char helping [NAME_LEN+USERNAME_LENGTH+2];
uint len; uint len;
bool error= TRUE; bool error= TRUE;
size_t copy_length;
copy_length= (size_t) (strlen(sctx->priv_user ? sctx->priv_user : "") +
strlen(db ? db : ""));
/*
Make sure that strmov() operations do not result in buffer overflow.
*/
if (copy_length >= (NAME_LEN+USERNAME_LENGTH+2))
return 1;
len= (uint) (strmov(strmov(helping, sctx->priv_user) + 1, db) - helping) + 1; len= (uint) (strmov(strmov(helping, sctx->priv_user) + 1, db) - helping) + 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment