From patchwork Sat Nov 19 13:29:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1485 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp636488vsb; Sat, 19 Nov 2016 05:29:49 -0800 (PST) X-Received: by 10.28.232.213 with SMTP id f82mr3660344wmi.85.1479562189784; Sat, 19 Nov 2016 05:29:49 -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 yk9si11814633wjb.266.2016.11.19.05.29.49; Sat, 19 Nov 2016 05:29:49 -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=@googlemail.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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 90CE8689E46; Sat, 19 Nov 2016 15:29:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 810CE689DF8 for ; Sat, 19 Nov 2016 15:29:35 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id g23so13176616wme.1 for ; Sat, 19 Nov 2016 05:29:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=c4m37CWWjyjCiklvHnwbtSA48EOSqDS5gLxphz5yeF4=; b=WiJCapUNGAN5STb8Qpz5Mwy/vwWhewwtiBuWQ4BBnExlaS16/2jf1p3WCZ+aF6I8zI oJO0hL9BJVIlPIa4uPFcdagWC0guSkC0u6ck0aIL3S2nhj2OXI4nKpaG+7rpyOfWoWcb IbXMlIRxNi+8iivQeTHYodZWgGtX/7uM9nRjdocRGnSXSYyKFaqQwF9iIA/RUsJGiGIR JE80Z3woljPZ/6RreTdLapkUl/xHZMdl7w+4BXBm7LqGIDGJjvK7B3VoVg2x59/26Y15 EoIM4kNyif/m66Zvc+QSlnprvUSyK3/HLQrUClMPwQHfX0JqRZoBUkLvpGkhmUvG//6b j9ew== 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:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=c4m37CWWjyjCiklvHnwbtSA48EOSqDS5gLxphz5yeF4=; b=hrXC3GAKMCC9eyip3u+04ZeYVugeH/ChNVB5pfkpHM9qYWNFOs8mys6zhwJIZ+iHtI t62urXpjOSpptRrF6qu+f62O379jXG+/XmGY6ImqyWWNZcT/kKg95DD8f78sSBSsWhaD 3uppmhodBB/ncyL5maiJ3qbJxsnS1xNyl5D085ohP13NZuSDT5ImhbVfE4BJkQHI262X UXhDPAisD1eYRbYiV/ZH8dhNw0rCJfKXh47pfFxZqZOkecqxJ2ZyRPuiGl1HkagkUxX4 pt6v9+yRz2tilPpCmHvAFAxKs4ndAEhDPPoF9n3rTIwN1FtmIWi0lLn6cPHmm4NJ50GS c1wA== X-Gm-Message-State: AKaTC008pzjpNtYKVdUL6DVb3NUNkLedHLNO0HcOPDpb+sRJyK/i29igEXGMtiGsd/wFnQ== X-Received: by 10.28.226.139 with SMTP id z133mr3621056wmg.139.1479562177108; Sat, 19 Nov 2016 05:29:37 -0800 (PST) Received: from [192.168.2.21] (p5B095CF1.dip0.t-ipconnect.de. [91.9.92.241]) by smtp.googlemail.com with ESMTPSA id i10sm14286758wjd.15.2016.11.19.05.29.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Nov 2016 05:29:36 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches , libav development Message-ID: <451af605-69ea-c944-9e1b-0fb67ae1abcf@googlemail.com> Date: Sat, 19 Nov 2016 14:29:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] smacker: limit recursion depth of smacker_decode_bigtree 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This fixes segmentation faults due to stack-overflow caused by too deep recursion. Signed-off-by: Andreas Cadhalpun --- libavcodec/smacker.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index b8a0c55..0fec7a3 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -184,8 +184,8 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int DBCtx ctx; int err = 0; - if(size >= UINT_MAX>>4){ // (((size + 3) >> 2) + 3) << 2 must not overflow - av_log(smk->avctx, AV_LOG_ERROR, "size too large\n"); + if(size >= 10000){ // Larger sizes can cause segmentation faults due to too deep recursion. + av_log(smk->avctx, AV_LOG_ERROR, "size %d too large\n", size); return AVERROR_INVALIDDATA; }