From bb626c1818f256975a53891c40990b7158ffd80f Mon Sep 17 00:00:00 2001 From: Xie Yongji Date: Mon, 2 Aug 2021 11:01:34 +0800 Subject: [PATCH] virtio_net: Fix error handling in virtnet_restore() stable inclusion from linux-4.19.198 commit 845ae8523f5a9ecfdbed48b485cb4ffae71df95b -------------------------------- [ Upstream commit 3f2869cace829fb4b80fc53b3ddaa7f4ba9acbf1 ] Do some cleanups in virtnet_restore() when virtnet_cpu_notif_add() failed. Signed-off-by: Xie Yongji Link: https://lore.kernel.org/r/20210517084516.332-1-xieyongji@bytedance.com Acked-by: Jason Wang Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin Signed-off-by: Yang Yingliang --- drivers/net/virtio_net.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 3595127f714f..68eda4739a9a 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3185,8 +3185,11 @@ static __maybe_unused int virtnet_restore(struct virtio_device *vdev) virtnet_set_queues(vi, vi->curr_queue_pairs); err = virtnet_cpu_notif_add(vi); - if (err) + if (err) { + virtnet_freeze_down(vdev); + remove_vq_common(vi); return err; + } return 0; } -- GitLab