From patchwork Sun Nov 5 20:20:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 5871 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2195791jah; Sun, 5 Nov 2017 12:20:45 -0800 (PST) X-Google-Smtp-Source: ABhQp+TaTR01L/eLK+iptf2lT+44NEt3sUD5VU8m2ARwaOFxEuBcyQT/8mM4FCgNzNxi3VcNfode X-Received: by 10.28.10.68 with SMTP id 65mr3269847wmk.55.1509913244918; Sun, 05 Nov 2017 12:20:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1509913244; cv=none; d=google.com; s=arc-20160816; b=i01Dt4uJoiOMj4uOMv92hUWUEITx6WFAXVJ90HRPQ4ZuNPPvjdza2HtSmijybrtgND 3GqQfJ5BD+7VVyzlDB5EHHfA6NZZiJOi6pZ32c/1b6RynnLTD/zKGC++3pOXoo9jcQOu /8XX9yk6f9ehrxZo03EnsL0FQmSZgJgyUmgPIrTb/yeUkcV0EQIHNmFwTmKn1JFSMo9I 8WqZuIB+qxZ9aRVfAIp5+wKLLwHNB4QbSP6XMQj6jp+gWjno9ilPeM/UfoPOJY/Dx7we IJCEvaRT1Kb6SnK6A7shKOK0cHYkWePyGeTZMFAIvXFgb5QkSpzxAL+TP9fdxGCU238j g5DQ== 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=ybcjC+nFRYc5LV8NrvfDC8yklFRERhx0/JabSIMBW0Y=; b=NUq0ZSxBXsUsx5SAi5v0UTavOx2sZfxEnbK9dp+EJigu72mN1+I3mGklws7yye/Usc Ns6+VUIqgenRaAmd1+9i1dJoIycsFmBti3J3GHgGqDJddxO55ALxD3TR/eDrsHPb1aCd cgc4/oYbqG+rDAAhf0Or6Rtk1oKwnCRRURIl/J3C4JnvM7AJy697PRy+UQRhnQiYO26d TfD7qUm3Hx2uRStibI3edsR3Rl8gZ9YqnjUrcvUJ+EaJ8sWrW1Rc8tqoShgWyr1eX1VG bXBkLnaQTNq9yWlxnTgOfzae1I/8hMmBFgO3mOBRKXrup/oZ9sWaIFtMJ/OZvyvxWf9B gdsA== 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 c58si9127486wrg.122.2017.11.05.12.20.44; Sun, 05 Nov 2017 12:20:44 -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; 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 2EF1F689FCF; Sun, 5 Nov 2017 22:20:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A86AE689F90 for ; Sun, 5 Nov 2017 22:20:05 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eBROz-0002Qs-8n for ffmpeg-devel@ffmpeg.org; Sun, 05 Nov 2017 21:20:17 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id WLL91w0030S5wYM01LLAnu; Sun, 05 Nov 2017 21:20:10 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Nov 2017 21:20:05 +0100 Message-Id: <20171105202008.29966-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/snowdec: Fix integer overflow in header parsing 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: 3984/clusterfuzz-testcase-minimized-5265759929368576 Fixes: runtime error: signed integer overflow: -1085585801 + -1094995529 cannot be represented in type 'int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/snowdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 13668c2105..727e908fb5 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -374,7 +374,7 @@ static int decode_header(SnowContext *s){ } } - s->spatial_decomposition_type+= get_symbol(&s->c, s->header_state, 1); + s->spatial_decomposition_type+= (unsigned)get_symbol(&s->c, s->header_state, 1); if(s->spatial_decomposition_type > 1U){ av_log(s->avctx, AV_LOG_ERROR, "spatial_decomposition_type %d not supported\n", s->spatial_decomposition_type); return AVERROR_INVALIDDATA; @@ -390,10 +390,10 @@ static int decode_header(SnowContext *s){ } - s->qlog += get_symbol(&s->c, s->header_state, 1); - s->mv_scale += get_symbol(&s->c, s->header_state, 1); - s->qbias += get_symbol(&s->c, s->header_state, 1); - s->block_max_depth+= get_symbol(&s->c, s->header_state, 1); + s->qlog += (unsigned)get_symbol(&s->c, s->header_state, 1); + s->mv_scale += (unsigned)get_symbol(&s->c, s->header_state, 1); + s->qbias += (unsigned)get_symbol(&s->c, s->header_state, 1); + s->block_max_depth+= (unsigned)get_symbol(&s->c, s->header_state, 1); if(s->block_max_depth > 1 || s->block_max_depth < 0 || s->mv_scale > 256U){ av_log(s->avctx, AV_LOG_ERROR, "block_max_depth= %d is too large\n", s->block_max_depth); s->block_max_depth= 0;