postgresql: fix build (#13419)

DavidKorczynski · web-flow · commit 753f9f7002e3 · 2025-06-10T01:20:27.000+01:00
Signed-off-by: David Korczynski &lt;david@adalogics.com&gt;
diff --git a/projects/postgresql/Dockerfile b/projects/postgresql/Dockerfile
@@ -16,13 +16,14 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 
-RUN apt-get update && apt-get install -y make libreadline-dev zlib1g-dev bison flex
+RUN apt-get update && apt-get install -y make libreadline-dev zlib1g-dev bison\
+    flex pkg-config libicu-dev
 
-RUN git clone git://git.postgresql.org/git/postgresql.git
-RUN zip postgresql_fuzzer_seed_corpus.zip postgresql/src/test/regress/sql/*
+RUN git clone https://github.com/postgres/postgres
+RUN zip postgresql_fuzzer_seed_corpus.zip postgres/src/test/regress/sql/*
 
-WORKDIR postgresql
+WORKDIR postgres
 RUN mkdir bld
 
 COPY fuzzer $SRC/fuzzer
-COPY build.sh add_fuzzers.diff $SRC/
+COPY build.sh add_fuzzers.diff main.diff $SRC/
diff --git a/projects/postgresql/add_fuzzers.diff b/projects/postgresql/add_fuzzers.diff
@@ -1,10 +1,10 @@
 diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
-index 0775abe35d..f53b3580b3 100644
+index 2f8c3d5f918..d9774758413 100644
 --- a/src/backend/tcop/postgres.c
 +++ b/src/backend/tcop/postgres.c
-@@ -105,6 +105,11 @@ int			PostAuthDelay = 0;
- /* Time between checks that the client is still connected. */
- int			client_connection_check_interval = 0;
+@@ -104,6 +104,11 @@ int			client_connection_check_interval = 0;
+ /* flags for non-system relation kinds to restrict use */
+ int			restrict_nonsystem_relation_kind;
  
 +#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 +bool        fuzzer_first_run = true;
@@ -14,7 +14,7 @@ index 0775abe35d..f53b3580b3 100644
  /* ----------------
   *		private typedefs etc
   * ----------------
-@@ -471,11 +476,14 @@ static int
+@@ -480,11 +485,14 @@ static int
  ReadCommand(StringInfo inBuf)
  {
  	int			result;
@@ -30,9 +30,9 @@ index 0775abe35d..f53b3580b3 100644
  	return result;
  }
  
-@@ -4021,6 +4029,11 @@ PostgresMain(const char *dbname, const char *username)
- 	bool		idle_in_transaction_timeout_enabled = false;
- 	bool		idle_session_timeout_enabled = false;
+@@ -4190,6 +4198,11 @@ PostgresMain(const char *dbname, const char *username)
+ 	volatile bool idle_in_transaction_timeout_enabled = false;
+ 	volatile bool idle_session_timeout_enabled = false;
  
 +#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 +       if(fuzzer_first_run)
@@ -42,7 +42,7 @@ index 0775abe35d..f53b3580b3 100644
  	Assert(dbname != NULL);
  	Assert(username != NULL);
  
-@@ -4312,6 +4325,11 @@ PostgresMain(const char *dbname, const char *username)
+@@ -4509,6 +4522,11 @@ PostgresMain(const char *dbname, const char *username)
  	if (!ignore_till_sync)
  		send_ready_for_query = true;	/* initially, or after error */
  
@@ -55,16 +55,15 @@ index 0775abe35d..f53b3580b3 100644
  	 * Non-error queries loop here.
  	 */
 diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
-index 2af87ee3bd..825bb70532 100644
+index 47af743990f..476e336d418 100644
 --- a/src/backend/utils/error/elog.c
 +++ b/src/backend/utils/error/elog.c
-@@ -594,7 +594,9 @@ errfinish(const char *filename, int lineno, const char *funcname)
+@@ -540,7 +540,7 @@ errfinish(const char *filename, int lineno, const char *funcname)
  	}
  
  	/* Emit the message to the right places */
-+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
- 	EmitErrorReport();
-+#endif
+-	EmitErrorReport();
++ 	//EmitErrorReport();
  
  	/* Now free up subsidiary data attached to stack entry, and release it */
- 	if (edata->message)
+ 	FreeErrorDataContents(edata);
diff --git a/projects/postgresql/build.sh b/projects/postgresql/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -eu
+#!/bin/bash -eux
 # Copyright 2020 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,16 +14,34 @@
 # limitations under the License.
 #
 ################################################################################
+# Apply diff for fuzzers
 cp -r $SRC/fuzzer src/backend/
 git apply --ignore-space-change --ignore-whitespace  ../add_fuzzers.diff
 
