3.18-stable review patch. If anyone has any objections, please let me know.
------------------ From: Jean-Philippe Brucker <jean-philippe.bruc...@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.bruc...@arm.com Signed-off-by: Jean-Philippe Brucker <jean-philippe.bruc...@arm.com> Reviewed-by: Greg Kurz <gr...@kaod.org> Cc: Eric Van Hensbergen <eri...@gmail.com> Cc: Ron Minnich <rminn...@sandia.gov> Cc: Latchesar Ionkov <lu...@ionkov.net> Signed-off-by: Andrew Morton <a...@linux-foundation.org> Signed-off-by: Dominique Martinet <dominique.marti...@cea.fr> Signed-off-by: Sasha Levin <alexander.le...@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gre...@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 @@ -537,7 +537,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); @@ -590,6 +590,7 @@ out_free_tag: kfree(tag); out_free_vq: vdev->config->del_vqs(vdev); +out_free_chan: kfree(chan); fail: return err;
