From: Guillem Jover <guillem@debian.org>
Date: Sat, 12 Apr 2008 17:06:58 +0000 (+0300)
Subject: Fix a double-free by setting scontext to NULL after calling freecon
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8ef1fc56dc5e4d2248ca7f3ce8f43ee7f3a4a38;p=dpkg

Fix a double-free by setting scontext to NULL after calling freecon

Based on a patch by Russell Coker. Closes: #474339
---

diff --git a/ChangeLog b/ChangeLog
index 070378e6..6a0432fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-12  Russell Coker <russell@coker.com.au>,
+            Guillem Jover  <guillem@debian.org>
+
+	* src/archives.c (tarobject): Set scontext to NULL after freecon.
+
 2008-04-10  Sven Joachim  <svenjoac@gmx.de>
 
 	* src/trigcmd.c: Fix typo.
diff --git a/THANKS b/THANKS
index 073fc9cf..f1da8bae 100644
--- a/THANKS
+++ b/THANKS
@@ -142,6 +142,7 @@ Robert Luberda <robert@debian.org>
 Robert Millan <rmh@debian.org>
 Roderick Schertler <roderick@argon.org>
 Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
+Russell Coker <russell@coker.com.au>
 SZERVÁC Attila <sas@321.hu>
 Samuel Thibault <samuel.thibault@ens-lyon.org>
 Scott Barker <scott@mostlylinux.ab.ca>
diff --git a/debian/changelog b/debian/changelog
index dd7cb87d..175b3605 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 dpkg (1.14.19) UNRELEASED; urgency=low
 
+  [ Guillem Jover ]
+  * Fix a double-free by setting scontext to NULL after calling freecon.
+    Based on a patch by Russell Coker. Closes: #474339
+
   [ Updated dpkg translations ]
   * Galician (Jacobo Tarrio).
   * German (Sven Joachim).
diff --git a/src/archives.c b/src/archives.c
index 023678fe..50ca0349 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -801,6 +801,7 @@ int tarobject(struct TarInfo *ti) {
        if(setfscreatecon(scontext) < 0)
          perror("Error setting security context for next file object:");
        freecon(scontext);
+       scontext = NULL;
      }
         
 #endif /* WITH_SELINUX */