Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita793c14

Browse files
committed
Merge branch 'REL9_5_STABLE' into PGPRO9_5
2 parents9abe67f +b56f7b1 commita793c14

File tree

5 files changed

+115
-16
lines changed

5 files changed

+115
-16
lines changed

‎contrib/pageinspect/brinfuncs.c

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,23 @@ brin_page_type(PG_FUNCTION_ARGS)
4646
{
4747
bytea*raw_page=PG_GETARG_BYTEA_P(0);
4848
Pagepage=VARDATA(raw_page);
49+
intraw_page_size;
4950
char*type;
5051

52+
if (!superuser())
53+
ereport(ERROR,
54+
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
55+
(errmsg("must be superuser to use raw page functions"))));
56+
57+
raw_page_size=VARSIZE(raw_page)-VARHDRSZ;
58+
59+
if (raw_page_size!=BLCKSZ)
60+
ereport(ERROR,
61+
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
62+
errmsg("input page too small"),
63+
errdetail("Expected size %d, got %d",
64+
BLCKSZ,raw_page_size)));
65+
5166
switch (BrinPageType(page))
5267
{
5368
caseBRIN_PAGETYPE_META:
@@ -79,11 +94,12 @@ verify_brin_page(bytea *raw_page, uint16 type, const char *strtype)
7994

8095
raw_page_size=VARSIZE(raw_page)-VARHDRSZ;
8196

82-
if (raw_page_size<SizeOfPageHeaderData)
97+
if (raw_page_size!=BLCKSZ)
8398
ereport(ERROR,
8499
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
85100
errmsg("input page too small"),
86-
errdetail("Expected size %d, got %d",raw_page_size,BLCKSZ)));
101+
errdetail("Expected size %d, got %d",
102+
BLCKSZ,raw_page_size)));
87103

88104
page=VARDATA(raw_page);
89105

@@ -316,6 +332,11 @@ brin_metapage_info(PG_FUNCTION_ARGS)
316332
boolnulls[4];
317333
HeapTuplehtup;
318334

335+
if (!superuser())
336+
ereport(ERROR,
337+
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
338+
(errmsg("must be superuser to use raw page functions"))));
339+
319340
page=verify_brin_page(raw_page,BRIN_PAGETYPE_META,"metapage");
320341

321342
/* Build a tuple descriptor for our result type */

‎doc/src/sgml/release-9.5.sgml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,49 @@ Branch: REL9_5_STABLE [8aa6e9780] 2016-03-23 16:04:35 -0400
7777
</para>
7878
</listitem>
7979

80+
<!--
81+
Author: Stephen Frost <sfrost@snowman.net>
82+
Branch: master [86ebf30fd] 2016-03-28 09:03:20 -0400
83+
Branch: REL9_5_STABLE [db69e58a0] 2016-03-28 09:03:41 -0400
84+
-->
85+
86+
<listitem>
87+
<para>
88+
Maintain row-security status properly in cached plans (Stephen Frost)
89+
</para>
90+
91+
<para>
92+
In a session that performs queries as more than one role, the plan
93+
cache might incorrectly re-use a plan that was generated for another
94+
role ID, thus possibly applying the wrong set of policies when
95+
row-level security (RLS) is in use.
96+
(CVE-2016-2193)
97+
</para>
98+
</listitem>
99+
100+
<!--
101+
Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
102+
Branch: master [3e1338475] 2016-03-28 10:57:42 -0300
103+
Branch: REL9_5_STABLE [bf78a6f10] 2016-03-28 10:57:46 -0300
104+
-->
105+
106+
<listitem>
107+
<para>
108+
Add must-be-superuser checks to some
109+
new <filename>contrib/pageinspect</> functions (Andreas Seltenreich)
110+
</para>
111+
112+
<para>
113+
Most functions in the <filename>pageinspect</> extension that
114+
inspect <type>bytea</> values disallow calls by non-superusers,
115+
but <function>brin_page_type()</> and <function>brin_metapage_info()</>
116+
failed to do so. Passing contrived <type>bytea</> values to them might
117+
crash the server or disclose a few bytes of server memory. Add the
118+
missing permissions checks to prevent misuse.
119+
(CVE-2016-3065)
120+
</para>
121+
</listitem>
122+
80123
<!--
81124
Author: Simon Riggs <simon@2ndQuadrant.com>
82125
Branch: master [c7111d11b] 2016-03-03 09:53:43 +0000

