From patchwork Mon Jun 21 21:25:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28593 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2042:0:0:0:0 with SMTP id z2csp2343987iod; Mon, 21 Jun 2021 14:27:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUcvE/CDMbh+vqpea17HV8R+r1kmSPuODlwAmG4Is/BXIAxGrNl0ErcMaFnK7UL5cH76jD X-Received: by 2002:a50:9e6b:: with SMTP id z98mr551302ede.210.1624310830581; Mon, 21 Jun 2021 14:27:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624310830; cv=none; d=google.com; s=arc-20160816; b=M+tPscjAaZV1Miu0qsYwStqgv6fp4AyWa79rSlKg6hojMEAXOBMd7zsL8X0IYYrM1K VEyD5lfmhXtxAT28/m34rsJBmVW2IVS8Y3dGaC+KC6xK5tImJDQWELSbBZU9tNet5xw9 shv0wLeORDHPxdxllr6mZeeg5aZ6V6JwGWik+fGrzsefaQ4DdRte9Dgtwb7WmPcG24wf /K+K80rZnp5uXWOKMQ7e27Sa0i8uRnL0LsKj9SJ9OuubvLs9YV9RH1vyvILmRYToKhZ7 gtlPyyZE52qVwGeDBmmArFAck1DJSToZzOTXytXz5nBzX2CJuOXMxzaRrcViLKQQ0iOa Bhng== 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=8iPR0koiDngtiFp49iHCKZOk255WLtpaltBvSHlE2ew=; b=RGW2OwFFBZ5VGYiXfAkv3ZR4HB4GrBiWfs3w++2PWXVg59GqkVWhmDkRgI8XyQFAMW 3vUSJWEvnwfUj1zkgZ8wl946WYGm546C/UZEvYcGKPGP4bkXdNnyLxX6BfecU0HwPXzW DN2t0FC6+UoaZTesjiH5kt0W0uGXmjbJQKa4u7LOsuhN6WjtM1jv5N7Olwq6egQHmBHU b4ziEuHM6GgtNJ2eNpUHZlnpK6M2kYyZD9H3R9qw05jaKaUT6qmaQ7yjZcoQ+1QWJnPm mOEWZ0DnKz/NXPo3JvMOysFKZAvcscVRSCgBcGAEu52eWuLos5JSTt7HfP9cBeBv/dmW 6KjA== 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 r15si18988963edx.343.2021.06.21.14.27.09; Mon, 21 Jun 2021 14:27:10 -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 EA2506898E4; Tue, 22 Jun 2021 00:26:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED548689D32 for ; Tue, 22 Jun 2021 00:26:46 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lvRRN-004Fiz-0D for ffmpeg-devel@ffmpeg.org; Mon, 21 Jun 2021 23:26:45 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id vRQOl0M3uljeHvRQOlc6QP; Mon, 21 Jun 2021 23:25:45 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=KI2OfjKSR4ISLy7_ywMA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Jun 2021 23:25:42 +0200 Message-Id: <20210621212544.15449-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfPB7h9lGiyBCJka6qvSxX4Q4CEQw9jhheVzjosW0H0CvNaPBL8Gbu9HhVlRW+gx31IJvGa228r/d0bfGN/DYhsQC/F4T8L+UmlCblJJE0c0nKpp1A3C0 29wOyCEx7i1XfpAsCWeKaVP9SnC8ZjrE2CyuY+xhUFy1yrPa1KkO4wtp Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/clearvideo: Check tile_size to be not too large 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: 3kmR2ks+sb2s Fixes: left shift of 1 by 31 places cannot be represented in type 'int' Fixes: 35023/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CLEARVIDEO_fuzzer-6740166587842560 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/clearvideo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index 5c79376c64..5ed8ac71dc 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -722,8 +722,8 @@ static av_cold int clv_decode_init(AVCodecContext *avctx) } c->tile_shift = av_log2(c->tile_size); - if (1U << c->tile_shift != c->tile_size || c->tile_shift < 1) { - av_log(avctx, AV_LOG_ERROR, "Tile size: %d, is not power of 2 > 1\n", c->tile_size); + if (1U << c->tile_shift != c->tile_size || c->tile_shift < 1 || c->tile_shift > 30) { + av_log(avctx, AV_LOG_ERROR, "Tile size: %d, is not power of 2 > 1 and < 2^31\n", c->tile_size); return AVERROR_INVALIDDATA; }