summaryrefslogtreecommitdiff
path: root/src/backend/access/gist/gist.c
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2014-04-03 15:09:37 +0300
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2014-04-03 15:43:50 +0300
commit04e298b826d452ceb838d9fda884a29f229d484d (patch)
tree95d544122aff600de78c9e7e716546ea78de925e /src/backend/access/gist/gist.c
parentfc752505a99a4e2c781a070d3d42a25289c22e3c (diff)
downloadpostgresql-04e298b826d452ceb838d9fda884a29f229d484d.tar.gz
Avoid palloc in critical section in GiST WAL-logging.
Memory allocation can fail if you run out of memory, and inside a critical section that will lead to a PANIC. Use conservatively-sized arrays in stack instead. There was previously no explicit limit on the number of pages a GiST split can produce, it was only limited by the number of LWLocks that can be held simultaneously (100 at the moment). This patch adds an explicit limit of 75 pages. That should be plenty, a typical split shouldn't produce more than 2-3 page halves. The bug has been there forever, but only backpatch down to 9.1. The code was changed significantly in 9.1, and it doesn't seem worth the risk or trouble to adapt this for 9.0 and 8.4.
Diffstat (limited to 'src/backend/access/gist/gist.c')
-rw-r--r--src/backend/access/gist/gist.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index b0711052fc..64125d5195 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -220,6 +220,7 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
GistNSN oldnsn = 0;
SplitedPageLayout rootpg;
bool is_rootsplit;
+ int npage;
is_rootsplit = (blkno == GIST_ROOT_BLKNO);
@@ -241,6 +242,19 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
dist = gistSplit(rel, page, itvec, tlen, giststate);
/*
+ * Check that split didn't produce too many pages.
+ */
+ npage = 0;
+ for (ptr = dist; ptr; ptr = ptr->next)
+ npage++;
+ /* in a root split, we'll add one more page to the list below */
+ if (is_rootsplit)
+ npage++;
+ if (npage > GIST_MAX_SPLIT_PAGES)
+ elog(ERROR, "GiST page split into too many halves (%d, maximum %d)",
+ npage, GIST_MAX_SPLIT_PAGES);
+
+ /*
* Set up pages to work with. Allocate new buffers for all but the
* leftmost page. The original page becomes the new leftmost page, and
* is just replaced with the new contents.