Fix two NULL pointer dereferences when reading custom pgstats from file

There were two spots in pgstat_read_statsfile() where is was possible to
finish with a null-pointer-dereference crash for custom pgstats kinds:
- When reading stats for a fixed-numbered stats entry.
- When reading a variable stats entry with name serialization.
For both cases, these issues were reachable by starting a server after
changing shared_preload_libraries so as the stats written previously
could not be loaded.

The code is changed so as the stats are ignored in this case, like the
other code paths doing similar sanity checks.  Two WARNINGs are added to
be able to debug these issues.  A test is added for the case of
fixed-numbered stats with the module injection_points.

Oversights in 7949d9594582, spotted while looking at a different report.

Discussion: https://postgr.es/m/Ztj0Jftsn4xXuXtl@paquier.xyz
This commit is contained in:
Michael Paquier 2024-09-05 14:36:57 +09:00
parent 5735521ac2
commit 341e9a05e7
2 changed files with 18 additions and 0 deletions

View File

@ -1781,6 +1781,12 @@ pgstat_read_statsfile(XLogRecPtr redo)
}
info = pgstat_get_kind_info(kind);
if (!info)
{
elog(WARNING, "could not find information of kind %u for entry of type %c",
kind, t);
goto error;
}
if (!info->fixed_amount)
{
@ -1861,6 +1867,12 @@ pgstat_read_statsfile(XLogRecPtr redo)
}
kind_info = pgstat_get_kind_info(kind);
if (!kind_info)
{
elog(WARNING, "could not find information of kind %u for entry of type %c",
kind, t);
goto error;
}
if (!kind_info->from_serialized_name)
{

View File

@ -69,4 +69,10 @@ $fixedstats = $node->safe_psql('postgres',
"SELECT * FROM injection_points_stats_fixed();");
is($fixedstats, '0|0|0|0|0', 'fixed stats after crash');
# Stop the server, disable the module, then restart. The server
# should be able to come up.
$node->stop;
$node->adjust_conf('postgresql.conf', 'shared_preload_libraries', "''");
$node->start;
done_testing();