lkml.org 
[lkml]   [2018]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 094/197] net/9p: fix error path of p9_virtio_probe
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>

    [ Upstream commit 92aef4675d5b1b55404e1532379e343bed0e5cf2 ]

    Currently when virtio_find_single_vq fails, we go through del_vqs which
    throws a warning (Trying to free already-free IRQ). Skip del_vqs if vq
    allocation failed.

    Link: http://lkml.kernel.org/r/20180524101021.49880-1-jean-philippe.brucker@arm.com
    Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
    Reviewed-by: Greg Kurz <groug@kaod.org>
    Cc: Eric Van Hensbergen <ericvh@gmail.com>
    Cc: Ron Minnich <rminnich@sandia.gov>
    Cc: Latchesar Ionkov <lucho@ionkov.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/9p/trans_virtio.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/net/9p/trans_virtio.c
    +++ b/net/9p/trans_virtio.c
    @@ -571,7 +571,7 @@ static int p9_virtio_probe(struct virtio
    chan->vq = virtio_find_single_vq(vdev, req_done, "requests");
    if (IS_ERR(chan->vq)) {
    err = PTR_ERR(chan->vq);
    - goto out_free_vq;
    + goto out_free_chan;
    }
    chan->vq->vdev->priv = chan;
    spin_lock_init(&chan->lock);
    @@ -624,6 +624,7 @@ out_free_tag:
    kfree(tag);
    out_free_vq:
    vdev->config->del_vqs(vdev);
    +out_free_chan:
    kfree(chan);
    fail:
    return err;

    \
     
     \ /
      Last update: 2018-09-13 15:57    [W:4.215 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site