From patchwork Tue May 30 21:21:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Arzelier X-Patchwork-Id: 41896 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp2787908pzb; Tue, 30 May 2023 14:22:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ59lDZ4e4Ei9fVUSosUDwQCBURWGkwEaBFFhkoAhVvf/ntqu9DFZzSkQ6t98AmK8rCfg/FI X-Received: by 2002:a17:907:7b85:b0:971:5a46:8ac8 with SMTP id ne5-20020a1709077b8500b009715a468ac8mr4725718ejc.27.1685481731359; Tue, 30 May 2023 14:22:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685481731; cv=none; d=google.com; s=arc-20160816; b=cVwlbe/pAe9t+Q3HtwTbmctcJZwXFAaSDrFkqjFylOxdQMrMlysbkon17GcD+bshat 2w0FbiRuKLYzdLlC1gyxDFiHH5uWKvD1Umi9uTGUUuovhWM5BFv57L3dapB79bL8dsQM /2mfqrc0JKqYgrZlWv8zcetowWVgaYlZ32/+R8BSYueAsvsZwrFxofcPB2//BlrXdYqs 6FfcQOWalUQB4OnDhDmo6aLmM82n3EgLeX4hP89ZajGiqRIOOygxC+nGfZwfa9NMn2aY e3Rs7WdW6VgeEO/MaEyXW+QO7+kQ7XfcSV8PybroTx5dv0xPrWhU27yx1iw/0P2UeVW+ zapQ== 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 :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=5fDTwm+8t9UjQFraCHo8zg385WL5MbWgbvdfUonTs2A=; b=ZzhZ8NTpLSsmsm+NFo3EhkF5jlKdHSqlqcy7TMz0N7krtT2E5w71HMesg/SPwGNhOP ioCOiqN6QajnbgXYcWpkvt3H1+0L4q9PlgBR+q8ktI8M49qqE7J4O8Q0rkFOFiou6Rqh fWL/NhnYEaYNihjTB1fRyoRPZ3Tvi1YM9cAfApAVRkjPfKNTOBGi48pN3kbzwyqkMvWN ip0j6Ytu4UbWLWqKkRe80JKkt0o+yezh/dJpTAehLeQxT59z0FZwteJARhNNytT1alcX 2rkOhwbEcFAs3ZEZcLR+/aNxYPNXHkem7wdsGb354QVQ/VUMReD19U78RzOIPx55FoQd aXRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@free.fr header.s=smtp-20201208 header.b=klyhvAZ4; 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=free.fr Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g20-20020a170906595400b0094f297e08c2si1350179ejr.964.2023.05.30.14.22.07; Tue, 30 May 2023 14:22:11 -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=@free.fr header.s=smtp-20201208 header.b=klyhvAZ4; 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=free.fr Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A73668BF75; Wed, 31 May 2023 00:22:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A64168B48D for ; Wed, 31 May 2023 00:21:57 +0300 (EEST) Received: from Coucou-PC.webspeed.dk (unknown [188.178.217.132]) (Authenticated sender: paul.arzelier@free.fr) by smtp2-g21.free.fr (Postfix) with ESMTPSA id 774D12003D6; Tue, 30 May 2023 23:21:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1685481716; bh=PD6bKTHW5fbTLg4zMObRhwcpJrFFBJ9xRJyAoc3TYEs=; h=From:To:Cc:Subject:Date:From; b=klyhvAZ44bu4iNfMBByVr+HroN2RZHGgUkaPDLDcKkPQsnDvWV6vKVAnxTYoUEMDu YjTCGdAXXGCNrb/duc4Qm3wPzL0pWHnGJQV/rHxNnJdA2d5fF8YmC/qW5rt08mzOtU /IyhADx4VSKeQIHOISV1tPJ3DERH5Ow2WC44Se21E5bockFXtWJCqyq14NxBaJPn45 SEBYx0NIwOhLc9k9sFKkE9ER1ft+LBlpe9CxX5nh3tpv4Z+jYHOF7hLQRGZhrYX9UA l3T2iiJ+7tYDWdW4gpiwb5CvMDQUogyJUIo65WxRlikEQKO2+yzkXc927OWlL87nJ5 mMxlWUV+R9AbA== From: Paul Arzelier To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 May 2023 23:21:36 +0200 Message-Id: <20230530212136.1368389-1-paul.arzelier@free.fr> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/oggparseflac: check init_get_bits' result 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 Cc: Paul Arzelier , Polochon-street Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Pxia5waX16Gn From: Polochon-street Check init_get_bits' result for NULL, to avoid dereferencing a NULL pointer later (CWE-476). Without this, a segfault happens when trying to decode a handcrafted ogg-flac file with an absurdly long (e.g. 268435455 bytes) ogg header. Thanks to jamrial for basically writing this patch after I reported the bug! Signed-off-by: Paul Arzelier --- libavformat/oggparseflac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index eef6e09927..557440d94b 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -40,7 +40,10 @@ flac_header (AVFormatContext * s, int idx) if (os->buf[os->pstart] == 0xff) return 0; - init_get_bits(&gb, os->buf + os->pstart, os->psize*8); + ret = init_get_bits8(&gb, os->buf + os->pstart, os->psize); + if (ret < 0) + return ret; + skip_bits1(&gb); /* metadata_last */ mdt = get_bits(&gb, 7);