From patchwork Fri Aug 4 02:05:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4619 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp1660413vsu; Thu, 3 Aug 2017 19:05:42 -0700 (PDT) X-Received: by 10.223.161.133 with SMTP id u5mr515032wru.191.1501812342806; Thu, 03 Aug 2017 19:05:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501812342; cv=none; d=google.com; s=arc-20160816; b=l/Scj9klDF2IVliISSoZtk7/CYgzXuNslg/hOR7GadyMer+KvvUIjDIPVqSCmknr8k F+iGWbeGW+368jqKjW+AW4ZaIWuZocdK/n16eVMn8BoXRcd7m4kqjcxDMYjJ9p5+Rj2n QxhqvKtNI47rODIXYyInmz3HPVzdHVp+HOuiNtgsvgSaBFrPDxeywf5FY/L8ITVi5pvb kCMBRXoUY+qAr9aYAV14o9R/U+DdmVQq+KsidABXUXmhWxF0s9Zoh+FgyokJwwv1EWCy lnVLiVSWlN4Gj3wpmlR3d9KIpgqJeQckaWQ2DUOpZQpkctI2L3msJS7fe/6tLwG0+aFa l4mQ== 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=89imPcfDyuWkKuP3atbT6/bsItoU/J5G3629goh5miw=; b=QMV/zgv0+ziF/S/c+x6lnxUVUNtaHhs9BEfzP1GOkg87iCfd5zB8DhsMEtSl0kJaWz 8JQEF/P59/NfAYXHFgp9halm3Y+uoBRbPudBF4yev0c489a2phg9vHhSH59JkxVH3Mey fjZmeELeevQB1wE4XkEkERTIvpDjohC09MQnrE2Cp3yvZRliYbD89gGu0H+SDgJ0KHe7 ScXiTlT/2zxafGz9iiI8gSh0SkSXVPbZ7doqV/b4JH7GldGd5A045ZJ/yu+I0ElMYfwT XJCX/b8xEwCJx0BpgsNfNRT5M3CmDJBwT3kkeqoH6Smb+KuCBo1cwkjq04HxX1LKa8ct oqNA== 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 g132si2306730wmf.48.2017.08.03.19.05.40; Thu, 03 Aug 2017 19:05:42 -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; 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 7223868924F; Fri, 4 Aug 2017 05:05:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-2.mx.upcmail.net (vie01a-dmta-pe01-2.mx.upcmail.net [62.179.121.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFA786882E3 for ; Fri, 4 Aug 2017 05:05:30 +0300 (EEST) 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 1ddRzW-0005O9-BV for ffmpeg-devel@ffmpeg.org; Fri, 04 Aug 2017 04:05:30 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id sq5S1v0060S5wYM01q5TpB; Fri, 04 Aug 2017 04:05:27 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 4 Aug 2017 04:05:24 +0200 Message-Id: <20170804020525.870-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/h264_slice: Fix overflow in slice offset 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: runtime error: signed integer overflow: 1610612736 * 2 cannot be represented in type 'int' Fixes: 2817/clusterfuzz-testcase-minimized-5289691240726528 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h264_slice.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 2fb89b189d..4e7eba4adb 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1854,17 +1854,19 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, sl->deblocking_filter ^= 1; // 1<->0 if (sl->deblocking_filter) { - sl->slice_alpha_c0_offset = get_se_golomb(&sl->gb) * 2; - sl->slice_beta_offset = get_se_golomb(&sl->gb) * 2; - if (sl->slice_alpha_c0_offset > 12 || - sl->slice_alpha_c0_offset < -12 || - sl->slice_beta_offset > 12 || - sl->slice_beta_offset < -12) { + int slice_alpha_c0_offset_div2 = get_se_golomb(&sl->gb); + int slice_beta_offset_div2 = get_se_golomb(&sl->gb); + if (slice_alpha_c0_offset_div2 > 6 || + slice_alpha_c0_offset_div2 < -6 || + slice_beta_offset_div2 > 6 || + slice_beta_offset_div2 < -6) { av_log(h->avctx, AV_LOG_ERROR, "deblocking filter parameters %d %d out of range\n", - sl->slice_alpha_c0_offset, sl->slice_beta_offset); + slice_alpha_c0_offset_div2, slice_beta_offset_div2); return AVERROR_INVALIDDATA; } + sl->slice_alpha_c0_offset = slice_alpha_c0_offset_div2 * 2; + sl->slice_beta_offset = slice_beta_offset_div2 * 2; } }