[gentoo-commits] gentoo-x86 commit in sys-apps/kmod/files: kmod-13-errno_syscall.patch

[Samuli Suominen (ssuominen)]

ssuominen    13/05/27 15:38:50

  Added:                kmod-13-errno_syscall.patch
  Log:
  Avoid calling syscall() with -1 patch from upstream for http://bugs.funtoo.org/browse/FL-534 as requested by lxnay
  
  (Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.1                  sys-apps/kmod/files/kmod-13-errno_syscall.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/files/kmod-13-errno_syscall.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/files/kmod-13-errno_syscall.patch?rev=1.1&content-type=text/plain

Index: kmod-13-errno_syscall.patch
===================================================================
From 5eac795b8b067842caec32f96d55a7554c3c67f9 Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jlu@×××××××××××.de>
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.1