‎src/backend/utils/cache/plancache.c

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
* if it has one. When (and if) the next demand for a cached plan occurs,
1717
* parse analysis and rewrite is repeated to build a new valid query tree,
1818
* and then planning is performed as normal. We also force re-analysis and
19-
* re-planning if the active search_path is different from the previous time.
19+
* re-planning if the active search_path is different from the previous time
20+
* or, if RLS is involved, if the user changes or the RLS environment changes.
2021
*
2122
* Note that if the sinval was a result of user DDL actions, parse analysis
2223
* could throw an error, for example if a column referenced by the query is
@@ -204,8 +205,8 @@ CreateCachedPlan(Node *raw_parse_tree,
204205
plansource->total_custom_cost=0;
205206
plansource->num_custom_plans=0;
206207
plansource->hasRowSecurity= false;
207-
plansource->row_security_env=row_security;
208208
plansource->planUserId=InvalidOid;
209+
plansource->row_security_env= false;
209210

210211
MemoryContextSwitchTo(oldcxt);
211212

@@ -271,6 +272,8 @@ CreateOneShotCachedPlan(Node *raw_parse_tree,
271272
plansource->generic_cost=-1;
272273
plansource->total_custom_cost=0;
273274
plansource->num_custom_plans=0;
275+
plansource->planUserId=InvalidOid;
276+
plansource->row_security_env= false;
274277

275278
returnplansource;
276279
}
@@ -409,6 +412,8 @@ CompleteCachedPlan(CachedPlanSource *plansource,
409412
plansource->cursor_options=cursor_options;
410413
plansource->fixed_result=fixed_result;
411414
plansource->resultDesc=PlanCacheComputeResultDesc(querytree_list);
415+
plansource->planUserId=GetUserId();
416+
plansource->row_security_env=row_security;
412417

413418
MemoryContextSwitchTo(oldcxt);
414419

@@ -571,24 +576,15 @@ RevalidateCachedQuery(CachedPlanSource *plansource)
571576
returnNIL;
572577
}
573578

574-
/*
575-
* If this is a new cached plan, then set the user id it was planned by
576-
* and under what row security settings; these are needed to determine
577-
* plan invalidation when RLS is involved.
578-
*/
579-
if (!OidIsValid(plansource->planUserId))
580-
{
581-
plansource->planUserId=GetUserId();
582-
plansource->row_security_env=row_security;
583-
}
584-
585579
/*
586580
* If the query is currently valid, we should have a saved search_path ---
587581
* check to see if that matches the current environment. If not, we want
588-
* to force replan.
582+
* to force replan. We should also have a valid planUserId.
589583
*/
590584
if (plansource->is_valid)
591585
{
586+
Assert(OidIsValid(plansource->planUserId));
587+
592588
Assert(plansource->search_path!=NULL);
593589
if (!OverrideSearchPathMatchesCurrent(plansource->search_path))
594590
{
@@ -643,6 +639,14 @@ RevalidateCachedQuery(CachedPlanSource *plansource)
643639
plansource->invalItems=NIL;
644640
plansource->search_path=NULL;
645641

642+
/*
643+
* The plan is invalid, possibly due to row security, so we need to reset
644+
* row_security_env and planUserId as we're about to re-plan with the
645+
* current settings.
646+
*/
647+
plansource->row_security_env=row_security;
648+
plansource->planUserId=GetUserId();
649+
646650
/*
647651
* Free the query_context. We don't really expect MemoryContextDelete to
648652
* fail, but just in case, make sure the CachedPlanSource is left in a
@@ -1380,6 +1384,14 @@ CopyCachedPlan(CachedPlanSource *plansource)
13801384
newsource->total_custom_cost=plansource->total_custom_cost;
13811385
newsource->num_custom_plans=plansource->num_custom_plans;
13821386

1387+
/*
1388+
* Copy over the user the query was planned as, and under what RLS
1389+
* environment. We will check during RevalidateCachedQuery() if the user
1390+
* or environment has changed and, if so, will force a re-plan.
1391+
*/
1392+
newsource->planUserId=plansource->planUserId;
1393+
newsource->row_security_env=plansource->row_security_env;
1394+
13831395
MemoryContextSwitchTo(oldcxt);
13841396

13851397
returnnewsource;

‎src/test/regress/expected/rowsecurity.out

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2334,23 +2334,37 @@ GRANT SELECT ON t1 TO rls_regress_user1, rls_regress_user2;
23342334
CREATE POLICY p1 ON t1 TO rls_regress_user1 USING ((a % 2) = 0);
23352335
CREATE POLICY p2 ON t1 TO rls_regress_user2 USING ((a % 4) = 0);
23362336
ALTER TABLE t1 ENABLE ROW LEVEL SECURITY;
2337+
-- Prepare as rls_regress_user1
23372338
SET ROLE rls_regress_user1;
23382339
PREPARE role_inval AS SELECT * FROM t1;
2340+
-- Check plan
23392341
EXPLAIN (COSTS OFF) EXECUTE role_inval;
23402342
QUERY PLAN
23412343
-------------------------
23422344
Seq Scan on t1
23432345
Filter: ((a % 2) = 0)
23442346
(2 rows)
23452347

2348+
-- Change to rls_regress_user2
23462349
SET ROLE rls_regress_user2;
2350+
-- Check plan- should be different
23472351
EXPLAIN (COSTS OFF) EXECUTE role_inval;
23482352
QUERY PLAN
23492353
-------------------------
23502354
Seq Scan on t1
23512355
Filter: ((a % 4) = 0)
23522356
(2 rows)
23532357

2358+
-- Change back to rls_regress_user1
2359+
SET ROLE rls_regress_user1;
2360+
-- Check plan- should be back to original
2361+
EXPLAIN (COSTS OFF) EXECUTE role_inval;
2362+
QUERY PLAN
2363+
-------------------------
2364+
Seq Scan on t1
2365+
Filter: ((a % 2) = 0)
2366+
(2 rows)
2367+
23542368
--
23552369
-- CTE and RLS
23562370
--

‎src/test/regress/sql/rowsecurity.sql

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -852,11 +852,20 @@ CREATE POLICY p2 ON t1 TO rls_regress_user2 USING ((a % 4) = 0);
852852

853853
ALTERTABLE t1 ENABLE ROW LEVEL SECURITY;
854854

855+
-- Prepare as rls_regress_user1
855856
SET ROLE rls_regress_user1;
856857
PREPARE role_invalASSELECT*FROM t1;
858+
-- Check plan
857859
EXPLAIN (COSTS OFF) EXECUTE role_inval;
858860

861+
-- Change to rls_regress_user2
859862
SET ROLE rls_regress_user2;
863+
-- Check plan- should be different
864+
EXPLAIN (COSTS OFF) EXECUTE role_inval;
865+
866+
-- Change back to rls_regress_user1
867+
SET ROLE rls_regress_user1;
868+
-- Check plan- should be back to original
860869
EXPLAIN (COSTS OFF) EXECUTE role_inval;
861870

862871
--

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp