From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 42C454A61A for ; Mon, 1 Apr 2024 23:12:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 21C1368CF14; Tue, 2 Apr 2024 02:12:35 +0300 (EEST) 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-Google-Smtp-Source: AGHT+IHokqGmivEuhUhiLMEa+2xmAb+hMjGTFh2XRMQJNsgNXkhSlUcxxcbSAx4PUZlzUL+QN/GWTRuXQlJChA== 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: , From: Eugene Zemtsov via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Eugene Zemtsov , eugene@chromium.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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); -- 2.44.0.478.gd926399ef9-goog _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".