From patchwork Fri Jun 7 00:32:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49636 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp715866vqo; Thu, 6 Jun 2024 17:33:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXQUkD3hMnmqPKNIoL5czJQ87s8P00Y1yMd0clAmb0yfD4NhYjCLBYw1acRfbbKFZ82dFTGfR+P7cqy4LchY7V9l6M8+0EFIS1ZWA== X-Google-Smtp-Source: AGHT+IGae4zsOGT4qp9gL2RD8BLmEapnEsNdjKB4O7z4m8Y+c0LxZH+KcPkEYDDkGy2Q4Eday3bP X-Received: by 2002:a50:f615:0:b0:57a:273e:d8e8 with SMTP id 4fb4d7f45d1cf-57c509b66a1mr507834a12.39.1717720388199; Thu, 06 Jun 2024 17:33:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717720388; cv=none; d=google.com; s=arc-20160816; b=wOCMkAROeP0NOHrI+CzfA3BjtjSfFhSPomqf1N7JMmj7tRVarn8ZXz4UVLcPJiaQW2 ry4zuyqv0yQBtXu/mAR48b2K9Tpwc6CQYq+rGKAodekGt63R1P/gcS7Omw5I8IL57pvr WbMSQ2sYI5/YRaGt7SM/+VWfBXD2+iYaEtUsGFyLPCVOEgnbE/R0cji1+Km0MX+/vcLi 1IYEyzShDYIOtmC1vG6o4NutNin5BKEi8As3HSMOY1itDOWLhga+uyr8HKEMW3tJJtzL GdEJhaDkblcmB1UbqOvraqgQyaJFQUhnvmTFtnDoL0XBzC5vy/mXS+4vxQ21/lBQQiRL Y9rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=uXKAzJFnz/mWErOLXnX1+mBaEqyWpflB7dfB2gMcwGE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=qI0t5F6wSwjaEuIVunmv4hhs/aAl3SDtHKtGgl0XGQmCI2y9cBHUgT58df+UO1jOsg pAYNiFIevaVwZAk68XseLFmkbPy7kStAvwjfihz3Cuaz29dVEPHMAVwpOy27B5B/v38H W2QlfQtpAEjhIkDehegHkR5+mi3yhWqettblGqviG8eywcjkEXEYVhKXLsxt/H2IUQ2a z25FKSIyEXScYIv9MqN63HBaQLsnfSSfYT8EzP/Y1gJ8OZp+THzpbMA310l02qT8XZh3 LpMHc2E6ckooJkI0es6JbVMJi2hRx0/m1eortx8gfRuVaqQLA+7KfY02ZGRQVGKhIk55 jlpQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=n8tbbNLu; 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 4fb4d7f45d1cf-57aae0fce00si1175082a12.187.2024.06.06.17.33.07; Thu, 06 Jun 2024 17:33:08 -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=@niedermayer.cc header.s=gm1 header.b=n8tbbNLu; 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 E709D68D749; Fri, 7 Jun 2024 03:32:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 718C668D72C for ; Fri, 7 Jun 2024 03:32:21 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id AE284FF802 for ; Fri, 7 Jun 2024 00:32:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1717720340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5W6QlzQl7pcZAcoDVOmTlqeqtNf3oWwWIONzMlhZHNM=; b=n8tbbNLuyUsH2k+/o8a7H7XCmACacfhjo88LPpVNp6avcS2zUcsHq/Iyl9sMM9C2ZnAGhW RGQMTcFVv35gWA3aOc2l8fibV8/+EUSIOwDLkfw4If7PZ0I8RTeXJKfTOV66Od9h3O9Raa 8BFQxib4WS4B0yGnTwIMTa3XKuRFOXAr0jUZGIFMII05Lny0jAyIDJb7ug7MyfmutiNicT WfwXf1/9xVu8isEiyGyK67l/jQKp1FRDDsFhu2Mjk4rRUUmhL11fGrRiU8fEQ1Saq4mrWv ohr0Vd0jO52THeSNNIaIqG2qKSuMNJ/GiAeICsd7xYhw6UG25UpZJGG1AE+I1A== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 7 Jun 2024 02:32:15 +0200 Message-ID: <20240607003215.1723906-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240607003215.1723906-1-michael@niedermayer.cc> References: <20240607003215.1723906-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 5/5] avformat/rdt: Check pkt_len 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: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tK3C2Dqv2yE2 Fixes: CID1473553 Untrusted loop bound Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/rdt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 60449d256a5..2fa53d34a8d 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -206,6 +206,8 @@ ff_rdt_parse_header(const uint8_t *buf, int len, return -1; /* not followed by a data packet */ pkt_len = AV_RB16(buf+3); + if (pkt_len > len) + return AVERROR_INVALIDDATA; buf += pkt_len; len -= pkt_len; consumed += pkt_len;