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);