From patchwork Thu Aug 30 22:21:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Curtis X-Patchwork-Id: 10184 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp63704jap; Thu, 30 Aug 2018 15:29:00 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZyFfnGdBTIN+n7rW0LJh97cGYZMWh86MsqEMjsMRLyG2twN2d2dW1d38jgZCjm27Wf35Vo X-Received: by 2002:a1c:8587:: with SMTP id h129-v6mr2818489wmd.105.1535668140291; Thu, 30 Aug 2018 15:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535668140; cv=none; d=google.com; s=arc-20160816; b=w14XTnU7QziC+vjpy/ZIjqNUm7Rrx9B85IdT5VZ6L0wZ9UuXb6H0aHR6yiQy8kIYh8 GwPed8qjAI28LqQzoZzWo+So3q6IuMmjYY+D11mcm4DFNvSbvrc4soyIoy3Xw8cije2F TYlWvvuePg/xo37QUT5Pb0CFGJ2ONc8es+s8LJrkBiPDaLSDmPffg8psE4KWHnrdd16v va7AMqqkL17sclRAsjXWr7mADri9e7GIkfmraTXBmNxf84Ob8fI7rr5U1CUTx/jDbJm6 u3Ssw9qeRVthMwpeicmYlv527izfcbQNhVieAcxJpcB305wi9vcBeNUE37F7l1Zqu70f Zjnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=jsUkLGEVSHfxRvQUZ3aN7OO7xuYX3OBj0MU903tfKxg=; b=iIMhHGEMo6DzE2iDxlqIwomGtoliuN5CiSq7Ip8gXkVqsUWG8nj7GVUwIN9VQO6qVR RRiTDDNdJBQ3/Q3xlBTBRVTKpneLwBbXeTNlfCMgugyq1KMpn5SYQnyveJMLc8SvrQ6Y 54+fsg3vd+BIqfyx4/ZX67SBXudcgoEcLvmrh211jUbESSCCByGZFckYWdSBMuNTY7ww ujI04mSKap1E/UeOZcEYN2rR49KrMAVpUwRfV1Hes8awaLMQlsYKRmwBXvUdEKDQXX7v zgGB6BXGQRLdhFLUajSYydw6VHUTz5Pm6h07ySMd/1MkXkQb8Ijgw5AGRLML6BFEtRbu QZNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=fQJ4D6FY; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v1-v6si6930321wrq.302.2018.08.30.15.28.59; Thu, 30 Aug 2018 15:29:00 -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; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=fQJ4D6FY; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DA84689AA1; Fri, 31 Aug 2018 01:28:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f42.google.com (mail-yw1-f42.google.com [209.85.161.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F8FA689720 for ; Fri, 31 Aug 2018 01:28:46 +0300 (EEST) Received: by mail-yw1-f42.google.com with SMTP id x83-v6so4389984ywd.4 for ; Thu, 30 Aug 2018 15:28:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:from:date:message-id:subject:to; bh=2kGHtiouo8pTuqofOnjaPLeWBxqCpsJTDSXzyQ9vsy0=; b=fQJ4D6FYPHCSvptSy6f/sdsAdjO8vUyWu+z/jXPpHwy868rLZro+fXdZLTmMPnBNwJ Be1jGG7zMbNCxxPFD1G8FM+h63nL55Ztq+dfpHMfGuG3xy51BdJp9FZsyYe+QJx3iPKd YGPF3F/QQV6Q0aBhkbcsGoGqnFc3O1GCP1iJE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=2kGHtiouo8pTuqofOnjaPLeWBxqCpsJTDSXzyQ9vsy0=; b=q4TCiISbyo1dG0LoRYnvm03iMwzxqy8InxI5c5xrMUMv6as1hC1lj0h/lvmOEZt59H JP28fIhHSDC8VigNaymr6/HPz7ZHWmmX8akMCE1L8LTufzcOOAwXvxCyx3+m9jL2ug+l N2MqJWOxMg44jiMEggmQV4GUG6ed+AYl9i05MBzk7y9eRRZgp6DevnEuF7ZG7ZX8XPoo OuQmDMZaSJWck8DQwm5ulppEXCfCXh9tpAb25zUhKg/oRZ7EgIDfydt0x62k23tSKvw6 7Q3k/cYz/zh2VG3LbNwnQ3sHNj3jSorobzMa7iLmz7MN4Hm1DP2KxIZw3zUxgccEdjK9 lnww== X-Gm-Message-State: APzg51CZmf91fWzx2QNBpMdShCqejAS2q+I5ka5G9Uu2Qh/Mz8/CY6Sd MIfHTTJ29fKqf9sRzvEt7NIrYt8x6WbEHqOU6E50WAUD+zU= X-Received: by 2002:a81:b65f:: with SMTP id h31-v6mr7153398ywk.144.1535667674030; Thu, 30 Aug 2018 15:21:14 -0700 (PDT) MIME-Version: 1.0 From: Dale Curtis Date: Thu, 30 Aug 2018 15:21:02 -0700 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [mov] Error on too large stsd entry counts. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Entries are always at least 8 bytes per the parsing code, so if we see an impossible entry count avoid massive allocations. This is similar to an existing check in mov_read_stsc(). Since ff_mov_read_stsd_entries() does eof checks, an alternative approach could be to clamp the entry count to atom.size / 8. Signed-off-by: Dale Curtis From 3e1663d84068ff7615f7e84fa1c1122729a531da Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Thu, 30 Aug 2018 15:18:25 -0700 Subject: [PATCH] Error on too large stsd entry counts. Entries are always at least 8 bytes per the parsing code, so if we see an impossible entry count avoid massive allocations. This is similar to an existing check in mov_read_stsc(). Since ff_mov_read_stsd_entries() does eof checks, an alternative approach could be to clamp the entry count to atom.size / 8. Signed-off-by: Dale Curtis --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index d66f4e338c..d922e0f173 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2558,7 +2558,8 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_rb24(pb); /* flags */ entries = avio_rb32(pb); - if (entries <= 0) { + /* Each entry contains a size (4 bytes) and format (4 bytes). */ + if (entries <= 0 || entries > atom.size / 8) { av_log(c->fc, AV_LOG_ERROR, "invalid STSD entries %d\n", entries); return AVERROR_INVALIDDATA; } -- 2.19.0.rc0.228.g281dcd1b4d0-goog