From patchwork Thu May 25 21:40:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41827 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp865070pzb; Thu, 25 May 2023 14:40:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ55dDXIgFiv9AoRkSSE73niuTkSNVkImeL/V/nviULrDFgvKujog0TjdAWwgP5NLLNLT3p7 X-Received: by 2002:a17:907:2d1e:b0:969:9c0c:4c97 with SMTP id gs30-20020a1709072d1e00b009699c0c4c97mr2778825ejc.1.1685050833179; Thu, 25 May 2023 14:40:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685050833; cv=none; d=google.com; s=arc-20160816; b=JmY1MAokm7b2v7tAy2YLx1aMjqPXBVYjA8DTnbrDRLFvdXvk3OJGllFv4uvnfJKLx2 pSzfflOgiv5OtWbDBpCgCbAwuRghSlnmFCyzbVA37wuRLamydCgoHl/JpV8FrRg07OS+ xt5B0Eo2e1ESAVz6Usny6KLGmVJvTid5iZTQlOxy0sIC8CHsW9HqggEl9fkJIY9lhHOz g0moXxnohPWR7BUv8huFeBqQdmRFKZ+yd806GJxK0gonJ6hN3XAHQLJxtwS1Vm3Vvy6c Y/CqS/g8DC4p9tvBJvrlljsHUnTYe2VD9VyklcVccmtQ7RYV4nzJj3w9WFFVBEKRBIKZ E+3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=J0a4n0pSwt+6L1byMoC35nKxdhIo3XebeLPzOZ+qrd4=; b=x69/zGJm2fRpHiHVXyDLx3UgslvU5Dtr/NJHec4akSBWhj/cYh/YB4OjL7lUU5G121 v4bWRxmn3VQXoWebPQN2yrl/JkCiBrQi4z6pyZ3vU4uzd5Q2/26dPOsmM374l5wl6p0E kzkcb0RT55mGFs0FI5oVrlrRrO2iSwQQOiEgDbLj6bjGWFu98oUdqRhIAgofqWrwdrAP o6mECTmaqiUjU8JPg5eK+f1L5VpqP1nod5S/8vNzo6a1EZYaPDik8PPRYz+4RoH5NJee rdvwlHTfjVT80dgMPrKSZYTiMyiSbWYT4T4B5E7Dgd69WDZ6KMEZBRoc+v5vpdFGax/h pEBQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hr3-20020a1709073f8300b0094f39c6a9b1si2054774ejc.4.2023.05.25.14.40.32; Thu, 25 May 2023 14:40:33 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3EE1168C1B6; Fri, 26 May 2023 00:40:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77A7F68BB8E for ; Fri, 26 May 2023 00:40:21 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id A188020003 for ; Thu, 25 May 2023 21:40:20 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 25 May 2023 23:40:15 +0200 Message-Id: <20230525214019.29048-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/mov: We do not support creation times of 300 billion years ago X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2RBHxKCZ8YJp Fixes: signed integer overflow: -9223372036854775808 - 2082844800 cannot be represented in type 'long' Fixes: 58384/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6428383700713472 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 9fdeef057e..3e2c4bc10d 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1530,6 +1530,10 @@ static void mov_metadata_creation_time(MOVContext *c, AVIOContext *pb, AVDiction } } if (time) { + if (time < INT64_MIN + 2082844800) { + av_log(c->fc, AV_LOG_DEBUG, "creation_time predates big bang\n"); + return; + } time -= 2082844800; /* seconds between 1904-01-01 and Epoch */ if ((int64_t)(time * 1000000ULL) / 1000000 != time) { From patchwork Thu May 25 21:40:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41828 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp865188pzb; Thu, 25 May 2023 14:40:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6LV+UjkGSTKfJb7jlgzB4gyJMqatuN9rJheyYUWmh/LybDg/y0aqdjl2XvjJd6aJfbULtp X-Received: by 2002:a17:907:2688:b0:96f:7636:65ca with SMTP id bn8-20020a170907268800b0096f763665camr2576740ejc.3.1685050844450; Thu, 25 May 2023 14:40:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685050844; cv=none; d=google.com; s=arc-20160816; b=KolDzdbKpghyjVcnvdFip7YPW6Q1pJ0fm9U6u2nGKhv1OPmDxDNH422Altg0KM8p1S 0BRDtB0NRI8RQmqGw6QMGvLD+mC1o9baY2ORRduMQubA6nqMael0ZL/F1qAUD7ENAeWV jI5XubdrTDjHB7hdvMtdWxsAFjhNkTrYGgzsnyiHORy/xVq5FIkIGRuUBIaMTmta82AQ 1dzEt6UW/KMKJIHV0mUljUzb5yOoYu93pDoSGGnjb91aYqvlBhatQQ6fZqKFk91dFxIs OsSSxoy9A/lTrt3oGkI9qN+s/6wxNmWKIApOHzOYJ37ucv9OB8q7CRSucJmqH/NbVuJ1 qciw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=+1pIB/AO3OWWQ7SAururnDUfFea28jUWYk3BzKxA1vE=; b=uyrZOIQlkQdKOah41TuoXIYXkZ49scsXaDafdEPW6LW27o2hJxZUffDYu6GN/U3kbR 90sD2Oml0FFaUQc0QoUj8XXn3PqjMe1gQz15DffjEC0paOwOowFj238OywNNJ7FXF4gb +kK+fij2NfuAK5u2DccGV3NwZm2mrlLZCa6LkdOSArSwaSctwyt1VKmMZaQ73J9WHFgV w2X2Uc3h05orYMGJ3ea8SnjhHvovM9HjBMSdkOCFa8KLguyuixHTiwvQ+fGdav31qgPN /NZnEP/lJ2lVcMl3TDxE2jP5X07GM5Bfu1PM0/b6CrB6t1xiUjRPp4m3RyuqI601h5Vj JgLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fq2-20020a1709069d8200b00965ec09592bsi1494039ejc.817.2023.05.25.14.40.44; Thu, 25 May 2023 14:40:44 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 618F168C1D4; Fri, 26 May 2023 00:40:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4118C68C13F for ; Fri, 26 May 2023 00:40:22 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id 9900640004 for ; Thu, 25 May 2023 21:40:21 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 25 May 2023 23:40:16 +0200 Message-Id: <20230525214019.29048-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230525214019.29048-1-michael@niedermayer.cc> References: <20230525214019.29048-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/takdsp: Fix integer overflows X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eo8F7AZfWqg2 Fixes: avcodec/takdsp.c:44:23: runtime error: signed integer overflow: -2097158 - 2147012608 cannot be represented in type 'int' Fixes: 58417/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TAK_fuzzer-5268919664640000 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/takdsp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/takdsp.c b/libavcodec/takdsp.c index 881d7be5f2..b646a063db 100644 --- a/libavcodec/takdsp.c +++ b/libavcodec/takdsp.c @@ -28,8 +28,8 @@ static void decorrelate_ls(int32_t *p1, int32_t *p2, int length) int i; for (i = 0; i < length; i++) { - int32_t a = p1[i]; - int32_t b = p2[i]; + uint32_t a = p1[i]; + uint32_t b = p2[i]; p2[i] = a + b; } } @@ -39,8 +39,8 @@ static void decorrelate_sr(int32_t *p1, int32_t *p2, int length) int i; for (i = 0; i < length; i++) { - int32_t a = p1[i]; - int32_t b = p2[i]; + uint32_t a = p1[i]; + uint32_t b = p2[i]; p1[i] = b - a; } } @@ -50,7 +50,7 @@ static void decorrelate_sm(int32_t *p1, int32_t *p2, int length) int i; for (i = 0; i < length; i++) { - int32_t a = p1[i]; + uint32_t a = p1[i]; int32_t b = p2[i]; a -= b >> 1; p1[i] = a; @@ -63,7 +63,7 @@ static void decorrelate_sf(int32_t *p1, int32_t *p2, int length, int dshift, int int i; for (i = 0; i < length; i++) { - int32_t a = p1[i]; + uint32_t a = p1[i]; int32_t b = p2[i]; b = (unsigned)((int)(dfactor * (unsigned)(b >> dshift) + 128) >> 8) << dshift; p1[i] = b - a; From patchwork Thu May 25 21:40:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41829 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp865304pzb; Thu, 25 May 2023 14:40:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7SPMJCZ6GioWC/uxjxNClOvKdq8hSOiZqZEVI2RUJIXVbVSP7szMu+Swwdp89hOiMUjLtj X-Received: by 2002:aa7:c619:0:b0:50b:7959:8b09 with SMTP id h25-20020aa7c619000000b0050b79598b09mr3748074edq.15.1685050856745; Thu, 25 May 2023 14:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685050856; cv=none; d=google.com; s=arc-20160816; b=XbV0Tw5fLhlnSTxGDbCeUXlTze/OoB0A5KEQdTAf9S7jo9MFIEArs6ScY0Twz1v2Ml +hw8GYgwqFg2MpRqMBc2+6IchjUkU7jWAnXDcMBjryL9NnIyYZTqk5PIkArRHFMoje7y GRJntXa0kjIM2N8vAXPwcc7yfi8muxZgSPEnjeiUAdMKvAUpMlfzmK89b0HpLRA2p9Fz FqGyHZyLPPG4l7qTtryOylIZtc9sZjZV4mJN0NfA9COZrilXFuUOEVLUiyDnXb5YFyTG 9p6z9LXn/7lyCFWnSEgb+BKkDMjP01TDu1pJNb8TNN7lf9zHeVLfeMvpazQRNMmiGh5T eF8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=izKZjzFd58eonYkWZFw80q9g0kIjRpsfoJb0F/eCJQk=; b=ngoy4w7Tg3t7bhNNNQ6Ip8rwbLCGcHunh8wjHA0dPrMxh44pMLEP0WrBO1HIDGuVoP KXKldQP1ieiXOVu07Lkyl+2GMuNZvQVKNu43pRTbz5GXn++FOaWVa2mYQMshqdSqQ5iz /quwK5aB1DR7gX6MWUhKvG0K/DyZ7x1Mh4aqG2Uf2QylndRVRMkb0SvE4RLpsVHtjGKP GpAmHDevTrwuEkleHFYqQYj58kcQULooQ7qQGv1mXpoOgPKmZbqW1cBhLsORqLMqejHR M5rPxPzBSp8+jtq91I7uPKEjd12LqsZTHworKOeYeTIHHvU9rKoCQot1EoSBojo5+nel fz0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o17-20020aa7c7d1000000b00510e76af77csi1428214eds.43.2023.05.25.14.40.54; Thu, 25 May 2023 14:40:56 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 838D068C1DE; Fri, 26 May 2023 00:40:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8488E68C1B7 for ; Fri, 26 May 2023 00:40:23 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id B54A0FF805 for ; Thu, 25 May 2023 21:40:22 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 25 May 2023 23:40:17 +0200 Message-Id: <20230525214019.29048-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230525214019.29048-1-michael@niedermayer.cc> References: <20230525214019.29048-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/rka: Avoid undefined left shift X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /h5KyzGXQCmD Fixes: left shift of 34136248 by 6 places cannot be represented in type 'int' Fixes: 58429/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RKA_fuzzer-5692211592560640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/rka.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/rka.c b/libavcodec/rka.c index 3e86d83819..01920dbba5 100644 --- a/libavcodec/rka.c +++ b/libavcodec/rka.c @@ -750,7 +750,7 @@ static int decode_filter(RKAContext *s, ChContext *ctx, ACoder *ac, int off, uns } if (ctx->cmode2 != 0) { int sum = 0; - for (int i = (m << 6) / split; i > 0; i = i >> 1) + for (int i = (signed)((unsigned)m << 6) / split; i > 0; i = i >> 1) sum++; sum = sum - (ctx->cmode2 + 7); ctx->cmode = FFMAX(sum, tab[ctx->cmode2]); From patchwork Thu May 25 21:40:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41830 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp865383pzb; Thu, 25 May 2023 14:41:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4g23ckWLhTRVIL0oCJpzOjPgxg9oZu1TvbnOraYEQ6Xn63iZEGjNGfCs8Nb5FXN2gIXKsJ X-Received: by 2002:a17:907:9413:b0:967:5c5f:e45c with SMTP id dk19-20020a170907941300b009675c5fe45cmr188917ejc.0.1685050866986; Thu, 25 May 2023 14:41:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685050866; cv=none; d=google.com; s=arc-20160816; b=XaapjPlyczSEglQJjTyG5rxdiu4gOX35y24vhSsbw2NVhl9S28A52idVhtKZwa3vdZ kNXgg/C6N4cyeFLwzCPaP8gxSsKECBo4fgMyhI6cl7mvKTg/0C0drfMStP54yAIDRo6J 41yAtpGbGkqcYu8aSAKEHL8p1sEe9QGdYOfDfaBlG3ILJBgLSet7RUfiebhd0BAmJKQh eRXGPY5ZZFPZ8TFw8AJ/EnMOJn9dS+Hp4OnTZlE25LG++Hym6gXAC3GkUL0mfT2T8Oii 1SPbyIm1u9ppsPQGSAPX5jUR7ZnJ8GPSotVQWjrckSvvJcWQvU1fzkb/D5Kmhg5qJiJT keDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=sIb3TFz/DTqDzQP06vgBbEarL2qhlB8ME6V4EuvfTac=; b=W90IfWYc3V5bt7byoECJQsDN4twRO5YiUOJCTGz/BpTtAwyTtVgweSmQPAdDC/XMnt wbYZwHaagWj+MEs5N45fjxkSvdKOPvGvbNHHw+LxbskJJ9lSCPV0p9VYIP/yUqhAAI8n ozkauWNCinvkKadOncU6Ppf5QxKz7HYiUjPhGjTY61c9edLx8jKdAFjBeXtFWuLbeijt oxyGPW1E0LbFD3JAw3FB48qFsUoUJM1gllgt0Y91blR+BJKxzUdN/rAQiWDvfhAKoUbo 4O2xZLJ9fKuPogjBlGRPm/ecvgRACeWsBtPwrmKEGnzOtM8cjzr+Lkfy2Qp5oF4BTXLR zuxQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kg7-20020a17090776e700b0094f07a86d4fsi1580361ejc.126.2023.05.25.14.41.06; Thu, 25 May 2023 14:41:06 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A88FF68C1B1; Fri, 26 May 2023 00:40:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 779D268C13F for ; Fri, 26 May 2023 00:40:24 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id AE7CC240002 for ; Thu, 25 May 2023 21:40:23 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 25 May 2023 23:40:18 +0200 Message-Id: <20230525214019.29048-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230525214019.29048-1-michael@niedermayer.cc> References: <20230525214019.29048-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/hevcdec: Avoid null pointer dereferences in MC X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oijgxWl8pkUK Fixes: runtime error: pointer index expression with base 0x000000000000 overflowed to 0xfffffffffffffff8 Fixes: 58440/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5956015530311680 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevcdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 7e1bf4e915..90000203e4 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -1940,13 +1940,13 @@ static void hls_prediction_unit(HEVCLocalContext *lc, int x0, int y0, if (current_mv.pred_flag & PF_L0) { ref0 = refPicList[0].ref[current_mv.ref_idx[0]]; - if (!ref0) + if (!ref0 || !ref0->frame->data[0]) return; hevc_await_progress(s, ref0, ¤t_mv.mv[0], y0, nPbH); } if (current_mv.pred_flag & PF_L1) { ref1 = refPicList[1].ref[current_mv.ref_idx[1]]; - if (!ref1) + if (!ref1 || !ref1->frame->data[0]) return; hevc_await_progress(s, ref1, ¤t_mv.mv[1], y0, nPbH); } From patchwork Thu May 25 21:40:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41831 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp865618pzb; Thu, 25 May 2023 14:41:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ59ZqUwA2ygqsplze+ThGQ4lV4clXJ3Ex44S5/dhT+eMZlPVzej2cm4F2BCtEPQGN9RLf09 X-Received: by 2002:a17:907:3f27:b0:961:be96:b0e6 with SMTP id hq39-20020a1709073f2700b00961be96b0e6mr105942ejc.68.1685050894002; Thu, 25 May 2023 14:41:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685050893; cv=none; d=google.com; s=arc-20160816; b=Vx3VCW4I04fyBv3d7DoAaOyVIw10X+FFVpKoCmYpiiFkhRUmJvDyHRamTHE542U/+2 NRALbLktGfkAq3wiv4kUWTu4FWv3/GOyOAn4MYwyuPqtagFlV7T+7l6SM6wMfxqeirMo Rr7FIP6Juh7C66XY3O6PMUTBVsAh/zsp+A7bfZsXP9kMLLvA58MlkR8CwhMRV2VkNN/p q4q/LlO6sBQfNRmPyTV4e4mw7C0vnCYDArh3Bgbt2XNDSQVPfP9NrZ0xKZJZKwgvN1TC zTmxyv+EFAC5RxsnDzWUMye3pMgMKji4SCiJI0fZf+rOSwMFjhG3+OTKls4Vv5/4vXy4 nhlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=hdLMXYg2LuJ8RsRkW+vgHoa74lWFe/txWBHXJTQQDmw=; b=CebZzz4hJg6U/6KuKsatNo7XzXrbtgNV3L1gUJCsp/C08qbOn3Wc+Z9SdDSsmj0GAo HifKJJKYGymt0Qt1plRFNg5QSNNBMzc2RAzh+chNb0wSFggItX/auwVsVFqwJtKKT7v2 3FY48djADwHVGUKovxlCf0x8m9HBy+5IG0so8jA5/FRk/zFozebVBBUXPAZfq84ZVRWT qpjoKvszUdK5q0aCbwQQloUD/8t+QAlrddMNnK31Tmr3r1FvweIInMpG3BdfBZcFB+qi 5/JO2ssuf8x/w8HUf1ePNY9UOyMLjN9qfVL9K2e/iHS4zdfMF66p2A4VO+JImOy0wpzp +01g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jz21-20020a17090775f500b0094f442c8a6dsi1739967ejc.291.2023.05.25.14.41.18; Thu, 25 May 2023 14:41:33 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4FC968C1EC; Fri, 26 May 2023 00:40:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 123FE68C1AB for ; Fri, 26 May 2023 00:40:25 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id 76A1220005 for ; Thu, 25 May 2023 21:40:24 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 25 May 2023 23:40:19 +0200 Message-Id: <20230525214019.29048-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230525214019.29048-1-michael@niedermayer.cc> References: <20230525214019.29048-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/hevc_refs: Check that nb_refs stays <= HEVC_MAX_REFS X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Td5AYS/S/vfj Fixes: 58528/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5834725318328320 Fixes: index 16 out of bounds for type 'int [16]' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc_refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index e9be02c489..0716e1a597 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -353,7 +353,7 @@ int ff_hevc_slice_rpl(HEVCContext *s) } } // Construct RefPicList0, RefPicList1 (8-8, 8-10) - if (s->ps.pps->pps_curr_pic_ref_enabled_flag) { + if (s->ps.pps->pps_curr_pic_ref_enabled_flag && rpl_tmp.nb_refs < HEVC_MAX_REFS) { rpl_tmp.list[rpl_tmp.nb_refs] = s->ref->poc; rpl_tmp.ref[rpl_tmp.nb_refs] = s->ref; rpl_tmp.isLongTerm[rpl_tmp.nb_refs] = 1;