From 7c619136c6f622c724c9057d8be9d0ed0527d75a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 23 Oct 2016 10:48:01 +0200 Subject: [PATCH] Fix security issue CVE-2016-6232 Based on https://quickgit.kde.org/?p=karchive.git&a=commitdiff&h=0cb243f6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 261a3b7a126b7a1d28e263085b85bf1905eb4c19) --- tdeio/tdeio/karchive.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tdeio/tdeio/karchive.cpp b/tdeio/tdeio/karchive.cpp index b0e0dc6ab..69e54d1b2 100644 --- a/tdeio/tdeio/karchive.cpp +++ b/tdeio/tdeio/karchive.cpp @@ -601,6 +601,7 @@ void KArchiveDirectory::addEntry( KArchiveEntry* entry ) void KArchiveDirectory::copyTo(const TQString& dest, bool recursiveCopy ) const { TQDir root; + const TQString destDir(TQDir(dest).absPath()); // get directory path without any "." or ".." PosSortedPtrList fileList; TQMap fileToDir; @@ -620,10 +621,19 @@ void KArchiveDirectory::copyTo(const TQString& dest, bool recursiveCopy ) const TQValueStack dirNameStack; dirStack.push( this ); // init stack at current directory - dirNameStack.push( dest ); // ... with given path + dirNameStack.push( destDir ); // ... with given path do { curDir = dirStack.pop(); - curDirName = dirNameStack.pop(); + + // extract only to specified folder if it is located within archive's extraction folder + // otherwise put file under root position in extraction folder + TQString curDirName = dirNameStack.pop(); + if (!TQDir(curDirName).absPath().startsWith(destDir)) { + kdWarning() << "Attempted export into folder" << curDirName + << "which is outside of the extraction root folder" << destDir << "." + << "Changing export of contained files to extraction root folder."; + curDirName = destDir; + } root.mkdir(curDirName); dirEntries = curDir->entries();