Skip to contentSkip to conversation

Add test for CVE 2020-25704

PATCH New Martin Doucha 2 participants 3 messages Aug 3, 2021 – Aug 4, 2021

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 Add test for CVE 2020-25704

Fixes #740

---

Changes since v1:
- Use memory statistics from /proc/meminfo instead of sysinfo()

 runtest/cve                                   |  2 +
 runtest/syscalls                              |  3 +
 .../syscalls/perf_event_open/.gitignore       |  1 +
 .../perf_event_open/perf_event_open.h         | 39 +++++++++
 .../perf_event_open/perf_event_open03.c       | 84 +++++++++++++++++++
 5 files changed, 129 insertions(+)
 create mode 100644 testcases/kernel/syscalls/perf_event_open/perf_event_open.h
 create mode 100644 testcases/kernel/syscalls/perf_event_open/perf_event_open03.c
runtest/cve +2 -0
index 5b7bf5323..e0d3723de 100644
@@ -67,3 +67,5 @@ cve-2020-25705 icmp_rate_limit01
 cve-2020-29373 io_uring02
 cve-2021-3444 bpf_prog05
 cve-2021-26708 vsock01
+# Tests below may cause kernel memory leak
+cve-2020-25704 perf_event_open03
runtest/syscalls +3 -0
index b379b2d90..5e3ac517f 100644
@@ -1737,3 +1737,6 @@ membarrier01 membarrier01
 
 io_uring01 io_uring01
 io_uring02 io_uring02
+
+# Tests below may cause kernel memory leak
+perf_event_open03 perf_event_open03
testcases/kernel/syscalls/perf_event_open/.gitignore +1 -0
index 057690063..a1e5987b6 100644
@@ -1,2 +1,3 @@
 /perf_event_open01
 /perf_event_open02
+/perf_event_open03
testcases/kernel/syscalls/perf_event_open/perf_event_open.h new file +39 -0
new file mode 100644
index 000000000..02f0dd72e
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (c) 2021 SUSE LLC <[email protected]>
+ *
+ * Common definitions for perf_event_open tests
+ */
+
+#ifndef _PERF_EVENT_OPEN_H
+#define _PERF_EVENT_OPEN_H
+
+#include <linux/types.h>
+#include <linux/perf_event.h>
+#include <inttypes.h>
+
+static int perf_event_open(struct perf_event_attr *event, pid_t pid,
+	int cpu, int group_fd, unsigned long flags)
+{
+	int ret;
+
+	ret = tst_syscall(__NR_perf_event_open, event, pid, cpu,
+		group_fd, flags);
+
+	if (ret != -1)
+		return ret;
+
+	tst_res(TINFO, "%s event.type: %"PRIu32
+		", event.config: %"PRIu64, __func__, (uint32_t)event->type,
+		(uint64_t)event->config);
+	if (errno == ENOENT || errno == ENODEV) {
+		tst_brk(TCONF | TERRNO, "%s type/config not supported",
+			__func__);
+	}
+	tst_brk(TBROK | TERRNO, "%s failed", __func__);
+
+	/* unreachable */
+	return -1;
+}
+
+#endif /* _PERF_EVENT_OPEN_H */
testcases/kernel/syscalls/perf_event_open/perf_event_open03.c new file +84 -0

84 lines not on this page · raw message

Signature · 1 line
2.32.0
#1 lore raw

PATCH v2 2/2 perf_event_open02: Use common perf_event_open() wrapper

---

Changes since v1: None

 .../perf_event_open/perf_event_open02.c       | 28 +------------------
 1 file changed, 1 insertion(+), 27 deletions(-)
testcases/kernel/syscalls/perf_event_open/perf_event_open02.c +1 -27
index eead421ac..7200d35e3 100644
@@ -29,7 +29,6 @@
 
 #define _GNU_SOURCE
 #include <errno.h>
-#include <inttypes.h>
 #include <sched.h>
 #include <signal.h>
 #include <stddef.h>
@@ -47,8 +46,7 @@
 #include "lapi/syscalls.h"
 
 #if HAVE_PERF_EVENT_ATTR
-#include <linux/types.h>
-#include <linux/perf_event.h>
+#include "perf_event_open.h"
 
 #define MAX_CTRS	1000
 
@@ -67,30 +65,6 @@ static int tsk0 = -1, hwfd[MAX_CTRS], tskfd[MAX_CTRS];
 static int volatile work_done;
 static unsigned int est_loops;
 
-static int perf_event_open(struct perf_event_attr *event, pid_t pid,
-	int cpu, int group_fd, unsigned long flags)
-{
-	int ret;
-
-	ret = tst_syscall(__NR_perf_event_open, event, pid, cpu,
-		group_fd, flags);
-
-	if (ret != -1)
-		return ret;
-
-	tst_res(TINFO, "perf_event_open event.type: %"PRIu32
-		", event.config: %"PRIu64, (uint32_t)event->type,
-		(uint64_t)event->config);
-	if (errno == ENOENT || errno == ENODEV) {
-		tst_brk(TCONF | TERRNO,
-			"perf_event_open type/config not supported");
-	}
-	tst_brk(TBROK | TERRNO, "perf_event_open failed");
-
-	/* unreachable */
-	return -1;
-}
-
 static void all_counters_set(int state)
 {
 	if (prctl(state) == -1)
Signature · 1 line
2.32.0
#2 lore raw

PATCH v2 1/2 Add test for CVE 2020-25704

In reply to Martin Doucha

Hi!
Pushed with a minor change, thanks.

Quoted 1 line

+#ifndef _PERF_EVENT_OPEN_H

Identifiers starting with single or double underscore are reserved for system implemntation, e.g. libc so I've changed the guards just to PERF_EVENT_OPEN_H.

Signature · 2 lines
Cyril Hrubis
[email protected]