From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Xie Yongji <xieyongji@bytedance.com>,
Jason Wang <jasowang@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Sasha Levin <sashal@kernel.org>,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.14 20/21] virtio_net: Fix error handling in virtnet_restore()
Date: Sat, 10 Jul 2021 19:52:11 -0400 [thread overview]
Message-ID: <20210710235212.3222375-20-sashal@kernel.org> (raw)
In-Reply-To: <20210710235212.3222375-1-sashal@kernel.org>
From: Xie Yongji <xieyongji@bytedance.com>
[ Upstream commit 3f2869cace829fb4b80fc53b3ddaa7f4ba9acbf1 ]
Do some cleanups in virtnet_restore() when virtnet_cpu_notif_add() failed.
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Link: https://lore.kernel.org/r/20210517084516.332-1-xieyongji@bytedance.com
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 2d2a307c0231..dbc944c5759e 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2765,8 +2765,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;
}
--
2.30.2
next prev parent reply other threads:[~2021-07-10 23:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-10 23:51 [PATCH AUTOSEL 4.14 01/21] pwm: spear: Don't modify HW state in .remove callback Sasha Levin
2021-07-10 23:51 ` [PATCH AUTOSEL 4.14 02/21] power: supply: ab8500: Avoid NULL pointers Sasha Levin
2021-07-10 23:51 ` [PATCH AUTOSEL 4.14 03/21] power: supply: max17042: Do not enforce (incorrect) interrupt trigger type Sasha Levin
2021-07-10 23:51 ` [PATCH AUTOSEL 4.14 04/21] power: reset: gpio-poweroff: add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-10 23:51 ` [PATCH AUTOSEL 4.14 05/21] ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1 Sasha Levin
2021-07-10 23:51 ` [PATCH AUTOSEL 4.14 06/21] watchdog: Fix possible use-after-free in wdt_startup() Sasha Levin
2021-07-10 23:51 ` [PATCH AUTOSEL 4.14 07/21] watchdog: sc520_wdt: Fix possible use-after-free in wdt_turnoff() Sasha Levin
2021-07-10 23:51 ` [PATCH AUTOSEL 4.14 08/21] watchdog: Fix possible use-after-free by calling del_timer_sync() Sasha Levin
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 09/21] watchdog: iTCO_wdt: Account for rebooting on second timeout Sasha Levin
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 10/21] x86/fpu: Return proper error codes from user access functions Sasha Levin
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 11/21] orangefs: fix orangefs df output Sasha Levin
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 12/21] ceph: remove bogus checks and WARN_ONs from ceph_set_page_dirty Sasha Levin
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 13/21] NFS: nfs_find_open_context() may only select open files Sasha Levin
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 14/21] power: supply: charger-manager: add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 15/21] power: supply: ab8500: " Sasha Levin
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 16/21] pwm: tegra: Don't modify HW state in .remove callback Sasha Levin
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 17/21] ACPI: AMBA: Fix resource name in /proc/iomem Sasha Levin
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 18/21] ACPI: video: Add quirk for the Dell Vostro 3350 Sasha Levin
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 19/21] virtio-blk: Fix memory leak among suspend/resume procedure Sasha Levin
2021-07-10 23:52 ` Sasha Levin [this message]
2021-07-10 23:52 ` [PATCH AUTOSEL 4.14 21/21] virtio_console: Assure used length from device is limited Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210710235212.3222375-20-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=xieyongji@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).