Skip to contentSkip to conversation

Add test for CVE 2017-10661

PATCH Superseded Martin Doucha 3 participants 3 messages Feb 20, 2020 – Feb 21, 2020

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add test for CVE 2017-10661

---
 testcases/cve/Makefile         |   3 +
 testcases/cve/cve-2017-10661.c | 112 +++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 testcases/cve/cve-2017-10661.c
testcases/cve/Makefile +3 -0
index da44fff60..1faee9fc5 100644
@@ -36,6 +36,9 @@ endif
 cve-2017-2671:	CFLAGS += -pthread
 cve-2017-2671:	LDLIBS += -lrt
 
+cve-2017-10661:	CFLAGS += -pthread
+cve-2017-10661:	LDLIBS += -lrt
+
 meltdown: CFLAGS += -I$(abs_srcdir)/../realtime/include
 
 ifneq (,$(filter $(HOST_CPU),x86 x86_64))
testcases/cve/cve-2017-10661.c new file +112 -0

112 lines not on this page · raw message

Signature · 1 line
2.25.0
#1 lore raw

PATCH 1/1 Add test for CVE 2017-10661

Hello,

Looks mostly good, but see comments below.

Quoted 27 lines · Martin Doucha
---
 testcases/cve/Makefile         |   3 +
 testcases/cve/cve-2017-10661.c | 112 +++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 testcases/cve/cve-2017-10661.c
testcases/cve/Makefile +3 -0
index da44fff60..1faee9fc5 100644
@@ -36,6 +36,9 @@ endif
 cve-2017-2671:	CFLAGS += -pthread
 cve-2017-2671:	LDLIBS += -lrt
 
+cve-2017-10661:	CFLAGS += -pthread
+cve-2017-10661:	LDLIBS += -lrt
+
 meltdown: CFLAGS += -I$(abs_srcdir)/../realtime/include
 
 ifneq (,$(filter $(HOST_CPU),x86 x86_64))
testcases/cve/cve-2017-10661.c new file +0 -0
new file mode 100644
index 000000000..6fe6b63c7

testcases/cve/cve-2017-10661.c line 9

Quoted 9 lines
testcases/cve/cve-2017-10661.c new file +9 -0
@@ -0,0 +1,112 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2020 SUSE LLC <[email protected]>
+ *
+ * CVE-2017-10661
+ *
+ * Test for race condition vulnerability in timerfd_settime(). Multiple
+ * concurrent calls of timerfd_settime() clearing the CANCEL_ON_SET flag may
+ * cause memory corruption. Fixed in:

We had some complaints that sorting tests by cve number made the tests for a particular component difficult to find. So you should put this with the other timerfd tests.

CVEs which rely on the interaction between many components or are against hardware go in this folder.

Quoted 16 lines
testcases/cve/cve-2017-10661.c new file +16 -0
+ *
+ *  commit 1e38da300e1e395a15048b0af1e5305bd91402f6
+ *  Author: Thomas Gleixner <[email protected]>
+ *  Date:   Tue Jan 31 15:24:03 2017 +0100
+ *
+ *  timerfd: Protect the might cancel mechanism proper
+ */
+#include <unistd.h>
+#include <lapi/timerfd.h>
+#include "tst_test.h"
+#include "tst_fuzzy_sync.h"
+#include "tst_taint.h"
+
+#define TIMERFD_FLAGS "timerfd_settime(TFD_TIMER_ABSTIME | TFD_TIMER_CANCEL_ON_SET)"
+
+#ifndef TFD_TIMER_CANCEL_ON_SET

testcases/cve/cve-2017-10661.c line 35

Quoted 10 lines
testcases/cve/cve-2017-10661.c new file +10 -0
+#define TFD_TIMER_CANCEL_ON_SET (1<<1)
+#endif
+
+static int fd = -1;
+static struct itimerspec its;
+static struct tst_fzsync_pair fzsync_pair;
+
+static void setup(void)
+{
+	int tmp;

All variables are temporary.

testcases/cve/cve-2017-10661.c line 41

Quoted 6 lines
testcases/cve/cve-2017-10661.c new file +6 -0
+
+	tst_taint_init(TST_TAINT_W | TST_TAINT_D);
+	fd = timerfd_create(CLOCK_REALTIME, 0);
+
+	if (fd < 0) {
+		tmp = (errno == ENOTSUP ? TCONF : TBROK) | TERRNO,

Huh? This compiles?

Quoted 14 lines
testcases/cve/cve-2017-10661.c new file +14 -0
+		tst_brk(tmp, "Cannot create timer");
+	}
+
+	fzsync_pair.exec_loops = 1000000;
+	tst_fzsync_pair_init(&fzsync_pair);
+}
+
+static void cleanup(void)
+{
+	if (fd >= 0)
+		SAFE_CLOSE(fd);
+	tst_fzsync_pair_cleanup(&fzsync_pair);
+}
+

