From patchwork Mon Aug 22 22:55:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37404 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1559099pzh; Mon, 22 Aug 2022 15:56:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR7QesTcExjoKZx/w95IEiClZU5uPjnWWOkaqlkIzwMrTISwJHUD4rg/1AfMlfZtEVH4Soj5 X-Received: by 2002:a17:907:28c8:b0:730:9ccc:331f with SMTP id en8-20020a17090728c800b007309ccc331fmr13827433ejc.608.1661208976759; Mon, 22 Aug 2022 15:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661208976; cv=none; d=google.com; s=arc-20160816; b=G43kDAnWNd5nVK32E89EjVlgmk9J0C0O93IJhE8DXqygq2p43qk8q2Hl2qP2ajCG2W aPSN1h3jf6YhzwrDb5xTpU/Y48JvjSUwKBKBGOwYKcvlQCm+kX7jmVgbtgXyRbFJDheo nSD1YZg5rlnFkeg+2UsjVDyMbBz4yd7mjleocRSRBn745B5EIO5XNHzYiuRzE7fkkiuW aIU4K+9BH6lFzshLPxEVian9l/UPN9QGgR3EOjBR8O2Ye49c+G31C/lpyRyTK28bJeNU 8K5b3OerXkLidYgEnkkaSQNTxYDGQZAbRD938hXveExSasupPZ8h+Q9WU2NgIW918dfu JAXA== 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=p6IOzgcRa3Jqn0JvcwXEa2UsO5BKG9A98SiBE9Tmvow=; b=SkIkOQRETZ+SCWXxEhqcA/v2rtwUTVrxvQBN2sHWzd3HNa/W5tf8YJXzlv4UGuXnCg oru4xztSPVbdOl3JLau8QHYbOGQrbtcb74XetcmSRT7XtuaJYeRrLOk+G0kakMZysS7T zJgOD14C2iU1QsOSevjDaj1n67HJk1EolMG3+lUotrQYf+KJe4K1msGy/WNpJ8+3Oc/A c8h+mM2qsEX3aWiHXemre8xHgFm5gRKuV+dxdpo6isIluxWYvj+Anu3K+PX2nyUOr/fz HgkCTDpmQBoBT5ztLlOplFP2ozQRPxr1AiFxH14v3vDsY6TBrJivPZG19caq31YigaZq ORDw== 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 y16-20020a056402271000b004408bac1e2fsi618604edd.370.2022.08.22.15.56.16; Mon, 22 Aug 2022 15:56:16 -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 C989868B9E8; Tue, 23 Aug 2022 01:55:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03A9868B934 for ; Tue, 23 Aug 2022 01:55:49 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oQGKi-005Zn8-MK for ffmpeg-devel@ffmpeg.org; Tue, 23 Aug 2022 00:55:48 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id QGKioQO6g8s8UQGKio20xI; Tue, 23 Aug 2022 00:55:48 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id QGKiofKWnOPqFQGKioXp16; Tue, 23 Aug 2022 00:55:48 +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=OcX7sjfY c=1 sm=1 tr=0 ts=63040974 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=atLl2F6amod1EEmZevUA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 23 Aug 2022 00:55:47 +0200 Message-Id: <20220822225547.12895-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220822225547.12895-1-michael@niedermayer.cc> References: <20220822225547.12895-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfFpa1zr9YnzZ7R11LqEtJQ4/VUEFjvKlo2UIdCzpUs1F7Vl5TPLYkrJFSFNs2WXSHY5C51D8YyD/r7WTaCDWK3L0YBtag1q+tyQdBWOJuwJtezj6s80Y eAHHnT0qi4n23JB+ULYaUGk3OJwx9KZECaHhbj5Je1zb3IKqZPlk48MGFLMKZLYOslz2Fxs4CM61cQ== Subject: [FFmpeg-devel] [PATCH 4/4] libavcodec/8bps: Check that line lengths fit within the buffer 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: 16TuHWH+XV17 Fixes: Timeout Fixes: undefined pointer arithmetic Fixes: 50330/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EIGHTBPS_fuzzer-5436287485607936 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/8bps.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index 3bac9f64c4..4a3511948b 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -71,6 +71,9 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, unsigned char *planemap = c->planemap; int ret; + if (buf_size < planes * height *2) + return AVERROR_INVALIDDATA; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret;