Fix cross-version compatibility checks of pg_verify_checksums

michaelpq · michaelpq · commit c9ae7f704c67 · 2019-03-13T09:51:02.000+09:00
pg_verify_checksums performs a read of the control file, and the data it fetches should be from a data folder compatible with the major version of Postgres the binary has been compiled with, but we never actually checked that compatibility. Reported-by: Sergei Kornilov Author: Michael Paquier Reviewed-by: Sergei Kornilov Discussion: https://postgr.es/m/155231347133.16480.11453587097036807558.pgcf@coridan.postgresql.org Backpatch-through: 11
diff --git a/src/bin/pg_verify_checksums/pg_verify_checksums.c b/src/bin/pg_verify_checksums/pg_verify_checksums.c
@@ -316,6 +316,13 @@ main(int argc, char *argv[])
 		exit(1);
 	}
 
+	if (ControlFile->pg_control_version != PG_CONTROL_VERSION)
+	{
+		fprintf(stderr, _("%s: cluster is not compatible with this version of pg_verify_checksums\n"),
+				progname);
+		exit(1);
+	}
+
 	if (ControlFile->state != DB_SHUTDOWNED &&
 		ControlFile->state != DB_SHUTDOWNED_IN_RECOVERY)
 	{

Original file line number	Diff line number	Diff line change
`@@ -316,6 +316,13 @@ main(int argc, char *argv[])`
`316`	`316`	`exit(1);`
`317`	`317`	`}`
`318`	`318`
	`319`	`+ if (ControlFile->pg_control_version != PG_CONTROL_VERSION)`
	`320`	`+ {`
	`321`	`+ fprintf(stderr, _("%s: cluster is not compatible with this version of pg_verify_checksums\n"),`
	`322`	`+ progname);`
	`323`	`+ exit(1);`
	`324`	`+ }`
	`325`	`+`
`319`	`326`	`if (ControlFile->state != DB_SHUTDOWNED &&`
`320`	`327`	`ControlFile->state != DB_SHUTDOWNED_IN_RECOVERY)`
`321`	`328`	`{`