From patchwork Sat Sep 10 22:30:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37840 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1690706pzh; Sat, 10 Sep 2022 15:31:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR4AvlUQgUxzeeCquryypl9NFPZ9yMzZq3dZ7wAp+CzvzOtsQvSiLJxjJsHwT3S0ZetYJMle X-Received: by 2002:aa7:d150:0:b0:44e:3c06:d719 with SMTP id r16-20020aa7d150000000b0044e3c06d719mr17056754edo.265.1662849071439; Sat, 10 Sep 2022 15:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662849071; cv=none; d=google.com; s=arc-20160816; b=U1Sw+tyUmK1733pvFNp08dnBNOVoMfLhaahXR5hBnnkLp2AsKAvybae1UkQGvtdpz9 QKOEIm0o+ZBn0YKP4EG9YtuDuOka8juyLcvD7Aw0AFDB9NwGCYIOQ3ngVaJVewRVPHb3 iKofF/15PeUVIA1KM2nrLXDui/4ca7nHF92NDq+0dYANHQVOi2fD9izOXy8sdL+M2Nm4 Yg3XnlDr6dr1MUKGWceYukeeOjtv/sH/Ls8zcjAMVI1W9Ehxgaex+GHVEx5pUZMovMxd 1rZMPf+gr7qj6pA0wbWvEKY6SlRSjdrZuAVA2Isg8b9CAFeKApfy+MzWerXO6BowSzim 7Xvg== 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=efyykiIMghtUf+FB6vI9WckpeVrdDMN6UYo/4v1srK4=; b=klpdZFy8AAZ0wxYInib0UQVyvOhM3nRoggO6Q8Q3Dc9NM/I315LyL3n8C51udv5dj5 UBIEPEgrxoIsX/r6ruxOhAXNFkHGn43Oq8vZSfszfLdGbMOEo1wwjp9BDN+FUu9EnbZY AuKKb/u8EF2zTuO6DTidjaV1W7PxRKfOi6516FDVkJugQFTdVE/ZJ4pPssw9B0CNTxmT OkRqFIatGHm3lsAo4gFSSu4IKQgP3B3TEcFxhO4Z4aFKl6wEW/dLAyITCtplW4bB0ZxN hrtwcjZlb3h8NnUmaaDDhQAxhNu2d2WsZzolRpcskDF6U6IaaWhSLdvzpbtITdM9gXmR uuRg== 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 js9-20020a17090797c900b0077cc598a100si118937ejc.2.2022.09.10.15.31.11; Sat, 10 Sep 2022 15:31:11 -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 1825A68BB2D; Sun, 11 Sep 2022 01:30:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD1AA68BB04 for ; Sun, 11 Sep 2022 01:30:49 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oX8zw-001tW2-9D for ffmpeg-devel@ffmpeg.org; Sun, 11 Sep 2022 00:30:48 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id X8zToAq098s8UX8zvopKqW; Sun, 11 Sep 2022 00:30:48 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id X8zvoXwe08eSWX8zvoIVdC; Sun, 11 Sep 2022 00:30:47 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=631d1017 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=EGuGzb794k-4MbXI5gUA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Sep 2022 00:30:42 +0200 Message-Id: <20220910223046.5135-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfNHmSjA9tCyQeaUR+0s6SiHUrEnqMaRFoZkhoG9EITNXTfPpVM+pakJED/+SpVmUVL4rsVgsUOLXnP209NpqaXZ/EhZWEdNQrzcBbEJlhAo9sSf0vsmH smkBROHxVkDmsUJ1cu6v2nUbIcviOZhPc0ZkfSINBrUVZsMq31TJgHgMQQEKXYwotYGFV+btMRjZgg== Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/apedec: Fix integer overflow in filter_3800() 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: Sk96mLMvCTDi Fixes: signed integer overflow: -2147448926 + -198321 cannot be represented in type 'int' Fixes: 48798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5739619273015296 Fixes: 48798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-6744428485672960 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apedec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 4e3ddfea01b..c08d13d6c23 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -934,7 +934,7 @@ static av_always_inline int filter_3800(APEPredictor *p, p->coeffsB[filter][0] += (((d3 >> 29) & 4) - 2) * sign; p->coeffsB[filter][1] -= (((d4 >> 30) & 2) - 1) * sign; - p->filterB[filter] = p->lastA[filter] + (predictionB >> shift); + p->filterB[filter] = p->lastA[filter] + (unsigned)(predictionB >> shift); p->filterA[filter] = p->filterB[filter] + (unsigned)((int)(p->filterA[filter] * 31U) >> 5); return p->filterA[filter]; From patchwork Sat Sep 10 22:30:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37842 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1690936pzh; Sat, 10 Sep 2022 15:31:52 -0700 (PDT) X-Google-Smtp-Source: AA6agR7Qc4olYTZNrctw00cq6liRTs1+N48eb7/9Dee29tSLw52wfJMHKf6Scj/56xWD9HV1S6UN X-Received: by 2002:a05:6402:2756:b0:443:4a6d:f05a with SMTP id z22-20020a056402275600b004434a6df05amr16816221edd.396.1662849112501; Sat, 10 Sep 2022 15:31:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662849112; cv=none; d=google.com; s=arc-20160816; b=xW3meO78i1uGi5z9mZzCO64vKnobhInrrQHi7MVxbyrePm6sP11R+qxpggtfUHlMS+ CFLis4VCMfBvBpTRm7jeayRWl+lRRGmTIGbb0RzV6xw5WB1OAjDoS2zWtB5/3qqZe2WW kk2QsH5+ehT4HHgsXeZG2fG/p4SomoTopSJufOqXYly2Pe3vebpkozd0pNvcD4WL4jXD 3wCEjkWkrMcpFidD1AUO7cbsNCVOTX4nqXtDBZb1wfo5gRFCyl9VhyNTk+mTlQHfhAfb tdkWXkg3suT6yW/6hgPsIn1V3lavMzvdnR3gMGmRyGvG3VCICDuFtXUDgu3D618VoHHL 1jqw== 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=qe8d+Re5KdJvD19pf/k/r1g5jKUxWaOZgJG/Tl/o/Wc=; b=R5wZ8n2p9kUn9V8ZeTw5O7sOIj9KveX/1tgPq8M8iK1TtQethpuFUa1d4ERvyhzXP6 SfSMZr1WiLMdFtsTuJO99Su9Ow2j7b5jd2gwi5QI5uABHAoS/QcWiEwTyaCJCr5Ss34B ItcXsN7x7Z1EFUdZOCtChGNxTTb7qILqJV0RJnYA/rLFFMAMX8btrCDbZevUscZ5U49j gVGolfO2OmM3Z3NRMcWxaBZaPCzYGti4dj1Xo3xT8O51vLGfwKPgNHORJUhGmvPsadza dpsM9tG3XcgaaOu2K8l0QPuq29W9Fk6LC3uEDku+63cZ9RufTiUA+8erkWpzF1e240ax aC2A== 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 js15-20020a17090797cf00b0077a35bc5fafsi4087807ejc.318.2022.09.10.15.31.52; Sat, 10 Sep 2022 15:31: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 35BC468BB35; Sun, 11 Sep 2022 01:31:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1AA368BB21 for ; Sun, 11 Sep 2022 01:31:48 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oX90u-001u6V-5C for ffmpeg-devel@ffmpeg.org; Sun, 11 Sep 2022 00:31:48 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id X90uoAs7R8s8UX90uopKvZ; Sun, 11 Sep 2022 00:31:48 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id X8zvoDe5sOPqFX8zvo6P1G; Sun, 11 Sep 2022 00:30:48 +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.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=631d1018 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=SnBPfzcMAngPLq6mrSMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Sep 2022 00:30:43 +0200 Message-Id: <20220910223046.5135-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220910223046.5135-1-michael@niedermayer.cc> References: <20220910223046.5135-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNX4jS6NlX3VyGiJOMPyJN4LSehmqEuxKgpuswazMw/EvOo5z5jWxXTkyWqOtnavWp6Nc5wg3+6MvXQNlRHcTv7xbelFGdudh3ICIvX6glhWErGs9QA4 ciOoFpfOpjLLfwQK0pKjbdSKju8A/AilGTXYzFwDMP/J3gHtpOtryr2b6WuB2Ai3O4gCuNyoIGT1rQ== Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/dstdec: Check for overflow in build_filter() 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: lHeliuCtHplv Fixes: signed integer overflow: 1917019860 + 265558963 cannot be represented in type 'int' Fixes: 48798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DST_fuzzer-4833165046317056 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dstdec.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c index 6bdd6c885c8..4b1762db33c 100644 --- a/libavcodec/dstdec.c +++ b/libavcodec/dstdec.c @@ -215,7 +215,7 @@ static uint8_t prob_dst_x_bit(int c) return (ff_reverse[c & 127] >> 1) + 1; } -static void build_filter(int16_t table[DST_MAX_ELEMENTS][16][256], const Table *fsets) +static int build_filter(int16_t table[DST_MAX_ELEMENTS][16][256], const Table *fsets) { int i, j, k, l; @@ -226,14 +226,17 @@ static void build_filter(int16_t table[DST_MAX_ELEMENTS][16][256], const Table * int total = av_clip(length - j * 8, 0, 8); for (k = 0; k < 256; k++) { - int v = 0; + int64_t v = 0; for (l = 0; l < total; l++) v += (((k >> l) & 1) * 2 - 1) * fsets->coeff[i][j * 8 + l]; + if ((int16_t)v != v) + return AVERROR_INVALIDDATA; table[i][j][k] = v; } } } + return 0; } static int decode_frame(AVCodecContext *avctx, AVFrame *frame, @@ -328,7 +331,9 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, return AVERROR_INVALIDDATA; ac_init(ac, gb); - build_filter(s->filter, &s->fsets); + ret = build_filter(s->filter, &s->fsets); + if (ret < 0) + return ret; memset(s->status, 0xAA, sizeof(s->status)); memset(dsd, 0, frame->nb_samples * 4 * channels); From patchwork Sat Sep 10 22:30:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37839 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1691254pzh; Sat, 10 Sep 2022 15:32:56 -0700 (PDT) X-Google-Smtp-Source: AA6agR4tqkb+JmTTS9W02Iz8L51Zqk0zBqTmek+zlN1oO4NM75iy8Zr9RqFnAdtHrWkrTlTKEpes X-Received: by 2002:aa7:c610:0:b0:44e:9a0f:753a with SMTP id h16-20020aa7c610000000b0044e9a0f753amr16422549edq.140.1662849176736; Sat, 10 Sep 2022 15:32:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662849176; cv=none; d=google.com; s=arc-20160816; b=fVm3ewXQ0XqQ2mm4ihNbi7vn8eJpv0h4xWoboidzUaoiLvpVOYUkRXh3yeqpe4jzdD 4z7cU/tPsuGzuYcqDQh81obQ+EMq9Ri74Jp4IAFMuSrYv3vLPE1F1l4yIaDGbdWUiwZu 4xJrEB/G2bljVyfpLK0JQr8+/jDPsKJjO1hKpjwnqFPgYv2FFbuczm1FmfkMGmrsFRhN b3mfdZT9/USqDyy6qEfmKBYVVR2XeuRvSdE0pGbShKBKzJ5izYUSCZYpL6NOjm5dXAIW C1iZvmIp+bKLkQfaL24Opcx3cMHXF7om6SJv3KAhE8deJmpnlrQtCcsmUI32+neNfaeh CtGg== 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=vh+irVIGBRZOFbN2NIWTzBNuuOu72FzkDgaa7YMfgTs=; b=e/cUot5WUsPeGo2nGSbLHHOZdqE6H3U656rAFQMNhChr35tniKCP3cwii436E+Te4Y SlMhpFEhKMzBMJVRej6/DVXUSlXolJR9Rnws78QPGX75I9YBP+IY8xcCvSNyFBvKjoT9 T4J8q32tCzvdA1/jiCr5VDIl8T8RPaZZseUPpd8GT7dkbMoSnp0J/mGLHrfa03pMA3hQ 1LY/LOR9XEH/QTZYGCObnbfkMug9OnBl/EeRcIDd7+dP+7DEuuvIl9Nj/zrGm/y3Rron GlmunElcRIRlEBhkeUDi3X+1AaS02+EWrR5h9c3TUviKE+Zq2iFRErVMSK1qSVnNqbUX yg+Q== 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 p12-20020a170906604c00b007700c3ad033si3236470ejj.565.2022.09.10.15.32.56; Sat, 10 Sep 2022 15:32: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 46AC668BB2F; Sun, 11 Sep 2022 01:32:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75A6D68BB1B for ; Sun, 11 Sep 2022 01:32:48 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oX91s-005JK1-0E for ffmpeg-devel@ffmpeg.org; Sun, 11 Sep 2022 00:32:48 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id X90uoAs7S8s8UX90uopKvY; Sun, 11 Sep 2022 00:31:48 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id X8zwoDe67OPqFX8zwo6P1H; Sun, 11 Sep 2022 00:30:48 +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.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=631d1018 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=qXCkH0IT268N9l7CK0gA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Sep 2022 00:30:44 +0200 Message-Id: <20220910223046.5135-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220910223046.5135-1-michael@niedermayer.cc> References: <20220910223046.5135-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNX4jS6NlX3VyGiJOMPyJN4LSehmqEuxKgpuswazMw/EvOo5z5jWxXTkyWqOtnavWp6Nc5wg3+6MvXQNlRHcTv7xbelFGdudh3ICIvX6glhWErGs9QA4 ciOoFpfOpjLLfwQK0pKjbdSKju8A/AilGTXYzFwDMP/J3gHtpOtryr2b6WuB2Ai3O4gCuNyoIGT1rQ== Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/exr: Check preview psize 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: JbLJ9xGIU6yv Fixes: signed integer overflow: 17121181824 * 538976288 cannot be represented in type 'long long' Fixes: 48798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5915330316206080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 235f6fa6cdd..c924406f131 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1942,9 +1942,12 @@ static int decode_header(EXRContext *s, AVFrame *frame) "preview", 16)) >= 0) { uint32_t pw = bytestream2_get_le32(gb); uint32_t ph = bytestream2_get_le32(gb); - int64_t psize = 4LL * pw * ph; + uint64_t psize = pw * ph; + if (psize > INT64_MAX / 4) + return AVERROR_INVALIDDATA; + psize *= 4; - if (psize >= bytestream2_get_bytes_left(gb)) + if ((int64_t)psize >= bytestream2_get_bytes_left(gb)) return AVERROR_INVALIDDATA; bytestream2_skip(gb, psize); From patchwork Sat Sep 10 22:30:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37841 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1690755pzh; Sat, 10 Sep 2022 15:31:19 -0700 (PDT) X-Google-Smtp-Source: AA6agR6a4mYy/jq+DbZRwCd5ngL6OSV05/l7yv/IPg+iQ1c6DkNzZAQgz3SsyZP2BATxKkDNl2ZE X-Received: by 2002:a05:6402:d05:b0:425:b5c8:faeb with SMTP id eb5-20020a0564020d0500b00425b5c8faebmr16292896edb.273.1662849079585; Sat, 10 Sep 2022 15:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662849079; cv=none; d=google.com; s=arc-20160816; b=dlUCYPWt8M4o6ObiZq2CDzxnC+gAphTrJ6Qrm/8w6IPN+JCJewu6jH1FQuQAbOKMUr sMCA06fDrjq1WkOf9PigZjMlz3b26s9t3MJZuFOGy4xTLFcVwPF+HQp2LaXwdcQCdKVH bFnBzCF+nnlpI39H6rqC04gTaGzHC05qkV04SimIp8MnBH0E3ahQPAF3fn1WqHfwIllB 0rLkmnYhce/pH1H6K3M2u8v6RFiEqhy4DUVCgUSjCALKzjgj5/qnVuvjtEZaI/+iY1g7 9gPuO8uql+NFCI73k70kFk/TCW38eV0+QsZP2gxZon/hcgmNGRuS9HpoYaOHs7lQDbY7 38SA== 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=mSErrYvsTCMLz32CvOczo16Kud/oTiHAbdS+8IHBkU8=; b=J5ca66OzdwEqfkr75fQV1a6iiUOlbd/J/TkVAq1VYdftEkR/HvJlTuq4Sqh5VTQeMb tzrBsu661aLu6wMgBDcbE/aV9/z3LqSmN/TMNJfa7EzWxq4T4fCFySimDeaHsFWW7SI5 GOr8X1hVJQz/KZ0M6lqQKKRSbPv5yJSFtQjFBGuOye7dxviBB0OhA51zUl4yCWyIYIqB qH6MiuR5NNPuITKl5o0rXl7AlgeNkGSSrlQNr7m5phHZdKWe6zSgsABmW6IyEWLe9eet rlvCglQ8wNSXDje+3fixbMjpjqnoRgcgX1oLmi0Fl0JpKv0tOOaPc3NYs3WkihBLFF20 ZICA== 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 x7-20020a05640225c700b004483613511esi3768223edb.618.2022.09.10.15.31.19; Sat, 10 Sep 2022 15:31:19 -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 2383C68BB34; Sun, 11 Sep 2022 01:30:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD25268BB06 for ; Sun, 11 Sep 2022 01:30:49 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oX8zw-005Jdx-MI for ffmpeg-devel@ffmpeg.org; Sun, 11 Sep 2022 00:30:48 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id X8zToAq098s8UX8zwopKqe; Sun, 11 Sep 2022 00:30:48 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id X8zwoXwev8eSWX8zwoIVdG; Sun, 11 Sep 2022 00:30:48 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=631d1018 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=7v9BlLdgWfvl7RR9u_YA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Sep 2022 00:30:45 +0200 Message-Id: <20220910223046.5135-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220910223046.5135-1-michael@niedermayer.cc> References: <20220910223046.5135-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNHmSjA9tCyQeaUR+0s6SiHUrEnqMaRFoZkhoG9EITNXTfPpVM+pakJED/+SpVmUVL4rsVgsUOLXnP209NpqaXZ/EhZWEdNQrzcBbEJlhAo9sSf0vsmH smkBROHxVkDmsUJ1cu6v2nUbIcviOZhPc0ZkfSINBrUVZsMq31TJgHgMQQEKXYwotYGFV+btMRjZgg== Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/mobiclip: Check quantizer for overflow 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: pQddC3tDgUd1 Fixes: signed integer overflow: 127 + 2147483536 cannot be represented in type 'int' Fixes: 48798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOBICLIP_fuzzer-6014034970804224 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mobiclip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index 5348f3bd6c3..aca462428c1 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -330,7 +330,7 @@ static av_cold int mobiclip_init(AVCodecContext *avctx) return 0; } -static int setup_qtables(AVCodecContext *avctx, int quantizer) +static int setup_qtables(AVCodecContext *avctx, int64_t quantizer) { MobiClipContext *s = avctx->priv_data; int qx, qy; @@ -1256,7 +1256,7 @@ static int mobiclip_decode(AVCodecContext *avctx, AVFrame *rframe, frame->key_frame = 0; s->dct_tab_idx = 0; - ret = setup_qtables(avctx, s->quantizer + get_se_golomb(gb)); + ret = setup_qtables(avctx, s->quantizer + (int64_t)get_se_golomb(gb)); if (ret < 0) return ret; From patchwork Sat Sep 10 22:30:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37838 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1690670pzh; Sat, 10 Sep 2022 15:31:02 -0700 (PDT) X-Google-Smtp-Source: AA6agR6l2XmAd0i7/N+mZQ1etwhryq8/+KR4Oxi/Wp2hakVNjTgbdl4oRY2pH0RKC67I3gRarAlO X-Received: by 2002:a17:907:968f:b0:774:d10f:a98e with SMTP id hd15-20020a170907968f00b00774d10fa98emr10513004ejc.750.1662849062538; Sat, 10 Sep 2022 15:31:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662849062; cv=none; d=google.com; s=arc-20160816; b=RKe0pPkur4lhmcr3m+n/0jHvRigY1h5d6VPsxVhOzguR4OBvVTkpKM3aBZEr0PxYTV exdtudEkH7dXbq28ZgLjOKdtfViSpZgE0eQM5TUGQZbcEPRjXpe/7K7qJW5JE0zOhd4K zS6EG8KCHCOWvRi2gsnE1x1sYNUa9XRaFU7cAxd1PHpADnwf9+8vyrRifeFgcBfbqtX6 zOQJeThOHqXGSbCZKp94DmkZjvmpidoMHKDkhFY7YBZNuZt9nNQFCaoCMmMHQg9swu5l GbsJWaW81I96NJswdCMSL8UT870UfTH7B7oOkvtZf6JfKf/6NIJqV0Mdh2YewQEvpG5X chvg== 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=RZms3JKDKjw19b2suBn1m44oDBiq+NXbhddBBfOsoQw=; b=bhNHLuNFf8pWIUyjABpoZcAf6Frf9F0FGEB/mBkZGFk/NkdKkI5awtLrA/NP8Bq/px Rm4XndQch/jaPniwrBfHZLxFMou6NqAEhsYvCUzDJ5oQ0/h9NM5VM+0xeXfCI3QZQQqc C6EJcia38qyBngEyXUPwDQfDx1/mVq81TSF9PkWZxoNqahxQj3VJ9YakQNfE6SC6uBOA FvBrS8K605ID57MluozX5x8UesnyhHzfGluLoMPbfkQcWoeLAFQMsrAheMe6snTDjW/S k0KBXodja11GxfmRRCRFCe1zI+Kyy1c5ALne1X8oGD1lEhzYiEMM2vYvekgW3ESo23E2 D5+w== 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 gw1-20020a170906f14100b007304a4dd41esi3278958ejb.762.2022.09.10.15.31.00; Sat, 10 Sep 2022 15:31:02 -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 E188968BB06; Sun, 11 Sep 2022 01:30:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAE7B68B9F3 for ; Sun, 11 Sep 2022 01:30:49 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oX8zx-001u3i-2i for ffmpeg-devel@ffmpeg.org; Sun, 11 Sep 2022 00:30:49 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id X8zToAq098s8UX8zxopKqj; Sun, 11 Sep 2022 00:30:49 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id X8zwoXwfE8eSWX8zwoIVdH; Sun, 11 Sep 2022 00:30:49 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=631d1019 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=stzCqc40Zid2qbPFplgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Sep 2022 00:30:46 +0200 Message-Id: <20220910223046.5135-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220910223046.5135-1-michael@niedermayer.cc> References: <20220910223046.5135-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfBa4N8qEd9jy2IHF1GwENesm/pVAfZh11zS/Y/pvyXrQQ5Jg1bu3I6pp20sSDffF96mPz8QJ0zaDzgl8rCKa+R4JjD+dECnOmbta7hGEh+locTB7rk0S ppLn+8BvsWZIoCB5kf4U4Qhx/6fyKlBbmN+uiiCd37lZ0TFemolt/OvJbN/es9UfUgQeMmE7Url00A== Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/tta: Check 24bit scaling for overflow 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: 6ThmdCObNws9 Fixes: signed integer overflow: -8427924 * 256 cannot be represented in type 'int' Fixes: 48798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TTA_fuzzer-5409428670644224 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/tta.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 6fb8d7a74f9..d66e25af059 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -377,8 +377,15 @@ static int tta_decode_frame(AVCodecContext *avctx, AVFrame *frame, case 3: { // shift samples for 24-bit sample format int32_t *samples = (int32_t *)frame->data[0]; - for (i = 0; i < framelen * s->channels; i++) - *samples++ *= 256; + int overflow = 0; + + for (i = 0; i < framelen * s->channels; i++) { + int scaled = *samples * 256U; + overflow += (scaled >> 8 != *samples); + *samples++ = scaled; + } + if (overflow) + av_log(avctx, AV_LOG_WARNING, "%d overflows occurred on 24bit upscale\n", overflow); // reset decode buffer s->decode_buffer = NULL; break;