database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Fix possible race. Use LOCK_grant on access to grant_version.

Browse Source
This commit is contained in:
kroki@mysql.com
2006-05-15 11:56:02 +04:00
parent 0963c705cd
commit ed6ad7d359
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_acl.cc
View File

@@ -6009,20 +6009,21 @@ void fill_effective_table_privileges(THD *thd, GRANT_INFO *grant,
} }
/* table privileges */ /* table privileges */
rw_rdlock(&LOCK_grant);
if (grant->version != grant_version) if (grant->version != grant_version)
{ {
rw_rdlock(&LOCK_grant);
grant->grant_table= grant->grant_table=
table_hash_search(sctx->host, sctx->ip, db, table_hash_search(sctx->host, sctx->ip, db,
sctx->priv_user, sctx->priv_user,
table, 0); /* purecov: inspected */ table, 0); /* purecov: inspected */
grant->version= grant_version; /* purecov: inspected */ grant->version= grant_version; /* purecov: inspected */
rw_unlock(&LOCK_grant);
} }
if (grant->grant_table != 0) if (grant->grant_table != 0)
{ {
grant->privilege|= grant->grant_table->privs; grant->privilege|= grant->grant_table->privs;
} }
rw_unlock(&LOCK_grant);
DBUG_PRINT("info", ("privilege 0x%lx", grant->privilege)); DBUG_PRINT("info", ("privilege 0x%lx", grant->privilege));
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }