rpms/libreoffice
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Debrand for AlmaLinux

Browse Source
This commit is contained in:
Eduard Abdullin 2026-07-06 13:01:22 +00:00 committed by root
commit 2cc8b73107
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
SOURCES/0001-CVE-2026-4430-Conform-AlignEngine-parsing.patch Normal file
View File

@ -0,0 +1,46 @@
From 1ec3db717fa144ddff3e9b0a2338a82355cf365b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolan.mcnamara@collabora.com>
Date: Mon, 16 Mar 2026 17:22:23 +0000
Subject: [PATCH] Conform AlignEngine parsing to what section 2.3.4.10 of the spec has
Change-Id: Ibb9162b1ce7993ef74665ec0329c95b423fa8174
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201874
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
---
diff -up libreoffice-7.1.8.1/oox/source/crypto/AgileEngine.cxx.cve-2026-4430 libreoffice-7.1.8.1/oox/source/crypto/AgileEngine.cxx
--- libreoffice-7.1.8.1/oox/source/crypto/AgileEngine.cxx.cve-2026-4430 2021-12-03 22:40:28.000000000 +0100
+++ libreoffice-7.1.8.1/oox/source/crypto/AgileEngine.cxx 2026-05-18 08:51:46.431152626 +0200
@@ -8,6 +8,8 @@
*
*/
+#include <o3tl/safeint.hxx>
+#include <sal/log.hxx>
#include <oox/crypto/AgileEngine.hxx>
#include <oox/helper/binaryinputstream.hxx>
@@ -532,8 +534,21 @@ bool AgileEngine::readEncryptionInfo(uno
if (0 > mInfo.spinCount || mInfo.spinCount > 10000000)
return false;
- if (1 > mInfo.saltSize|| mInfo.saltSize > 65536) // Check
+ // [MS-OFFCRYPTO] 2.3.4.10: saltSize "MUST be at least 1 and no greater than 65,536"
+ if (1 > mInfo.saltSize || mInfo.saltSize > 65536)
+ {
+ SAL_WARN("oox", "AgileEngine::readEncryptionInfo(): saltSize out of range: " << mInfo.saltSize);
+ return false;
+ }
+
+ // [MS-OFFCRYPTO] 2.3.4.10: "The number of bytes required to decode the saltValue
+ // attribute MUST be equal to the value of the saltSize attribute"
+ if (mInfo.keyDataSalt.size() != o3tl::make_unsigned(mInfo.saltSize))
+ {
+ SAL_WARN("oox", "AgileEngine::readEncryptionInfo(): keyDataSalt size " << mInfo.keyDataSalt.size()
+ << " does not match saltSize " << mInfo.saltSize);
return false;
+ }
// AES 128 CBC with SHA1
if (mInfo.keyBits == 128 &&

16
SPECS/libreoffice.spec
View File

@ -1,3 +1,8 @@
# RHEL-9.* without i686, not shipped and Java mismatches
%if 0%{?rhel} >= 9
ExcludeArch: %{ix86}
%endif
# download path contains version without the last (fourth) digit
%global libo_version 7.1.8
# Should contain .alphaX / .betaX, if this is pre-release (actually
@ -57,7 +62,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.1
Release: 15%{?libo_prerelease}%{?dist}.alma.1
Release: 15%{?libo_prerelease}%{?dist}.1.alma.1
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL: http://www.libreoffice.org/
@ -299,6 +304,8 @@ Patch43: 0006-CVE-2023-6186-backporting.patch
Patch44: 0001-CVE-2024-3044-add-notify-for-script-use.patch
Patch45: 0001-CVE-2024-6472-remove-ability-to-trust-not-validated-macro-signatur.patch
Patch46: 0001-CVE-2025-1080-Filter-out-more-unwanted-command-URIs.patch
# https://gerrit.libreoffice.org/c/core/+/202756
Patch47: 0001-CVE-2026-4430-Conform-AlignEngine-parsing.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
@ -2292,9 +2299,14 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Wed Apr 02 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1:7.1.8.1-15.alma.1
* Mon Jul 06 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1:7.1.8.1-15.1.alma.1
- Debrand for AlmaLinux
* Tue May 19 2026 Tomas Popela <tpopela@redhat.com> - 1:7.1.8.1-15.el9_8.1
- Fix CVE-2026-4430 Conform AlignEngine parsing to what section 2.3.4.10 of
the spec has
- Resolves: RHEL-176576
* Mon Mar 10 2025 Eike Rathke <erack@redhat.com> - 1:7.1.8.1-15
- Fix CVE-2025-1080 Filter out more unwanted command URIs