Attachment 872106 Details for Bug 1218429

[patch] unsuccessful patch

libaom-CVE-2023-6879.patch (text/plain), 5.80 KB, created by Petr Gajdos on 2024-01-23 18:09:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Gajdos

Created: 2024-01-23 18:09:12 UTC

Size: 5.80 KB

patch

obsolete

>Index: libaom-3.2.0/av1/common/thread_common.c
>===================================================================
>--- libaom-3.2.0.orig/av1/common/thread_common.c
>+++ libaom-3.2.0/av1/common/thread_common.c
>@@ -615,7 +615,7 @@ void av1_loop_restoration_alloc(AV1LrSyn
> }
> 
> // Deallocate loop restoration synchronization related mutex and data
>-void av1_loop_restoration_dealloc(AV1LrSync *lr_sync, int num_workers) {
>+void av1_loop_restoration_dealloc(AV1LrSync *lr_sync) {
>   if (lr_sync != NULL) {
>     int j;
> #if CONFIG_MULTITHREAD
>@@ -646,7 +646,8 @@ void av1_loop_restoration_dealloc(AV1LrS
>     aom_free(lr_sync->job_queue);
> 
>     if (lr_sync->lrworkerdata) {
>-      for (int worker_idx = 0; worker_idx < num_workers - 1; worker_idx++) {
>+      for (int worker_idx = 0; worker_idx < lr_sync->num_workers - 1;
>+           worker_idx++) {
>         LRWorkerData *const workerdata_data =
>             lr_sync->lrworkerdata + worker_idx;
> 
>@@ -843,7 +844,7 @@ static void foreach_rest_unit_in_planes_
> 
>   if (!lr_sync->sync_range || num_rows_lr > lr_sync->rows ||
>       num_workers > lr_sync->num_workers || num_planes > lr_sync->num_planes) {
>-    av1_loop_restoration_dealloc(lr_sync, num_workers);
>+    av1_loop_restoration_dealloc(lr_sync);
>     av1_loop_restoration_alloc(lr_sync, cm, num_workers, num_rows_lr,
>                                num_planes, cm->width);
>   }
>Index: libaom-3.2.0/av1/common/thread_common.h
>===================================================================
>--- libaom-3.2.0.orig/av1/common/thread_common.h
>+++ libaom-3.2.0/av1/common/thread_common.h
>@@ -165,7 +165,7 @@ void av1_loop_restoration_filter_frame_m
>                                           int optimized_lr, AVxWorker *workers,
>                                           int num_workers, AV1LrSync *lr_sync,
>                                           void *lr_ctxt);
>-void av1_loop_restoration_dealloc(AV1LrSync *lr_sync, int num_workers);
>+void av1_loop_restoration_dealloc(AV1LrSync *lr_sync);
> void av1_loop_restoration_alloc(AV1LrSync *lr_sync, AV1_COMMON *cm,
>                                 int num_workers, int num_rows_lr,
>                                 int num_planes, int width);
>Index: libaom-3.2.0/av1/decoder/decoder.c
>===================================================================
>--- libaom-3.2.0.orig/av1/decoder/decoder.c
>+++ libaom-3.2.0/av1/decoder/decoder.c
>@@ -217,7 +217,7 @@ void av1_decoder_remove(AV1Decoder *pbi)
>   if (pbi->num_workers > 0) {
>     av1_loop_filter_dealloc(&pbi->lf_row_sync);
> #if !CONFIG_REALTIME_ONLY
>-    av1_loop_restoration_dealloc(&pbi->lr_row_sync, pbi->num_workers);
>+    av1_loop_restoration_dealloc(&pbi->lr_row_sync);
> #endif
>     av1_dealloc_dec_jobs(&pbi->tile_mt_info);
>   }
>Index: libaom-3.2.0/av1/encoder/encoder.c
>===================================================================
>--- libaom-3.2.0.orig/av1/encoder/encoder.c
>+++ libaom-3.2.0/av1/encoder/encoder.c
>@@ -1584,9 +1584,7 @@ void av1_remove_compressor(AV1_COMP *cpi
>     av1_loop_filter_dealloc(&mt_info->lf_row_sync);
>     av1_cdef_mt_dealloc(&mt_info->cdef_sync);
> #if !CONFIG_REALTIME_ONLY
>-    int num_lr_workers =
>-        av1_get_num_mod_workers_for_alloc(&cpi->ppi->p_mt_info, MOD_LR);
>-    av1_loop_restoration_dealloc(&mt_info->lr_row_sync, num_lr_workers);
>+    av1_loop_restoration_dealloc(&mt_info->lr_row_sync);
>     av1_gm_dealloc(&mt_info->gm_sync);
>     av1_tf_mt_dealloc(&mt_info->tf_sync);
> #endif
>Index: libaom-3.2.0/av1/encoder/ethread.c
>===================================================================
>--- libaom-3.2.0.orig/av1/encoder/ethread.c
>+++ libaom-3.2.0/av1/encoder/ethread.c
>@@ -650,7 +650,7 @@ void av1_init_mt_sync(AV1_COMP *cpi, int
>     if (!lr_sync->sync_range || num_rows_lr > lr_sync->rows ||
>         num_lr_workers > lr_sync->num_workers ||
>         MAX_MB_PLANE > lr_sync->num_planes) {
>-      av1_loop_restoration_dealloc(lr_sync, num_lr_workers);
>+      av1_loop_restoration_dealloc(lr_sync);
>       av1_loop_restoration_alloc(lr_sync, cm, num_lr_workers, num_rows_lr,
>                                  MAX_MB_PLANE, cm->width);
>     }
>@@ -2649,7 +2649,8 @@ static AOM_INLINE int compute_num_pack_b
>   return compute_num_enc_tile_mt_workers(&cpi->common, cpi->oxcf.max_threads);
> }
> 
>-int compute_num_mod_workers(AV1_COMP *cpi, MULTI_THREADED_MODULES mod_name) {
>+static int compute_num_mod_workers(AV1_COMP *cpi,
>+                                   MULTI_THREADED_MODULES mod_name) {
>   int num_mod_workers = 0;
>   switch (mod_name) {
>     case MOD_FP:
>@@ -2681,7 +2682,8 @@ int compute_num_mod_workers(AV1_COMP *cp
> }
> // Computes the number of workers for each MT modules in the encoder
> void av1_compute_num_workers_for_mt(AV1_COMP *cpi) {
>-  for (int i = MOD_FP; i < NUM_MT_MODULES; i++)
>+  for (int i = MOD_FP; i < NUM_MT_MODULES; i++) {
>     cpi->ppi->p_mt_info.num_mod_workers[i] =
>         compute_num_mod_workers(cpi, (MULTI_THREADED_MODULES)i);
>+  }
> }
>Index: libaom-3.2.0/av1/av1_cx_iface.c
>===================================================================
>--- libaom-3.2.0.orig/av1/av1_cx_iface.c
>+++ libaom-3.2.0/av1/av1_cx_iface.c
>@@ -2816,7 +2816,9 @@ static aom_codec_err_t encoder_encode(ao
>     if ((num_workers > 1) && (ppi->p_mt_info.num_workers == 0)) {
>       av1_create_workers(ppi, num_workers);
>       av1_init_tile_thread_data(ppi, cpi->oxcf.pass == AOM_RC_FIRST_PASS);
>+    }
> #if CONFIG_MULTITHREAD
>+    if (ppi->p_mt_info.num_workers > 1) {
> #if CONFIG_FRAME_PARALLEL_ENCODE
>       for (int i = 0; i < ppi->num_fp_contexts; i++) {
>         av1_init_mt_sync(ppi->parallel_cpi[i],
>@@ -2828,8 +2830,8 @@ static aom_codec_err_t encoder_encode(ao
>       if (cpi_lap != NULL) {
>         av1_init_mt_sync(cpi_lap, 1);
>       }
>-#endif  // CONFIG_MULTITHREAD
>     }
>+#endif  // CONFIG_MULTITHREAD
> #if CONFIG_FRAME_PARALLEL_ENCODE
>     for (int i = 0; i < ppi->num_fp_contexts; i++) {
>       av1_init_frame_mt(ppi, ppi->parallel_cpi[i]);

Actions: View | Diff

Attachments on bug 1218429: 871719 | 872106 | 872107