From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Subject: [PATCH] fix libxc not to hide real errno with EBADF Date: Fri, 04 Aug 2006 17:13:03 -0400 Message-ID: <44D3B85F.8000403@redhat.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010008090505060908020509" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Keir Fraser Cc: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------010008090505060908020509 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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 (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; } --------------010008090505060908020509 Content-Type: text/x-patch; name="libxc-badfd.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="libxc-badfd.patch" 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; } --------------010008090505060908020509 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------010008090505060908020509--