From patchwork Fri Sep 29 23:20:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44042 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp97824pzf; Fri, 29 Sep 2023 16:20:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZBEGnz5N/I8awAdAhwghQV4LcrvIp9Qv1G81ZPqQ5dTedivQ5f/FLcfW7lAQt6ilAmbQr X-Received: by 2002:aa7:c7c3:0:b0:530:52a0:8b1a with SMTP id o3-20020aa7c7c3000000b0053052a08b1amr4506318eds.25.1696029650476; Fri, 29 Sep 2023 16:20:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696029650; cv=none; d=google.com; s=arc-20160816; b=a9kC9klGQDzDPE+lWmr16YEZ+0VSJKOC+6OZk3WfPCu1JslydRh41XJxuGhAwBb3JY OBNCp5XM3/b3Awl28N7xAG+AkTL65mHgjRwLYj9DabyyIyi+peyd6TvLfnqL2uzY+IqS ZEYFd5a6wBf3dCyyjWYnxorhvBTLEtMCVTeG2uyw+MfnJFb5+jl/1sTT7sWLP1L4mGVy vsCv+NDlZpPeMimBC7p2bwVZuqcXj5432uNdqAXh7D2VQsK3+0hBk2AhFQWDziFyI2Qc th3MUCEwrmE259oU5mepmLZ9nieYnHrAXtfqouVrRktF61iYZBy2UhU8YiL5HXAClrgq un+Q== 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=4vDYvUgKNkRx7WEC5m/ZWpjkaawBfo0atd2Je01yh44=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=KjOywV3poAhLc/9w5oUtudiTZaRHBk8ztqcEtSc1k9j+L2/+9zcpRPMg7BZ4oTVnHM o09BpYCwFPc45EAvm5gr0owOJIPivQwlomwfIUSBw1ReqU/B4eGw/cMjN/154uLQMsvq CRlm1BWEUxsvpBDDjjEnnnhCHRtOFInmu1H+/3EUZ2TjVaARVfhrOQ38lMC2aTsTd7IC YAGvQBwLW0oRADTCbDF1VWErKRlW1y2wdd73CUzktMrQz8cGDqiyJlaHcpsDomdjTB07 HeOeKV1LYOspzMQyLIsEZIq1tJuzgRCsoMlnU+PfemqLBRsD3ibzIIu4FXZC3/dVmN53 X+4Q== 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 i6-20020aa7c706000000b005256af07b3bsi15597995edq.541.2023.09.29.16.20.50; Fri, 29 Sep 2023 16:20: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; 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 1693868CCBD; Sat, 30 Sep 2023 02:20:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D885068CCA7 for ; Sat, 30 Sep 2023 02:20:07 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0BA361BF205 for ; Fri, 29 Sep 2023 23:20:06 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 30 Sep 2023 01:20:00 +0200 Message-Id: <20230929232001.23197-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230929232001.23197-1-michael@niedermayer.cc> References: <20230929232001.23197-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 5/6] avformat/dxa: Adjust order of operations around block align 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: EMHIoWKbiJxH Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464 Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 'int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/dxa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dxa.c b/libavformat/dxa.c index 474b85270ae..b4d9d005290 100644 --- a/libavformat/dxa.c +++ b/libavformat/dxa.c @@ -122,7 +122,7 @@ static int dxa_read_header(AVFormatContext *s) if(ast->codecpar->block_align) { if (c->bpc > INT_MAX - ast->codecpar->block_align + 1) return AVERROR_INVALIDDATA; - c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / ast->codecpar->block_align) * ast->codecpar->block_align; + c->bpc = ((c->bpc - 1 + ast->codecpar->block_align) / ast->codecpar->block_align) * ast->codecpar->block_align; } c->bytes_left = fsize; c->wavpos = avio_tell(pb);