From patchwork Tue Mar 26 02:30:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47479 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp1557078pzb; Mon, 25 Mar 2024 19:31:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVSC+mgL2jm0YNkw7BePn1sBBFjwiWu1FK+l2fRM9UP8arnkrsj2OjXhmRq3zlpCU/mNl0mLLS3JGXgDk5lr+Jz+K4DJAKh15qZ2w== X-Google-Smtp-Source: AGHT+IGGkU/eKfxQ/b1rgBiOZ+zPNOzn1T3S244Jah4nVEbBTpgyI9z2GEeY3yQu05MNjuIi7+QS X-Received: by 2002:a17:906:d0d7:b0:a47:5265:9aac with SMTP id bq23-20020a170906d0d700b00a4752659aacmr3495556ejb.55.1711420293355; Mon, 25 Mar 2024 19:31:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711420293; cv=none; d=google.com; s=arc-20160816; b=oCs5jcWy6aMOqtqCyCyMMDNCcye6mFBt0LGoEtODHj3X45DX+fp6+HavL9y3n3KwmM zEyFDSqtlbsX76pCOvgMo8rI6i4aFmq7cy7T+sirnYlbmsK/dA5xQBDiRnjqUnLYd5Yx BQkxDY1yokB+wZSd8ZmCvsC88hJ/dkQ3Nckr+2PZgOw9FH8jW3boa8+h3HyNarmzlLnw BLVVdrJvCX0MwjFMyiRSAJ1fBXCGbJfeQfMGS9lHB0KUJP3q2nv6VOAV38PpFtrca14o V+MKb4Eoul3pVDU6/Y30m/YC7/VQnf0uhT2GHIo4qQWjlqSfQCHU9/E2Lcoxvk7PyVSO RFnw== 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=3k1iKr3XfNjBUMY3jkRVU++fIVuJJzPizfh2osBNobM=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=uClLIzXJ4EUweeneyS8qULRLzjwoA7vP3tawbXdKs1T9IRyNhg2FnAflAuxnYeN9Uj uwShcAg/GLFj6I3gdYUxNzTk+ym0o2pwFLbpNe94xrCzcFGZj0XcYbK5YIny/5U1wvj4 vVPOKcu21JAKTcKY+2lYSb0eGCOzsciXLFHAGaTd18JwQP0/SKJs7ZJF4b3xWeqDqneG crbQAKSrMyWu1UCPfLp58KZrI7H5qc3WL0ekX6OIu5TMmkTFBj3CAYbaIJr3Q0pYVlgo hNSRbaAox/XfPAg7QS9yQwlY54mGfRBB4Dv75gEy80auB3BpsSlldeXqD+pQhd0M2WHR 1Avw==; 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="U3/qqEfu"; 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 nc11-20020a1709071c0b00b00a4a34222287si1480759ejc.767.2024.03.25.19.31.33; Mon, 25 Mar 2024 19:31:33 -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="U3/qqEfu"; 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 ABE4B68D5A1; Tue, 26 Mar 2024 04:31:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A54868D4CB for ; Tue, 26 Mar 2024 04:31:01 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 66BA340003 for ; Tue, 26 Mar 2024 02:31:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711420260; 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=zcl+Z9IcwQmKOpJg7Gg8wjxBJ+Z8xdIL3xl46PshDx0=; b=U3/qqEfuzXIoKd1P5xGfnYaYkQsw6I7XiDe9kUJk/1MV4QokO/2wOCCW+zhYibEFEZSfA7 rK2uYROnCHXkypDqDkz8KsubeiX/jR64KeTZdYn9ZwYKe2S1eB4oU8BE0B3GpQFeZspHdX XJj8PgQ/nVnF0HCvzWdmuNjRETmliucDEVLDBn3nblhulci26cFdySX20d5fXhZ+ayrunX ZqENq7Bf9aGgJuFXZwcgrOxfSLwdYv0ahcHQr7qQdRrl273zF8PomW6OWjr6qH8AdOubQD NvTJ/klYq2/S5WCc2P6PVidrDIkMjA0miaM5bP+gQykbnok+wZo5NsUalvWUXQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 26 Mar 2024 03:30:53 +0100 Message-Id: <20240326023056.20548-4-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 4/7] avcodec/rtv1: fix undefined FFALIGN 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: BpzYKElmC/Wk Fixes: signed integer overflow: 2147483647 + 4 cannot be represented in type 'int' Fixes: 62285/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RTV1_fuzzer-6324303861514240 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/rtv1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/rtv1.c b/libavcodec/rtv1.c index 06afe9e873c..807c8a34666 100644 --- a/libavcodec/rtv1.c +++ b/libavcodec/rtv1.c @@ -113,6 +113,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, width = bytestream2_get_le32(&gb); height = bytestream2_get_le32(&gb); + if (width > INT_MAX-4U || height > INT_MAX-4U) + return AVERROR_INVALIDDATA; ret = ff_set_dimensions(avctx, FFALIGN(width, 4), FFALIGN(height, 4)); if (ret < 0) return ret;