* [LTP] [PATCH v3 1/3] lib: Add SAFE_CHROOT(path) macro
@ 2018-06-21 14:16 Petr Vorel
2018-06-21 14:16 ` [LTP] [PATCH v3 2/3] lib: Introduce TESTPTR() Petr Vorel
2018-06-21 14:16 ` [LTP] [PATCH v3 3/3] cve/cve-2018-1000001: Add Realpath Buffer Underflow test Petr Vorel
0 siblings, 2 replies; 5+ messages in thread
From: Petr Vorel @ 2018-06-21 14:16 UTC (permalink / raw)
To: ltp
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
include/tst_safe_macros.h | 6 +++++-
lib/tst_safe_macros.c | 13 +++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h
index 75c2a0803..1ad9c71b2 100644
--- a/include/tst_safe_macros.h
+++ b/include/tst_safe_macros.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2015 Linux Test Project
+ * Copyright (c) 2010-2018 Linux Test Project
* Copyright (c) 2011-2015 Cyril Hrubis <chrubis@suse.cz>
*
* This program is free software: you can redistribute it and/or modify
@@ -48,6 +48,10 @@
#define SAFE_CREAT(pathname, mode) \
safe_creat(__FILE__, __LINE__, NULL, (pathname), (mode))
+#define SAFE_CHROOT(path) \
+ safe_chroot(__FILE__, __LINE__, (path))
+int safe_chroot(const char *file, const int lineno, const char *path);
+
#define SAFE_DIRNAME(path) \
safe_dirname(__FILE__, __LINE__, NULL, (path))
diff --git a/lib/tst_safe_macros.c b/lib/tst_safe_macros.c
index e152bff7f..17384f32c 100644
--- a/lib/tst_safe_macros.c
+++ b/lib/tst_safe_macros.c
@@ -152,3 +152,16 @@ struct group *safe_getgrnam(const char *file, const int lineno,
return rval;
}
+
+int safe_chroot(const char *file, const int lineno, const char *path)
+{
+ int rval;
+
+ rval = chroot(path);
+ if (rval == -1) {
+ tst_brk_(file, lineno, TBROK | TERRNO,
+ "chroot(%s) failed", path);
+ }
+
+ return rval;
+}
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [LTP] [PATCH v3 2/3] lib: Introduce TESTPTR()
2018-06-21 14:16 [LTP] [PATCH v3 1/3] lib: Add SAFE_CHROOT(path) macro Petr Vorel
@ 2018-06-21 14:16 ` Petr Vorel
2018-06-21 14:16 ` [LTP] [PATCH v3 3/3] cve/cve-2018-1000001: Add Realpath Buffer Underflow test Petr Vorel
1 sibling, 0 replies; 5+ messages in thread
From: Petr Vorel @ 2018-06-21 14:16 UTC (permalink / raw)
To: ltp
useful for testing with pointers.
NOTE: variable TST_RET_PTR has new format (TST_*), to confirm gh#336.
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
include/tst_test.h | 9 +++++++++
lib/tst_res.c | 1 +
2 files changed, 10 insertions(+)
diff --git a/include/tst_test.h b/include/tst_test.h
index 54ff306d9..7caf2e174 100644
--- a/include/tst_test.h
+++ b/include/tst_test.h
@@ -195,6 +195,15 @@ void tst_reinit(void);
extern long TEST_RETURN;
extern int TEST_ERRNO;
+extern void *TST_RET_PTR;
+
+#define TESTPTR(SCALL) \
+ do { \
+ errno = 0; \
+ TST_RET_PTR = (void*)SCALL; \
+ TEST_ERRNO = errno; \
+ } while (0)
+
/*
* Functions to convert ERRNO to its name and SIGNAL to its name.
*/
diff --git a/lib/tst_res.c b/lib/tst_res.c
index 8ff7ee425..c35f41b74 100644
--- a/lib/tst_res.c
+++ b/lib/tst_res.c
@@ -55,6 +55,7 @@
long TEST_RETURN;
int TEST_ERRNO;
+void *TST_RET_PTR;
#define VERBOSE 1
#define NOPASS 3
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [LTP] [PATCH v3 3/3] cve/cve-2018-1000001: Add Realpath Buffer Underflow test
2018-06-21 14:16 [LTP] [PATCH v3 1/3] lib: Add SAFE_CHROOT(path) macro Petr Vorel
2018-06-21 14:16 ` [LTP] [PATCH v3 2/3] lib: Introduce TESTPTR() Petr Vorel
@ 2018-06-21 14:16 ` Petr Vorel
2018-06-21 14:20 ` Cyril Hrubis
1 sibling, 1 reply; 5+ messages in thread
From: Petr Vorel @ 2018-06-21 14:16 UTC (permalink / raw)
To: ltp
Idea based on glibc source io/tst-getcwd-abspath.c, contributed by
Dmitry V. Levin [1]
[1] https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=52a713fdd0a30e1bd79818e2e3c4ab44ddca1a94;hp=249a5895f120b13290a372a49bb4b499e749806f
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Changes v2->v3:
* Put source into testcases/kernel/syscalls/getcwd/getcwd05.c.
* Put record in several runtest files.
* Minor code simplification.
Kind regards,
Petr
---
runtest/cve | 1 +
runtest/ltplite | 1 +
runtest/stress.part3 | 1 +
runtest/syscalls | 1 +
testcases/cve/Makefile | 2 +-
testcases/kernel/syscalls/getcwd/.gitignore | 1 +
testcases/kernel/syscalls/getcwd/getcwd05.c | 56 +++++++++++++++++++++
7 files changed, 62 insertions(+), 1 deletion(-)
create mode 100644 testcases/kernel/syscalls/getcwd/getcwd05.c
diff --git a/runtest/cve b/runtest/cve
index 2f4171c84..c7f438be2 100644
--- a/runtest/cve
+++ b/runtest/cve
@@ -33,3 +33,4 @@ cve-2017-17052 cve-2017-17052
cve-2017-16939 cve-2017-16939
cve-2017-17053 cve-2017-17053
cve-2018-5803 sctp_big_chunk
+cve-2018-1000001 getcwd05
diff --git a/runtest/ltplite b/runtest/ltplite
index 249262674..9d4af2da6 100644
--- a/runtest/ltplite
+++ b/runtest/ltplite
@@ -281,6 +281,7 @@ getcwd01 getcwd01
getcwd02 getcwd02
getcwd03 getcwd03
getcwd04 getcwd04
+getcwd05 getcwd05
getdents01 getdents01
getdents02 getdents02
diff --git a/runtest/stress.part3 b/runtest/stress.part3
index d9287197b..8eb02d8b3 100644
--- a/runtest/stress.part3
+++ b/runtest/stress.part3
@@ -220,6 +220,7 @@ getcwd01 getcwd01
getcwd02 getcwd02
getcwd03 getcwd03
getcwd04 getcwd04
+getcwd05 getcwd05
getdents01 getdents01
getdents02 getdents02
diff --git a/runtest/syscalls b/runtest/syscalls
index 65c96edab..edec76f13 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -348,6 +348,7 @@ getcwd01 getcwd01
getcwd02 getcwd02
getcwd03 getcwd03
getcwd04 getcwd04
+getcwd05 getcwd05
getdents01 getdents01
getdents02 getdents02
diff --git a/testcases/cve/Makefile b/testcases/cve/Makefile
index 3a05dd4fe..e5fc8d44f 100644
--- a/testcases/cve/Makefile
+++ b/testcases/cve/Makefile
@@ -41,4 +41,4 @@ cve-2017-17053: CFLAGS += -pthread
cve-2015-3290: CFLAGS += -pthread
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
+include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/kernel/syscalls/getcwd/.gitignore b/testcases/kernel/syscalls/getcwd/.gitignore
index 338852b62..99b2ba19f 100644
--- a/testcases/kernel/syscalls/getcwd/.gitignore
+++ b/testcases/kernel/syscalls/getcwd/.gitignore
@@ -2,3 +2,4 @@
/getcwd02
/getcwd03
/getcwd04
+/getcwd05
diff --git a/testcases/kernel/syscalls/getcwd/getcwd05.c b/testcases/kernel/syscalls/getcwd/getcwd05.c
new file mode 100644
index 000000000..182f6b56f
--- /dev/null
+++ b/testcases/kernel/syscalls/getcwd/getcwd05.c
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2018 Petr Vorel <pvorel@suse.cz>
+ * Based on the reproducer posted upstream so other copyrights may apply.
+ *
+ * Author: Dmitry V. Levin <ldv@altlinux.org>
+ * LTP conversion from glibc source: Petr Vorel <pvorel@suse.cz>
+ */
+
+#include "tst_test.h"
+
+#include <errno.h>
+#include <stdlib.h>
+
+#define CHROOT_DIR "cve-2018-1000001"
+
+static void setup(void)
+{
+ SAFE_MKDIR(CHROOT_DIR, 0755);
+ SAFE_CHROOT(CHROOT_DIR);
+}
+
+static void run(unsigned int i)
+{
+ int fail = 0;
+
+ if (i) {
+ tst_res(TINFO, "testing realpath()");
+ TESTPTR(realpath(".", NULL));
+ } else {
+ tst_res(TINFO, "testing getcwd()");
+ TESTPTR(getcwd(NULL, 0));
+ }
+
+ if (TEST_ERRNO != ENOENT) {
+ tst_res(TFAIL | TTERRNO, "returned unexpected errno");
+ fail = 1;
+ }
+
+ if (TST_RET_PTR != NULL) {
+ tst_res(TFAIL, "syscall didn't return NULL: '%s'",
+ (char *)TST_RET_PTR);
+ fail = 1;
+ }
+
+ if (!fail)
+ tst_res(TPASS, "bug not reproduced");
+}
+
+static struct tst_test test = {
+ .test = run,
+ .tcnt = 2,
+ .setup = setup,
+ .needs_root = 1,
+ .needs_tmpdir = 1,
+};
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [LTP] [PATCH v3 3/3] cve/cve-2018-1000001: Add Realpath Buffer Underflow test
2018-06-21 14:16 ` [LTP] [PATCH v3 3/3] cve/cve-2018-1000001: Add Realpath Buffer Underflow test Petr Vorel
@ 2018-06-21 14:20 ` Cyril Hrubis
2018-06-21 14:32 ` Petr Vorel
0 siblings, 1 reply; 5+ messages in thread
From: Cyril Hrubis @ 2018-06-21 14:20 UTC (permalink / raw)
To: ltp
Hi!
> diff --git a/testcases/cve/Makefile b/testcases/cve/Makefile
> index 3a05dd4fe..e5fc8d44f 100644
> --- a/testcases/cve/Makefile
> +++ b/testcases/cve/Makefile
> @@ -41,4 +41,4 @@ cve-2017-17053: CFLAGS += -pthread
>
> cve-2015-3290: CFLAGS += -pthread
>
> -include $(top_srcdir)/include/mk/generic_leaf_target.mk
> +include $(top_srcdir)/include/mk/generic_trunk_target.mk
This change is useless now.
Other than that the patchset looks fine.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 5+ messages in thread
* [LTP] [PATCH v3 3/3] cve/cve-2018-1000001: Add Realpath Buffer Underflow test
2018-06-21 14:20 ` Cyril Hrubis
@ 2018-06-21 14:32 ` Petr Vorel
0 siblings, 0 replies; 5+ messages in thread
From: Petr Vorel @ 2018-06-21 14:32 UTC (permalink / raw)
To: ltp
Hi Cyril,
> > diff --git a/testcases/cve/Makefile b/testcases/cve/Makefile
> > index 3a05dd4fe..e5fc8d44f 100644
> > --- a/testcases/cve/Makefile
> > +++ b/testcases/cve/Makefile
> > @@ -41,4 +41,4 @@ cve-2017-17053: CFLAGS += -pthread
> > cve-2015-3290: CFLAGS += -pthread
> > -include $(top_srcdir)/include/mk/generic_leaf_target.mk
> > +include $(top_srcdir)/include/mk/generic_trunk_target.mk
> This change is useless now.
Sorry for leaving this. Removed it and pushed, with your ack.
> Other than that the patchset looks fine.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-06-21 14:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-21 14:16 [LTP] [PATCH v3 1/3] lib: Add SAFE_CHROOT(path) macro Petr Vorel
2018-06-21 14:16 ` [LTP] [PATCH v3 2/3] lib: Introduce TESTPTR() Petr Vorel
2018-06-21 14:16 ` [LTP] [PATCH v3 3/3] cve/cve-2018-1000001: Add Realpath Buffer Underflow test Petr Vorel
2018-06-21 14:20 ` Cyril Hrubis
2018-06-21 14:32 ` Petr Vorel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.