From patchwork Sun Mar 26 22:26: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: 40849 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp885944pzh; Sun, 26 Mar 2023 15:27:05 -0700 (PDT) X-Google-Smtp-Source: AKy350akomHgXHtEb99hkGaMw78fQJUK0q6o6w8X0kO9bpXZ66meF1hcXBjwphRpSjGFCrZykqRs X-Received: by 2002:a17:907:8c0e:b0:930:bc07:3bf7 with SMTP id ta14-20020a1709078c0e00b00930bc073bf7mr11675458ejc.5.1679869625336; Sun, 26 Mar 2023 15:27:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679869625; cv=none; d=google.com; s=arc-20160816; b=iHspLCGoANKJkSNXPGMueaS4T55vm6MTrz8s+SYvh8fLH0sfJRRnHKsBbTnOE8QMib KAcblLf25639z/u8kbAwkDIJzkSsgbQH/6Z6Zza1DU2hoozpSHvvZKXPHn8Q0yfk+3v1 nJ94+UUxX2UpyOWPrrV76iBLpy6DWDzHI9FQ/hGTqdBSKZPiaobu55/kz3zV7GY6m69O k6peAKIwZtJqi4lgNSZ9QMUqVmkki6ZTtf6wRrNlNCiKSGMANIXIAMd3+KMZRiTv2qGC gk/6BaCZFZrzb6SwgscluU5LxF2MDSk2NXkUKhThLu14pb9gMcjD18unkEsPE3xHxUcZ 6Ggg== 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=dnjxshsLCuQXS69vZ4g7bHHhLAMzObCfy5ymnsDPrfw=; b=S3zicIDQ9lOVzitv0bCHxJlVHy29ftg+kk110L11f9rNNnwqrn4BMoLAy01R9jJMKr 9y27Jr+whjtaFUTgZtVuiRv2iPDtreldGhMTEKme09LKLy7TJH3as7+UVcPN6ohJD1cn mkdgKJlboLUNgC8WAn9Gg5id+D71SgmVCRRXmiiyRtbiFXJ/qE5gzTOQt0E7G2aptYp5 WLiG1jX5L+3KEsoIKatFRrnBABES4mNmy36ioba1JKP32TRR2hBHDEY0PvllYoj4l4Ct P646FShht+VQiKSpiXKSGV4NorWtYbITpAxgd3k50iKbq3zDIMaAsjKCKc7oWt/clS7K iQBg== 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 hp33-20020a1709073e2100b00934e2ca8548si22437574ejc.210.2023.03.26.15.27.04; Sun, 26 Mar 2023 15:27:05 -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 8309068C63B; Mon, 27 Mar 2023 01:26:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6FB968C477 for ; Mon, 27 Mar 2023 01:26:44 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id CE7A5FF802 for ; Sun, 26 Mar 2023 22:26:42 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 27 Mar 2023 00:26:39 +0200 Message-Id: <20230326222642.2489-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/wavarc: Fix several integer overflows 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: I18BlnCj7f/x Fixes: signed integer overflow: -532410125 + -1759642300 cannot be represented in type 'int' Fixes: 57045/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-637023665297817 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavarc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c index 8d37af95716..896972cec82 100644 --- a/libavcodec/wavarc.c +++ b/libavcodec/wavarc.c @@ -349,7 +349,7 @@ static int decode_2slp(AVCodecContext *avctx, int sum = 15; for (int o = 0; o < order; o++) - sum += s->filter[ch][o] * samples[n + 70 - o - 1]; + sum += s->filter[ch][o] * (unsigned)samples[n + 70 - o - 1]; samples[n + 70] = get_srice(gb, k) + (sum >> 4); } @@ -452,7 +452,7 @@ fail: const int *src = s->samples[ch] + s->offset; for (int n = 0; n < frame->nb_samples; n++) - dst[n] = src[n] * (1 << s->shift) + 0x80U; + dst[n] = src[n] * (1U << s->shift) + 0x80U; } break; case AV_SAMPLE_FMT_S16P: @@ -461,7 +461,7 @@ fail: const int *src = s->samples[ch] + s->offset; for (int n = 0; n < frame->nb_samples; n++) - dst[n] = src[n] * (1 << s->shift); + dst[n] = src[n] * (1U << s->shift); } break; }