From 18e806cf6033697cefca58a2be55377c8d92dbd4 Mon Sep 17 00:00:00 2001 From: smitsohu Date: Mon, 4 Jan 2021 18:48:35 +0100 Subject: non-dumpable plugins (hopefully) fixes the issues that led to reverting commits 6abb65d328af61d67361890743190bd4c57f8e3c and 98e42dc6da4e4b1e47ed2aa020012d4dedc1e80e --- src/fsec-print/Makefile.in | 4 ++-- src/fsec-print/fsec_print.h | 1 - src/fsec-print/main.c | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/fsec-print') diff --git a/src/fsec-print/Makefile.in b/src/fsec-print/Makefile.in index a30ff4ba3..bf39a8c77 100644 --- a/src/fsec-print/Makefile.in +++ b/src/fsec-print/Makefile.in @@ -5,8 +5,8 @@ include ../common.mk %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ -fsec-print: $(OBJS) ../lib/libnetlink.o ../lib/errno.o ../lib/syscall.o - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) +fsec-print: $(OBJS) ../lib/common.o ../lib/libnetlink.o ../lib/errno.o ../lib/syscall.o + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) clean:; rm -fr *.o fsec-print *.gcov *.gcda *.gcno *.plist diff --git a/src/fsec-print/fsec_print.h b/src/fsec-print/fsec_print.h index 9d17e3f18..337199288 100644 --- a/src/fsec-print/fsec_print.h +++ b/src/fsec-print/fsec_print.h @@ -23,7 +23,6 @@ #include "../include/seccomp.h" #include "../include/syscall.h" #include -#include // print.c void print(struct sock_filter *filter, int entries); diff --git a/src/fsec-print/main.c b/src/fsec-print/main.c index d1f056e47..ed030db21 100644 --- a/src/fsec-print/main.c +++ b/src/fsec-print/main.c @@ -61,10 +61,7 @@ printf("\n"); return 0; } -#ifdef WARN_DUMPABLE - if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid()) - fprintf(stderr, "Error fsec-print: I am dumpable\n"); -#endif + warn_dumpable(); char *fname = argv[1]; -- cgit v1.2.3-54-g00ecf