From patchwork Sun Mar 5 23:36:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40588 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2478120pzb; Sun, 5 Mar 2023 15:37:09 -0800 (PST) X-Google-Smtp-Source: AK7set8N+hJo0Rsme+EZNd+RFSN81GG63hcayGLJIBMfZKDrBkAO4BNwqWPsqO/E0pPq/jPOooh/ X-Received: by 2002:a17:907:6e0f:b0:907:672b:736a with SMTP id sd15-20020a1709076e0f00b00907672b736amr10476000ejc.31.1678059428811; Sun, 05 Mar 2023 15:37:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678059428; cv=none; d=google.com; s=arc-20160816; b=p+jUEWS8vYBpifazU7ExaiHY4lK+XYkM2IF3sDNkxrpbgHQgkPPiLEgXmuaN3hdypA W0nVkMNDrFdzyfy8urdrdFyhpFH8rBV6ipm06dolWSr8F22RBGlwYBgZcRKI3b4AoGdV 4I53YRuciP1e2xGEUjd8Hy7cBzjoR5XTEqG2R0nx73Zyh/o8BQJ03Hj7nh3rJpC+ARGN zXe+p43R96DPhJUspKnBSEntXHXZdUSPEqZlo6gf0Ti0GamPYqgX8E/NIA8tBRhogABs LWEYa469Hn7N2s5iOfyVHU4kg//WOKSyMgUV9bg+bu6kg/EaCyU+nI2LcFN3ZOrB9eTK YpRg== 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=Y/mwPgIETTkY9GYa+IsxDJIG/8yBKMHMboXEg9/8uGE=; b=FzqLJhJZko3sJX7LtnG/FjkG22IEdaC1+eTBhg5WwjEo0sbEC0Rj7ZkHys8TQyjdZm xmoix1+0LnvNNerIDFuYvXBnA1x0qAuWoMyRODaREVcHQcGn3bb8eVK8Efd2ZgUuCRlD EcxppPieKq01mQrC3pjULTGJQ3L09bSrDUxyMqZb42rBVypnEsQ99DVwnCOnD7h2HuBx ynsNmEv2uKVsNI7NuF1f684XjBlZfeLqw8gma4K6qvOe84sUn/z1/nf2dcYjK8hPxUUj g8gnpDgLdfvzfjieWkt/fd8x0heqDoP7HlU4CzrCWcLwQzSbHeNSCUY5ou5vXz5IPcEn 032Q== 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 f22-20020a170906c09600b008bb405ac759si5675378ejz.817.2023.03.05.15.37.07; Sun, 05 Mar 2023 15:37:08 -0800 (PST) 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 7FB3068B1C7; Mon, 6 Mar 2023 01:37:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88F9968A829 for ; Mon, 6 Mar 2023 01:36:56 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 55C441C0003 for ; Sun, 5 Mar 2023 23:36:55 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 6 Mar 2023 00:36:52 +0100 Message-Id: <20230305233654.13895-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/escape124: fix signdness of end of input check 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: jDk8HSJcO3DL Fixes: Timeout Fixes: 56561/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ESCAPE124_fuzzer-5560363635834880 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/escape124.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index 024eec59ce..e9c6b2df1b 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -89,7 +89,7 @@ static CodeBook unpack_codebook(GetBitContext* gb, unsigned depth, unsigned i, j; CodeBook cb = { 0 }; - if (size >= INT_MAX / 34 || get_bits_left(gb) < size * 34) + if (size >= INT_MAX / 34 || get_bits_left(gb) < (int)size * 34) return cb; if (size >= INT_MAX / sizeof(MacroBlock)) From patchwork Sun Mar 5 23:36:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40589 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2478196pzb; Sun, 5 Mar 2023 15:37:18 -0800 (PST) X-Google-Smtp-Source: AK7set+qim7w9HHxh/npuLJCZsM7IBJW3YQWeWRHQBMhZiqxWOBeW1LlQvbFhrUE7FcyCSsGzrWf X-Received: by 2002:a17:907:20aa:b0:8b1:3a8f:a51 with SMTP id pw10-20020a17090720aa00b008b13a8f0a51mr8825464ejb.15.1678059438038; Sun, 05 Mar 2023 15:37:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678059438; cv=none; d=google.com; s=arc-20160816; b=TIwl+1wXLY1t135hynJXXGz28Rdy/EyJQgCm/O2VDr7awG4vgCntOXq7Z4D15lrvrV RkIuWxvPWsi/kEFkWYrSmTpcxlWiaI76Q/1LJ7/Qw5p9N5vWHnwJIYizfvlXxcK01biU G/7nuI+7+7Lvu4VigRCfWS5g/MnYnYMTQkyBIj4+dIb+2hrVRuwPSjKJLkE0HKIyxKA1 Uk3O+5I3WmaZONT5lSXwFPSKaBFqZsTx6/Z1nllFB/V1cKECOZQOlcMuhKugUyUbtzxa 02avXRV2xilTq+QWDO7uvalXSpK3MpriSusjoz7FlUXAnL2/9St93eT1xlGIxakief9N qHvg== 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=1mz4hiYeQPH9QHR2hJcML5UQOnEkrmNPAjGH7ya86vA=; b=yZVKLJv7P3Fg+QSve8xRO+VX71fI/tToZCGm5xtLqGMBRyoabEPYog8NIzozjtBI6Z +nbgReu60pNUCZzNa0EQUn7KBSkQtY1d/Y8hkTyWou0A2u9H+7N3qNXBivDjoKlIxyD2 raSMj5trA9aIPhfjzhtsLGQFykISJNAvuffMHWk+qsNhxgqPNB4MP5RJvOD4zx2SW4N6 PfY1KzMlVTfxA0Ld1ir4CT1OWyLT5kyw+37+3GJMTBr8YC/BSJcgpNxR+7jWgUrUh24m lNvMX6Ygxgisald+LvaCuseOgCCbk52csJNUbWSTdelIZ/FvY+wwfTzX52MIsNYoFq+X G3cw== 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 d21-20020a50fb15000000b004c215052ff3si8994404edq.41.2023.03.05.15.37.17; Sun, 05 Mar 2023 15:37:18 -0800 (PST) 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 81AEB68BB59; Mon, 6 Mar 2023 01:37:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70BAC68AC15 for ; Mon, 6 Mar 2023 01:36:57 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 81BD0100002 for ; Sun, 5 Mar 2023 23:36:56 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 6 Mar 2023 00:36:53 +0100 Message-Id: <20230305233654.13895-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230305233654.13895-1-michael@niedermayer.cc> References: <20230305233654.13895-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/escape124: Fix some return codes 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: QXlj/ELXPZta Signed-off-by: Michael Niedermayer --- libavcodec/escape124.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index e9c6b2df1b..064a4e6bf5 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -89,11 +89,6 @@ static CodeBook unpack_codebook(GetBitContext* gb, unsigned depth, unsigned i, j; CodeBook cb = { 0 }; - if (size >= INT_MAX / 34 || get_bits_left(gb) < (int)size * 34) - return cb; - - if (size >= INT_MAX / sizeof(MacroBlock)) - return cb; cb.blocks = av_malloc(size ? size * sizeof(MacroBlock) : 1); if (!cb.blocks) return cb; @@ -225,7 +220,7 @@ static int escape124_decode_frame(AVCodecContext *avctx, AVFrame *frame, // represent a lower bound of the space needed for skipped superblocks. Non // skipped SBs need more space. if (get_bits_left(&gb) < 64 + s->num_superblocks * 23LL / 4320) - return -1; + return AVERROR_INVALIDDATA; frame_flags = get_bits_long(&gb, 32); frame_size = get_bits_long(&gb, 32); @@ -276,9 +271,14 @@ static int escape124_decode_frame(AVCodecContext *avctx, AVFrame *frame, } av_freep(&s->codebooks[i].blocks); + if (cb_size >= INT_MAX / 34 || get_bits_left(&gb) < (int)cb_size * 34) + return AVERROR_INVALIDDATA; + + if (cb_size >= INT_MAX / sizeof(MacroBlock)) + return AVERROR_INVALIDDATA; s->codebooks[i] = unpack_codebook(&gb, cb_depth, cb_size); if (!s->codebooks[i].blocks) - return -1; + return AVERROR(ENOMEM); } } From patchwork Sun Mar 5 23:36:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40590 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2478245pzb; Sun, 5 Mar 2023 15:37:26 -0800 (PST) X-Google-Smtp-Source: AK7set8kNeUrOxEnGfragFp8s0xtdxL0ckbXQMj1bJ6D6Kz5gktR7S4On7iJVUvW5IoRFG4GwlOv X-Received: by 2002:a17:906:9bdd:b0:88a:b6ca:7d3d with SMTP id de29-20020a1709069bdd00b0088ab6ca7d3dmr8984477ejc.8.1678059446505; Sun, 05 Mar 2023 15:37:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678059446; cv=none; d=google.com; s=arc-20160816; b=PEI9s9ubWrxjHWp2iAvyYEUJOuGZ3/wwFnW6MQfY5vYz9JPlab/TLDD/3vFAaL27sF V7Gn6fsujfKVjKb4vib3lXjLiOU5C9BKAUrLh2chgeQT+b/PHe/eun5XPA63dh3LoIOa Uh1aM+bXPtLaZHFbh0VEDLsZzGbAQt3ZT9X/wNX3W0Z2i4uYE1vBp8ehrICNnMXHYj0C HCgK57gsSAEh0yGUHHXl44ppM5szYUKgsuns0rGTr/97HdSRh1eCcz6Z/kHpAK+vU6K0 bLN+Sji2SwnvbzrGgD/qg8Y1s+u0IlJZoK1TeeB34AUVY1yR1kzxpnCqGz7SxUyNHdyk OtUA== 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=5km0PnmM3Muy6DCJcvNKWqS9OD+rieqfWdQXTKbKQ08=; b=L9z+J/RbsDMGasktDIGEE9ysGtBPi//JpXvrYublTnLujRSOKsum3PjObfx7bCiTu2 Db9a069HEFvDYISzdCyZUxwCWDfPr6r6eVYWKMK0VLouPmmRiOh/lkDCzW81s8E/mB0Z 5uijXSqANmCAithGGrMDFq3Xj9q3WONHkksOnLUXqn2fjIpkvjiq+l5U5lmIXzJlJQbl 2pNGy+im/R7wbylNBxq6P5KZwV1rXRuX4hcadCgRfO5XWKT1qjGfTY3iyr4nrshnG3X4 6e5DCzaWi0kYlZhWSw57Yjo+iAnvyJN/TeGMH/CTq2tI77U9vLEJt+H0Upue/zHPctnI 2jCA== 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 s3-20020aa7c543000000b004af6e957024si8814643edr.580.2023.03.05.15.37.26; Sun, 05 Mar 2023 15:37:26 -0800 (PST) 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 7443668BB64; Mon, 6 Mar 2023 01:37:05 +0200 (EET) 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 3F06668BA07 for ; Mon, 6 Mar 2023 01:36:58 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 830CE40003 for ; Sun, 5 Mar 2023 23:36:57 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 6 Mar 2023 00:36:54 +0100 Message-Id: <20230305233654.13895-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230305233654.13895-1-michael@niedermayer.cc> References: <20230305233654.13895-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/escape124: Simplify unpack_codebook() 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: lOgOrNiCu4ZB Signed-off-by: Michael Niedermayer --- libavcodec/escape124.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index 064a4e6bf5..e8a8395f4b 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -97,15 +97,12 @@ static CodeBook unpack_codebook(GetBitContext* gb, unsigned depth, cb.size = size; for (i = 0; i < size; i++) { unsigned mask_bits = get_bits(gb, 4); - unsigned color0 = get_bits(gb, 15); - unsigned color1 = get_bits(gb, 15); - - for (j = 0; j < 4; j++) { - if (mask_bits & (1 << j)) - cb.blocks[i].pixels[j] = color1; - else - cb.blocks[i].pixels[j] = color0; - } + unsigned color[2]; + color[0] = get_bits(gb, 15); + color[1] = get_bits(gb, 15); + + for (j = 0; j < 4; j++) + cb.blocks[i].pixels[j] = color[(mask_bits>>j) & 1]; } return cb; }