From patchwork Tue Feb 28 21:07:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 2704 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp1629934vsf; Tue, 28 Feb 2017 13:08:27 -0800 (PST) X-Received: by 10.28.134.198 with SMTP id i189mr481976wmd.134.1488316107095; Tue, 28 Feb 2017 13:08:27 -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 d10si7986621wma.109.2017.02.28.13.08.26; Tue, 28 Feb 2017 13:08:27 -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 944CC689221; Tue, 28 Feb 2017 23:08:13 +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 B4C556891F7 for ; Tue, 28 Feb 2017 23:08:06 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cip0L-0000h6-2C for ffmpeg-devel@ffmpeg.org; Tue, 28 Feb 2017 22:08:17 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id qM7h1u01c0S5wYM01M7ixW; Tue, 28 Feb 2017 22:07:42 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 28 Feb 2017 22:07:38 +0100 Message-Id: <20170228210738.19786-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170228210738.19786-1-michael@niedermayer.cc> References: <20170228210738.19786-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/wavpack: Check value before shift in wp_exp2() 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 undefined shift, all callers should be changed to check the value they use with wp_exp2() or its return value. Fixes: 692/clusterfuzz-testcase-5757381516460032 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavpack.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/wavpack.h b/libavcodec/wavpack.h index a1b46d5bd7..0196574aab 100644 --- a/libavcodec/wavpack.h +++ b/libavcodec/wavpack.h @@ -171,6 +171,8 @@ static av_always_inline int wp_exp2(int16_t val) res = wp_exp2_table[val & 0xFF] | 0x100; val >>= 8; + if (val > 31) + return INT_MIN; res = (val > 9) ? (res << (val - 9)) : (res >> (9 - val)); return neg ? -res : res; }