From patchwork Thu Dec 8 03:33:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1712 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp655070vsa; Wed, 7 Dec 2016 19:50:29 -0800 (PST) X-Received: by 10.194.87.230 with SMTP id bb6mr71298807wjb.163.1481169028922; Wed, 07 Dec 2016 19:50:28 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i6si11470894wmf.38.2016.12.07.19.50.28; Wed, 07 Dec 2016 19:50:28 -0800 (PST) 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; 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 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 80918689FF5; Thu, 8 Dec 2016 05:50:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86379689E3E for ; Thu, 8 Dec 2016 05:50:16 +0200 (EET) Received: by mail-qt0-f195.google.com with SMTP id l20so47422220qta.1 for ; Wed, 07 Dec 2016 19:50:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=eJJlTrFRQBDc5/y4vHrnSX0VlEwJh6FL1vaMxUQ5C0U=; b=yaDZ8ZoH1u5sOBYpBUD87+Nisi54jXgwKN4nhRBDRwRT9zNX7p+lubtF2GiZy+ONZ/ lYb7Rfa8zREDONMc5eCaWPNc/K4ZpZooaKw/SmeVykl+ky26ym/YXSJKS/7KctJ8lJh6 mvDCswf1YlK6V5NjaVZB8CYJ5s0+M1HDQbiL3FX2zCogNnQpjYbguyYhn01LDR2nFfji BdxP1+hfFLDbi8FOtQRFbIXYcX8ZetwI9zf8rqtPl+12koBMjly/x2+fik14LnTL6Rax IGxj1axr/gHeOB84sknvEUixa7EF2gZlNK2/hQfMYSguO2nPr5U/CJCd2EiY5KmyoSOM OEag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=eJJlTrFRQBDc5/y4vHrnSX0VlEwJh6FL1vaMxUQ5C0U=; b=Me+1dWZycjcZ2RHsgGkikcP0EZ5+uCinZYrT6fnmz5XLT7BLnQvaS8VFocFv3mzPO9 U0d9YIfa0R4WsmCl8+jQal6xrBiqWXa80XTs8nEi1IHdYzxu3ZFZ5YFmaClNAHsiIZkD BQ4evHbUqghjI+U49jX8+eSGXCVbiOuGfUBuqMw1vjvQMlZj+rxfDi+nr4XewUnCr8zc V/GAqe/qrV13QmNznXKoSW4po+7PL96O9vLwNqjM5vF4wtM9zvBO1qpUp73Kp0ZX0p0G 0pU+F3if/jApiIIKEnqxvvu8OOVhtJ4GdmsxC2KadFyoJ50JxwLKPbilZOPTI/IQICWZ 1eFQ== X-Gm-Message-State: AKaTC03zn72O+jVEZZWmWZ7BK/4TFkxiIc09dPnJsvzh4GgdUh02UZzhlWnEHjkoLr/kAQ== X-Received: by 10.237.42.65 with SMTP id k1mr62653770qtf.210.1481168065220; Wed, 07 Dec 2016 19:34:25 -0800 (PST) Received: from localhost.localdomain ([181.22.40.68]) by smtp.gmail.com with ESMTPSA id c2sm14926402qkg.8.2016.12.07.19.34.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Dec 2016 19:34:24 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Dec 2016 00:33:56 -0300 Message-Id: <20161208033356.1716-1-jamrial@gmail.com> X-Mailer: git-send-email 2.10.2 Subject: [FFmpeg-devel] [PATCH] avcodec/flac: check frame header crc only if requested 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" It's more consistent with other similar checks in the decoder, and should help with fuzzing. Signed-off-by: James Almer --- I could also add an AV_EF_EXPLODE check before aborting, but i figured that with a frame header crc failure it's pretty much guaranteed the file will be unplayable. libavcodec/flac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 5ffbf93..8e1b059 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -135,7 +135,8 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, /* header CRC-8 check */ skip_bits(gb, 8); - if (av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, gb->buffer, + if ((avctx->err_recognition & (AV_EF_CRCCHECK|AV_EF_COMPLIANT)) && + av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, gb->buffer, get_bits_count(gb)/8)) { av_log(avctx, AV_LOG_ERROR + log_level_offset, "header crc mismatch\n");