diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-04-07 08:16:15 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-04-07 08:16:15 +0100 |
| commit | 15d5739ea96c83a989c31e5f28436004cf831035 (patch) | |
| tree | aa82d1cc429dfc7b1bc0ff331c84774c7151ef14 /extras | |
| parent | 42e3a21b11ec98ecfd1e3473c9bbc8e9e98b10b5 (diff) | |
| download | xen-15d5739ea96c83a989c31e5f28436004cf831035.tar.gz xen-15d5739ea96c83a989c31e5f28436004cf831035.tar.bz2 xen-15d5739ea96c83a989c31e5f28436004cf831035.zip | |
mini-os: Fix crash on frontend shutdown failures
Do not free frontend resources if some error happened, since the
backend may not have finished properly restarting in such case.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/mini-os/blkfront.c | 3 | ||||
| -rw-r--r-- | extras/mini-os/fbfront.c | 6 | ||||
| -rw-r--r-- | extras/mini-os/netfront.c | 3 | ||||
| -rw-r--r-- | extras/mini-os/pcifront.c | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index f47aa69f23..d59140fcb8 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -313,7 +313,8 @@ close: snprintf(path, sizeof(path), "%s/event-channel", nodename); xenbus_rm(XBT_NIL, path); - free_blkfront(dev); + if (!err) + free_blkfront(dev); } static void blkfront_wait_slot(struct blkfront_dev *dev) diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 6d2268e27e..ef024cbcd0 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -288,7 +288,8 @@ close_kbdfront: snprintf(path, sizeof(path), "%s/request-abs-pointer", nodename); xenbus_rm(XBT_NIL, path); - free_kbdfront(dev); + if (!err) + free_kbdfront(dev); } #ifdef HAVE_LIBC @@ -681,7 +682,8 @@ close_fbfront: snprintf(path, sizeof(path), "%s/feature-update", nodename); xenbus_rm(XBT_NIL, path); - free_fbfront(dev); + if (!err) + free_fbfront(dev); } #ifdef HAVE_LIBC diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 491876fd9a..bc70b98b4a 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -574,7 +574,8 @@ close: snprintf(path, sizeof(path), "%s/request-rx-copy", nodename); xenbus_rm(XBT_NIL, path); - free_netfront(dev); + if (!err) + free_netfront(dev); } diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index 638fdb3966..dc6c461de8 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -378,7 +378,8 @@ close_pcifront: snprintf(path, sizeof(path), "%s/event-channel", nodename); xenbus_rm(XBT_NIL, path); - free_pcifront(dev); + if (!err) + free_pcifront(dev); } int pcifront_physical_to_virtual (struct pcifront_dev *dev, |