uml: bump to 3.18
Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 44937
This commit is contained in:
Nicolas Thill
parent
223468546d
commit
577da84c25
5 changed files with 4271 additions and 1 deletions
|
|
@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux
|
||||||
FEATURES:=ext4 audio
|
FEATURES:=ext4 audio
|
||||||
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
|
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
|
||||||
|
|
||||||
KERNEL_PATCHVER:=3.14
|
KERNEL_PATCHVER:=3.18
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,8 @@ CONFIG_CRYPTO_HASH=y
|
||||||
CONFIG_CRYPTO_HASH2=y
|
CONFIG_CRYPTO_HASH2=y
|
||||||
# CONFIG_CRYPTO_SALSA20_X86_64 is not set
|
# CONFIG_CRYPTO_SALSA20_X86_64 is not set
|
||||||
CONFIG_CRYPTO_SHA1=y
|
CONFIG_CRYPTO_SHA1=y
|
||||||
|
# CONFIG_CRYPTO_SKEIN is not set
|
||||||
|
# CONFIG_CRYPTO_THREEFISH is not set
|
||||||
# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
|
# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
|
||||||
CONFIG_DEBUG_BUGVERBOSE=y
|
CONFIG_DEBUG_BUGVERBOSE=y
|
||||||
CONFIG_DEBUG_MEMORY_INIT=y
|
CONFIG_DEBUG_MEMORY_INIT=y
|
||||||
|
|
@ -135,6 +137,7 @@ CONFIG_UML_RANDOM=y
|
||||||
CONFIG_UML_SOUND=m
|
CONFIG_UML_SOUND=m
|
||||||
CONFIG_UML_WATCHDOG=m
|
CONFIG_UML_WATCHDOG=m
|
||||||
CONFIG_UML_X86=y
|
CONFIG_UML_X86=y
|
||||||
|
# CONFIG_UNISYSSPAR is not set
|
||||||
# CONFIG_USB_ARCH_HAS_EHCI is not set
|
# CONFIG_USB_ARCH_HAS_EHCI is not set
|
||||||
# CONFIG_USB_ARCH_HAS_OHCI is not set
|
# CONFIG_USB_ARCH_HAS_OHCI is not set
|
||||||
# CONFIG_USB_ARCH_HAS_XHCI is not set
|
# CONFIG_USB_ARCH_HAS_XHCI is not set
|
||||||
|
|
|
||||||
3932
target/linux/uml/patches-3.18/001-fix_make_headers_install.patch
Normal file
3932
target/linux/uml/patches-3.18/001-fix_make_headers_install.patch
Normal file
File diff suppressed because it is too large
Load diff
211
target/linux/uml/patches-3.18/101-mconsole-exec.patch
Normal file
211
target/linux/uml/patches-3.18/101-mconsole-exec.patch
Normal file
|
|
@ -0,0 +1,211 @@
|
||||||
|
#
|
||||||
|
# Minimalist mconsole exec patch
|
||||||
|
#
|
||||||
|
# 3.10 version (with bit more synchronous behavior) by fingon at iki dot fi
|
||||||
|
# Adaptation to kernel 3.3.8 made by David Fernández (david at dit.upm.es) for
|
||||||
|
# Starting point: mconsole-exec-2.6.30.patch for kernel 2.6.30
|
||||||
|
# Author of original patch: Paolo Giarrusso, aka Blaisorblade
|
||||||
|
# (http://www.user-mode-linux.org/~blaisorblade)
|
||||||
|
#
|
||||||
|
# Known misfeatures:
|
||||||
|
#
|
||||||
|
# - If output is too long, blocks (and breaks horribly)
|
||||||
|
# (this misfeature from 3.10 patches, when minimalizing the patch;
|
||||||
|
# workaround: redirect to a shared filesystem if long output is expected)
|
||||||
|
#
|
||||||
|
# - Nothing useful is done with stdin
|
||||||
|
#
|
||||||
|
--- a/arch/um/drivers/mconsole.h
|
||||||
|
+++ b/arch/um/drivers/mconsole.h
|
||||||
|
@@ -85,6 +85,7 @@ extern void mconsole_cad(struct mc_reque
|
||||||
|
extern void mconsole_stop(struct mc_request *req);
|
||||||
|
extern void mconsole_go(struct mc_request *req);
|
||||||
|
extern void mconsole_log(struct mc_request *req);
|
||||||
|
+extern void mconsole_exec(struct mc_request *req);
|
||||||
|
extern void mconsole_proc(struct mc_request *req);
|
||||||
|
extern void mconsole_stack(struct mc_request *req);
|
||||||
|
|
||||||
|
--- a/arch/um/drivers/mconsole_kern.c
|
||||||
|
+++ b/arch/um/drivers/mconsole_kern.c
|
||||||
|
@@ -4,6 +4,7 @@
|
||||||
|
* Licensed under the GPL
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#include "linux/kmod.h"
|
||||||
|
#include <linux/console.h>
|
||||||
|
#include <linux/ctype.h>
|
||||||
|
#include <linux/string.h>
|
||||||
|
@@ -24,6 +25,7 @@
|
||||||
|
#include <linux/fs.h>
|
||||||
|
#include <linux/mount.h>
|
||||||
|
#include <linux/file.h>
|
||||||
|
+#include <linux/completion.h>
|
||||||
|
#include <asm/uaccess.h>
|
||||||
|
#include <asm/switch_to.h>
|
||||||
|
|
||||||
|
@@ -121,6 +123,59 @@ void mconsole_log(struct mc_request *req
|
||||||
|
mconsole_reply(req, "", 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
+void mconsole_exec(struct mc_request *req)
|
||||||
|
+{
|
||||||
|
+ struct subprocess_info *sub_info;
|
||||||
|
+ int res, len;
|
||||||
|
+ struct file *out;
|
||||||
|
+ char buf[MCONSOLE_MAX_DATA];
|
||||||
|
+
|
||||||
|
+ char *envp[] = {
|
||||||
|
+ "HOME=/", "TERM=linux",
|
||||||
|
+ "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin",
|
||||||
|
+ NULL
|
||||||
|
+ };
|
||||||
|
+ char *argv[] = {
|
||||||
|
+ "/bin/sh", "-c",
|
||||||
|
+ req->request.data + strlen("exec "),
|
||||||
|
+ NULL
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ sub_info = call_usermodehelper_setup("/bin/sh", argv, envp, GFP_ATOMIC, NULL, NULL, NULL);
|
||||||
|
+ if (sub_info == NULL) {
|
||||||
|
+ mconsole_reply(req, "call_usermodehelper_setup failed", 1, 0);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ res = call_usermodehelper_stdoutpipe(sub_info, &out);
|
||||||
|
+ if (res < 0) {
|
||||||
|
+ kfree(sub_info);
|
||||||
|
+ mconsole_reply(req, "call_usermodehelper_stdoutpipe failed", 1, 0);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ res = call_usermodehelper_exec(sub_info, UMH_WAIT_PROC);
|
||||||
|
+ if (res < 0) {
|
||||||
|
+ kfree(sub_info);
|
||||||
|
+ mconsole_reply(req, "call_usermodehelper_exec failed", 1, 0);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (;;) {
|
||||||
|
+ len = out->f_op->read(out, buf, sizeof(buf), &out->f_pos);
|
||||||
|
+ if (len < 0) {
|
||||||
|
+ mconsole_reply(req, "reading output failed", 1, 0);
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ if (len == 0)
|
||||||
|
+ break;
|
||||||
|
+ mconsole_reply_len(req, buf, len, 0, 1);
|
||||||
|
+ }
|
||||||
|
+ fput(out);
|
||||||
|
+
|
||||||
|
+ mconsole_reply_len(req, NULL, 0, 0, 0);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
void mconsole_proc(struct mc_request *req)
|
||||||
|
{
|
||||||
|
struct vfsmount *mnt = task_active_pid_ns(current)->proc_mnt;
|
||||||
|
@@ -187,6 +242,7 @@ void mconsole_proc(struct mc_request *re
|
||||||
|
stop - pause the UML; it will do nothing until it receives a 'go' \n\
|
||||||
|
go - continue the UML after a 'stop' \n\
|
||||||
|
log <string> - make UML enter <string> into the kernel log\n\
|
||||||
|
+ exec <string> - pass <string> to /bin/sh -c synchronously\n\
|
||||||
|
proc <file> - returns the contents of the UML's /proc/<file>\n\
|
||||||
|
stack <pid> - returns the stack of the specified pid\n\
|
||||||
|
"
|
||||||
|
--- a/arch/um/drivers/mconsole_user.c
|
||||||
|
+++ b/arch/um/drivers/mconsole_user.c
|
||||||
|
@@ -30,6 +30,7 @@ static struct mconsole_command commands[
|
||||||
|
{ "stop", mconsole_stop, MCONSOLE_PROC },
|
||||||
|
{ "go", mconsole_go, MCONSOLE_INTR },
|
||||||
|
{ "log", mconsole_log, MCONSOLE_INTR },
|
||||||
|
+ { "exec", mconsole_exec, MCONSOLE_PROC },
|
||||||
|
{ "proc", mconsole_proc, MCONSOLE_PROC },
|
||||||
|
{ "stack", mconsole_stack, MCONSOLE_INTR },
|
||||||
|
};
|
||||||
|
--- a/arch/um/os-Linux/file.c
|
||||||
|
+++ b/arch/um/os-Linux/file.c
|
||||||
|
@@ -534,6 +534,8 @@ int os_create_unix_socket(const char *fi
|
||||||
|
|
||||||
|
addr.sun_family = AF_UNIX;
|
||||||
|
|
||||||
|
+ if (len > sizeof(addr.sun_path))
|
||||||
|
+ len = sizeof(addr.sun_path);
|
||||||
|
snprintf(addr.sun_path, len, "%s", file);
|
||||||
|
|
||||||
|
err = bind(sock, (struct sockaddr *) &addr, sizeof(addr));
|
||||||
|
--- a/include/linux/kmod.h
|
||||||
|
+++ b/include/linux/kmod.h
|
||||||
|
@@ -62,6 +62,7 @@ struct subprocess_info {
|
||||||
|
int wait;
|
||||||
|
int retval;
|
||||||
|
int (*init)(struct subprocess_info *info, struct cred *new);
|
||||||
|
+ struct file *stdout;
|
||||||
|
void (*cleanup)(struct subprocess_info *info);
|
||||||
|
void *data;
|
||||||
|
};
|
||||||
|
@@ -104,4 +105,6 @@ extern int usermodehelper_read_trylock(v
|
||||||
|
extern long usermodehelper_read_lock_wait(long timeout);
|
||||||
|
extern void usermodehelper_read_unlock(void);
|
||||||
|
|
||||||
|
+int call_usermodehelper_stdoutpipe(struct subprocess_info *sub_info, struct file **filp);
|
||||||
|
+
|
||||||
|
#endif /* __LINUX_KMOD_H__ */
|
||||||
|
--- a/kernel/kmod.c
|
||||||
|
+++ b/kernel/kmod.c
|
||||||
|
@@ -39,6 +39,7 @@
|
||||||
|
#include <linux/rwsem.h>
|
||||||
|
#include <linux/ptrace.h>
|
||||||
|
#include <linux/async.h>
|
||||||
|
+#include <linux/pipe_fs_i.h>
|
||||||
|
#include <asm/uaccess.h>
|
||||||
|
|
||||||
|
#include <trace/events/module.h>
|
||||||
|
@@ -231,6 +232,28 @@ static int ____call_usermodehelper(void
|
||||||
|
flush_signal_handlers(current, 1);
|
||||||
|
spin_unlock_irq(¤t->sighand->siglock);
|
||||||
|
|
||||||
|
+ /* Install output when needed */
|
||||||
|
+ if (sub_info->stdout) {
|
||||||
|
+ struct files_struct *f = current->files;
|
||||||
|
+ struct fdtable *fdt;
|
||||||
|
+
|
||||||
|
+ sys_close(1);
|
||||||
|
+ sys_close(2);
|
||||||
|
+ get_file(sub_info->stdout);
|
||||||
|
+ fd_install(1, sub_info->stdout);
|
||||||
|
+ fd_install(2, sub_info->stdout);
|
||||||
|
+ spin_lock(&f->file_lock);
|
||||||
|
+ fdt = files_fdtable(f);
|
||||||
|
+ __set_bit(1, fdt->open_fds);
|
||||||
|
+ __clear_bit(1, fdt->close_on_exec);
|
||||||
|
+ __set_bit(2, fdt->open_fds);
|
||||||
|
+ __clear_bit(2, fdt->close_on_exec);
|
||||||
|
+ spin_unlock(&f->file_lock);
|
||||||
|
+
|
||||||
|
+ /* disallow core files */
|
||||||
|
+ current->signal->rlim[RLIMIT_CORE] = (struct rlimit){0, 0};
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* We can run anywhere, unlike our parent keventd(). */
|
||||||
|
set_cpus_allowed_ptr(current, cpu_all_mask);
|
||||||
|
|
||||||
|
@@ -544,6 +567,20 @@ struct subprocess_info *call_usermodehel
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(call_usermodehelper_setup);
|
||||||
|
|
||||||
|
+int call_usermodehelper_stdoutpipe(struct subprocess_info *sub_info,
|
||||||
|
+ struct file **filp)
|
||||||
|
+{
|
||||||
|
+ struct file *f[2];
|
||||||
|
+
|
||||||
|
+ if (create_pipe_files(f, 0)<0)
|
||||||
|
+ return PTR_ERR(f);
|
||||||
|
+ sub_info->stdout = f[1];
|
||||||
|
+ *filp = f[0];
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+EXPORT_SYMBOL(call_usermodehelper_stdoutpipe);
|
||||||
|
+
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* call_usermodehelper_exec - start a usermode application
|
||||||
|
* @sub_info: information about the subprocessa
|
||||||
124
target/linux/uml/patches-3.18/102-pseudo-random-mac.patch
Normal file
124
target/linux/uml/patches-3.18/102-pseudo-random-mac.patch
Normal file
|
|
@ -0,0 +1,124 @@
|
||||||
|
===============================================================================
|
||||||
|
|
||||||
|
This patch makes MAC addresses of network interfaces predictable. In
|
||||||
|
particular, it adds a small routine that computes MAC addresses of based on
|
||||||
|
a SHA1 hash of the virtual machine name and interface ID.
|
||||||
|
|
||||||
|
TECHNICAL INFORMATION:
|
||||||
|
|
||||||
|
Applies to vanilla kernel 3.9.4.
|
||||||
|
|
||||||
|
===============================================================================
|
||||||
|
--- a/arch/um/Kconfig.net
|
||||||
|
+++ b/arch/um/Kconfig.net
|
||||||
|
@@ -21,6 +21,19 @@ config UML_NET
|
||||||
|
enable at least one of the following transport options to actually
|
||||||
|
make use of UML networking.
|
||||||
|
|
||||||
|
+config UML_NET_RANDOM_MAC
|
||||||
|
+ bool "Use random MAC addresses for network interfaces"
|
||||||
|
+ default n
|
||||||
|
+ depends on UML_NET
|
||||||
|
+ help
|
||||||
|
+ Virtual network devices inside a User-Mode Linux instance must be
|
||||||
|
+ assigned a MAC (Ethernet) address. If none is specified on the UML
|
||||||
|
+ command line, one must be automatically computed. If this option is
|
||||||
|
+ enabled, a randomly generated address is used. Otherwise, if this
|
||||||
|
+ option is disabled, the address is generated from a SHA1 hash of
|
||||||
|
+ the umid of the UML instance and the interface name. The latter choice
|
||||||
|
+ is useful to make MAC addresses predictable.
|
||||||
|
+
|
||||||
|
config UML_NET_ETHERTAP
|
||||||
|
bool "Ethertap transport"
|
||||||
|
depends on UML_NET
|
||||||
|
--- a/arch/um/drivers/net_kern.c
|
||||||
|
+++ b/arch/um/drivers/net_kern.c
|
||||||
|
@@ -25,6 +25,13 @@
|
||||||
|
#include <net_kern.h>
|
||||||
|
#include <net_user.h>
|
||||||
|
|
||||||
|
+#include <crypto/sha.h>
|
||||||
|
+#include <linux/string.h>
|
||||||
|
+#include <linux/crypto.h>
|
||||||
|
+#include <linux/err.h>
|
||||||
|
+#include <linux/scatterlist.h>
|
||||||
|
+#include "os.h"
|
||||||
|
+
|
||||||
|
#define DRIVER_NAME "uml-netdev"
|
||||||
|
|
||||||
|
static DEFINE_SPINLOCK(opened_lock);
|
||||||
|
@@ -295,11 +302,47 @@ static void uml_net_user_timer_expire(un
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef CONFIG_UML_NET_RANDOM_MAC
|
||||||
|
+
|
||||||
|
+/* Compute a SHA1 hash of the UML instance's id and
|
||||||
|
+ * * an interface name. */
|
||||||
|
+static int compute_hash(const char *umid, const char *ifname, char *hash) {
|
||||||
|
+ char vmif[1024];
|
||||||
|
+ struct scatterlist sg;
|
||||||
|
+ struct crypto_hash *tfm;
|
||||||
|
+ struct hash_desc desc;
|
||||||
|
+
|
||||||
|
+ strcpy (vmif, umid);
|
||||||
|
+ strcat (vmif, ifname);
|
||||||
|
+
|
||||||
|
+ tfm = crypto_alloc_hash("sha1", 0, CRYPTO_ALG_ASYNC);
|
||||||
|
+ if (IS_ERR(tfm))
|
||||||
|
+ return 1;
|
||||||
|
+
|
||||||
|
+ desc.tfm = tfm;
|
||||||
|
+ desc.flags = 0;
|
||||||
|
+
|
||||||
|
+ sg_init_table(&sg, 1);
|
||||||
|
+ sg_set_buf(&sg, vmif, strlen(vmif));
|
||||||
|
+
|
||||||
|
+ if (crypto_hash_digest(&desc, &sg, strlen(vmif), hash)) {
|
||||||
|
+ crypto_free_hash(tfm);
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ crypto_free_hash(tfm);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
static void setup_etheraddr(struct net_device *dev, char *str)
|
||||||
|
{
|
||||||
|
unsigned char *addr = dev->dev_addr;
|
||||||
|
char *end;
|
||||||
|
int i;
|
||||||
|
+ u8 hash[SHA1_DIGEST_SIZE];
|
||||||
|
|
||||||
|
if (str == NULL)
|
||||||
|
goto random;
|
||||||
|
@@ -340,9 +383,26 @@ static void setup_etheraddr(struct net_d
|
||||||
|
return;
|
||||||
|
|
||||||
|
random:
|
||||||
|
+#ifdef CONFIG_UML_NET_RANDOM_MAC
|
||||||
|
printk(KERN_INFO
|
||||||
|
"Choosing a random ethernet address for device %s\n", dev->name);
|
||||||
|
eth_hw_addr_random(dev);
|
||||||
|
+#else
|
||||||
|
+ printk(KERN_INFO
|
||||||
|
+ "Computing a digest to use as ethernet address for device %s\n", dev->name);
|
||||||
|
+ if (compute_hash(get_umid(), dev->name, hash)) {
|
||||||
|
+ printk(KERN_WARNING
|
||||||
|
+ "Could not compute digest to use as ethernet address for device %s. "
|
||||||
|
+ "Using random address instead.\n", dev->name);
|
||||||
|
+ random_ether_addr(addr);
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ for (i=0; i < 6; i++)
|
||||||
|
+ addr[i] = (hash[i] + hash[i+6]) % 0x100;
|
||||||
|
+ }
|
||||||
|
+ addr [0] &= 0xfe; /* clear multicast bit */
|
||||||
|
+ addr [0] |= 0x02; /* set local assignment bit (IEEE802) */
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static DEFINE_SPINLOCK(devices_lock);
|
||||||
Loading…
Reference in a new issue