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

Pull uml updates from Richard Weinberger:
 "Minor updates for UML:

   - fixes for our new vector network driver by Anton

   - initcall cleanup by Alexander

   - We have a new mailinglist, sourceforge.net sucks"

* 'for-linus-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Fix raw interface options
  um: Fix initialization of vector queues
  um: remove uml initcalls
  um: Update mailing list address

1 files changed, 14 insertions, 6 deletions

diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
index 627075e6d875..50ee3bb5a63a 100644
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -188,7 +188,7 @@ static int get_transport_options(struct arglist *def)
         if (strncmp(transport, TRANS_TAP, TRANS_TAP_LEN) == 0)
                 return (vec_rx | VECTOR_BPF);
         if (strncmp(transport, TRANS_RAW, TRANS_RAW_LEN) == 0)
-                return (vec_rx | vec_tx);
+                return (vec_rx | vec_tx | VECTOR_QDISC_BYPASS);
         return (vec_rx | vec_tx);
 }
 
@@ -504,15 +504,19 @@ static struct vector_queue *create_queue(
 
         result = kmalloc(sizeof(struct vector_queue), GFP_KERNEL);
         if (result == NULL)
-                goto out_fail;
+                return NULL;
         result->max_depth = max_size;
         result->dev = vp->dev;
         result->mmsg_vector = kmalloc(
                 (sizeof(struct mmsghdr) * max_size), GFP_KERNEL);
+        if (result->mmsg_vector == NULL)
+                goto out_mmsg_fail;
         result->skbuff_vector = kmalloc(
                 (sizeof(void *) * max_size), GFP_KERNEL);
-        if (result->mmsg_vector == NULL || result->skbuff_vector == NULL)
-                goto out_fail;
+        if (result->skbuff_vector == NULL)
+                goto out_skb_fail;
+
+        /* further failures can be handled safely by destroy_queue*/
 
         mmsg_vector = result->mmsg_vector;
         for (i = 0; i < max_size; i++) {
@@ -563,6 +567,11 @@ static struct vector_queue *create_queue(
         result->head = 0;
         result->tail = 0;
         return result;
+out_skb_fail:
+        kfree(result->mmsg_vector);
+out_mmsg_fail:
+        kfree(result);
+        return NULL;
 out_fail:
         destroy_queue(result);
         return NULL;
@@ -1232,9 +1241,8 @@ static int vector_net_open(struct net_device *dev)
 
         if ((vp->options & VECTOR_QDISC_BYPASS) != 0) {
                 if (!uml_raw_enable_qdisc_bypass(vp->fds->rx_fd))
-                        vp->options = vp->options | VECTOR_BPF;
+                        vp->options |= VECTOR_BPF;
         }
-
         if ((vp->options & VECTOR_BPF) != 0)
                 vp->bpf = uml_vector_default_bpf(vp->fds->rx_fd, dev->dev_addr);