lkml.org 
[lkml]   [2017]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 137/178] virtio_console: fix uninitialized variable use
    3.16.46-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Michael S. Tsirkin" <mst@redhat.com>

    commit 2055997f983c6db7b5c3940ce5f8f822657d5bc3 upstream.

    We try to disable callbacks on c_ivq even without multiport
    even though that vq is not initialized in this configuration.

    Fixes: c743d09dbd01 ("virtio: console: Disable callbacks for virtqueues at start of S4 freeze")
    Suggested-by: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/char/virtio_console.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/char/virtio_console.c
    +++ b/drivers/char/virtio_console.c
    @@ -2180,14 +2180,16 @@ static int virtcons_freeze(struct virtio

    vdev->config->reset(vdev);

    - virtqueue_disable_cb(portdev->c_ivq);
    + if (use_multiport(portdev))
    + virtqueue_disable_cb(portdev->c_ivq);
    cancel_work_sync(&portdev->control_work);
    cancel_work_sync(&portdev->config_work);
    /*
    * Once more: if control_work_handler() was running, it would
    * enable the cb as the last step.
    */
    - virtqueue_disable_cb(portdev->c_ivq);
    + if (use_multiport(portdev))
    + virtqueue_disable_cb(portdev->c_ivq);
    remove_controlq_data(portdev);

    list_for_each_entry(port, &portdev->ports, list) {
    \
     
     \ /
      Last update: 2017-07-16 16:35    [W:4.084 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site