Skip to contentSkip to conversation

kmod : protect against architectures without __NR_finit_module

PATCH New Jérémy Rosen 2 participants 2 messages May 29, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kmod : protect against architectures without __NR_finit_module

This bug caused udev to fail to load any module, crashing with Illegal instruction.

The patch was taken from upstream and should be integrated in the next version of kmod (version 14)

---
This bug went undetected because it only triggers when modules are loaded via libkmod and buildroot will use busybox to implement modprobe.

---
 package/kmod/kmod-001-no-syscall--1.patch |   31 +++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/kmod/kmod-001-no-syscall--1.patch
package/kmod/kmod-001-no-syscall--1.patch new file +31 -0
new file mode 100644
index 0000000..e7a3a11
@@ -0,0 +1,31 @@
+From 5eac795b8b067842caec32f96d55a7554c3c67f9 Mon Sep 17 00:00:00 2001
+From: Jan Luebbe <[email protected]>
+Date: Thu, 02 May 2013 14:47:12 +0000
+Subject: libkmod: Avoid calling syscall() with -1
+
+At least in qemu 1.4.1 for vexpress/arm-cortexa9, this resulted in an
+illegal instruction error. Solve that by returning an error when
+__NR_finit_module is -1.
+---
+diff --git a/libkmod/missing.h b/libkmod/missing.h
+index edb88b9..b45bbe2 100644
+--- a/libkmod/missing.h
++++ b/libkmod/missing.h
+@@ -20,8 +20,15 @@
+ #endif
+ 
+ #ifndef HAVE_FINIT_MODULE
++#include <errno.h>
++
+ static inline int finit_module(int fd, const char *uargs, int flags)
+ {
++	if (__NR_finit_module == -1) {
++		errno = ENOSYS;
++		return -1;
++	}
++
+ 	return syscall(__NR_finit_module, fd, uargs, flags);
+ }
+ #endif
+--
+cgit v0.9.2
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 kmod : protect against architectures without __NR_finit_module

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"J?r?my" == J?r?my Rosen <[email protected]> writes:

J?r?my> This bug caused udev to fail to load any module, crashing with Illegal J?r?my> instruction.

J?r?my> The patch was taken from upstream and should be integrated in the next J?r?my> version of kmod (version 14)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard