From patchwork Sun Sep 18 17:14:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38012 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp791044pzh; Sun, 18 Sep 2022 10:15:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7hzEJX4uR84EeR89xWDFfPAgEw5zXvcoqpnOaWkxBQ8D/Ys/sMoK3vWFLtvqsaJDTO/EPn X-Received: by 2002:a17:906:ef8c:b0:77c:8d9a:9aed with SMTP id ze12-20020a170906ef8c00b0077c8d9a9aedmr10799640ejb.704.1663521315526; Sun, 18 Sep 2022 10:15:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663521315; cv=none; d=google.com; s=arc-20160816; b=XcTCS+D+OWns0Yhw3nwVBvoZC97d9EjUFl7AvbQOQPyZVs1mXJElfU0Rj3jpAiam+F kNMvDCE52sUzqkRDUP+oEZiFA50XXsx2Jh7SQggx2kkZJYZnwAnPtg0mrkXQipj4f+Se q9aLWNUzBdv0PhhfuCdwoWbNloRDko2NL54Etxh6woylbZucPuMnGD0FyUlowmRFDI3G UuuY3nAvHuR1ltkGVj+GX8YviSBt7uGC4Pg+6xI+QYh9mV7JTBCfSVK5MoAHKkUgKv4P iubYnMaoLFVtme88JEKQj/yG+oIOgR5Zs3ErhglT/uuJpCwr+b+yDTetVbmCnArIZRP6 Gb9w== 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=ediC5BdpmPzwNKZjXXWOfSZsDtcpxNB7piYTt/KQ0Tg=; b=MGTuL5JeXVsg+Pp2JztHjKItJiOFVtaPNwjp5OD9CRGxpDIdo4UZlVRoxlhc57Bkg0 vtq7Mia1OsUMMJKNmxf9h95rD73aDoly18EyDXMnZPIXYnItdoyDF4iB+olATgoERQSZ Pa3htPOIa4YwGdiCo1KaHqxnd9MtrHYvR9c5FYXPgXZL5yvQbjEHSu0mSHJo2xHwFa7Z bCmY0a7HkJdhAcUrKjeMfuB22m+y+uUK5DatneyYJofcADs3YDN+OaeJaXBZX0Zjg5eo wXWMxsJ+isTKcg5cJ+IZ8qITzdaWT2iIbg0pIzYIhmvubrUKKxIGr/cdublZNN1K+YUI zICw== 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 di3-20020a170906730300b007803739fe20si14274378ejc.367.2022.09.18.10.15.14; Sun, 18 Sep 2022 10:15:15 -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 0DAB868BB28; Sun, 18 Sep 2022 20:14:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 780F668BB10 for ; Sun, 18 Sep 2022 20:14:13 +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 1oZxrv-00Hane-QC for ffmpeg-devel@ffmpeg.org; Sun, 18 Sep 2022 19:14:11 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Zxrtolzzw8s8UZxrvoH66z; Sun, 18 Sep 2022 19:14:11 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id ZxrvoprCzOG5ZZxrvonHiW; Sun, 18 Sep 2022 19:14:11 +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=632751e3 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=Nn6dVWX56Be3HNlrA-kA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Sep 2022 19:14:00 +0200 Message-Id: <20220918171410.31835-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220918171410.31835-1-michael@niedermayer.cc> References: <20220918171410.31835-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfI9BV6yW0sx0oIBpYi4B7nmO8jtIIvYg6+aaFCJvkg6qQ84H6NH96xkmjxgD/fY+Cg3mBlLQdhtz+uGHoG/rjXx+ipKMuU2SeT1G+sB0FrDBTbwR1IX4 W/LrQTYGIkSSvK9oSfBJT8OGiWXvxdTvuO/wjC7ywFL768Rvq92EIp2Ai5fRdxPJLZ/P8L4iYd8kDQ== Subject: [FFmpeg-devel] [PATCH 03/13] avformat/nutdec: Check fields 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: z8AXhquPyWNS Fixes: signed integer overflow: -2147483648 - 1 cannot be represented in type 'int' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_NUT_fuzzer-6566001610719232 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/nutdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 8cc56615ad7..24dedc47582 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -245,6 +245,11 @@ static int decode_main_header(NUTContext *nut) for (i = 0; i < 256;) { int tmp_flags = ffio_read_varlen(bc); int tmp_fields = ffio_read_varlen(bc); + if (tmp_fields < 0) { + av_log(s, AV_LOG_ERROR, "fields %d is invalid\n", tmp_fields); + ret = AVERROR_INVALIDDATA; + goto fail; + } if (tmp_fields > 0) tmp_pts = get_s(bc);