From patchwork Sat May 4 23:51:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48509 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp614875pzb; Sat, 4 May 2024 16:52:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRcZ1Cq295/YEo+Fnkx9mLMtamvqqOs/M4z/15Yxjp2YRuS21vGuQi3Atn/aY4n0Y/WiXaYQbWuJIFN5S3ElUEDh2p+Mv2JksswA== X-Google-Smtp-Source: AGHT+IEk9q62u3X2N0op0xCh1nE1uGxG+yp4nhb58/cIsicj4rG2BUUd/jqWMvA2KfaTb04Ur4zF X-Received: by 2002:a17:907:9715:b0:a58:ecff:7a00 with SMTP id jg21-20020a170907971500b00a58ecff7a00mr4611741ejc.4.1714866749191; Sat, 04 May 2024 16:52:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714866749; cv=none; d=google.com; s=arc-20160816; b=BpARI5GtTaH6zYw95vk75QAq/gU5pZTa5Wuhgc/Bpey9wwphQFJo+lqbUj53AJ3Pn9 p5bu3XzSJzSsQh23nkeuheD8Ewl6px961V7eIziGmt/6HKvOcGUI7oZ4nkgK7UJDmYLr PCyfnfPPqjDpRFd8N6laECE+6rVswf+BI5vHzLCIS3bmKkIk6bDy8Q4TyYSW4ftG9OuE Q8vyS/P1fsIo5/eZzMnNuvdZbYQgrM79h+5ZsKd401cS2oWv2oaN9bW3sfM7sBXm8Jnw A/4UFagwUF5mE08WQZCDxB8ME472RMDWkRFG07idtI79EgZHfJXw16sAWo8Fy8RdyHEm xn5Q== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=vM4c2mM8StQ6Z0SpXqzLHCqXuobioBtkUa9e4txmZek=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=nbzl16PPOTTBGvGvxRvhTG4XHk7eB7uCwRip7yBf2bn1JvL5SxbQPjnA5yBojCOhND CC90aSTz24GCj8COaz3eKt+oX3Yf9h6d4+9+5v9k6A2F1Gt4n4+r4RRfgzePS9uNKbqA Gf8XJBQ02OWNjCM1Ix3GsNPGieJ45cT41DjBz3dXfAMndV++Kzx/1Hz+k5WOnW2UE1jy ruJqKdCHcweTHWqQea8EMX9i+ZYEVxr+TeSbygeKn/oIQRS4gFnKJRH4WMkyT8XEh4uZ 8KjAn1Vofar4bNbuIbYbgHlFwz6WD8FatUPzRx51mQMjpZQe5HP6SLqiMrZSUIBvVfia l3mQ==; 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=iTqShImT; 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 bh20-20020a170906a0d400b00a51c9692fc1si3260074ejb.474.2024.05.04.16.52.13; Sat, 04 May 2024 16:52:29 -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=iTqShImT; 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 70E3A68D57C; Sun, 5 May 2024 02:52:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FCDC68D56D for ; Sun, 5 May 2024 02:52:03 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 74DEB240004 for ; Sat, 4 May 2024 23:52:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714866721; 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; bh=liGWkLsiyQU0tiOIPxXOj6zoCdE0RgAHz9DfQdKCjCU=; b=iTqShImTa32sLf//kxu5pplAbQVmJU4nlLb7WIONTI0n20PbFRja5o26o4yPJ8oWmv27be BBL4oOOZWV4OZleFklnLuiuPopKGG6abQ5aeuiUvexwns1BlBFLMw1gT/OftI6VqlNlVd/ UAMh4nH0MmudAsPHKPYOy4epoHExFMfj0VjkotCy4S2iH+v2fixteKGzJ9xte5C7/pwKKm 18+H2fPfxzPH3zBcc99H74cK3evk6MRU+R/127bSOqmwR/UkxLX/WcXMV1TGP6zFvZUyAr qU/ssP88QorclROuvupUBO/UthxHdoxtkcC+ZXLXDjTjKMlJ4ApnBaJ2W+zYZQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 May 2024 01:51:59 +0200 Message-ID: <20240504235200.2875183-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/flac_parser: Assert that we do not overrun the link_penalty array 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: Dpjf0gT54tVk Fixes: CID1454676 Out-of-bounds read Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/flac_parser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index 47904d515a6..d9c47801f83 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -518,6 +518,8 @@ static int check_header_mismatch(FLACParseContext *fpc, for (i = 0; i < FLAC_MAX_SEQUENTIAL_HEADERS && curr != child; i++) curr = curr->next; + av_assert0(i < FLAC_MAX_SEQUENTIAL_HEADERS); + if (header->link_penalty[i] < FLAC_HEADER_CRC_FAIL_PENALTY || header->link_penalty[i] == FLAC_HEADER_NOT_PENALIZED_YET) { FLACHeaderMarker *start, *end;