Thread (13 messages) 13 messages, 2 authors, 2014-02-28
STALE4478d

[PATCH 3/5] testsuite: Do not provide finit_module(2) on older kernels

From: Michal Marek <hidden>
Date: 2014-02-27 22:52:26
Subsystem: the rest · Maintainer: Linus Torvalds

If the test's uname -r is less that 3.8, return -ENOSYS from
finit_module(), so that the fallback is tested.
---
 testsuite/init_module.c |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/testsuite/init_module.c b/testsuite/init_module.c
index 42177e7..96f4aa7 100644
--- a/testsuite/init_module.c
+++ b/testsuite/init_module.c
@@ -37,6 +37,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
+#include <sys/utsname.h>
 #include <unistd.h>
 
 /* kmod_elf_get_section() is not exported, we need the private header */
@@ -280,6 +281,25 @@ long init_module(void *mem, unsigned long len, const char *args)
 	return err;
 }
 
+static int check_kernel_version(int major, int minor)
+{
+	struct utsname u;
+	const char *p;
+	int maj = 0, min = 0;
+
+	if (uname(&u) < 0)
+		return false;
+	for (p = u.release; *p >= '0' && *p <= '9'; p++)
+		maj = maj * 10 + *p - '0';
+	if (*p == '.')
+		for (p++; *p >= '0' && *p <= '9'; p++)
+			min = min * 10 + *p - '0';
+	if (maj > major || (maj == major && min >= minor))
+		return true;
+	return false;
+}
+
+
 TS_EXPORT int finit_module(const int fd, const char *args, const int flags);
 
 int finit_module(const int fd, const char *args, const int flags)
@@ -289,6 +309,11 @@ int finit_module(const int fd, const char *args, const int flags)
 	unsigned long len;
 	struct stat st;
 
+	if (!check_kernel_version(3, 8)) {
+		stat("/old/kernel", &st);
+		errno = ENOSYS;
+		return -1;
+	}
 	if (fstat(fd, &st) < 0)
 		return -1;
 
-- 
1.7.3.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help