aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Yunshu Ouyang <61579667+yooyoo9@users.noreply.github.com>2020-09-08 21:07:01 +0200
committerGravatar GitHub <noreply@github.com>2020-09-08 12:07:01 -0700
commitdc44763e9eebe9c22450d0df5962d7c2abe93399 (patch)
tree78908c293c3df6263ad0cb03851aa3ecf98ab3a9
parent26cb1c648c2b9400a298d28b07261fef57bdc822 (diff)
[Nginx] fixing startup crashes (#4425)
* fixing startup crashes * Removed whitespaces
-rw-r--r--projects/nginx/build.sh2
-rw-r--r--projects/nginx/fuzz/http_request_fuzzer.cc1
-rw-r--r--projects/nginx/fuzz/wrappers.c9
3 files changed, 10 insertions, 2 deletions
diff --git a/projects/nginx/build.sh b/projects/nginx/build.sh
index 341b0e5a..fcfb70ba 100644
--- a/projects/nginx/build.sh
+++ b/projects/nginx/build.sh
@@ -24,7 +24,7 @@ rm -rf genfiles && mkdir genfiles && $SRC/LPM/external.protobuf/bin/protoc http_
cd ../..
auto/configure \
- --with-ld-opt="-Wl,--wrap=listen -Wl,--wrap=setsockopt -Wl,--wrap=bind -Wl,--wrap=shutdown -Wl,--wrap=connect -Wl,--wrap=getpwnam -Wl,--wrap=getgrnam" \
+ --with-ld-opt="-Wl,--wrap=listen -Wl,--wrap=setsockopt -Wl,--wrap=bind -Wl,--wrap=shutdown -Wl,--wrap=connect -Wl,--wrap=getpwnam -Wl,--wrap=getgrnam -Wl,--wrap=chmod -Wl,--wrap=chown" \
--with-http_v2_module
make -f objs/Makefile fuzzers
diff --git a/projects/nginx/fuzz/http_request_fuzzer.cc b/projects/nginx/fuzz/http_request_fuzzer.cc
index 4cb8c008..bed04d7d 100644
--- a/projects/nginx/fuzz/http_request_fuzzer.cc
+++ b/projects/nginx/fuzz/http_request_fuzzer.cc
@@ -30,7 +30,6 @@ extern "C" {
#include "libprotobuf-mutator/src/libfuzzer/libfuzzer_macro.h"
static char configuration[] =
-"user root;\n"
"error_log stderr emerg;\n"
"events {\n"
" use epoll;\n"
diff --git a/projects/nginx/fuzz/wrappers.c b/projects/nginx/fuzz/wrappers.c
index a351c37a..21391217 100644
--- a/projects/nginx/fuzz/wrappers.c
+++ b/projects/nginx/fuzz/wrappers.c
@@ -15,6 +15,7 @@
////////////////////////////////////////////////////////////////////////////////
#include <sys/socket.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <grp.h>
#include <pwd.h>
@@ -35,6 +36,14 @@ int __wrap_setsockopt(int fd, int level, int optname, const void *optval,
return 0;
}
+int __wrap_chmod(const char *pathname, mode_t mode){
+ return 0;
+}
+
+int __wrap_chown(const char *pathname, uid_t owner, gid_t group){
+ return 0;
+}
+
struct passwd *__wrap_getpwnam(const char *name){
struct passwd *pwd = (struct passwd *) calloc(1, sizeof(struct passwd));
pwd->pw_uid = 1;