From patchwork Mon Sep 23 21:32:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51776 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2737049vqb; Mon, 23 Sep 2024 14:39:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCViKrO84f8ic7yo4A20MMcMHgkIEZVuBs9x1URWVtPrTa4jYZidoPHOLbbMZou/1UNY28+sH5uCeQSPysvLSP2W@gmail.com X-Google-Smtp-Source: AGHT+IFRd896SDDcpYHrUR/KphLJp5AyRfjY0Tm6sJ2s8Iwgt0jrLKktDT4Ol//t2mYNux4GIxcO X-Received: by 2002:a05:6512:2254:b0:536:9f02:17b4 with SMTP id 2adb3069b0e04-536ac334260mr7648423e87.40.1727127558598; Mon, 23 Sep 2024 14:39:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727127558; cv=none; d=google.com; s=arc-20240605; b=MujKS63K4ZRXedrWsTLQScKVsKCmFbVdiSVQqJn51J8BUWn23NkeaNXFH6nJbQ86Tt L5gtI0iOwSE8rXbdoDFOCuzeMW3Jexl4Am2TgwYMsnjEQ1R/IuIjajpFVNBZEPDealqi /Bd3ITcHoKjX1gvgrfs3MiZuFO/iVzJWnrEnH4ElqIf0+leKC3aogN5YXD+DsXdd4e62 0DXRQeyIvmH2/ie4OFk1nM5uibaPfvkSoisd1AYbuD4HExSPcQoN/ep1EBw2clNc5qnR F/Q6cWCwOrIPhurGReaWtHM51QyQzwZcLIWnwlHJS2xrgov7o/lxeGabNHbC+VauWwH0 ydog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=UBOTGvQJer76qxl24n567QT1ZB1eKxK3VkdVKbB5tfI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=gKYa6MQTsZlSVRy3BKnL3dyXpir4IitwWYyCn/nXw79WZ1WA/4Imoi/pk8uQkJGME9 NSLWNCuC+IHBWT3fCK9NVJ5nTIS16dSYyUIkbwJLwgoYVg+LFebK/a6WOzCjxZi9hOIU QY9PsOWzflTOOXn4ny9bqkTvHZNSLj1OCWjR52eygKonrgkfEGuAkk3DQyHntZBaQIIT z8l2k9ad8QRDtyyiEVuAd8F+caT4/4pAsEfWc5Yjg2B1RNeSzRG7Hy2jG4yvjQrd9NxH HqMVp+rTLQbkLsRe7c0jXdMxGBNWOGjdX3Fw5Hj5Iqc1S0vRthQaWLQ0p9yzchEJx1Q3 jrYw==; 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=alL8BKpz; 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 a640c23a62f3a-a9392f2d203si3483566b.90.2024.09.23.14.39.18; Mon, 23 Sep 2024 14:39:18 -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=alL8BKpz; 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 66ED668DA68; Tue, 24 Sep 2024 00:32:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B6D168DA47 for ; Tue, 24 Sep 2024 00:32:52 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id C582C1C0002 for ; Mon, 23 Sep 2024 21:32:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1727127171; 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=cPsVxrXrBF5oKBQc+pCM8iU7Tfqwv5+dooS+dksu0bk=; b=alL8BKpzqaeRyGBoND6r3Opcx3mbO9hEiRJsNjX/NlqgdRK2772qCaRiRvkDI+ev9lls/g ndAStrGmpukhEmO7+wET/F6EQpwJ0TZe8XHw1STXixFiRZY5rmEKko7IWbI+Gb738bwDQ3 BR1DSzP2fD7cwhzjYROkPjzmPJT9KTd9N7z0y5eXxFbwrjR2r3IWCbNxnzs3F11Um8lRTe QH+7Xi7ay6Xh/4CPpfaiRxGQ6bjcIOgMD9VODo0uucJjz3N4R7A9l3CBpPFvqIrIyHxzu9 JMYBOAyFUV6dMClDzQpaN83114T4MEn5No4TET18J8jYbJ4CG6DB6yEUqGQfxw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 23 Sep 2024 23:32:44 +0200 Message-ID: <20240923213249.3256534-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240923213249.3256534-1-michael@niedermayer.cc> References: <20240923213249.3256534-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/7] avformat/mxfdec: Check avio_read() success in mxf_decrypt_triplet() 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: HCQbs20G2/VQ Fixes: Use of uninitialized memory Fixes: 71444/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-5448597561212928 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 24f4ed1c33d..b232c45f47d 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -671,7 +671,8 @@ static int mxf_decrypt_triplet(AVFormatContext *s, AVPacket *pkt, KLVPacket *klv if (size < 32 || size - 32 < orig_size || (int)orig_size != orig_size) return AVERROR_INVALIDDATA; avio_read(pb, ivec, 16); - avio_read(pb, tmpbuf, 16); + if (avio_read(pb, tmpbuf, 16) != 16) + return AVERROR_INVALIDDATA; if (mxf->aesc) av_aes_crypt(mxf->aesc, tmpbuf, tmpbuf, 1, ivec, 1); if (memcmp(tmpbuf, checkv, 16))