From patchwork Tue Mar 26 02:30:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47481 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp1557175pzb; Mon, 25 Mar 2024 19:31:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW0PbnDvGSPCAXrsxtUMW1S7u0At7/jd+Uqgh/gb+zXXFda4GBQ+Ugq/OuHwZE4/1EW3o4S3W8OsWeBZF/yh7jKxt1/GxSUHpUmjA== X-Google-Smtp-Source: AGHT+IHD+J93GDxtnF5XI15UQJmfU21VAOQNbqYrIggzT3nT3pIfEkyOWfhs3yaD2CgfrcKJztug X-Received: by 2002:a17:906:b789:b0:a46:f9a0:748 with SMTP id dt9-20020a170906b78900b00a46f9a00748mr5574222ejb.5.1711420310314; Mon, 25 Mar 2024 19:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711420310; cv=none; d=google.com; s=arc-20160816; b=AdIwRoBR46DzMEw529lGqZdWYOKvGTdUpq5E+Gj0bfEVfkqFL3zMRDcoUgigwdMQuN 5NN7h8K/nNalgjXdyRpR+ECX5s99xc+rLKzqQTWgAPGfmYAAZkgItkoN4T3bfSLsqbGN JZUSdwkg0NuZRIMO6+Whq3w+5OMjJGOKapQKEt5cW3AWPrHJ/hYCWrgdxMRW37G0cHtf Mis2r+uS6R9c23ufpJA6qBR1tpyEOpZJRpIHU4mINtnMI2cRU6l9qQ97x8QlryqtdTix YnP0Bg0Jxj5K/YW60hwwO3OC2vqdlE/uHivv0kHGiga1e6jTeaLI8z3RsBsVrinFOxIA Mw1A== 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:dkim-signature:delivered-to; bh=/XmIanC7rGh+PA/czEyP+0twLfK17JS9QNZ+VcOYu6M=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=x4gNNl1w+vKh1f4TVRL3Qk9pNrPI3I28WExGs22VKtvyzmgIo/yvGjrSN28smwktIG 7sxCneiCx373phI87rMKEzu+8GNZjCbrmq8slaO6sV+yPTRaJ3V3Hp4uIPEmTwdS8jCx 1FOxHu4M/H8sm1eHunkZt1KOPk8qehVy/JS3nhn2+hotWjzPMzoPxE68ZBp+dQue/DBt nAIJVQ85iVPlSlyzEp9r5+EEnmAznjJO4Z1xWB27JOGpgLO6mWeKEwJOBFK/ijjf4clj L8xPfgTQZNINk+6L2oXnfgvWhN38x34xrsj44rZZUtC1HEzmb6wy1Zf/vRbbrUNGtH2I 5tYA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=HthpX9Bo; 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 ov7-20020a170906fc0700b00a474a38fdcasi2449746ejb.458.2024.03.25.19.31.50; Mon, 25 Mar 2024 19:31:50 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=HthpX9Bo; 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 213AD68D60B; Tue, 26 Mar 2024 04:31:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7A9668D5E7 for ; Tue, 26 Mar 2024 04:31:02 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id CFA261C0002 for ; Tue, 26 Mar 2024 02:31:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711420262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=o0WOckRWH0ZEeoPT0gDM/mxJSg7Tp11HiHsyg7e0RIQ=; b=HthpX9BoVw51k292We9qvewTDTfi0SYXmvUsX0Z9Ismx3FrlSs7RFlixj7iQj0Vf1DDWqJ 8snIOTKGZdbZn8hasEg/E5alntwmz80wPFKJ/fjOWacmRkHgbYH56jvd7CW29n7RKTzco8 hp2nFOzKbPaJ/DFtcLLJp8/714cYCYWIg1aaVXU5vgOuHxc/iY476oUDwlADNOZEP8AWjW Qh/eWY/E+b89gUPVDG41wBG3HD++VOreUCX/KKX0uaMmnuBdI44zyZe+xg9KPk4rKTyaA4 Nf5HfEcXt3XJEtG7T05K4MUoU+NE42odHmXhwqjR47LDNN4zRxP4VT0S4I/RaQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 26 Mar 2024 03:30:55 +0100 Message-Id: <20240326023056.20548-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240326023056.20548-1-michael@niedermayer.cc> References: <20240326023056.20548-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/wavarc: Avoid signed integer overflow in sample 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: KXHmDHk5ye/h Fixes: signed integer overflow: -2147483648 + -25122315 cannot be represented in type 'int' Fixes: 62285/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6199806972198912 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavarc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c index 09ed4d473a2..99cbaf01091 100644 --- a/libavcodec/wavarc.c +++ b/libavcodec/wavarc.c @@ -374,7 +374,7 @@ static int decode_2slp(AVCodecContext *avctx, for (int o = 0; o < order; o++) sum += s->filter[ch][o] * (unsigned)samples[n + 70 - o - 1]; - samples[n + 70] = get_srice(gb, k) + (sum >> 4); + samples[n + 70] = get_srice(gb, k) + (unsigned)(sum >> 4); } finished = 1; break;