Mailing List Archive

# HG changeset patch
# User kaf24@firebug.cl.cam.ac.uk
# Node ID f36627941bbe224ee7177f0ae63bba099376c668
# Parent 0e47bcdac69d08e4ca4c63b0e21d7ec4d8c11e2c
Fix a leak occurring at netif_map(). The problem raised after allocating
both {rx,tx}_comms_area, and one (and just one) of them failed. As we
were
doing a single test for both, returning would leave one of them
allocated.

Signed-off-by: Glauber de Oliveira Costa <glommer@br.ibm.com>

diff -r 0e47bcdac69d -r f36627941bbe linux-2.6-xen-sparse/drivers/xen/netback/interface.c
--- a/linux-2.6-xen-sparse/drivers/xen/netback/interface.c Wed Dec 28 14:14:23 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/interface.c Wed Dec 28 14:17:04 2005
@@ -196,9 +196,13 @@
return 0;

netif->tx_comms_area = alloc_vm_area(PAGE_SIZE);
+ if (netif->tx_comms_area == NULL)
+ return -ENOMEM;
netif->rx_comms_area = alloc_vm_area(PAGE_SIZE);
- if (netif->tx_comms_area == NULL || netif->rx_comms_area == NULL)
+ if (netif->rx_comms_area == NULL) {
+ free_vm_area(netif->tx_comms_area);
return -ENOMEM;
+ }

err = map_frontend_pages(netif, tx_ring_ref, rx_ring_ref);
if (err) {

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