mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure locks are acquired on RLS-added relations

Browse Source 
During fireRIRrules(), get_row_security_policies can add to
securityQuals and withCheckOptions.  Make sure to lock any relations
added at that point and before firing RIR rules on those expressions.

Back-patch to 9.5 where RLS was added.
This commit is contained in:
Stephen Frost 2015-08-28 11:39:37 -04:00
parent c0f0d8097b
commit 2ba9e2b778
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/backend/rewrite/rewriteHandler.c
View File

@ -1794,6 +1794,8 @@ fireRIRrules(Query *parsetree, List *activeRIRs, bool forUpdatePushedDown)
{ {
if (hasSubLinks) if (hasSubLinks)
{ {
acquireLocksOnSubLinks_context context;
/* /*
* Recursively process the new quals, checking for infinite * Recursively process the new quals, checking for infinite
* recursion. * recursion.
@ -1806,6 +1808,23 @@ fireRIRrules(Query *parsetree, List *activeRIRs, bool forUpdatePushedDown)
activeRIRs = lcons_oid(RelationGetRelid(rel), activeRIRs); activeRIRs = lcons_oid(RelationGetRelid(rel), activeRIRs);
/*
* get_row_security_policies just passed back securityQuals
* and/or withCheckOptions, and there were SubLinks, make sure
* we lock any relations which are referenced.
*
* These locks would normally be acquired by the parser, but
* securityQuals and withCheckOptions are added post-parsing.
*/
context.for_execute = true;
(void) acquireLocksOnSubLinks((Node *) securityQuals, &context);
(void) acquireLocksOnSubLinks((Node *) withCheckOptions,
&context);
/*
* Now that we have the locks on anything added by
* get_row_security_policies, fire any RIR rules for them.
*/
expression_tree_walker((Node *) securityQuals, expression_tree_walker((Node *) securityQuals,
fireRIRonSubLink, (void *) activeRIRs); fireRIRonSubLink, (void *) activeRIRs);