Properly terminate the array returned by GetLockConflicts().

anarazel · anarazel · commit 78f8c67054d0 · 2015-01-29T22:48:46.000+01:00
GetLockConflicts() has for a long time not properly terminated the
returned array. During normal processing the returned array is zero
initialized which, while not pretty, is sufficient to be recognized as
a invalid virtual transaction id. But the HotStandby case is more than
aesthetically broken: The allocated (and reused) array is neither
zeroed upon allocation, nor reinitialized, nor terminated.

Not having a terminating element means that the end of the array will
not be recognized and that recovery conflict handling will thus read
ahead into adjacent memory. Only terminating when hitting memory
content that looks like a invalid virtual transaction id.  Luckily
this seems so far not have caused significant problems, besides making
recovery conflict more expensive.

Discussion: 20150127142713.GD29457@awork2.anarazel.de

Backpatch into all supported branches.
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
@@ -1990,6 +1990,8 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
 		 * on this lockable object.
 		 */
 		LWLockRelease(partitionLock);
+		vxids[count].backendId = InvalidBackendId;
+		vxids[count].localTransactionId = InvalidLocalTransactionId;
 		return vxids;
 	}
 
@@ -2035,6 +2037,8 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
 	if (count > MaxBackends)	/* should never happen */
 		elog(PANIC, "too many conflicting locks found");
 
+	vxids[count].backendId = InvalidBackendId;
+	vxids[count].localTransactionId = InvalidLocalTransactionId;
 	return vxids;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1990,6 +1990,8 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)`
`1990`	`1990`	`* on this lockable object.`
`1991`	`1991`	`*/`
`1992`	`1992`	`LWLockRelease(partitionLock);`
	`1993`	`+ vxids[count].backendId = InvalidBackendId;`
	`1994`	`+ vxids[count].localTransactionId = InvalidLocalTransactionId;`
`1993`	`1995`	`return vxids;`
`1994`	`1996`	`}`
`1995`	`1997`
`@@ -2035,6 +2037,8 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)`
`2035`	`2037`	`if (count > MaxBackends) /* should never happen */`
`2036`	`2038`	`elog(PANIC, "too many conflicting locks found");`
`2037`	`2039`
	`2040`	`+ vxids[count].backendId = InvalidBackendId;`
	`2041`	`+ vxids[count].localTransactionId = InvalidLocalTransactionId;`
`2038`	`2042`	`return vxids;`
`2039`	`2043`	`}`
`2040`	`2044`