diff --git a/CVE-2023-44488-libvpx.patch b/CVE-2023-44488-libvpx.patch new file mode 100644 index 0000000000000000000000000000000000000000..79e523565bb95525d890e4fed0c72def2cd4da06 --- /dev/null +++ b/CVE-2023-44488-libvpx.patch @@ -0,0 +1,127 @@ +From 263682c9a29395055f3b3afe2d97be1828a6223f Mon Sep 17 00:00:00 2001 +From: Jerome Jiang +Date: Thu, 30 Jun 2022 13:48:56 -0400 +Subject: [PATCH] Fix bug with smaller width bigger size + +Fixed previous patch that clusterfuzz failed on. + +Bug: webm:1642 +Change-Id: If0e08e72abd2e042efe4dcfac21e4cc51afdfdb9 +--- + test/resize_test.cc | 11 +++-------- + vp9/common/vp9_alloccommon.c | 13 ++++++------- + vp9/encoder/vp9_encoder.c | 27 +++++++++++++++++++++++++-- + 3 files changed, 34 insertions(+), 17 deletions(-) + +diff --git a/test/resize_test.cc b/test/resize_test.cc +index fd1c2a92de6..20ad2229b46 100644 +--- a/test/resize_test.cc ++++ b/test/resize_test.cc +@@ -102,11 +102,8 @@ void ScaleForFrameNumber(unsigned int frame, unsigned int initial_w, + if (frame < 30) { + return; + } +- if (frame < 100) { +- *w = initial_w * 7 / 10; +- *h = initial_h * 16 / 10; +- return; +- } ++ *w = initial_w * 7 / 10; ++ *h = initial_h * 16 / 10; + return; + } + if (frame < 10) { +@@ -559,9 +556,7 @@ TEST_P(ResizeRealtimeTest, TestExternalResizeWorks) { + } + } + +-// TODO(https://crbug.com/webm/1642): This causes a segfault in +-// init_encode_frame_mb_context(). +-TEST_P(ResizeRealtimeTest, DISABLED_TestExternalResizeSmallerWidthBiggerSize) { ++TEST_P(ResizeRealtimeTest, TestExternalResizeSmallerWidthBiggerSize) { + ResizingVideoSource video; + video.flag_codec_ = true; + video.smaller_width_larger_size_ = true; +diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c +index e53883f621d..9e73e40ea09 100644 +--- a/vp9/common/vp9_alloccommon.c ++++ b/vp9/common/vp9_alloccommon.c +@@ -135,13 +135,6 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) { + cm->free_mi(cm); + if (cm->alloc_mi(cm, new_mi_size)) goto fail; + } +- +- if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { +- // Create the segmentation map structure and set to 0. +- free_seg_map(cm); +- if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; +- } +- + if (cm->above_context_alloc_cols < cm->mi_cols) { + vpx_free(cm->above_context); + cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc( +@@ -156,6 +149,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) { + cm->above_context_alloc_cols = cm->mi_cols; + } + ++ if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { ++ // Create the segmentation map structure and set to 0. ++ free_seg_map(cm); ++ if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; ++ } ++ + if (vp9_alloc_loop_filter(cm)) goto fail; + + return 0; +diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c +index 69a4e3c314f..e3ba294c32f 100644 +--- a/vp9/encoder/vp9_encoder.c ++++ b/vp9/encoder/vp9_encoder.c +@@ -2047,6 +2047,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) { + } + } + ++static void free_copy_partition_data(VP9_COMP *cpi) { ++ vpx_free(cpi->prev_partition); ++ cpi->prev_partition = NULL; ++ vpx_free(cpi->prev_segment_id); ++ cpi->prev_segment_id = NULL; ++ vpx_free(cpi->prev_variance_low); ++ cpi->prev_variance_low = NULL; ++ vpx_free(cpi->copied_frame_cnt); ++ cpi->copied_frame_cnt = NULL; ++} ++ + void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { + VP9_COMMON *const cm = &cpi->common; + RATE_CONTROL *const rc = &cpi->rc; +@@ -2126,6 +2137,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { + new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows); + if (cm->mi_alloc_size < new_mi_size) { + vp9_free_context_buffers(cm); ++ vp9_free_pc_tree(&cpi->td); ++ vpx_free(cpi->mbmi_ext_base); + alloc_compressor_data(cpi); + realloc_segmentation_maps(cpi); + cpi->initial_width = cpi->initial_height = 0; +@@ -2144,8 +2157,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { + update_frame_size(cpi); + + if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) { +- memset(cpi->consec_zero_mv, 0, +- cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv)); ++ vpx_free(cpi->consec_zero_mv); ++ CHECK_MEM_ERROR( ++ &cm->error, cpi->consec_zero_mv, ++ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv))); ++ ++ vpx_free(cpi->skin_map); ++ CHECK_MEM_ERROR( ++ &cm->error, cpi->skin_map, ++ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0]))); ++ ++ free_copy_partition_data(cpi); ++ alloc_copy_partition_data(cpi); + if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ) + vp9_cyclic_refresh_reset_resize(cpi); + rc->rc_1_frame = 0; diff --git a/download b/download index 3f8e60116267855694a3403cb9719708fedd5344..97005a19ecb6a2f4131aaf33878df9a3041c51a0 100644 --- a/download +++ b/download @@ -2,6 +2,5 @@ 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm d9c9dd9619daeb43820de97b04bede45 nss-3.90.0-2.el8_1.src.rpm 5c2f6d790957733c5f0d06f8caea3b0d nss-3.90.0-3.el9_0.src.rpm -40f4da60cccbcd0c64bd45589b792313 thunderbird-115.3.1.processed-source.tar.xz -98f64f514116f7cca93ba5976c90000c thunderbird-langpacks-115.3.1-20230929.tar.xz -6611e41665de11dd80b2ff5f1f40ee03 rust-cbindgen.tar.gz +16f8a8028a91c36f00a627fe6f6d9d71 thunderbird-115.4.1.processed-source.tar.xz +ac368733170f92a751093993784077c5 thunderbird-langpacks-115.4.1-20231025.tar.xz diff --git a/thunderbird-anolis-default-prefs.js b/thunderbird-redhat-default-prefs.js similarity index 96% rename from thunderbird-anolis-default-prefs.js rename to thunderbird-redhat-default-prefs.js index 1d192b118c3400135cd8897caa6ecbc6cc25feba..4d01b7833b018d0bf5fe31dab6d5e578aadc53ec 100644 --- a/thunderbird-anolis-default-prefs.js +++ b/thunderbird-redhat-default-prefs.js @@ -2,7 +2,7 @@ pref("app.update.enabled", false); pref("app.update.autoInstallEnabled", false); /* Allow users to set custom colors*/ /* pref("browser.display.use_system_colors", true);*/ -pref("general.useragent.vendor", "Anolis"); +pref("general.useragent.vendor", "Red Hat"); pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); pref("intl.locale.matchOS", true); pref("mail.shell.checkDefaultClient", false); diff --git a/thunderbird.spec b/thunderbird.spec index 786f77272a203e09ec74d67c34711d66cf46977e..1d51290257f3dfae91882499b300ee1efd0d9371 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,5 +1,3 @@ -%define anolis_release .0.1 - # Set for local builds only %global disable_toolsets 0 @@ -69,7 +67,7 @@ end} %global nspr_version_max 4.36 %global nss_version 3.90 %global nss_version_max 3.91 -#%global rust_version 1.66 +%global rust_version 1.66 %global system_libvpx 0 # Toolsets setup @@ -136,8 +134,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 115.3.1 -Release: 1%{anolis_release}%{?dist} +Version: 115.4.1 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -152,7 +150,7 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc +ExcludeArch: aarch64 s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -162,12 +160,12 @@ ExcludeArch: s390 ppc #Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: thunderbird-langpacks-%{version}-20230929.tar.xz +Source1: thunderbird-langpacks-%{version}-20231025.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: thunderbird-mozconfig -Source12: thunderbird-anolis-default-prefs.js +Source12: thunderbird-redhat-default-prefs.js Source20: thunderbird.desktop Source21: thunderbird.sh.in Source24: mozilla-api-key @@ -179,7 +177,6 @@ Source401: nss-setup-flags-env.inc Source402: nspr-4.35.0-1.el8_1.src.rpm Source403: nss-3.90.0-2.el8_1.src.rpm Source404: nss-3.90.0-3.el9_0.src.rpm -Source405: rust-cbindgen.tar.gz # ---- RHEL specific patches --- # -- Downstream only -- @@ -216,6 +213,9 @@ Patch154: firefox-nss-addon-hack.patch # ARM run-time patch Patch155: rhbz-1354671.patch +# ---- Security patches ---- +Patch301: CVE-2023-44488-libvpx.patch + # BUILD REQURES/REQUIRES %if %{?system_nss} && !0%{?bundle_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} @@ -310,7 +310,7 @@ BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel %endif %if 0%{?use_rust_ts} -#BuildRequires: rust-toolset-%{rust_version} +BuildRequires: rust-toolset-%{rust_version} %endif # Bundled nss/nspr requirement @@ -891,15 +891,15 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. %prep echo "Build environment" echo "--------------------------------------------" -echo "dist %{?dist}" -echo "RHEL 8 minor version: %{?rhel_minor_version}" -echo "bundle_nss %{?bundle_nss}" -echo "system_nss %{?system_nss}" -echo "use_rust_ts %{?use_rust_ts}" -echo "use_dts %{?use_dts}" -echo "use_nodejs_scl %{?use_nodejs_scl}" -echo "use_llvm_ts %{?use_llvm_ts}" -echo "use_python3_scl %{?use_python3_scl}" +echo "dist %{?dist}" +echo "RHEL minor version: %{?rhel_minor_version}" +echo "bundle_nss %{?bundle_nss}" +echo "system_nss %{?system_nss}" +echo "use_rust_ts %{?use_rust_ts}" +echo "use_dts %{?use_dts}" +echo "use_nodejs_scl %{?use_nodejs_scl}" +echo "use_llvm_ts %{?use_llvm_ts}" +echo "use_python3_scl %{?use_python3_scl}" echo "--------------------------------------------" %setup -q @@ -948,6 +948,11 @@ echo "--------------------------------------------" %patch -P155 -p1 -b .rhbz-1354671 %endif +# ---- Security patches ---- +cd media/libvpx/libvpx +%patch -P301 -p1 -b .CVE-2023-44488-libvpx +cd - + %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig %{__cp} %{SOURCE24} mozilla-api-key @@ -1132,23 +1137,8 @@ which python3 mkdir -p my_rust_vendor cd my_rust_vendor %{__tar} xf %{SOURCE2} -cd .. -mkdir rust-cbindgen -cd rust-cbindgen -%{__tar} xf %{SOURCE405} -mkdir -p %{_buildrootdir}/cargo -export CACHE_DIR=%{_buildrootdir}/cargo -CARGO_HOME=$CACHE_DIR RUSTUP_HOME=$CACHE_DIR -%ifarch aarch64 -cp -r rust-cbindgen/rust-cbindgen-aarch64/* $CACHE_DIR -%endif -%ifarch x86_64 -cp -r rust-cbindgen/rust-cbindgen-x86_64/* $CACHE_DIR -%endif -export PATH=$CACHE_DIR/bin/:$PATH -export LD_LIBRARY_PATH=$CACHE_DIR/lib:$LD_LIBRARY_PATH -rustc --version -cat > %{_buildrootdir}/cargo/config < .cargo/config </dev/null || : #=============================================================================== %changelog -* Wed Oct 11 2023 yangxianzhao - 115.3.1-1.0.1 -- rebrand to anolis -- fix build error +* Wed Oct 25 2023 Eike Rathke - 115.4.1-1 +- Update to 115.4.1 build1 + +* Tue Oct 24 2023 Anton Bobrov - 115.4.0-3 +- Update to 115.4.0 build3 + +* Sat Oct 21 2023 Eike Rathke - 115.4.0-2 +- Update to 115.4.0 build2 + +* Fri Oct 20 2023 Eike Rathke - 115.4.0-1 +- Update to 115.4.0 build1 * Fri Sep 29 2023 Eike Rathke - 115.3.1-1 - Update to 115.3.1 build1