Fix possible cache invalidation failure in ReceiveSharedInvalidMessages.

tglsfdc · tglsfdc · commit 0f928a85ecd5 · 2014-05-05T14:43:39.000-04:00
Commit fad153e modified sinval.c to reduce the number of calls into sinvaladt.c (which require taking a shared lock) by keeping a local buffer of collected-but-not-yet-processed messages. However, if processing of the last message in a batch resulted in a recursive call to ReceiveSharedInvalidMessages, we could overwrite that message with a new one while the outer invalidation function was still working on it. This would be likely to lead to invalidation of the wrong cache entry, allowing subsequent processing to use stale cache data. The fix is just to make a local copy of each message while we're processing it. Spotted by Andres Freund. Back-patch to 8.4 where the bug was introduced.
diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
@@ -91,10 +91,10 @@ ReceiveSharedInvalidMessages(
 	/* Deal with any messages still pending from an outer recursion */
 	while (nextmsg < nummsgs)
 	{
-		SharedInvalidationMessage *msg = &messages[nextmsg++];
+		SharedInvalidationMessage msg = messages[nextmsg++];
 
 		SharedInvalidMessageCounter++;
-		invalFunction(msg);
+		invalFunction(&msg);
 	}
 
 	do
@@ -121,10 +121,10 @@ ReceiveSharedInvalidMessages(
 
 		while (nextmsg < nummsgs)
 		{
-			SharedInvalidationMessage *msg = &messages[nextmsg++];
+			SharedInvalidationMessage msg = messages[nextmsg++];
 
 			SharedInvalidMessageCounter++;
-			invalFunction(msg);
+			invalFunction(&msg);
 		}
 
 		/*

Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,10 @@ ReceiveSharedInvalidMessages(`
`91`	`91`	`/* Deal with any messages still pending from an outer recursion */`
`92`	`92`	`while (nextmsg < nummsgs)`
`93`	`93`	`{`
`94`		`- SharedInvalidationMessage *msg = &messages[nextmsg++];`
	`94`	`+ SharedInvalidationMessage msg = messages[nextmsg++];`
`95`	`95`
`96`	`96`	`SharedInvalidMessageCounter++;`
`97`		`- invalFunction(msg);`
	`97`	`+ invalFunction(&msg);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`do`
`@@ -121,10 +121,10 @@ ReceiveSharedInvalidMessages(`
`121`	`121`
`122`	`122`	`while (nextmsg < nummsgs)`
`123`	`123`	`{`
`124`		`- SharedInvalidationMessage *msg = &messages[nextmsg++];`
	`124`	`+ SharedInvalidationMessage msg = messages[nextmsg++];`
`125`	`125`
`126`	`126`	`SharedInvalidMessageCounter++;`
`127`		`- invalFunction(msg);`
	`127`	`+ invalFunction(&msg);`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`/*`