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 070378e6f1e9ca9b4a9f6d5e6fcdb36f6243e2c2..6a0432fe78d70e5627b5ef125d27fe6219717631 100644 (file)
--- 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 073fc9cf3185329994f41159cd6585142c325648..f1da8bae21df276e83908a9f78e9b9307a38eb54 100644 (file)
--- 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 dd7cb87d7f95ee912b4ff5362978b732f0ba9eaf..175b3605c2eb594ac65db4e2d701409c650be434 100644 (file)
--- 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 023678fef827cc8673e4314cc3df5c6c932a8706..50ca0349a9ebcad705b4fc7b9dc43b1845f017db 100644 (file)
--- 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 */