diff --git a/ark.spec b/ark.spec index 8e747d1..2846aa7 100644 --- a/ark.spec +++ b/ark.spec @@ -1,7 +1,7 @@ Name: ark Summary: Archive manager Version: 22.08.3 -Release: 1 +Release: 2 License: GPLv2+ URL: https://www.kde.org/applications/utilities/ark/ @@ -12,6 +12,7 @@ URL: https://www.kde.org/applications/utilities/ark/ %global stable stable %endif Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz +Patch6001: backport-CVE-2024-57966.patch BuildRequires: bzip2-devel BuildRequires: desktop-file-utils @@ -106,6 +107,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.ark.deskt %{_kf5_datadir}/kservicetypes5/kerfufflePlugin.desktop %changelog +* Tue Feb 04 2025 Funda Wang - 22.08.3-2 +- fix CVE-2024-57966 + * Thu Dec 15 2022 tanyulong - 22.08.3-1 - update to upstream version 22.08.3 diff --git a/backport-CVE-2024-57966.patch b/backport-CVE-2024-57966.patch new file mode 100644 index 0000000..fc12e37 --- /dev/null +++ b/backport-CVE-2024-57966.patch @@ -0,0 +1,52 @@ +From fe518d81b338941e0bf1c5ce5e75a9ab6de4bb58 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Thu, 7 Nov 2024 14:47:26 +0100 +Subject: [PATCH] Treat absolute paths as relative paths during extraction + +Tell libarchive to use the path for extraction that Ark uses internally. +In addition, set the ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS flag to avoid +that absolute paths are used by accident. + +(cherry picked from commit cc9ea9e89c1c679d398809e94f1217b1f73c4b48) +--- + plugins/libarchive/libarchiveplugin.cpp | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/plugins/libarchive/libarchiveplugin.cpp b/plugins/libarchive/libarchiveplugin.cpp +index 8d489f58f..9b47bae8c 100644 +--- a/plugins/libarchive/libarchiveplugin.cpp ++++ b/plugins/libarchive/libarchiveplugin.cpp +@@ -269,6 +269,11 @@ + entryName.remove(0, 1); + } + ++ // If this ends up empty (e.g. from // or ./), convert to ".". ++ if (entryName.isEmpty()) { ++ entryName = QStringLiteral("."); ++ } ++ + // Should the entry be extracted? + if (extractAll || + remainingFiles.contains(entryName) || +@@ -283,10 +288,12 @@ + continue; + } + ++ // Make sure libarchive uses the same path as we expect, based on transformations and renames, ++ qCDebug(ARK) << "setting path to " << entryName; ++ archive_entry_copy_pathname(entry, QFile::encodeName(entryName).constData()); + // entryFI is the fileinfo pointing to where the file will be + // written from the archive. + QFileInfo entryFI(entryName); +- //qCDebug(ARK) << "setting path to " << archive_entry_pathname( entry ); + + const QString fileWithoutPath(entryFI.fileName()); + // If we DON'T preserve paths, we cut the path and set the entryFI +@@ -492,6 +499,7 @@ + int LibarchivePlugin::extractionFlags() const + { + return ARCHIVE_EXTRACT_TIME ++ | ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS + | ARCHIVE_EXTRACT_SECURE_NODOTDOT + | ARCHIVE_EXTRACT_SECURE_SYMLINKS; + }