From patchwork Mon Oct 19 02:42:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaohui Zhang X-Patchwork-Id: 23066 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 1538F449C43 for ; Mon, 19 Oct 2020 05:42:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5267368B6D3; Mon, 19 Oct 2020 05:42:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-m974.mail.163.com (mail-m974.mail.163.com [123.126.97.4]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05A1368AD91 for ; Mon, 19 Oct 2020 05:42:25 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=72npHOAEpbgYv6F2ac SRMbcDYNJKHY5XBxvWA1jgItQ=; b=TOHFy+9tXcMT6LwhWLpt09HJb36A8jkdKk RRsjQdgHPAjyoggv/tHPZj1qhmv5KhADtB73xa6q6EvkZPrDJBLvApRoW/TbRZep YnQVsYp4FujvExpGyWha7hQJk3WB86B4dhdXcRetDvkxCm7hZaXm+6FLUKQZiFx7 eyAIQXXXk= Received: from localhost.localdomain (unknown [202.112.113.212]) by smtp4 (Coremail) with SMTP id HNxpCgC3MB8L_YxfYv1UUw--.303S4; Mon, 19 Oct 2020 10:42:20 +0800 (CST) From: Xiaohui Zhang To: Xiaohui Zhang , ffmpeg-devel@ffmpeg.org Date: Mon, 19 Oct 2020 10:42:12 +0800 Message-Id: <20201019024212.38561-1-ruc_zhangxiaohui@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: HNxpCgC3MB8L_YxfYv1UUw--.303S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrKr15Kr4kXr4rZF15ZF1fJFb_yoWDJrc_GF 4UWr18X347Za1xZ3W7Kay5Kry0qrn7CFZ3WwsIyrsrAas3X342v3s2v395XrWrAw4DtFs7 Jw15Ary3Gw4I9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xR_HGQPUUUUU== X-Originating-IP: [202.112.113.212] X-CM-SenderInfo: puxfs6pkdqw5xldrx3rl6rljoofrz/1tbiYw3CMFaECcEOoQAAsp Subject: [FFmpeg-devel] [PATCH 1/1] libavformat/mov: Add bound checks to avoid integer overflow and 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 atom.size and cmov_len, which may lead to integer overflow and invalid memory allocation. Signed-off-by: Zhang Xiaohui --- libavformat/mov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 7fd43a8fc5..245c720e42 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5181,8 +5181,12 @@ static int mov_read_cmov(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (avio_rl32(pb) != MKTAG('c','m','v','d')) return AVERROR_INVALIDDATA; moov_len = avio_rb32(pb); /* uncompressed size */ + if (atom.size > LONG_MAX + 6 * 4) + return AVERROR_INVALIDDATA; 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);