From patchwork Sun Oct 2 15:43:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38519 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp846612pzh; Sun, 2 Oct 2022 08:43:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4otGfnBcaKsk40xLHLjJzdLCS9bRUxjS/BxbBD+j6DvZXSooMpLoYP4plQLnh7FkbGfEr9 X-Received: by 2002:aa7:c919:0:b0:459:55b:57e7 with SMTP id b25-20020aa7c919000000b00459055b57e7mr519399edt.20.1664725422535; Sun, 02 Oct 2022 08:43:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664725422; cv=none; d=google.com; s=arc-20160816; b=yGW+KsgZp4iTEZmwes7WUNqG2YK45I2UItmmjLAK4VAms2y7Gkvei7SX1F7jkJh/Vo Q+ps4HNoNtnlENFRwfPKgq027O37cZtLNlNddsv3wButgHnH2/8+I2tKT782cU+tEgUK N54/t5NkzpGfgyovGM4sMPbs8uFExvDixihVbIqxJmywoS2snN00Ckcb4v/fOWiNzRdZ Hv1mAZh2j135jKqnFSvt0PDEJ/nLS6uvCFeN4D8zGKSt7aBS5B3N93wfrZ0vt2I4I6fT ruYO0FxZHlzfhORqUV8pCXqLqND2GqF08rVYF2H/eXN4Wq+Cral6+J8vVbG1D9piomKW /AEw== 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=gVr6CUTqpnPzpjCEJm9gT2tGcqmhM3SNV9QobNrff4c=; b=J7OzcYDbf6b83xmZqqtEsTs6z1iKdXZ536+byDHmZnOsKM/Xy7CP2rCDqPWqlm0jCX azBLtoZZhxxxpIFkhrKZWcShywYjUithwhADOB77cDGnCbB9P2SbMcwcyMaVFK5ulJoC zfLq1WrJNzWe84dB1Vdle01Jijhi/hC+vKMMJlEslFdiUAkVkqKhxVlicA/3Y7EQIM6q lbbqVmOYgjbhDj+ValZzqa4iYJ6Kkrs+atDzb5/hzPvuAMJC5DZU0vHHRh5Ztyx79+S1 OSYqrv1ZzJIJGONTxkEMRfjkqQ430dAKT11VNs3KqvK7f8zuuUFmtl1/5ChKsJFo1yLD YKjg== 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 m22-20020a1709061ed600b0073d5a794b43si5243190ejj.985.2022.10.02.08.43.35; Sun, 02 Oct 2022 08:43:42 -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 665CA68BB5E; Sun, 2 Oct 2022 18:43:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-2.mx.upcmail.net (vie01a-dmta-at01-2.mx.upcmail.net [62.179.121.146]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D528968B7D4 for ; Sun, 2 Oct 2022 18:43:25 +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 1of17k-004a5H-M1 for ffmpeg-devel@ffmpeg.org; Sun, 02 Oct 2022 17:43:24 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id f17kobZph8s8Uf17koJXSy; Sun, 02 Oct 2022 17:43:24 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id f17jokAZxOG5Zf17joBqzh; Sun, 02 Oct 2022 17:43:23 +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=KJo5sHJo c=1 sm=1 tr=0 ts=6339b19c a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=FBvexKzlGStxyKjI2fgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 2 Oct 2022 17:43:23 +0200 Message-Id: <20221002154323.21278-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfMhqsMK34Gm2Vh8cDaa295b4kqFDmmeVQ3timxJ7GwscMrpMFUG/Hcgb/HUd9fFx9z2cfJGv8TUl0jg9+bAvs0Aj7bS3nTtoX70bcYzRgy6ewFGbChrl iwEy4H35NrnnjQKuQz9DtlHBlYsxtH0O68sWITvc0TZw5mA8UDIQ/1gv4M43YM3uyeEo93hD655sfw== Subject: [FFmpeg-devel] [PATCH] avcodec/bonk: Check step 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: eHRiHZc+6UWu Fixes: signed integer overflow: 2040812214 + 255101526 cannot be represented in type 'int' Fixes: 51323/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-4791481067503616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 409694f710d..32f7c9b9bdb 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -187,6 +187,9 @@ static int intlist_read(BonkContext *s, int *buf, int entries, int base_2_part) if (!dominant) n_zeros += steplet; + if (step > INT_MAX/9*8) + return AVERROR_INVALIDDATA; + step += step / 8; } else if (steplet > 0) { int actual_run = read_uint_max(s, steplet - 1);