From patchwork Mon Oct 19 03:31:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaohui Zhang X-Patchwork-Id: 23067 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 71DCD4491C6 for ; Mon, 19 Oct 2020 06:31:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 42AA368B5F8; Mon, 19 Oct 2020 06:31:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-m971.mail.163.com (mail-m971.mail.163.com [123.126.97.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF89A68B5F3 for ; Mon, 19 Oct 2020 06:31:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=31LqHQAx89ZQcmyYe3 d3JG1Y4Tl5ldzTZmQDG2xYQpk=; b=Ky3OSrC+ZV0C1qcioN/1m/bAwPgBDlxCBu GPsEnNVgUFHnNgbqRAU3NwHpRnDYbZ+eZRZ6ch6Kdoq2fuuHAhfJ1mSUfF6Nptdw hojbGNi9ue/T9h8E0KvZhBCf3EFWWOR6lTffze0L3iCP1+hVjJo39DHU1oATRMui EJCQdRZ6M= Received: from localhost.localdomain (unknown [202.112.113.212]) by smtp1 (Coremail) with SMTP id GdxpCgDHK+B4CI1f7CH8DA--.143S4; Mon, 19 Oct 2020 11:31:09 +0800 (CST) From: Xiaohui Zhang To: Xiaohui Zhang , ffmpeg-devel@ffmpeg.org Date: Mon, 19 Oct 2020 11:31:03 +0800 Message-Id: <20201019033103.2765-1-ruc_zhangxiaohui@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: GdxpCgDHK+B4CI1f7CH8DA--.143S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrKr15Kr4kXryfXrW8tF1rtFb_yoW3AFX_Ka 17Jw18Xry3Za17Zw109ay5GFy0qw18CFZakF4avrsrJasxZw42q3WkXws5ZryrArZFyFs7 Gw1Yyr13Jw4I9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xR_-Vy3UUUUU== X-Originating-IP: [202.112.113.212] X-CM-SenderInfo: puxfs6pkdqw5xldrx3rl6rljoofrz/xtbBRR3CMFPAH7o8nQAAs9 Subject: [FFmpeg-devel] [PATCH 1/1] libavformat/mov: Add bound checks to avoid invalid memory allocation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" From: Zhang Xiaohui Hi, I think function mov_read_cmov fails to perform proper bounds checking on cmov_len, which may lead to invalid memory allocation. Signed-off-by: Zhang Xiaohui --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 7fd43a8fc5..a23daa25da 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5183,6 +5183,8 @@ static int mov_read_cmov(MOVContext *c, AVIOContext *pb, MOVAtom atom) moov_len = avio_rb32(pb); /* uncompressed size */ cmov_len = atom.size - 6 * 4; + if (cmov_len <= 0) + return AVERROR_INVALIDDATA; cmov_data = av_malloc(cmov_len); if (!cmov_data) return AVERROR(ENOMEM);