From patchwork Thu Apr 27 18:38:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp739896pzb; Thu, 27 Apr 2023 11:38:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4kNcw7tcLYgvBZ1CcErsyjs3AKc6Lb0t2bpSHsObVRKbwr72x9Nj4TFww66C+lUn0ZL6Hc X-Received: by 2002:a17:907:9807:b0:94f:7c4e:24ea with SMTP id ji7-20020a170907980700b0094f7c4e24eamr3103499ejc.38.1682620732766; Thu, 27 Apr 2023 11:38:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682620732; cv=none; d=google.com; s=arc-20160816; b=RMare0zCjwHbTcegMdjzk39ofYfyhvSxnGL1eAq0MUWi9S0oiJqj7TpnNFgJmwDi/b +PjQOJn8zNiJ2NipqqeVMxYxFo1Ml62jfHBIp6WKKwdrc9Q9pQEmXGe1n3ShDM/0BhAu HYsEa+H1UisbDx0quc80AHRbZZeR43f6Xex1oW+9FYB0UOLL1g+7nz1axOaLVQtD1FIf LukZdWMz89fCppFK2VKoP8JM/9eOrjzYiCKTccrho4eAMZfpb6pIb80XykGb5gJYYfIs GMd23lFu+SZDkqXcEebP1D99aGbUOCMg1sY1H+V0tVn3k7Q05KNtNebn3u7VK0l5HYZ+ AppQ== 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=G344/IbIhs0loGwga61VfNdwbyhQeFmemp21rlljaPA=; b=gHLo73mTufBPtLqQ/qV8uVRYLXZn5CTBfCEr2WmQvA5ankEMxr1aLkmwQID3LjCKSu BkgM9BfrjUBU0+G2QfjNQoE2UBJ1z601ueAlCjIp/bdJ0X8OE2cLix4mWVH43S5LnmEu eQ6CqTDJSZq5elCQ9sVajzz7AZ/WKPRjlr5gEzkzC1mmsdkVQ3mOaKrqwfpNUijeGhLz nkVehGnHUTLLKGb//ZOy9T6fd5o+5I4yISbUyMUd59afiULP/BJGVDLeHYlAQRfw+cC7 C0MT95jkTa1ujLMOrnPmXWy8WnygxEZppWOc9jW/INnOmjfEf+Vin7DXdhSR2vy2jE6G +POg== 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 y12-20020a170906558c00b0094a6d38db2fsi2769706ejp.294.2023.04.27.11.38.52; Thu, 27 Apr 2023 11:38:52 -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 3C5D268BA7B; Thu, 27 Apr 2023 21:38:49 +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 BB3CC68BA7B for ; Thu, 27 Apr 2023 21:38:42 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id E07E8240003 for ; Thu, 27 Apr 2023 18:38:41 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 27 Apr 2023 20:38:38 +0200 Message-Id: <20230427183840.1015-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] tools/target_dec_fuzzer: Adjust threshold for rka 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: Mp/myy6EN105 Fixes: Timeout Fixes: 57993/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RKA_fuzzer-5825782785376256 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 87a9f6eb17..d8e93f3a21 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -271,6 +271,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_QTRLE: maxpixels /= 16; break; case AV_CODEC_ID_PAF_VIDEO: maxpixels /= 16; break; case AV_CODEC_ID_PRORES: maxpixels /= 256; break; + case AV_CODEC_ID_RKA: maxsamples /= 256; break; case AV_CODEC_ID_RSCC: maxpixels /= 256; break; case AV_CODEC_ID_RASC: maxpixels /= 16; break; case AV_CODEC_ID_SANM: maxpixels /= 16; break; From patchwork Thu Apr 27 18:38:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41387 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp739947pzb; Thu, 27 Apr 2023 11:39:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5TLV3HOaxqUEVdLqjoIXT4wvUhYYbvyLoXaStzt9YkzmvDHY6iGpHN6WZm/tmdJykXb6k+ X-Received: by 2002:a17:907:930a:b0:94f:6316:ce8d with SMTP id bu10-20020a170907930a00b0094f6316ce8dmr2380615ejc.34.1682620741422; Thu, 27 Apr 2023 11:39:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682620741; cv=none; d=google.com; s=arc-20160816; b=b71gX54Yyibtov5vW0/pl60qn1oYBd/KXsNA2t+zdv86awFg2f+LUPbxf76hs8ueZ9 EbsZtuSkJJtoPeTn2YzTl64rZ5A5Cistzy/6TrE5dIfhgtBrAHSq0iuO3ulA0wKSrpvq QPcyt1JG3tFpmd5aZPnXYfsT6mXpQq+J93joxCa3pgP2msetyV6Dd3zhLcJQy7dJ25qp jY47VBjWb/hZ+zdX9ypt1cJI3x0CrlCZOwif99//K+G1o86zUtYkUQSm8GmorIh2eXvF C0LmqZvUNweRUYwRsx+CC6PWzWF/0BllzjqeaZvzvLiSQp1RCeZ0evAak0WcZivnK9hK BYVA== 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=AkByk+ZKo44IVrUqoj4NPB8FKL94a98rH4ShiilpntM=; b=bCX7ZIKtNVsird2du9KupiHNo0Un7koPBIeb+3ESRX++ihcnZzlR7X/c+lcMYC0rfk dlNa0+kgAzgoBqm+ZoRWFlYuZSr+engSY70+ySEjqIb9dhUEQJrFcpW0ch7RdFOF5ugL izuQ3/gYj6MGySF8jcczUYP9mM73N7hBS/HnLTqJIfNsbxctUHqE4RVeaNuI7v7kNPY7 UUw5GiTyt9AG6Y2kVPJk5cS35+Ps9Qj/fUtxp0nHI3k+24wp/ULNeY32LiX4ZtDJRtZd f5nsNqFxfaNFDND986dGjusQVlYRPs6ZsWCiJP+npojWT32c3orfJe+I5clq5ZTHtkTr DKoQ== 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 xj11-20020a170906db0b00b009572f8d8043si12283177ejb.979.2023.04.27.11.39.01; Thu, 27 Apr 2023 11:39:01 -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 4570E68BF56; Thu, 27 Apr 2023 21:38:51 +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 D037668BA7B for ; Thu, 27 Apr 2023 21:38:43 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 1984740002 for ; Thu, 27 Apr 2023 18:38:42 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 27 Apr 2023 20:38:39 +0200 Message-Id: <20230427183840.1015-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230427183840.1015-1-michael@niedermayer.cc> References: <20230427183840.1015-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/hevcdec: do not memcpy into itself 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: gQl8uXT/5Tzc Iam not sure if this buffer setup is intended but if it occurs memcpy() cannot always be used Fixes: memcpy-param-overlap Fixes: 58062/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-4717458841010176 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevcdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 0fa4fdd59d..1e590ec5d0 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -1542,6 +1542,7 @@ static void luma_mc_uni(HEVCLocalContext *lc, uint8_t *dst, ptrdiff_t dststride, src += y_off * srcstride + (x_off * (1 << s->ps.sps->pixel_shift)); if (x_off < QPEL_EXTRA_BEFORE || y_off < QPEL_EXTRA_AFTER || + s->frame->data[0] == ref->data[0] || x_off >= pic_width - block_w - QPEL_EXTRA_AFTER || y_off >= pic_height - block_h - QPEL_EXTRA_AFTER) { const ptrdiff_t edge_emu_stride = EDGE_EMU_BUFFER_STRIDE << s->ps.sps->pixel_shift; From patchwork Thu Apr 27 18:38:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41388 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp740032pzb; Thu, 27 Apr 2023 11:39:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7QhqfElmcVlXBA3ksq+GR6Rph4xDhVJK5Mb0xgOwd1/byWUo3rcEiSt2dQmijb+eMpBxN3 X-Received: by 2002:aa7:cc85:0:b0:508:3ff8:afe7 with SMTP id p5-20020aa7cc85000000b005083ff8afe7mr2359581edt.6.1682620750187; Thu, 27 Apr 2023 11:39:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682620750; cv=none; d=google.com; s=arc-20160816; b=KD363CVRBsfSg+9Q758j9qbJ8PMuBEiE5pInPcEQE/ckHyROzuHKbCqIF8xiK0hFiX ZlFG3RQZJsDsbwVT/znd6ElLD93Ff9wtkrrAmXtHWtixdCO4vBc21nnNblRhkSAwhZAj BFLAG/bR5t1YSNQ6Eq2PobISoqJyXv3sBSo8jfwnaNPPP+nQyN576XtYfNt/yVXEvA7H YJfK8OCC4Qk4sMjp2aOpihjKDx+8GuFe4hWXXE17cjPpeHjYmU4I7OXg8KEtwKK88TtU GOL+b4lAz8jdRQuXT4eTW4WKKcOchRpAm4GFESLVPtV7YARV3dQzmqzTKcPJQX1mrCXs wuGg== 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=XTin0NA9JPSDpeaTS+mzMAs5IBLnn+EMPwIrT1PEjfo=; b=rwTMhwSXPtLN4oJKAy60h7VMjf9+EI/7Ln9zMvAriSfYd89rhFPGh0lPOtvarc61WZ 5nBj+Op0d6jmtfjGZo/wV97zcEgoV8BzZQP+6jewTnMwXSq/iUNyEVX2vlU2lZjS4hAL VZyfBAeepDORMEjJUnXwfITTkjJdsxQ1UUa/95X8pR5IC7uqPG7LS0xEuw1i6C5eaONw 1d3mx19YuubQOy+6KiSPOxoqUYwjNm7BNMqJzFf2lHlzdUy4dro8eePOXn9pP8hyw+Fq 1Elb14K5jWt8OvcH+uy3R3dBPR0sGnKiW1h4yvtj7RXEWxWXOZGjW0TaxdWmkjZAipAy haZQ== 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 ca8-20020aa7cd68000000b005083db60638si12386731edb.590.2023.04.27.11.39.09; Thu, 27 Apr 2023 11:39:10 -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 2E64868BF5C; Thu, 27 Apr 2023 21:38:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD36468BF4F for ; Thu, 27 Apr 2023 21:38:44 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 0EEB960002 for ; Thu, 27 Apr 2023 18:38:43 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 27 Apr 2023 20:38:40 +0200 Message-Id: <20230427183840.1015-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230427183840.1015-1-michael@niedermayer.cc> References: <20230427183840.1015-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/hevc_ps: Avoid signed overflow before check on QP 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: Q5fubF2+He/1 Fixes: signed integer overflow: -2147483648 - 5 cannot be represented in type 'int' Fixes: 58066/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5312995835379712 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc_ps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 1533e2a817..6b8f432609 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1522,9 +1522,9 @@ static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, pps->pps_curr_pic_ref_enabled_flag = get_bits1(gb); if (pps->residual_adaptive_colour_transform_enabled_flag = get_bits1(gb)) { pps->pps_slice_act_qp_offsets_present_flag = get_bits1(gb); - pps->pps_act_y_qp_offset = get_se_golomb_long(gb) - 5; - pps->pps_act_cb_qp_offset = get_se_golomb_long(gb) - 5; - pps->pps_act_cr_qp_offset = get_se_golomb_long(gb) - 3; + pps->pps_act_y_qp_offset = get_se_golomb_long(gb) - 5U; + pps->pps_act_cb_qp_offset = get_se_golomb_long(gb) - 5U; + pps->pps_act_cr_qp_offset = get_se_golomb_long(gb) - 3U; #define CHECK_QP_OFFSET(name) (pps->pps_act_ ## name ## _qp_offset <= -12 || \ pps->pps_act_ ## name ## _qp_offset >= 12)