From patchwork Sat Jun 24 12:46:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4101 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp113100vsb; Sat, 24 Jun 2017 05:46:37 -0700 (PDT) X-Received: by 10.223.150.163 with SMTP id u32mr9148561wrb.195.1498308397178; Sat, 24 Jun 2017 05:46:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498308397; cv=none; d=google.com; s=arc-20160816; b=GGv6M5c51ziuZ38JAFKb2KuShz/CQZmMZLsiTtyDVvXAGiZm80sItu+tgRjX2odIox b8YpYjBOGJAwWSPGqTYRizFFqBS6b3MnHAmkKhJNSvrgc4s7COMLiCVflKhlN67zX9EZ XRHxxm+Cwe6cp8UlBEMoFxL4mNJ7uaU6lPtMgC9RK+zRlal+lm/V+YF1/el4NtK0y9OF cP50cvTDkQPoRv3Jj7WRlYuiwJDTkc1mYnDnnS/4e3fZT+g7hKIJchot5JI5btDeawIs sRMj1svXVgUSUiNjB/hmPMblOxbymgUVNQgyLb8C6hLcwk+18JBtW+aRozM9MENLiQ/9 Jc+A== 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=CVFYX/VOrtfNo6cP6VDN06sbfHdAxTrXjhmKWy+M9fU=; b=gchv3n0pQ/n8WD2Q5UwqrlzpIL1vLyKnR0TyVKGdyAlPDkQ+W0x0zySWDb8Ft8p2hw lBRTzbjRAkshrM9LEkcafSlWTCu4B5XmyizJLE2YSMja84jGkIRTrN1u+jaKQ1355sNG DbRcEXeUC4NY2WcSTKw8NZZG+2MhfH5oeX7P2Ez4CY+d22LO/h2RUceUXpTfSWfP+QZD GJXojS6mn2BpdrM3NU4J52Hvq2YNjHuZjM9Y1lF9LdQnMFIgTqLEeFk4w0OT554PhluE sasYoq+jaOeDX8z3VBui53SqLZotGQMx70zMZyZsZrHFkIbXI/C69IUpz7ViWsV2Z9ZZ xNRQ== 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 p40si6816924wrc.390.2017.06.24.05.46.36; Sat, 24 Jun 2017 05:46:37 -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 256FE68A11D; Sat, 24 Jun 2017 15:46:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 031D0689D7D for ; Sat, 24 Jun 2017 15:46:27 +0300 (EEST) Received: from [172.31.218.49] (helo=vie01a-dmta-pe05-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dOkSI-0004AS-IJ for ffmpeg-devel@ffmpeg.org; Sat, 24 Jun 2017 14:46:26 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dOkSC-00057i-OM for ffmpeg-devel@ffmpeg.org; Sat, 24 Jun 2017 14:46:20 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id ccmJ1v00p0S5wYM01cmKuw; Sat, 24 Jun 2017 14:46:19 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 24 Jun 2017 14:46:17 +0200 Message-Id: <20170624124618.32387-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/hevcdec: check ff_init_cabac_decoder() for failure 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: left shift of 1965559808 by 4 places cannot be represented in type 'int' Fixes: 2333/clusterfuzz-testcase-minimized-5223935677300736 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc_cabac.c | 25 +++++++++++++++++-------- libavcodec/hevcdec.c | 26 +++++++++++++++++++------- libavcodec/hevcdec.h | 2 +- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c index 3fe228d249..4c14e77bcd 100644 --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@ -467,12 +467,12 @@ static void cabac_reinit(HEVCLocalContext *lc) skip_bytes(&lc->cc, 0); } -static void cabac_init_decoder(HEVCContext *s) +static int cabac_init_decoder(HEVCContext *s) { GetBitContext *gb = &s->HEVClc->gb; skip_bits(gb, 1); align_get_bits(gb); - ff_init_cabac_decoder(&s->HEVClc->cc, + return ff_init_cabac_decoder(&s->HEVClc->cc, gb->buffer + get_bits_count(gb) / 8, (get_bits_left(gb) + 7) / 8); } @@ -501,10 +501,12 @@ static void cabac_init_state(HEVCContext *s) s->HEVClc->stat_coeff[i] = 0; } -void ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts) +int ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts) { if (ctb_addr_ts == s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]) { - cabac_init_decoder(s); + int ret = cabac_init_decoder(s); + if (ret < 0) + return ret; if (s->sh.dependent_slice_segment_flag == 0 || (s->ps.pps->tiles_enabled_flag && s->ps.pps->tile_id[ctb_addr_ts] != s->ps.pps->tile_id[ctb_addr_ts - 1])) @@ -524,8 +526,11 @@ void ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts) s->ps.pps->tile_id[ctb_addr_ts] != s->ps.pps->tile_id[ctb_addr_ts - 1]) { if (s->threads_number == 1) cabac_reinit(s->HEVClc); - else - cabac_init_decoder(s); + else { + int ret = cabac_init_decoder(s); + if (ret < 0) + return ret; + } cabac_init_state(s); } if (s->ps.pps->entropy_coding_sync_enabled_flag) { @@ -533,8 +538,11 @@ void ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts) get_cabac_terminate(&s->HEVClc->cc); if (s->threads_number == 1) cabac_reinit(s->HEVClc); - else - cabac_init_decoder(s); + else { + int ret = cabac_init_decoder(s); + if (ret < 0) + return ret; + } if (s->ps.sps->ctb_width == 1) cabac_init_state(s); @@ -543,6 +551,7 @@ void ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts) } } } + return 0; } #define GET_CABAC(ctx) get_cabac(&s->HEVClc->cc, &s->HEVClc->cabac_state[ctx]) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 0c478029c9..83130fc48f 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2337,6 +2337,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) int x_ctb = 0; int y_ctb = 0; int ctb_addr_ts = s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; + int ret; if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { av_log(s->avctx, AV_LOG_ERROR, "Impossible initial tile.\n"); @@ -2358,7 +2359,11 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) y_ctb = (ctb_addr_rs / ((s->ps.sps->width + ctb_size - 1) >> s->ps.sps->log2_ctb_size)) << s->ps.sps->log2_ctb_size; hls_decode_neighbour(s, x_ctb, y_ctb, ctb_addr_ts); - ff_hevc_cabac_init(s, ctb_addr_ts); + ret = ff_hevc_cabac_init(s, ctb_addr_ts); + if (ret < 0) { + s->tab_slice_address[ctb_addr_rs] = -1; + return ret; + } hls_sao_param(s, x_ctb >> s->ps.sps->log2_ctb_size, y_ctb >> s->ps.sps->log2_ctb_size); @@ -2417,7 +2422,9 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int if (ret < 0) return ret; - ff_init_cabac_decoder(&lc->cc, s->data + s->sh.offset[(ctb_row)-1], s->sh.size[ctb_row - 1]); + ret = ff_init_cabac_decoder(&lc->cc, s->data + s->sh.offset[(ctb_row)-1], s->sh.size[ctb_row - 1]); + if (ret < 0) + goto error; } while(more_data && ctb_addr_ts < s->ps.sps->ctb_size) { @@ -2433,15 +2440,15 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int return 0; } - ff_hevc_cabac_init(s, ctb_addr_ts); + ret = ff_hevc_cabac_init(s, ctb_addr_ts); + if (ret < 0) + goto error; hls_sao_param(s, x_ctb >> s->ps.sps->log2_ctb_size, y_ctb >> s->ps.sps->log2_ctb_size); more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); if (more_data < 0) { - s->tab_slice_address[ctb_addr_rs] = -1; - atomic_store(&s1->wpp_err, 1); - ff_thread_report_progress2(s->avctx, ctb_row ,thread, SHIFT_CTB_WPP); - return more_data; + ret = more_data; + goto error; } ctb_addr_ts++; @@ -2471,6 +2478,11 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int ff_thread_report_progress2(s->avctx, ctb_row ,thread, SHIFT_CTB_WPP); return 0; +error: + s->tab_slice_address[ctb_addr_rs] = -1; + atomic_store(&s1->wpp_err, 1); + ff_thread_report_progress2(s->avctx, ctb_row ,thread, SHIFT_CTB_WPP); + return ret; } static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal) diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 695ccfb591..293beb7083 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -508,7 +508,7 @@ int ff_hevc_frame_rps(HEVCContext *s); int ff_hevc_slice_rpl(HEVCContext *s); void ff_hevc_save_states(HEVCContext *s, int ctb_addr_ts); -void ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts); +int ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts); int ff_hevc_sao_merge_flag_decode(HEVCContext *s); int ff_hevc_sao_type_idx_decode(HEVCContext *s); int ff_hevc_sao_band_position_decode(HEVCContext *s);