Add patch for CVE-2023-5217
Resolves: RHEL-10631
This commit is contained in:
parent
af21ec46db
commit
73962d4116
34
0001-VP8-disallow-thread-count-changes.patch
Normal file
34
0001-VP8-disallow-thread-count-changes.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From 793417d20735bb85fbd248ce364aaeeec6c12df2 Mon Sep 17 00:00:00 2001
|
||||
From: James Zern <jzern@google.com>
|
||||
Date: Mon, 25 Sep 2023 18:55:59 -0700
|
||||
Subject: [PATCH] VP8: disallow thread count changes
|
||||
|
||||
Currently allocations are done at encoder creation time. Going from
|
||||
threaded to non-threaded would cause a crash.
|
||||
|
||||
Bug: chromium:1486441
|
||||
Change-Id: Ie301c2a70847dff2f0daae408fbef1e4d42e73d4
|
||||
(cherry picked from commit 3fbd1dca6a4d2dad332a2110d646e4ffef36d590)
|
||||
---
|
||||
vp8/encoder/onyx_if.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
|
||||
index aeed719d1..369adbdcb 100644
|
||||
--- a/vp8/encoder/onyx_if.c
|
||||
+++ b/vp8/encoder/onyx_if.c
|
||||
@@ -1445,6 +1445,11 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) {
|
||||
last_h = cpi->oxcf.Height;
|
||||
prev_number_of_layers = cpi->oxcf.number_of_layers;
|
||||
|
||||
+ if (cpi->initial_width) {
|
||||
+ // TODO(https://crbug.com/1486441): Allow changing thread counts; the
|
||||
+ // allocation is done once in vp8_create_compressor().
|
||||
+ oxcf->multi_threaded = cpi->oxcf.multi_threaded;
|
||||
+ }
|
||||
cpi->oxcf = *oxcf;
|
||||
|
||||
switch (cpi->oxcf.Mode) {
|
||||
--
|
||||
2.41.0
|
||||
|
@ -6,7 +6,7 @@
|
||||
Name: libvpx
|
||||
Summary: VP8/VP9 Video Codec SDK
|
||||
Version: 1.9.0
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: BSD
|
||||
#Source0: http://downloads.webmproject.org/releases/webm/%{name}-%{version}.tar.bz2
|
||||
Source0: https://github.com/webmproject/libvpx/archive/v%{version}.tar.gz
|
||||
@ -24,6 +24,7 @@ BuildRequires: doxygen, php-cli, perl(Getopt::Long)
|
||||
# Do not disable FORTIFY_SOURCE=2
|
||||
Patch0: libvpx-1.7.0-leave-fortify-source-on.patch
|
||||
Patch1: 0001-Fix-bug-with-smaller-width-bigger-size.patch
|
||||
Patch2: 0001-VP8-disallow-thread-count-changes.patch
|
||||
|
||||
%description
|
||||
libvpx provides the VP8/VP9 SDK, which allows you to integrate your applications
|
||||
@ -50,6 +51,7 @@ and decoder.
|
||||
%setup -q -n libvpx-%{version}
|
||||
%patch0 -p1 -b .leave-fs-on
|
||||
%patch1 -p1 -b .p1
|
||||
%patch2 -p1 -b .p2
|
||||
|
||||
%build
|
||||
|
||||
@ -235,6 +237,10 @@ rm -rf %{buildroot}%{_prefix}/src
|
||||
%{_bindir}/*
|
||||
|
||||
%changelog
|
||||
* Thu Oct 5 2023 Wim Taymans <wtaymans@redhat.com> - 1.9.0-7
|
||||
- Add patch for CVE-2023-5217
|
||||
- Resolves: RHEL-10631
|
||||
|
||||
* Tue Oct 3 2023 Wim Taymans <wtaymans@redhat.com> - 1.9.0-6
|
||||
- Add patch for CVE-2023-44488
|
||||
- Resolves: RHEL-11636
|
||||
|
Loading…
Reference in New Issue
Block a user