From patchwork Thu Sep 12 23:33:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51555 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c541:0:b0:48e:c0f8:d0de with SMTP id f1csp514vqr; Thu, 12 Sep 2024 16:34:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU5LTO2hVKpr+ET1fc3n3cm/+5vdX7lJogF2xo+HHNAlrXU3D2fH95/UkOnPYL6xPfxpBIVl2sK32VxCoIIorkk@gmail.com X-Google-Smtp-Source: AGHT+IGDfuo76diakDW63E6or2rNEUKssecQyIdxU17hG3OVfblATdr0yANXT4XKXXu0BBlt2/G/ X-Received: by 2002:a2e:a98a:0:b0:2f3:eca4:7c32 with SMTP id 38308e7fff4ca-2f791b663cfmr6584071fa.38.1726184042986; Thu, 12 Sep 2024 16:34:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726184042; cv=none; d=google.com; s=arc-20240605; b=bKlF/QbngGdwJvaSp8xiLh5G3YUCwQdVSmWTtMHb0t32xWqHzyFg0+oWfPUPJYL2mi RM5aSIMtGGJtzgSyl3ogWWGZKjciuZ3Dk5bK+QIQGSPlbLVbkjsZ7VHyfY4pUyE/oPXC BV22nAO7or8BvkiL0SN4lAvklrkN8VPXPzqZYCwuqXILDPGbW9l+kje5E34Dahw5AR4p oqMqGSEUDrk2Ag6JZ7YjqoYZJ6i6hUjrpQ39c+3kkUpTmvg2DSnVlTGROf8ZTNaxN3ZE +vInuulS0z/SK8xbFHesJrp8t1ig0797Z4mCaQ4GUIGm5a6zNIPKDvStQsuLvWGKPfv9 Ls5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=dSlNbrF4e2gyMUaPMAAvxV5mSk7OSPh1eFwde6q6Ih0=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Ta9NWpj+lBBkwOQk4G+JcXWa1t8UwgMWtB2SwNtfgugSfqgHI0CXq4iqbCwVi3K6a6 iMOaZsb8ULFQeD6xZT0Sp1NIv601oKLV9Su7cYvRiL0TDHHqqrjCWOUsQl5bDrf6vjJw gl9CA0ux1FH4l1Vlm+14GBRWReKZbGHUadGFyl1kGqzLxRct/4geNIb915SqERCJGILY ecQe5ENuLA4lz3NzEc50bvm1TNVg0S41bJ6a32/HA9G+LRgiCysjiqLBtTFYS4Rmekcs U+WwTSXiwucgTi0BM3zE7L6FB4CaIVOY0kbnbzljoQyhDkJ14lTMvPeIxRFXYcFMBlQV lRJA==; 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=UQFqQmQ9; 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 38308e7fff4ca-2f75bfd439fsi38038521fa.5.2024.09.12.16.34.02; Thu, 12 Sep 2024 16:34:02 -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=UQFqQmQ9; 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 C946468DBF6; Fri, 13 Sep 2024 02:33:47 +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 D62A868D657 for ; Fri, 13 Sep 2024 02:33:39 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 271CBFF802 for ; Thu, 12 Sep 2024 23:33:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1726184019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rDzKhBOdqzavYKiQTrDiEkNox4vwcgK1XuDamcv/J2A=; b=UQFqQmQ9zo+atYiiSnkbl9KnJQu2AgMm/WchGVCaXAF/h9JlauHLcds9KmDPzfKbchsFri UU8ZDUz9L3/jVgDaYRLCi4GpQRSDdGymhz/FdV6ueOxKWsxpXAYkOnKHCXBDX4nzUMm8Sg 51chkvYi4AAYoevuxb49/dZ9b3Ry7aeoWU3eWsVp3VT633eV3wVdqpP6xBudGRCVPd6vJz h9t/m3Rd5UD9Vqn8eSZR+kTA1KodQ11xei7ecsLytLA8kokfAfHl5zjcgaWWQ//SwcgTeY hwT4uBwow61KFFertYRyGiREsHu9nAiDm1PtGbKtsJk31Z9kqqFysrxn7EZ8rw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 13 Sep 2024 01:33:32 +0200 Message-ID: <20240912233337.2444412-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240912233337.2444412-1-michael@niedermayer.cc> References: <20240912233337.2444412-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/vc2enc: basic sanity check on slice_max_bytes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VZl88nOB4ocX Fixes: left shift of 896021632 by 3 places cannot be represented in type 'int' Fixes: 70544/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC2_fuzzer-6685593652756480 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vc2enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 508defc0b9f..b82370a7532 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -988,7 +988,7 @@ static av_cold int vc2_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } s->slice_min_bytes = s->slice_max_bytes - s->slice_max_bytes*(s->tolerance/100.0f); - if (s->slice_min_bytes < 0) + if (s->slice_min_bytes < 0 || s->slice_max_bytes > INT_MAX >> 3) return AVERROR(EINVAL); ret = encode_frame(s, avpkt, frame, aux_data, header_size, s->interlaced);