[Xen-changelog] [xen-3.0.5-testing] Ensure blk{tap/back}'s vm_area is not freed twice on error case.

["Xen patchbot-3.0.5-testing" <patchbot-3.0.5-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Jake Wires <jwires@xxxxxxxxxxxxx>
# Date 1177721646 25200
# Node ID b915eb96097a23f0a4085fc732a721415967d600
# Parent  aedc55daf92b1056c25e24482ba130913b86b867
Ensure blk{tap/back}'s vm_area is not freed twice on error case.
Signed-off-by: Jake Wires <jwires@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/xen/blkback/interface.c |    1 +
 linux-2.6-xen-sparse/drivers/xen/blktap/interface.c  |    1 +
 2 files changed, 2 insertions(+)

diff -r aedc55daf92b -r b915eb96097a 
linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c      Fri Apr 27 
16:27:07 2007 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c      Fri Apr 27 
17:54:06 2007 -0700
@@ -136,6 +136,7 @@ int blkif_map(blkif_t *blkif, unsigned l
        {
                unmap_frontend_page(blkif);
                free_vm_area(blkif->blk_ring_area);
+               blkif->blk_rings.common.sring = NULL;
                return err;
        }
        blkif->irq = err;
diff -r aedc55daf92b -r b915eb96097a 
linux-2.6-xen-sparse/drivers/xen/blktap/interface.c
--- a/linux-2.6-xen-sparse/drivers/xen/blktap/interface.c       Fri Apr 27 
16:27:07 2007 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/blktap/interface.c       Fri Apr 27 
17:54:06 2007 -0700
@@ -137,6 +137,7 @@ int tap_blkif_map(blkif_t *blkif, unsign
        if (err < 0) {
                unmap_frontend_page(blkif);
                free_vm_area(blkif->blk_ring_area);
+               blkif->blk_rings.common.sring = NULL;
                return err;
        }
        blkif->irq = err;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog