From patchwork Thu Jul 26 01:11:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 9797 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1435139jad; Wed, 25 Jul 2018 18:13:23 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf8WEoIFhQTs5E+hMVnplBxf9CdEhx/8CHC34YGpK46g//fyjA3xmYzF0T9huytiv2RbyXM X-Received: by 2002:adf:ba12:: with SMTP id o18-v6mr16811810wrg.249.1532567603195; Wed, 25 Jul 2018 18:13:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532567603; cv=none; d=google.com; s=arc-20160816; b=TJDJ/Y5TKq3cFg3RupoXS+AppP+J8vgw7AXr3X33rSLTMonmeMm30VVhEAHnrzoh8B JilnEQ6y3Krxu5/lGkbyJovUdpF+z7NlbQZsl/Ak85VorXndjuyqtvPS3WCpVc5NzGCT vBQ9cZr5lk+pkOfqURUQxeEVkG0Ma2Pf+hYe92YNgncrzWYN3Q4KpwDQ2RbjeA0RxZwI Qb1LXnEk+Qq6lZB+hBjn9T2MnNleMznlPM2v9atgqSO9C3OOyjS49HFDHF6tgbXOAg9i RnyxGwNYh+2ts6ChtI6YcB33YefkaBPfqrRZw00wPF5TYlPxzdzZUvfxBYRynCimUBqI 0Ekw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=b8ukn2O3MBYjJHEonAUWYmTCab9YNf3bMzpwpUJR/6I=; b=0UVdUbeXTyQiKuZOV2aQCo15oCu4goTiHN3TiN8gzo0GdROiESE/OBj1IqaKpU9VUd KKqd+BR9HORx249VFj/IF0IberT3iKRWIcR0U/pUij7GJzbS1jUE1TcHXPa9vXPy27de 8Fk0RaOyb4hao2OMSofcrOig1C7nJvpWXOqxBqwRUjym/yWRjrrZkX3FKFugvu4RaelL rLdpH1RJ+XY825dbkZCkZ4THYMHBaMGG7IUoJDuJewdvZ66/j4e4BpGqLINQiOc0FuX7 J6dfAoUhtzlIrTJ+JH9qwzHeLohx2TOJQ1zI91nK5pyt+dQ1dG2OAiWbzcYwSwWvldTf Hnwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IDVMRBcL; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v74-v6si12754390wrc.286.2018.07.25.18.13.22; Wed, 25 Jul 2018 18:13:23 -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=@gmail.com header.s=20161025 header.b=IDVMRBcL; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A1D968A3F4; Thu, 26 Jul 2018 04:12:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f175.google.com (mail-qk0-f175.google.com [209.85.220.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDB77689C3B for ; Thu, 26 Jul 2018 04:12:47 +0300 (EEST) Received: by mail-qk0-f175.google.com with SMTP id b5-v6so25497qkg.6 for ; Wed, 25 Jul 2018 18:13:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=Q9DSNyZE2TvA3mhiP/Z/59lvUaZtWJNuv3xf/83nH1w=; b=IDVMRBcLlaTKdcVHxiZwCOEwkSErClKcZi2AvArFmvpqQgOP7Q2fBfcFhbEZkpkoQu A12iQjJi5efddwCwj3WhPE4apQ9IUDEAa3A0finxJT2xOdzVweYnyw4789agP7kIUrBf 5wEW9xuZ1ce+eTMyYlQfe39xmTiFOeQxl8QV/s0uW1pQSe1yzc0xVNvtNQ4wvIglSFCo Xa8epi4FBgBdc2rS9XpQ7QonBGHI33+N3eqvttZME25V6TvJWkDUrfTP+xKKM8KCEC5H LEoYngpO1lx5tGiXDCVfdJideMLPssxieyjPOwMs/kvatrlUHrfQjsOyhXjCXUTkYMrm C27Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Q9DSNyZE2TvA3mhiP/Z/59lvUaZtWJNuv3xf/83nH1w=; b=tZI6d9gD5iHQMALseiEJqWUGmMECwuP6MvDLXAwBk8PRs/7MEWOmt3TcmTVFDBaUyE fezlzSTW8hzo0QZDW5HIJO3Z9bij+PmCgdjU4/FnJ/nIs89a8Jc2NmJU9h4np8uZ8qrk MPj8Nl8yzZKFjGPYQ3mILvQkHS5r4fBqT/hhNoh/6ZKjvFErfGMqt+i1PTnmmqeplgCK 96ekhqXlXndd3JMDFklOaXVa2Ud9TbfX2uRt6ix0HfjV6KGBipwiWzP/74jqO/Oa3sZp CNjY2BldwLGKJK3tIQET8tGgk3Cfs+tGBYRDE4JJqWFP8Npz2wD/DzsVBYtp92rRvjzi ls3Q== X-Gm-Message-State: AOUpUlHgDuJS41/FEdZuXMq4jUH7KpVn56BLEudDRzu0WJFh0Tcl9icl h1atRRKFVQkaZOzgXjPIsIWQcYYW X-Received: by 2002:a37:3515:: with SMTP id c21-v6mr21815782qka.355.1532567581218; Wed, 25 Jul 2018 18:13:01 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id 16-v6sm10941186qkd.93.2018.07.25.18.13.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jul 2018 18:13:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Jul 2018 22:11:49 -0300 Message-Id: <20180726011151.6232-3-jamrial@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180726011151.6232-1-jamrial@gmail.com> References: <20180726011151.6232-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/av1_parse: check for OBU header overread 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" Signed-off-by: James Almer --- libavcodec/av1_parse.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h index 84fc71c925..3a4151491a 100644 --- a/libavcodec/av1_parse.h +++ b/libavcodec/av1_parse.h @@ -118,6 +118,10 @@ static inline int parse_obu_header(const uint8_t *buf, int buf_size, *obu_size = has_size_flag ? leb128(&gb) : buf_size - 1 - extension_flag; + + if (get_bits_left(&gb) < 0) + return AVERROR_INVALIDDATA; + *start_pos = get_bits_count(&gb) / 8; return 0;