!46 [sync] PR-43: fix cves

From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2024-06-13 11:34:50 +00:00 committed by Gitee
commit 546611a075
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 1235 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From a928758612e67c4496bd9acf48bf66259c809782 Mon Sep 17 00:00:00 2001
From: Nika Layzell <nika@thelayzells.com>
Date: Tue, 07 Jun 2022 17:06:41
Subject: [PATCH] CVE-2022-34481
Conflict:NA
Reference:https://hg.mozilla.org/mozilla-central/rev/243ca18dc17200998c0c8d21979c15fb930e42fb
---
xpcom/ds/nsTArray.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/xpcom/ds/nsTArray.h b/xpcom/ds/nsTArray.h
index 92fe4a4649..10b5241ed1 100644
--- a/xpcom/ds/nsTArray.h
+++ b/xpcom/ds/nsTArray.h
@@ -2461,6 +2461,9 @@ auto nsTArray_Impl<E, Alloc>::ReplaceElementsAtInternal(index_type aStart,
if (MOZ_UNLIKELY(aStart > Length())) {
InvalidArrayIndex_CRASH(aStart, Length());
}
+ if (MOZ_UNLIKELY(aCount > Length() - aStart)) {
+ InvalidArrayIndex_CRASH(aStart + aCount, Length());
+ }
// Adjust memory allocation up-front to catch errors.
if (!ActualAlloc::Successful(this->template EnsureCapacity<ActualAlloc>(
--
2.27.0

File diff suppressed because it is too large Load Diff

View File

@ -12,7 +12,7 @@
# Big endian platforms
Name: mozjs%{major}
Version: 91.6.0
Release: 4
Release: 5
Summary: SpiderMonkey JavaScript library
License: MPL-2.0
Group: System/Libraries
@ -40,6 +40,8 @@ Patch16: spidermonkey_support_loongarch64.patch
Patch17: backport-CVE-2023-23599.patch
Patch18: backport-CVE-2023-23601.patch
Patch19: backport-CVE-2023-23602.patch
Patch20: backport-CVE-2022-34481.patch
Patch21: backport-CVE-2023-29532.patch
BuildRequires: autoconf213 cargo ccache clang-devel gcc gcc-c++ libtool perl-devel llvm llvm-devel nasm pkgconfig python3-devel python3-setuptools
BuildRequires: python3-six readline-devel zip rust pkgconfig(icu-i18n) >= 67.1 pkgconfig(libffi) pkgconfig(nspr) pkgconfig(zlib) icu
@ -211,6 +213,9 @@ popd
%{_includedir}/mozjs-%{major}/
%changelog
* Thu Jun 06 2024 sunhai <sunhai10@huawei.com> - 91.6.0-5
- fix CVEs
* Thu Mar 21 2024 sunhai <sunhai10@huawei.com> - 91.6.0-4
- fix CVEs