[PATCH] fix libxc not to hide real errno with EBADF

[Steven Rostedt <srostedt@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1201 bytes --]

I'm currently looking for a cause of a bug that's giving me an invalid 
argument on an ioctl call with libxc. But before I found where the 
problem was I was constantly getting a Bad File Descriptor error.  Well 
that is because the clean up of gzclose is done after the file 
descriptor that gzdopen used is closed when it doesn't need to be.  This 
patch allows for proper clean up and the correct errno to be presented.

-- Steve

Signed-off-by: Steven Rostedt <srostedt@redhat.com>

(this may have white space damage, so I'm attaching the same patch as 
well. Haven't yet figured out how to do proper inline patches in 
thunderbird)

diff -r 9632ececc8f4 tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c	Wed Aug 02 10:13:30 2006 +0100
+++ b/tools/libxc/xc_linux_build.c	Fri Aug 04 17:10:30 2006 -0400
@@ -1373,10 +1373,10 @@ int xc_linux_build(int xc_handle,
 
  error_out:
     free(image);
-    if ( fd >= 0 )
+    if ( initrd_info.type == INITRD_file && initrd_info.u.file_handle )
+        gzclose(initrd_info.u.file_handle);
+    else if ( fd >= 0 )
         close(fd);
-    if ( initrd_info.u.file_handle )
-        gzclose(initrd_info.u.file_handle);
 
     return sts;
 }



[-- Attachment #2: libxc-badfd.patch --]
[-- Type: text/x-patch, Size: 561 bytes --]

diff -r 9632ececc8f4 tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c	Wed Aug 02 10:13:30 2006 +0100
+++ b/tools/libxc/xc_linux_build.c	Fri Aug 04 17:10:30 2006 -0400
@@ -1373,10 +1373,10 @@ int xc_linux_build(int xc_handle,
 
  error_out:
     free(image);
-    if ( fd >= 0 )
+    if ( initrd_info.type == INITRD_file && initrd_info.u.file_handle )
+        gzclose(initrd_info.u.file_handle);
+    else if ( fd >= 0 )
         close(fd);
-    if ( initrd_info.u.file_handle )
-        gzclose(initrd_info.u.file_handle);
 
     return sts;
 }

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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