+# Change permission for fuzzers
 useradd fuzzuser
 chown -R fuzzuser .
+
 cd bld
 
+# Build icu 66 for postgres
+wget https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz
+tar -xzf icu4c-66_1-src.tgz
+pushd icu/source
+./configure --prefix=/opt/icu66  --enable-renaming CC=clang CXX=clang++ CFLAGS="" CXXFLAGS=""
+make -j$(nproc)
+make install
+popd
+
+# Add environment flags for icu 66
+export PKG_CONFIG_PATH=/opt/icu66/lib/pkgconfig
+export LD_LIBRARY_PATH=/opt/icu66/lib
+export ICU_CFLAGS="-I/opt/icu66/include"
+export ICU_LIBS="-L/opt/icu66/lib -licui18n -licuuc -licudata"
+
 CC="" CXX="" CFLAGS="" CXXFLAGS="" su fuzzuser -c ../configure
 cd src/backend/fuzzer
-su fuzzuser -c "make createdb"
+su fuzzuser -c "make -j10 createdb"
 chown -R root .
 mv temp/data .
 cp -r data $OUT/
@@ -32,12 +50,24 @@ cp -r tmp_install $OUT/
 make clean
 
 ../configure
-make
-cd src/backend/fuzzer
-make fuzzer
+make -j$(nproc)
+
+# Manually remove main function from main.c and recompile it
+cd ../
+git apply --ignore-space-change --ignore-whitespace  $SRC/main.diff
+cd bld
+$CC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -I./src/include -I./src/include/port -I../src/include -fPIC -c ../src/backend/main/main.c -o ./src/backend/main/main.o
+
+# Package static library
+cd src/backend
+ar rcs libpostgres.a $(find . -name '*.o' | grep -v '^./fuzzer/')
+
+cd fuzzer
+make -j$(nproc) fuzzer
 #if [ "$FUZZING_ENGINE" = "afl" ]
 #then
 rm protocol_fuzzer
+rm simple_query_fuzzer
 #fi
 cp *_fuzzer $OUT/
 cp $SRC/postgresql_fuzzer_seed_corpus.zip $OUT/
diff --git a/projects/postgresql/fuzzer/Makefile b/projects/postgresql/fuzzer/Makefile
@@ -31,6 +31,7 @@ OBJS = \
 	$(SUBDIROBJS) \
 	$(top_builddir)/src/common/libpgcommon_srv.a \
 	$(top_builddir)/src/port/libpgport_srv.a \
+        $(top_builddir)/src/backend/libpostgres.a \
 
 OBJS_FUZZERS = $(filter-out ../main/objfiles.txt, $(OBJS))
 
@@ -41,19 +42,19 @@ fuzzer: simple_query_fuzzer \
 	protocol_fuzzer
 
 simple_query_fuzzer json_parser_fuzzer: %: %.o fuzzer_initialize.o $(OBJS_FUZZERS)
-	$(CXX) $(CFLAGS) $(call expand_subsys,$^) -o $@ $(LIB_FUZZING_ENGINE) -lz
+	$(CXX) $(CFLAGS) $(call expand_subsys,$^) -o $@ -l:libicui18n.a -l:libicuuc.a -l:libicudata.a $(LIB_FUZZING_ENGINE) -lz -lpthread -ldl -lrt
 
 simple_query_fuzzer.o json_parser_fuzzer.o protocol_fuzzer.o fuzzer_initialize.o: %.o: %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $^ 
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $^
 
 protocol_fuzzer: %: %.o $(OBJS_FUZZERS)
-	$(CXX) $(CFLAGS) $(call expand_subsys,$^) -o $@ $(LIB_FUZZING_ENGINE) -Wl,--wrap=exit -Wl,--wrap=pq_getbyte  -lz
+	$(CXX) $(CFLAGS) $(call expand_subsys,$^) -o $@ -l:libicui18n.a -l:libicuuc.a -l:libicudata.a $(LIB_FUZZING_ENGINE) -Wl,--wrap=exit -Wl,--wrap=pq_getbyte -lz -lpthread -ldl -lrt
 
 dbfuzz: dbfuzz.o | submake-libpgport temp-install
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@ \
 	&& PATH="$(abs_top_builddir)/tmp_install$(bindir):$$PATH" LD_LIBRARY_PATH="$(abs_top_builddir)/tmp_install/usr/local/pgsql/lib" ./dbfuzz
 
-dbfuzz.o: dbfuzz.c $(top_builddir)/src/port/pg_config_paths.h 
+dbfuzz.o: dbfuzz.c $(top_builddir)/src/port/pg_config_paths.h
 dbfuzz.o: override CPPFLAGS := $(CPPFLAGS) -I$(top_builddir)/src/port -I$(top_builddir)/../src/test/regress '-DSHELLPROG="$(SHELL)"'
 
 $(top_builddir)/src/port/pg_config_paths.h: | submake-libpgport
