narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[hyperv] Fix resource leaks on error path 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/58/merge
Michael Brown 2017-03-21 14:51:03 +02:00
parent 2ae759219b
commit 8963193cda
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/interface/hyperv/vmbus.c
View File

@ -448,28 +448,31 @@ int vmbus_open ( struct vmbus_device *vmdev,
/* Post message */ /* Post message */
if ( ( rc = vmbus_post_message ( hv, &open.header, if ( ( rc = vmbus_post_message ( hv, &open.header,
sizeof ( open ) ) ) != 0 ) sizeof ( open ) ) ) != 0 )
return rc; goto err_post_message;
/* Wait for response */ /* Wait for response */
if ( ( rc = vmbus_wait_for_message ( hv, if ( ( rc = vmbus_wait_for_message ( hv,
VMBUS_OPEN_CHANNEL_RESULT ) ) != 0) VMBUS_OPEN_CHANNEL_RESULT ) ) != 0)
return rc; goto err_wait_for_message;
/* Check response */ /* Check response */
if ( opened->channel != cpu_to_le32 ( vmdev->channel ) ) { if ( opened->channel != cpu_to_le32 ( vmdev->channel ) ) {
DBGC ( vmdev, "VMBUS %s unexpected opened channel %#08x\n", DBGC ( vmdev, "VMBUS %s unexpected opened channel %#08x\n",
vmdev->dev.name, le32_to_cpu ( opened->channel ) ); vmdev->dev.name, le32_to_cpu ( opened->channel ) );
return -EPROTO; rc = -EPROTO;
goto err_check_response;
} }
if ( opened->id != open_id /* Non-endian */ ) { if ( opened->id != open_id /* Non-endian */ ) {
DBGC ( vmdev, "VMBUS %s unexpected open ID %#08x\n", DBGC ( vmdev, "VMBUS %s unexpected open ID %#08x\n",
vmdev->dev.name, le32_to_cpu ( opened->id ) ); vmdev->dev.name, le32_to_cpu ( opened->id ) );
return -EPROTO; rc = -EPROTO;
goto err_check_response;
} }
if ( opened->status != 0 ) { if ( opened->status != 0 ) {
DBGC ( vmdev, "VMBUS %s open failed: %#08x\n", DBGC ( vmdev, "VMBUS %s open failed: %#08x\n",
vmdev->dev.name, le32_to_cpu ( opened->status ) ); vmdev->dev.name, le32_to_cpu ( opened->status ) );
return -EPROTO; rc = -EPROTO;
goto err_check_response;
} }
/* Store channel parameters */ /* Store channel parameters */
@ -488,6 +491,9 @@ int vmbus_open ( struct vmbus_device *vmdev,
( virt_to_phys ( vmdev->out ) + len ) ); ( virt_to_phys ( vmdev->out ) + len ) );
return 0; return 0;
err_check_response:
err_wait_for_message:
err_post_message:
vmbus_gpadl_teardown ( vmdev, vmdev->gpadl ); vmbus_gpadl_teardown ( vmdev, vmdev->gpadl );
err_establish: err_establish:
free_dma ( ring, len ); free_dma ( ring, len );