testcases/cve/cve-2017-10661.c line 65

Quoted 10 lines
testcases/cve/cve-2017-10661.c new file +10 -0
+static int punch_clock(int flags)
+{
+	return timerfd_settime(fd, flags, &its, NULL);
+}
+
+static void *thread_run(void *arg)
+{
+	while (tst_fzsync_run_b(&fzsync_pair)) {
+		tst_fzsync_start_race_b(&fzsync_pair);
+		// race to clear the CANCEL_ON_SET flag

We don't need inline comments to explain this. The code is clear enough. Although it would be even clearer if you changed punch_clock to set_clock_flags.

testcases/cve/cve-2017-10661.c line 78

Quoted 13 lines
testcases/cve/cve-2017-10661.c new file +13 -0
+		punch_clock(0);
+		tst_fzsync_end_race_b(&fzsync_pair);
+	}
+
+	return arg;
+}
+
+static void run(void)
+{
+	tst_fzsync_pair_reset(&fzsync_pair, thread_run);
+
+	while (tst_fzsync_run_a(&fzsync_pair)) {
+		// set the CANCEL_ON_SET flag

Same here.

testcases/cve/cve-2017-10661.c line 89

Quoted 11 lines
testcases/cve/cve-2017-10661.c new file +11 -0
+		TEST(punch_clock(TFD_TIMER_ABSTIME | TFD_TIMER_CANCEL_ON_SET));
+
+		if (TST_RET == -1)
+			tst_res(TBROK | TTERRNO, TIMERFD_FLAGS " failed");
+
+		if (TST_RET != 0)
+			tst_res(TBROK | TTERRNO, "Invalid " TIMERFD_FLAGS
+				" return value");
+
+		tst_fzsync_start_race_a(&fzsync_pair);
+		// race to clear the CANCEL_ON_SET flag

and here.

Quoted 24 lines
testcases/cve/cve-2017-10661.c new file +23 -1
+		punch_clock(0);
+		tst_fzsync_end_race_a(&fzsync_pair);
+
+		if (tst_taint_check()) {
+			tst_res(TFAIL, "Kernel is vulnerable");
+			return;
+		}
+	}
+
+	tst_res(TPASS, "Nothing bad happened, probably");
+}
+
+static struct tst_test test = {
+	.test_all = run,
+	.setup = setup,
+	.cleanup = cleanup,
+	.min_kver = "2.6.25",
+	.tags = (const struct tst_tag[]) {
+		{"linux-git", "1e38da300e1e"},
+		{"CVE", "2017-10661"},
+		{}
+	}
+};
--
Quoted 1 line

2.25.0

--
Thank you,
Richard.

#2 lore raw

PATCH 1/1 Add test for CVE 2017-10661

Hi!

Quoted 10 lines

testcases/cve/cve-2017-10661.c line 35

Quoted 7 lines
testcases/cve/cve-2017-10661.c new file +7 -0
+static int fd = -1;
+static struct itimerspec its;
+static struct tst_fzsync_pair fzsync_pair;
+
+static void setup(void)
+{
+	int tmp;

All variables are temporary.

Quoted 8 lines

testcases/cve/cve-2017-10661.c line 41

Quoted 6 lines
testcases/cve/cve-2017-10661.c new file +6 -0
+
+	tst_taint_init(TST_TAINT_W | TST_TAINT_D);
+	fd = timerfd_create(CLOCK_REALTIME, 0);
+
+	if (fd < 0) {
+		tmp = (errno == ENOTSUP ? TCONF : TBROK) | TERRNO,

Huh? This compiles?

I do not like this piece of code either, but apart from that it's correct and works fine as far as I can tell.

Signature · 2 lines
Cyril Hrubis
[email protected]