From patchwork Thu Jan 9 03:53:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xingwen.Fang" X-Patchwork-Id: 17269 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3849744B5DD for ; Thu, 9 Jan 2020 05:54:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B6096880E7; Thu, 9 Jan 2020 05:54:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-221-252.mail.qq.com [203.205.221.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2ECB96880E7 for ; Thu, 9 Jan 2020 05:53:57 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1578542031; bh=LTkJ55WYH4Wx+8dHnRGf5MaYUFVto/WhDKJA7cYmu9g=; h=From:To:Cc:Subject:Date; b=MB2blT0PBV62qa+2Jy0HmZAUJJ3u4O2VR8UssuLYhr9PlJSmJE2iw2UFE20+1FVXm hVgdsYFLutpnY2D/NihbkShxt5w3u9Zgw1jGfDtMVuIGUHpcoPmxWXE0aT/VY5Nsoy josYB7n99K87KYLHKEPQcgPWdIsMUbdCMLXGz2xQ= Received: from localhost.localdomain ([58.22.7.114]) by newxmesmtplogicsvrszb1.qq.com (NewEsmtp) with SMTP id D720547E; Thu, 09 Jan 2020 11:53:50 +0800 X-QQ-mid: xmsmtpt1578542030tlb5woqrl X-QQ-XMAILINFO: Oc/oQqD0phqKKXTPDKb1ouP9qlQ+ZcRyGkyxOgKtBl1kliQn414uHcOHfVHVbX EK0sEaVPrTrYxfnbPnXhcvivjVYbrXLiZuet96eOR1w+XziQYyGP6O6JgYk2IBnyCR6p3/DZyZaE Hd5xGnY/+SztUBPnUJuY4ddUN3+HCdvZ1cvCHXJUAmq1Q6snWr44IdzOHCgSfemQfjfUCm8z2wPK XEyT9rcXoMLQ9qRwhh8cCqUOuYshOUEmBJNKZMRSXO/dKqCMkRpe3j8yficyLxROFKsr38G+yLCT 4ozzWHvEBZbBQUG62dUe61fFYGK5VnaQtP7nyaSbXyuu5ERqKXxZC3UzLk+1lF+4hTn6g1uRP5qp RO+rjoISpvSU2+0IQG9Vkx90QhvKp1g4iM7b9lPHAin6LpCzeF/w5pcfUJJmoooeWjgF2au7+2rr dSsXJAmr5ocklnJH7afCTmO2Afe9aNt5RboORe93lBSk3BiyHZEwIUIpv0M3wf8NVz1AVpoBW2uQ 1bE6jL9L0Ywnj25eQ= From: "Xingwen.Fang" To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jan 2020 11:53:49 +0800 Message-Id: <1578542029-29651-1-git-send-email-showvin@qq.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] avcodec/mlpdec: filter invalid block size X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: fxw@rock-chips.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Xingwen Fang When the block size is illegal, we don't need to read the block data. Otherwise, there will be abnormal memory access in dsp.mlp_filter_channel. Signed-off-by: Xingwen Fang --- libavcodec/mlpdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 39c4091..198d3c0 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -1263,6 +1263,11 @@ static int read_access_unit(AVCodecContext *avctx, void* data, if (!s->restart_seen) goto next_substr; + if (s->blocksize < 8) { + av_log(m->avctx, AV_LOG_ERROR, "Block size is too small.\n"); + goto next_substr; + } + if ((ret = read_block_data(m, &gb, substr)) < 0) return ret;