From patchwork Tue Oct 12 13:07:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp4756370ioa; Tue, 12 Oct 2021 06:08:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzY/+hJIp6XaDE5KszkkBPG2NCz4+aVU8czFaa/fjEG4CawrFjHP5/FCFbYlsoTItAjMtfA X-Received: by 2002:adf:f309:: with SMTP id i9mr31645029wro.256.1634044139778; Tue, 12 Oct 2021 06:08:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634044139; cv=none; d=google.com; s=arc-20160816; b=t6mEFMq4DtvdlIaIgtO65FPCBPeIrIuG34pwekDLIKYYVzusAqFzZfP04E2MgooVo/ ruDfgA05cnDgyx/NihpCRnNXFFOIFjjF09TRNTeKqlwUR63cCD1pF4OXc7W+si1lDdoC QERXrtOHVl3IKLPPD4mH0ssZitajfrndMZh0qH50hOJfX1++RDSI21uqMHLN6cisBFJV zBU83oJHKPmkO/BLXrPyIUh1kP/AnM/lbO34h5X6TbJPqf0vzB6iO/tbdkBQ3wNZzpmI ofm/eDhiqmXSIPEtc3/IbOiWSkbsfucXoywoLfKzo212gsAZVmYEzilUTOeuLEtduzvv TpQQ== 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=HYlyHLuaqcrCIWpz8OHLiBDd3MllY+8LTM4+MZakNpc=; b=q50diP++DRtYYcGZUIoYxHq2qScEwUcMXOTSN/f8DKAdadQBEgdEgWNocTN3E+MdXf QhjuZS/acERvZpaCHJOdvkVtmERl2mogvD184KA0EMByXLOwjb0oIlkLXAV++ML+lq/d 5pFv2e04qWALZOnz2DATWFXSjEmkSz76yMIOHu/QvzXS2hndr9T7r3Ub6UGFvDq/IL6N 1thGHNWosgVmAQtJFSl4atmlwaE1JZrpPBaKPFwbJufsquZXxB/p9oC5zzUxNUy9R9Iw zkxZWWATp0+OAtVPk2YQdLxZUPALGlefGtAAu5GhF8PedyeCAUhhOChllH4lUC/qn44h OpaQ== 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 c12si20063819edx.46.2021.10.12.06.08.59; Tue, 12 Oct 2021 06:08:59 -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 B8F7468A79C; Tue, 12 Oct 2021 16:08:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE53568A5FE for ; Tue, 12 Oct 2021 16:08:35 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1maHWF-00GIx5-09 for ffmpeg-devel@ffmpeg.org; Tue, 12 Oct 2021 15:08:35 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id aHVGmll1dSgGFaHVGmvaqy; Tue, 12 Oct 2021 15:07:34 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=PafBeEV_R6ZPPTU3:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=swE3_7hykDsrZs_7dn0A:9 a=u5JzRAyWyfnY8PdWFUJ8:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 12 Oct 2021 15:07:33 +0200 Message-Id: <20211012130734.12774-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfNn9FLtnJQYqHWAhv0sfdS7tU8pZ0lIQcWkkJmsZDcU/L8JFFW/K4SlY6/2R3FnCQZ6/7r1NopDduGQ/QMBoNnGH17cvkK0VGflIFeuMPw+j6wDXQOQ+ N70A2IpbJXAaeFdGeof8yJEXZOVaNYoMrzN8pgbr7HQlXTTrYE+nNB9V Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/speexdec: Seed should be unsigned otherwise the operations done on it are undefined 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: YxbEO7V6prFr Fixes: signed integer overflow: 1664525000 + 1013904223 cannot be represented in type 'int' Fixes: 39865/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEX_fuzzer-4979694508834816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/speexdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index fccceab74cb..4c50f54f27b 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -140,7 +140,7 @@ typedef void (*innovation_quant_func)(float *, float *, /** Innovation unquantization function */ typedef void (*innovation_unquant_func)(float *, const void *, int, - GetBitContext *, int32_t *); + GetBitContext *, uint32_t *); typedef struct SpeexSubmode { int lbr_pitch; /**< Set to -1 for "normal" modes, otherwise encode pitch using @@ -191,7 +191,7 @@ typedef struct DecoderState { /* This is used in packet loss concealment */ int last_pitch; /**< Pitch of last correctly decoded frame */ float last_pitch_gain; /**< Pitch gain of last correctly decoded frame */ - int32_t seed; /** Seed used for random number generation */ + uint32_t seed; /** Seed used for random number generation */ int encode_submode; const SpeexSubmode *const *submodes; /**< Sub-mode data */ @@ -293,7 +293,7 @@ static void forced_pitch_unquant(float *exc, float *exc_out, int start, int end, gain_val[1] = pitch_coef; } -static inline float speex_rand(float std, int32_t *seed) +static inline float speex_rand(float std, uint32_t *seed) { const uint32_t jflone = 0x3f800000; const uint32_t jflmsk = 0x007fffff; @@ -308,14 +308,14 @@ static inline float speex_rand(float std, int32_t *seed) } static void noise_codebook_unquant(float *exc, const void *par, int nsf, - GetBitContext *gb, int32_t *seed) + GetBitContext *gb, uint32_t *seed) { for (int i = 0; i < nsf; i++) exc[i] = speex_rand(1.f, seed); } static void split_cb_shape_sign_unquant(float *exc, const void *par, int nsf, - GetBitContext *gb, int32_t *seed) + GetBitContext *gb, uint32_t *seed) { int subvect_size, nb_subvect, have_sign, shape_bits; const SplitCodebookParams *params; From patchwork Tue Oct 12 13:07:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31083 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp4756130ioa; Tue, 12 Oct 2021 06:08:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjjSOY5rWpK9loKvxf/SArjT1uTzI+YdrxiXnoab++h0U8tewz2ixi9k13oqtf7US/uKyp X-Received: by 2002:a17:906:e098:: with SMTP id gh24mr32861458ejb.79.1634044127652; Tue, 12 Oct 2021 06:08:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634044127; cv=none; d=google.com; s=arc-20160816; b=ocelRItIikThCKG8z4vYpwBZrTMcocjfrSqmrvt+Izw6bMzJXMyyIuuDS8O3rDH2ee Y64D4QlRQQQWDlNHor7t4wsC022C8yF8/RDyB4XY8ZYcTeuUuu6Tyw638VwK5aP/RgxE fSqwQ5CeAY3xLggGWSn8PZL+YciryMUNfVXcF8IXAVtXWitxNnf2mPbHCkD6JD+s2tFl 3JpR58ehDgjtHJ1g4i+tI1UjAxgT55W0kJe/hniNWQhrDT0CNqy/4QehizZgEW3spMH+ 7gexJH18dVyqTlt5TQwx8Y+RP+mBLVZsVwK2Ghv3cBIbB0PG9Vh4cc4cWVE9dmaFFVgu dutw== 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=9wfNsxlI226K3lkdUh+5nUSs2rv1Hvofg8FUFy93YsA=; b=E3vBJyuYJAFlETnVZ3povaLDnQ6WbCiOHfEAkLFtKz+6KfoikIrG0zi7GaYUW9Misn 35nuvZiq6Zk15SXsdl+irBZX3uCHdaHsH7QvKvC6t2nMampLDHJlD1y4BQPJdArDPtMv u8tN6JQ5mMvhi9sZJe14O/aBXuNoTMZtNn4oxVNmvxXF8X+c1zU+GGUkzsLT83q2TIBH M0yx2bB2Gl5bvG6dyM/z+qakueyMtv27fTqDx+BGX1CrsMqcRtRJ+I/THMvi3nHfijbZ WjCXkqCfDHzgej39JUfy1Mgi7EY1fVpCzQAY0L0XPHHm3VGOotAJsbWt0jbeUX15H2+V r+tg== 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 d11si20332279edj.442.2021.10.12.06.08.46; Tue, 12 Oct 2021 06:08:47 -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 6E3DF68A0EA; Tue, 12 Oct 2021 16:08:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC6D768A0EA for ; Tue, 12 Oct 2021 16:08:35 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1maHWF-008NcX-0B for ffmpeg-devel@ffmpeg.org; Tue, 12 Oct 2021 15:08:35 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id aHVHmll3XSgGFaHVHmvarZ; Tue, 12 Oct 2021 15:07:35 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=7s6rQYwckFRIa4cbdNIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 12 Oct 2021 15:07:34 +0200 Message-Id: <20211012130734.12774-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211012130734.12774-1-michael@niedermayer.cc> References: <20211012130734.12774-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNn9FLtnJQYqHWAhv0sfdS7tU8pZ0lIQcWkkJmsZDcU/L8JFFW/K4SlY6/2R3FnCQZ6/7r1NopDduGQ/QMBoNnGH17cvkK0VGflIFeuMPw+j6wDXQOQ+ N70A2IpbJXAaeFdGeof8yJEXZOVaNYoMrzN8pgbr7HQlXTTrYE+nNB9V Subject: [FFmpeg-devel] [PATCH 2/2] tools/target_dec_fuzzer: Adjust threshold for MXPEG 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: e+mDD/750PF3 Fixes: Timeout Fixes: 39813/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MXPEG_fuzzer-6010298067189760 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 88002316916..1a790f66427 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -184,6 +184,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_MSRLE: maxpixels /= 16; break; case AV_CODEC_ID_MSS2: maxpixels /= 16384; break; case AV_CODEC_ID_MSZH: maxpixels /= 128; break; + case AV_CODEC_ID_MXPEG: maxpixels /= 128; break; case AV_CODEC_ID_OPUS: maxsamples /= 16384; break; case AV_CODEC_ID_PNG: maxpixels /= 128; break; case AV_CODEC_ID_APNG: maxpixels /= 128; break;