From patchwork Tue Apr 10 21:25:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8382 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1537029jad; Tue, 10 Apr 2018 14:26:41 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/+6oO8SAR7JxFPIrvC6XCatgQsA65pMx8lKYOWbVkI/jdgUkxct2c364j8GASg/4QY+1DB X-Received: by 10.28.98.69 with SMTP id w66mr780993wmb.64.1523395601828; Tue, 10 Apr 2018 14:26:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523395601; cv=none; d=google.com; s=arc-20160816; b=l+Q0nkukPATnbt6vKIv44gHglG/j47Zx3H5RDwYqt7ehcG70Twdhhp6n6vU5Y/CRx8 9IN/ZV+4+bSXkxGFRk0LDHURKX5Dc4IQwCPWHIW0rYivPaNE1KUHD9+TfeETkrCNMWHX nPtnJLkrnxBbBxipLpQZ/A97j7qIFdxID7uPMEayPhB0N/UO/amHts3tJJKZbM02F/ya ZLM2QY+o+G2pJcWnEnJpCUQaEnvYXC0sGkgvDIP5PYm4fneRXt9SXDOyyad74ZiBNFax gOuprSWx/IRK4rRIkwcNsWGZkxKqmGRHgCYFAA2EY+t+8cFFmEc8NLMXarMGhBzS24Nd +yzA== 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=sjcsiFhjQ6H2TlclJh7Hf4Nxwy/fe1fakiEMjRgceKA=; b=YDtEjAwqlBdD5a/nLAJVPECGWh042PumY79RuEpaf9oIpLgKu8pSK1vLC2KLqDw43Y wNGCn/xgjb4tHFpEslzBH1UwTYqbNPyOH2iuanpJmNyfaCxrTPHZP7q2lQ15m2zrgONL q4vvz8I1Q3r9L1RkLoEMNioPBEMy25qcGIRYuf8Lq3nIwvTpLmPpg9SPHjwNeve0KRk6 awLJVhZsS8LHi4aQYV1aO9Z1TsA4tEQvZ4VJBL69/t4e2NHut4slF1+eJ5R9z8uoFfQp QN6p/xxHp+lz8oyDRZVkOjHTj3IpABaTZicxGu+6TKH8p8VL2IYkgDxbnZR61idUVKK1 fklQ== 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 f58si2566358wra.479.2018.04.10.14.26.41; Tue, 10 Apr 2018 14:26:41 -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 E1C6268A0BC; Wed, 11 Apr 2018 00:26:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-2.mx.upcmail.net (vie01a-dmta-pe08-2.mx.upcmail.net [84.116.36.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7725F689F9E for ; Wed, 11 Apr 2018 00:26:09 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1f60me-0007Y2-Qq for ffmpeg-devel@ffmpeg.org; Tue, 10 Apr 2018 23:26:32 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id YlSS1x01D0S5wYM01lSTGY; Tue, 10 Apr 2018 23:26:27 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 10 Apr 2018 23:25:39 +0200 Message-Id: <20180410212540.13543-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/mjpegdec: Check input buffer size. 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: Timeout Fixes: 6381/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-5665032743419904 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 4 ++++ libavcodec/mjpegdec.h | 1 + 2 files changed, 5 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index beef174618..22ca69f841 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -335,6 +335,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height); if (av_image_check_size(width, height, 0, s->avctx) < 0) return AVERROR_INVALIDDATA; + if (s->buf_size && (width + 7) / 8 * ((height + 7) / 8) > s->buf_size * 4LL) + return AVERROR_INVALIDDATA; nb_components = get_bits(&s->gb, 8); if (nb_components <= 0 || @@ -2247,6 +2249,8 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int ret = 0; int is16bit; + s->buf_size = buf_size; + av_dict_free(&s->exif_metadata); av_freep(&s->stereo3d); s->adobe_transform = -1; diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index ff301bcb93..653fe7cae6 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -47,6 +47,7 @@ typedef struct MJpegDecodeContext { AVClass *class; AVCodecContext *avctx; GetBitContext gb; + int buf_size; int start_code; /* current start code */ int buffer_size;