tpm: fix RC value check in tpm2_seal_trusted

[mirror_ubuntu-zesty-kernel.git] / drivers / char / virtio_console.c

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 8b00e79c2683a4812126fb73c7134ea157554ef2..3cbf4c95e446c9e434d7e7a167ed2d011ef36f5c 100644 (file)
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1136,6 +1136,8 @@ static int put_chars(u32 vtermno, const char *buf, int count)
 {
        struct port *port;
        struct scatterlist sg[1];
+       void *data;
+       int ret;
 
        if (unlikely(early_put_chars))
                return early_put_chars(vtermno, buf, count);
@@ -1144,8 +1146,14 @@ static int put_chars(u32 vtermno, const char *buf, int count)
        if (!port)
                return -EPIPE;
 
-       sg_init_one(sg, buf, count);
-       return __send_to_port(port, sg, 1, count, (void *)buf, false);
+       data = kmemdup(buf, count, GFP_ATOMIC);
+       if (!data)
+               return -ENOMEM;
+
+       sg_init_one(sg, data, count);
+       ret = __send_to_port(port, sg, 1, count, data, false);
+       kfree(data);
+       return ret;
 }
 
 /*
@@ -1862,7 +1870,7 @@ static void config_work_handler(struct work_struct *work)
 {
        struct ports_device *portdev;
 
-       portdev = container_of(work, struct ports_device, control_work);
+       portdev = container_of(work, struct ports_device, config_work);
        if (!use_multiport(portdev)) {
                struct virtio_device *vdev;
                struct port *port;