From patchwork Tue Jul 12 18:43:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36762 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp2206244pzb; Tue, 12 Jul 2022 11:43:44 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tr5c5y9ee7nWiDlAYyWn40LSuV+m0/0UIJwfMQjb25Qe5MhAzbc1oBBDgnhlWVqLDQxZ9a X-Received: by 2002:a17:907:6287:b0:6e1:6ac:c769 with SMTP id nd7-20020a170907628700b006e106acc769mr25732015ejc.388.1657651423841; Tue, 12 Jul 2022 11:43:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657651423; cv=none; d=google.com; s=arc-20160816; b=HxUQi/7TQyRoX2OAapPwjFZ81Y4oB0r6nooDfglnlhtzWnASrbxRyCUmIZTMnGg3rN YfjhzeDPVG1J4QmGUdD425j60OhBZ2TCxGL8Ta6dELm1Xo8x7xTt/NRoasR/V4t1MTfL yvmiY7n/Yu4DHr4RrZOSBvBWAe6E9AlTSh77nmz8fNRrLmiLhrWvEV9Lr2B/qXHPRP5z 0ePFHRJ+ZTBj3KZBkMeO/SnXU3jqSQHozt/CqmwTP4oAb0QAZRENMugb9CydsDQav8nz 7B1VDK/qU13PYKCBe7Y7wUhmKhfflOXWfKlJIk6JaruIn1s3d8wwslDBVWaTrYc8yqf1 xHSQ== 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=cgsSVoUpCqwEt7yA1qMCY++9tzR1Xi685Z7bf2PjFkg=; b=NiIimdDQhBVNzzhUk+BTb1ICa9HHWX01ysBA0oyEj8g6vPa6z3umVwpcFrKT3ksLEA JBQTO865wZB4AdYEAfQMlEOhusImwObAn1MVVJ+RBJNxyzYfRmSzozUn4cGBW/Bs0GlV fVvcvaOooxrOrihPqVkRW3cOE5o4L+5x1opW/UNmJpDGU9OJdIpX0KwkaHfGpadwsQE1 fvFt5xcoGxVMB8Fl1h1ZrhVMB2y2QjPU5OIUtjc1rGpX2p8cijzkcArHNrID7E2xxLKr g1ISkzLTVHI/TAeOrfoVAR0CwtEXJGOA5yJG4icpCCVoNrQhro6i/6jP9xUh30rBlI5E qVpA== 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 w21-20020a05640234d500b0043ade299719si8342110edc.451.2022.07.12.11.43.43; Tue, 12 Jul 2022 11:43:43 -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 D585168B18B; Tue, 12 Jul 2022 21:43:32 +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 10EB368B7FF for ; Tue, 12 Jul 2022 21:43:25 +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 1oBKqx-000M3R-MX for ffmpeg-devel@ffmpeg.org; Tue, 12 Jul 2022 20:43:23 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id BKqroRdyc8s8UBKqxoLuVE; Tue, 12 Jul 2022 20:43:23 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id BKqwoYsaLOPqFBKqxoSboS; Tue, 12 Jul 2022 20:43:23 +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=62cdc0cb a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=RBAVOT49o4C0HbtVHAoA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 12 Jul 2022 20:43:20 +0200 Message-Id: <20220712184322.22814-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfC9NfDjwmRe0TXAqgUS/iGtIrceZtTBi46rRY84ADCQEJBA40l6pJJPwo/SXepXB9XRRworiIY6vb7TDwF6DJ9wJoIO6FG3CyS9mlbo64oSYL+vGlAM0 hoBtU5P2EEyDsCGIt5hacjaH0bQ4rebuHl2zB4AKKMFyFs/VSqDBM1wSnbZwLJGEji6OMKtBcobjVQ== Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/lagarith: Check dst/src in zero run code 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: mP3cjhdW9vyc Fixes: out of array access Fixes: 48799/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LAGARITH_fuzzer-4764457825337344 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/lagarith.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 3aeb1c8a99..00e8005222 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -409,6 +409,9 @@ output_zeros: if (zero_run) { zero_run = 0; i += esc_count; + if (i > end - dst || + i >= src_end - src) + return AVERROR_INVALIDDATA; memcpy(dst, src, i); dst += i; l->zeros_rem = lag_calc_zero_run(src[i]);