From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 29 Nov 2007 07:32:54 +0000 (+0100)
Subject: Close a file descriptor leak when cp --preserve=context fails.
X-Git-Tag: v6.9.90~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9962f24cc458e7d7588d4d043339823067aa3b83;p=thirdparty%2Fcoreutils.git

Close a file descriptor leak when cp --preserve=context fails.

* src/copy.c (copy_reg): Close dest_desc too, if getfscreatecon
or fsetfilecon fail.
---

diff --git a/ChangeLog b/ChangeLog
index 7326a40785..38401db1dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Close a file descriptor leak when cp --preserve=context fails.
+	* src/copy.c (copy_reg): Close dest_desc too, if getfscreatecon
+	or fsetfilecon fail.
+
 2007-11-28  Jim Meyering  <meyering@redhat.com>
 
 	* README: Document the known problem with gettext <= 0.17.
diff --git a/src/copy.c b/src/copy.c
index 4dec5166e1..975890750d 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -341,7 +341,7 @@ copy_reg (char const *src_name, char const *dst_name,
 	      if (x->require_preserve_context)
 		{
 		  return_val = false;
-		  goto close_src_desc;
+		  goto close_src_and_dst_desc;
 		}
 	    }
 
@@ -356,7 +356,7 @@ copy_reg (char const *src_name, char const *dst_name,
 		    {
 		      return_val = false;
 		      freecon (con);
-		      goto close_src_desc;
+		      goto close_src_and_dst_desc;
 		    }
 		}
 	      freecon(con);