diff options
| author | Jean-Philippe Brucker <jean-philippe.brucker@arm.com> | 2018-07-18 04:14:45 +0200 |
|---|---|---|
| committer | Dominique Martinet <dominique.martinet@cea.fr> | 2018-08-13 02:21:44 +0200 |
| commit | 92aef4675d5b1b55404e1532379e343bed0e5cf2 (patch) | |
| tree | c665f7be0788a4915e39724ddeb6f83c88a43001 /net/9p | |
| parent | 9p/net/protocol.c: return -ENOMEM when kmalloc() failed (diff) | |
| download | linux-92aef4675d5b1b55404e1532379e343bed0e5cf2.tar.xz linux-92aef4675d5b1b55404e1532379e343bed0e5cf2.zip | |
net/9p: fix error path of p9_virtio_probe
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>
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/trans_virtio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 05006cbb3361..eaacce086427 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -563,7 +563,7 @@ static int p9_virtio_probe(struct virtio_device *vdev) 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); @@ -616,6 +616,7 @@ out_free_tag: kfree(tag); out_free_vq: vdev->config->del_vqs(vdev); +out_free_chan: kfree(chan); fail: return err; |