diff options
author | Andrew G. Morgan <morgan@kernel.org> | 2021-06-19 16:26:31 -0700 |
---|---|---|
committer | Andrew G. Morgan <morgan@kernel.org> | 2021-06-19 17:36:46 -0700 |
commit | 2c99ecd7ee8580cced618dd9d16473f15e778e5e (patch) | |
tree | 136b14c3c63d38cda256647cfb1be9143c090260 | |
parent | c89405455d3b730e933aa0520ca3c57a07117b80 (diff) | |
download | libcap2-2c99ecd7ee8580cced618dd9d16473f15e778e5e.tar.gz |
Add kernel test to quicktest.sh
This resolves:
https://bugzilla.kernel.org/show_bug.cgi?id=212737
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
-rwxr-xr-x | kdebug/test-kernel.sh | 1 | ||||
-rw-r--r-- | progs/Makefile | 8 | ||||
-rwxr-xr-x | progs/quicktest.sh | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/kdebug/test-kernel.sh b/kdebug/test-kernel.sh index 8ef7b15..38f5584 100755 --- a/kdebug/test-kernel.sh +++ b/kdebug/test-kernel.sh @@ -48,6 +48,7 @@ file /root/capsh $HERE/../progs/capsh 0755 0 0 file /root/getpcaps $HERE/../progs/getpcaps 0755 0 0 file /root/tcapsh-static $HERE/../progs/tcapsh-static 0755 0 0 file /root/exit $HERE/exit 0755 0 0 +file /root/uns_test $HERE/../tests/uns_test 0755 0 0 EOF # convenience for some local experiments diff --git a/progs/Makefile b/progs/Makefile index 2289cf7..3e82862 100644 --- a/progs/Makefile +++ b/progs/Makefile @@ -51,10 +51,14 @@ capsh: capsh.c capshdoc.h.cf $(DEPS) tcapsh-static: capsh.c capshdoc.h.cf $(DEPS) $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static -sudotest: test tcapsh-static +uns_test: ../tests/uns_test.c + $(MAKE) -C ../tests uns_test + cp ../tests/uns_test . + +sudotest: test tcapsh-static uns_test sudo $(LDPATH) ./quicktest.sh clean: $(LOCALCLEAN) - rm -f *.o $(BUILD) privileged ping hack.sh compare-cap + rm -f *.o $(BUILD) privileged ping hack.sh compare-cap uns_test rm -f capsh tcapsh* capshdoc.h.cf diff --git a/progs/quicktest.sh b/progs/quicktest.sh index 6aa2598..aaabbca 100755 --- a/progs/quicktest.sh +++ b/progs/quicktest.sh @@ -259,4 +259,11 @@ else fi rm -f compare-cap +echo "attempt to exploit kernel bug" +./uns_test +if [ $? -ne 0 ]; then + echo "upgrade your kernel" + exit 1 +fi + echo "ALL TESTS PASSED!" |