From patchwork Thu Oct 26 10:47:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 5695 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp654959jah; Thu, 26 Oct 2017 03:47:42 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SGyO2GP9eX1WAXt1taYFEe/QfGgSMk5luawvZOzflYFZzRpItUT+O/LxbLfcNJIIL6WAjm X-Received: by 10.28.167.130 with SMTP id q124mr1142420wme.136.1509014862057; Thu, 26 Oct 2017 03:47:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509014862; cv=none; d=google.com; s=arc-20160816; b=XdOXtqYnQHEqX8OaUwOp8Kmh8iFuKiQDUohr8333yq86c552Fq4cbRFmHUCfUxoVg7 Fw3BoAEXj6woNEBnWhLNCH4av79NalMLEmjEQqrrKLxPeMROH9PpndtejGC/o3zApVvk 8bC0/uEKu4ohdqsGE+nF0KDKB7+XaFWPQdPVzOTJy36gF5QedWqQeavAV+eeLLkrx3uU aDlyfanY7E/KiNmkig3SI1MNJrYFjyLXoWutPQtV629Vbt257V5dIgVRrZ42BLthYNuZ B68PAWGjgbs0t9PaEc8g+6ElBrHZIiDZfJpE5pGYjXVKzDfg5Gy1lPcUhy5NfklVdaJD jbGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=moN5vbyWA9Eanqo0IdO3h6vthNrtkcR0C6RJtWcqMuM=; b=B7C/n0/LWvVT/TP38bUHcPRVjU/0ubyf8Or0yIkFwJGo/cXaPro09CWrnCyssyp+ge 2/8/dSVbx+OFrFTt5zXGzYdEzlAa2U9ON54BBGYdd+8Wfa2+IkkAqw0nC6+5KUn0F0bH UdPF7r0WMsG/ZS/bOMzWOL/OFzNmrPEX3XW5SmOqJR2o2hEvolVX7xlo3Je2wSije1v0 mjHe0fqqLm1R8jmRmXgDskB7d/SVWJdLCYie2quX+Y0sau6E77t4oy0sxg8XKk0Qo0p7 Hkmiaf1n6KfyF3+llPy6ffhdYPfj4+tVa4rZ1Z6sWVjUZcORlfAnaVik48DlJDjVzDuj tE9w== ARC-Authentication-Results: i=1; mx.google.com; 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 g84si731932wmf.275.2017.10.26.03.47.40; Thu, 26 Oct 2017 03:47:42 -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; 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 54E2168A573; Thu, 26 Oct 2017 13:47:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 502EC68A4DE for ; Thu, 26 Oct 2017 13:47:25 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1e7fhF-0007tJ-2r for ffmpeg-devel@ffmpeg.org; Thu, 26 Oct 2017 12:47:33 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id SAnW1w01Q0S5wYM01AnXsn; Thu, 26 Oct 2017 12:47:32 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 26 Oct 2017 12:47:30 +0200 Message-Id: <20171026104730.6404-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avcodec/wmv2dec: Check end of bitstream in parse_mb_skip() and ff_wmv2_decode_mb() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: Timeout Fixes: 3200/clusterfuzz-testcase-5750022136135680 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wmv2dec.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 261d291c97..bfde13bacb 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -30,7 +30,7 @@ #include "wmv2.h" -static void parse_mb_skip(Wmv2Context *w) +static int parse_mb_skip(Wmv2Context *w) { int mb_x, mb_y; MpegEncContext *const s = &w->s; @@ -45,6 +45,8 @@ static void parse_mb_skip(Wmv2Context *w) MB_TYPE_16x16 | MB_TYPE_L0; break; case SKIP_TYPE_MPEG: + if (get_bits_left(&s->gb) < s->mb_height * s->mb_width) + return AVERROR_INVALIDDATA; for (mb_y = 0; mb_y < s->mb_height; mb_y++) for (mb_x = 0; mb_x < s->mb_width; mb_x++) mb_type[mb_y * s->mb_stride + mb_x] = @@ -52,6 +54,8 @@ static void parse_mb_skip(Wmv2Context *w) break; case SKIP_TYPE_ROW: for (mb_y = 0; mb_y < s->mb_height; mb_y++) { + if (get_bits_left(&s->gb) < 1) + return AVERROR_INVALIDDATA; if (get_bits1(&s->gb)) { for (mb_x = 0; mb_x < s->mb_width; mb_x++) mb_type[mb_y * s->mb_stride + mb_x] = @@ -65,6 +69,8 @@ static void parse_mb_skip(Wmv2Context *w) break; case SKIP_TYPE_COL: for (mb_x = 0; mb_x < s->mb_width; mb_x++) { + if (get_bits_left(&s->gb) < 1) + return AVERROR_INVALIDDATA; if (get_bits1(&s->gb)) { for (mb_y = 0; mb_y < s->mb_height; mb_y++) mb_type[mb_y * s->mb_stride + mb_x] = @@ -77,6 +83,7 @@ static void parse_mb_skip(Wmv2Context *w) } break; } + return 0; } static int decode_ext_header(Wmv2Context *w) @@ -170,9 +177,12 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext *s) } } else { int cbp_index; + int ret; w->j_type = 0; - parse_mb_skip(w); + ret = parse_mb_skip(w); + if (ret < 0) + return ret; cbp_index = decode012(&s->gb); w->cbp_table_index = wmv2_get_cbp_table_index(s, cbp_index); @@ -345,6 +355,10 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]) if (w->j_type) return 0; + if (get_bits_left(&s->gb) < 0) { + return AVERROR_INVALIDDATA; + } + if (s->pict_type == AV_PICTURE_TYPE_P) { if (IS_SKIP(s->current_picture.mb_type[s->mb_y * s->mb_stride + s->mb_x])) { /* skip mb */