diff --git a/projects/postgresql/fuzzer/fuzzer_initialize.c b/projects/postgresql/fuzzer/fuzzer_initialize.c
@@ -37,7 +37,7 @@
 
 #include <libgen.h>
 
-const char *progname;
+extern const char *progname;
 static MemoryContext row_description_context = NULL;
 static StringInfoData row_description_buf;
 static const char *username = "username";
@@ -65,7 +65,7 @@ int FuzzerInitialize(char *dbname, char ***argv){
   av[4] = NULL;
 
   system(untar);
-  
+
   progname = get_progname(av[0]);
   MemoryContextInit();
 
@@ -81,13 +81,13 @@ int FuzzerInitialize(char *dbname, char ***argv){
   CreateDataDirLockFile(false);
   LocalProcessControlFile(false);
   InitializeMaxBackends();
-		 
-  CreateSharedMemoryAndSemaphores();
+
+  // CreateSharedMemoryAndSemaphores();
   InitProcess();
   BaseInit();
-  PG_SETMASK(&UnBlockSig);
-  InitPostgres("dbfuzz", InvalidOid, username, InvalidOid, false, false,  NULL);
- 
+  sigprocmask(SIG_SETMASK, &UnBlockSig, NULL);
+  InitPostgres("dbfuzz", InvalidOid, username, InvalidOid, false, false);
+
   SetProcessingMode(NormalProcessing);
 
   BeginReportingGUCOptions();
diff --git a/projects/postgresql/fuzzer/json_parser_fuzzer.c b/projects/postgresql/fuzzer/json_parser_fuzzer.c
@@ -22,7 +22,7 @@
 #include "utils/memdebug.h"
 
 int LLVMFuzzerInitialize(int *argc, char ***argv) {
-	FuzzerInitialize("json_db", argv);
+	//FuzzerInitialize("json_db", argv);
 	return 0;
 }
 
@@ -42,7 +42,7 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 	MemoryContextInit();
 	set_stack_base();
 	sem = nullSemAction;
-	lex = makeJsonLexContextCstringLen(buffer, size+1, PG_UTF8, true);
+	lex = makeJsonLexContextCstringLen(NULL, buffer, size+1, PG_UTF8, true);
 
 	if(!sigsetjmp(local_sigjmp_buf,0)){
 		error_context_stack = NULL;
diff --git a/projects/postgresql/fuzzer/protocol_fuzzer.c b/projects/postgresql/fuzzer/protocol_fuzzer.c
@@ -45,7 +45,6 @@
 #include <unistd.h>
 #include <libgen.h>
 
-const char *progname = "progname";
 static sigjmp_buf postgre_exit;
 static bool postgre_started;
 static char *buffer;
diff --git a/projects/postgresql/fuzzer/simple_query_fuzzer.c b/projects/postgresql/fuzzer/simple_query_fuzzer.c
@@ -57,7 +57,7 @@ exec_simple_query(const char *query_string)
       bool        snapshot_set = false;
       MemoryContext per_parsetree_context = NULL;
       List       *querytree_list,
-	*plantree_list;		
+	*plantree_list;
 
       if (use_implicit_block)
 	BeginImplicitTransactionBlock();
@@ -81,7 +81,7 @@ exec_simple_query(const char *query_string)
 
       querytree_list = pg_analyze_and_rewrite_fixedparams(parsetree, query_string,
 					      NULL, 0, NULL);
- 
+
       plantree_list = pg_plan_queries(querytree_list, query_string,
 				      CURSOR_OPT_PARALLEL_OK, NULL);
 
@@ -131,7 +131,7 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
       FlushErrorState();
 
       MemoryContextSwitchTo(MessageContext);
-      MemoryContextResetAndDeleteChildren(MessageContext);
+      MemoryContextReset(MessageContext);
 
       InvalidateCatalogSnapshotConditionally();
 
diff --git a/projects/postgresql/main.diff b/projects/postgresql/main.diff
@@ -0,0 +1,20 @@
+diff --git a/src/backend/main/main.c b/src/backend/main/main.c
+index 7d63cf94a6b..d10f721dadc 100644
+--- a/src/backend/main/main.c
++++ b/src/backend/main/main.c
+@@ -64,6 +64,7 @@ static void help(const char *progname);
+ static void check_root(const char *progname);
+
+
++#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+ /*
+  * Any Postgres server process begins execution here.
+  */
+@@ -231,6 +232,7 @@ main(int argc, char *argv[])
+        /* the functions above should not return */
+        abort();
+ }
++#endif
+
+ /*
+  * Returns the matching DispatchOption value for the given option name.  If no
