Merge tag 'for-linus-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[sfrench/cifs-2.6.git] / arch / um / drivers / vector_user.c

diff --git a/arch/um/drivers/vector_user.c b/arch/um/drivers/vector_user.c
index c4a0f26b282487fade2c1d2a8b68773b2e92f4b6..bae53220ce2625e07cfd0583e00203f6b672f226 100644 (file)
--- a/arch/um/drivers/vector_user.c
+++ b/arch/um/drivers/vector_user.c
@@ -18,9 +18,7 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <net/ethernet.h>
 #include <netinet/ip.h>
-#include <netinet/ether.h>
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>
 #include <sys/wait.h>
@@ -39,6 +37,7 @@
 #define ID_MAX 2
 
 #define TOKEN_IFNAME "ifname"
+#define TOKEN_SCRIPT "ifup"
 
 #define TRANS_RAW "raw"
 #define TRANS_RAW_LEN strlen(TRANS_RAW)
@@ -55,6 +54,9 @@
 
 #define MAX_UN_LEN 107
 
+static const char padchar[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+static const char *template = "tapXXXXXX";
+
 /* This is very ugly and brute force lookup, but it is done
  * only once at initialization so not worth doing hashes or
  * anything more intelligent
@@ -191,16 +193,21 @@ raw_fd_cleanup:
        return err;
 }
 
+
 static struct vector_fds *user_init_tap_fds(struct arglist *ifspec)
 {
-       int fd = -1;
+       int fd = -1, i;
        char *iface;
        struct vector_fds *result = NULL;
+       bool dynamic = false;
+       char dynamic_ifname[IFNAMSIZ];
+       char *argv[] = {NULL, NULL, NULL, NULL};
 
        iface = uml_vector_fetch_arg(ifspec, TOKEN_IFNAME);
        if (iface == NULL) {
-               printk(UM_KERN_ERR "uml_tap: failed to parse interface spec\n");
-               goto tap_cleanup;
+               dynamic = true;
+               iface = dynamic_ifname;
+               srand(getpid());
        }
 
        result = uml_kmalloc(sizeof(struct vector_fds), UM_GFP_KERNEL);
@@ -214,14 +221,30 @@ static struct vector_fds *user_init_tap_fds(struct arglist *ifspec)
        result->remote_addr_size = 0;
 
        /* TAP */
+       do {
+               if (dynamic) {
+                       strcpy(iface, template);
+                       for (i = 0; i < strlen(iface); i++) {
+                               if (iface[i] == 'X') {
+                                       iface[i] = padchar[rand() % strlen(padchar)];
+                               }
+                       }
+               }
+               fd = create_tap_fd(iface);
+               if ((fd < 0) && (!dynamic)) {
+                       printk(UM_KERN_ERR "uml_tap: failed to create tun interface\n");
+                       goto tap_cleanup;
+               }
+               result->tx_fd = fd;
+               result->rx_fd = fd;
+       } while (fd < 0);
 
-       fd = create_tap_fd(iface);
-       if (fd < 0) {
-               printk(UM_KERN_ERR "uml_tap: failed to create tun interface\n");
-               goto tap_cleanup;
+       argv[0] = uml_vector_fetch_arg(ifspec, TOKEN_SCRIPT);
+       if (argv[0]) {
+               argv[1] = iface;
+               run_helper(NULL, NULL, argv);
        }
-       result->tx_fd = fd;
-       result->rx_fd = fd;
+
        return result;
 tap_cleanup:
        printk(UM_KERN_ERR "user_init_tap: init failed, error %d", fd);
@@ -233,6 +256,7 @@ static struct vector_fds *user_init_hybrid_fds(struct arglist *ifspec)
 {
        char *iface;
        struct vector_fds *result = NULL;
+       char *argv[] = {NULL, NULL, NULL, NULL};
 
        iface = uml_vector_fetch_arg(ifspec, TOKEN_IFNAME);
        if (iface == NULL) {
@@ -266,6 +290,12 @@ static struct vector_fds *user_init_hybrid_fds(struct arglist *ifspec)
                        "uml_tap: failed to create paired raw socket: %i\n", result->rx_fd);
                goto hybrid_cleanup;
        }
+
+       argv[0] = uml_vector_fetch_arg(ifspec, TOKEN_SCRIPT);
+       if (argv[0]) {
+               argv[1] = iface;
+               run_helper(NULL, NULL, argv);
+       }
        return result;
 hybrid_cleanup:
        printk(UM_KERN_ERR "user_init_hybrid: init failed");
@@ -332,7 +362,7 @@ static struct vector_fds *user_init_unix_fds(struct arglist *ifspec, int id)
        }
        switch (id) {
        case ID_BESS:
-               if (connect(fd, remote_addr, sizeof(struct sockaddr_un)) < 0) {
+               if (connect(fd, (const struct sockaddr *) remote_addr, sizeof(struct sockaddr_un)) < 0) {
                        printk(UM_KERN_ERR "bess open:cannot connect to %s %i", remote_addr->sun_path, -errno);
                        goto unix_cleanup;
                }
@@ -399,8 +429,7 @@ static struct vector_fds *user_init_fd_fds(struct arglist *ifspec)
 fd_cleanup:
        if (fd >= 0)
                os_close_file(fd);
-       if (result != NULL)
-               kfree(result);
+       kfree(result);
        return NULL;
 }
 
@@ -410,6 +439,7 @@ static struct vector_fds *user_init_raw_fds(struct arglist *ifspec)
        int err = -ENOMEM;
        char *iface;
        struct vector_fds *result = NULL;
+       char *argv[] = {NULL, NULL, NULL, NULL};
 
        iface = uml_vector_fetch_arg(ifspec, TOKEN_IFNAME);
        if (iface == NULL)
@@ -432,6 +462,11 @@ static struct vector_fds *user_init_raw_fds(struct arglist *ifspec)
                result->remote_addr = NULL;
                result->remote_addr_size = 0;
        }
+       argv[0] = uml_vector_fetch_arg(ifspec, TOKEN_SCRIPT);
+       if (argv[0]) {
+               argv[1] = iface;
+               run_helper(NULL, NULL, argv);
+       }
        return result;
 raw_cleanup:
        printk(UM_KERN_ERR "user_init_raw: init failed, error %d", err);
@@ -789,10 +824,12 @@ void *uml_vector_user_bpf(char *filename)
                return false;
        }
        bpf_prog = uml_kmalloc(sizeof(struct sock_fprog), UM_GFP_KERNEL);
-       if (bpf_prog != NULL) {
-               bpf_prog->len = statbuf.st_size / sizeof(struct sock_filter);
-               bpf_prog->filter = NULL;
+       if (bpf_prog == NULL) {
+               printk(KERN_ERR "Failed to allocate bpf prog buffer");
+               return NULL;
        }
+       bpf_prog->len = statbuf.st_size / sizeof(struct sock_filter);
+       bpf_prog->filter = NULL;
        ffd = os_open_file(filename, of_read(OPENFLAGS()), 0);
        if (ffd < 0) {
                printk(KERN_ERR "Error %d opening bpf file", -errno);