mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make the overflow guards in ExecChooseHashTableSize be more protective.

Browse Source 
The original coding ensured nbuckets and nbatch didn't exceed INT_MAX,
which while not insane on its own terms did nothing to protect subsequent
code like "palloc(nbatch * sizeof(BufFile *))".  Since enormous join size
estimates might well be planner error rather than reality, it seems best
to constrain the initial sizes to be not more than work_mem/sizeof(pointer),
thus ensuring the allocated arrays don't exceed work_mem.  We will allow
nbatch to get bigger than that during subsequent ExecHashIncreaseNumBatches
calls, but we should still guard against integer overflow in those palloc
requests.  Per bug #5145 from Bernt Marius Johnsen.

Although the given test case only seems to fail back to 8.2, previous
releases have variants of this issue, so patch all supported branches.
This commit is contained in:
Tom Lane 2009-10-30 20:59:03 +00:00
parent c4fb0b2364
commit 818d2014c4
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/executor/nodeHash.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.107.2.1 2007/06/01 15:58:01 tgl Exp $ * $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.107.2.2 2009/10/30 20:59:03 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -350,6 +350,7 @@ ExecChooseHashTableSize(double ntuples, int tupwidth,
int tupsize; int tupsize;
double inner_rel_bytes; double inner_rel_bytes;
long hash_table_bytes; long hash_table_bytes;
long max_pointers;
int nbatch; int nbatch;
int nbuckets; int nbuckets;
int i; int i;
@ -376,8 +377,13 @@ ExecChooseHashTableSize(double ntuples, int tupwidth,
/* /*
* Set nbuckets to achieve an average bucket load of NTUP_PER_BUCKET when * Set nbuckets to achieve an average bucket load of NTUP_PER_BUCKET when
* memory is filled. Set nbatch to the smallest power of 2 that appears * memory is filled. Set nbatch to the smallest power of 2 that appears
* sufficient. * sufficient. The Min() steps limit the results so that the pointer
* arrays we'll try to allocate do not exceed work_mem.
*/ */
max_pointers = (work_mem * 1024L) / sizeof(void *);
/* also ensure we avoid integer overflow in nbatch and nbuckets */
max_pointers = Min(max_pointers, INT_MAX / 2);
if (inner_rel_bytes > hash_table_bytes) if (inner_rel_bytes > hash_table_bytes)
{ {
/* We'll need multiple batches */ /* We'll need multiple batches */
@ -386,11 +392,11 @@ ExecChooseHashTableSize(double ntuples, int tupwidth,
int minbatch; int minbatch;
lbuckets = (hash_table_bytes / tupsize) / NTUP_PER_BUCKET; lbuckets = (hash_table_bytes / tupsize) / NTUP_PER_BUCKET;
lbuckets = Min(lbuckets, INT_MAX); lbuckets = Min(lbuckets, max_pointers);
nbuckets = (int) lbuckets; nbuckets = (int) lbuckets;
dbatch = ceil(inner_rel_bytes / hash_table_bytes); dbatch = ceil(inner_rel_bytes / hash_table_bytes);
dbatch = Min(dbatch, INT_MAX / 2); dbatch = Min(dbatch, max_pointers);
minbatch = (int) dbatch; minbatch = (int) dbatch;
nbatch = 2; nbatch = 2;
while (nbatch < minbatch) while (nbatch < minbatch)
@ -402,7 +408,7 @@ ExecChooseHashTableSize(double ntuples, int tupwidth,
double dbuckets; double dbuckets;
dbuckets = ceil(ntuples / NTUP_PER_BUCKET); dbuckets = ceil(ntuples / NTUP_PER_BUCKET);
dbuckets = Min(dbuckets, INT_MAX); dbuckets = Min(dbuckets, max_pointers);
nbuckets = (int) dbuckets; nbuckets = (int) dbuckets;
nbatch = 1; nbatch = 1;
@ -481,7 +487,7 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable)
return; return;
/* safety check to avoid overflow */ /* safety check to avoid overflow */
if (oldnbatch > INT_MAX / 2) if (oldnbatch > Min(INT_MAX / 2, MaxAllocSize / (sizeof(void *) * 2)))
return; return;
nbatch = oldnbatch * 2; nbatch = oldnbatch * 2;