From patchwork Mon Apr 1 23:12:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugene Zemtsov X-Patchwork-Id: 47710 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1033715pzb; Mon, 1 Apr 2024 16:12:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWiy38gbg0WYBse+o1ouzl5iYwkCbtA/kYFYOoBdcYw3nd9fm02k0xIkvl5MC3H65wQ5+o/cDa+eVQbfbZ1PVCrCP5K6d0hXU8Umg== X-Google-Smtp-Source: AGHT+IGkscAYu1ivrYeGdzBBluPMT3aKEl1m2Dj02iz5YLs0u/W4igRHDQLP4dUV7Qy1cYQ9Gh2k X-Received: by 2002:a05:6512:3c92:b0:515:920e:eecd with SMTP id h18-20020a0565123c9200b00515920eeecdmr7653691lfv.1.1712013159468; Mon, 01 Apr 2024 16:12:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712013159; cv=none; d=google.com; s=arc-20160816; b=apglPfnTWE7bmHKzbFSKxXxaGjHIshpQz2DpFvb9GWiKu25tEJXvEBHgc5ByV5AiWz H2yf3FXHjO5bk0ZwrM4n12iUbkcPN4Ab/FzgzPyKlvczF7UsrYdHUP9B6N7Rrs6ME7Hz HIdvUSOjb2DRhUUSF52F9OyL5ICwUQ2GbLs1gsQIYvIkGFZZMcEFtws/jqZ8vNAPEEqT 4b6e0qlne1vpQWvHfGtSSDyucpfEBaAHTQS6iQiS2+PbngmXD1OxK+7lellXfwZRzShQ ZYG32b9U1qCgL+q1wEDHIMvceEOEljnPHfjOui+AJHLNzu03iXEpxWGS1NeYdu9GLNFt XDAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:mime-version:date :delivered-to; bh=BjiXE19z1AhCCZaRTkypVpp6VHWpsiHUSCkCbG6a740=; fh=/9RAhijlZj+WphHRSZsZ9sLSydmlaGzIcPxS+9T0zWY=; b=DM3U6Fn4zT6Cza9UCj0Nf01F1zBitdqreAaHRBJ+qUCfRa+N27kkz078OQO0Em7LWy Tu/X5r2GwpRsKLABhkRsrTedv/5CAUDxtEUNQOpgm7emp+vhFlFl46J5zXbcnXUAqBHu 0pXFu3TV+I84K080w9D3QZOZpDjHVbiX/eBFhtEKq4SrWGPvyAQjiNDzdrXq94XpW5/m H0WtOeH16uqBmTokY1dgtnhfzES9ld0DFhzAS5I0KHzc8dBRvvuqtlun+H2y8B0Vo/FA Xon6OpbQzAKVKTF3+y1od+AnFXuRRT9Fn4gm2q8CQv6SANKOF8UHQJ7zYN8piT/00oVD T+gg==; dara=google.com 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 md16-20020a170906ae9000b00a4e3dc7d36esi3459208ejb.77.2024.04.01.16.12.38; Mon, 01 Apr 2024 16:12:39 -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 5CB6668CF59; Tue, 2 Apr 2024 02:12:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EA6F68C157 for ; Tue, 2 Apr 2024 02:12:28 +0300 (EEST) Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-29df9eab3d4so3806841a91.0 for ; Mon, 01 Apr 2024 16:12:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712013146; x=1712617946; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=0Vg4/fJGcWVpSV8zH2aC1sLko6pZUWXnoi1dEEWpzWE=; b=e+HlkispC3lPuhVHbN9o3cx5h/Nw7uxgr1+qtMzu70tq/z1i5sRq5R9fwys61HP9tM U+PtbxH4I/Oj3ff6NCLdju6Jy8Whz4criMtfu79GviT+pod97/H9BKqflwhLt6OuGIaL px/TfyGyFRokmSbf/zZQqtcfwLAl1mzkSQpgnb+qEvSOXqpGjj2Eb+DVN8NlFNuZYAKR W0PJfd1qb5YqnXnALe+4gWUQJ8Sg0F3AS4X36NjAln7Be/oFTBwFEiKQVeCv9aiDs7Pd 5X2Bh/F53tLGogeAL03NN91ZAGtqUCRblWfAz/oPSqypJANpdqFQTyQGh9vVGEUJJgL+ B5Vg== X-Gm-Message-State: AOJu0YxxFrWb+flMgpdDFHZRoPilmJnCYFw1OrqhkA5QJqayVB9hSTZ9 B7YSogB65CEE6Fr6CBuWMgZYvOrPRHHl3Lea6OwF7dLBzWuN+BiR99+xR0XBCCV4PW0Prpnm/qv z1q+YRGPAJnQo6BJSEDj7qa+3m7WghbsvwbHpn9GooNPyGAHic73ssT5MUlaUJUwezV0mM2Abv3 WbtSKpH48+5eunaj5LerVFVxXKoB2pMjjiYk/eaMQi5kQ= X-Received: from ez-linux.bve.corp.google.com ([2620:15c:7d:6:e80c:319b:f389:8bbf]) (user=ezemtsov job=sendgmr) by 2002:a17:902:f683:b0:1e0:feef:5c1d with SMTP id l3-20020a170902f68300b001e0feef5c1dmr237961plg.10.1712013146053; Mon, 01 Apr 2024 16:12:26 -0700 (PDT) Date: Mon, 1 Apr 2024 16:12:18 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240401231219.540130-1-ezemtsov@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] mov demuxer: Check if a key is longer than the atom containing it 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: , X-Patchwork-Original-From: Eugene Zemtsov via ffmpeg-devel From: Eugene Zemtsov Reply-To: FFmpeg development discussions and patches Cc: Eugene Zemtsov , eugene@chromium.org Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 98flZoQk7Bqq From: Eugene Zemtsov Stop reading keys and return AVERROR_INVALIDDATA if key_size is larger than the amount of space left in the atom. Bug: https://crbug.com/41496983 Signed-off-by: Eugene Zemtsov --- libavformat/mov.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 662301bf67..5d2f7fa690 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5045,15 +5045,18 @@ static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (!c->meta_keys) return AVERROR(ENOMEM); + uint32_t bytes_left_in_atom = atom.size; for (i = 1; i <= count; ++i) { uint32_t key_size = avio_rb32(pb); uint32_t type = avio_rl32(pb); - if (key_size < 8) { + if (key_size < 8 || key_size > bytes_left_in_atom) { av_log(c->fc, AV_LOG_ERROR, "The key# %"PRIu32" in meta has invalid size:" "%"PRIu32"\n", i, key_size); return AVERROR_INVALIDDATA; } + + bytes_left_in_atom -= key_size; key_size -= 8; if (type != MKTAG('m','d','t','a')) { avio_skip(pb, key_size);