From patchwork Sat Aug 13 21:50:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37263 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp528346pzi; Sat, 13 Aug 2022 14:50:49 -0700 (PDT) X-Google-Smtp-Source: AA6agR63y7OGu3B90a4K4pQvaLU7iWlSSZH8zpXVTcQKuh0R5zEI/JI6ZTHfb2PcsUg0/+/F1wCi X-Received: by 2002:a17:906:8a52:b0:730:ab17:c7f9 with SMTP id gx18-20020a1709068a5200b00730ab17c7f9mr6316106ejc.279.1660427449454; Sat, 13 Aug 2022 14:50:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660427449; cv=none; d=google.com; s=arc-20160816; b=kNBeCYI3iIHvloLbMXRL13U5czRxG9ly1p9x/ozwSn3XBVsJ1eOjKvUnSs1dJgZtlR 76M/6rKi/246ntUn+DvBYUkNLNT/aXOfHa/+7afJx5zEW5SB7ME/vzbQHXvChR9Pk1fB fJd0MuCkC+ZdXau2mv8IkxamfoBhzLdINSPjdkIeonMZP8YkmLttQlVFR3NWvIHGHvmM uS1NqnhAZyzkCiyNj+IK9eOqpO5QPECqgczjiLL65n1jkyQJ3y7Gif+wrJaXIBKX8zj9 g7BXA6AYJrwpAiVJyn+q8WgKTrQFcXM3eExqQm/Jq0pdUvJ2lCDt0V0KnDPHchOa8TBm qZ3w== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=6MwFlcWyguOGQQ4ZOZnpxIdxZvlNl7t6gO0I0dBGchg=; b=JhIzZRHoJBneXJqmrrNYSMfyHdnlBmn0SfRlFJ0vU1alU3whd5skaCoIWHLpQAH2zF 1ZUNDErOVj9YXn1lCIII+fsjLbHkZuw6Mny/3uiVBWo9app9uDKrMm6dc8YCy6Ivs40y c/gv8IhXlffh2wLwzL2nsLfIhxzM5AU7LjLN89jKuBbAsuP+SxYGmIxMz2qgktXw4Tob OomzTrqrw3sZIVz217KrR+BPqP1MzNaWWU3ucLSgPVDGFwf+keQVXPlt8ZFtwbvweFDp sxMeGxdfV1HFaJ5xE5tLBxfWsmVKhHHbhAGfDzWGnk6DJTYMQVXbmW4Fz8a2jYTTIhMT B17g== 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 y1-20020a056402358100b0043d9822b4d0si5018010edc.547.2022.08.13.14.50.48; Sat, 13 Aug 2022 14:50:49 -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 4041768B8E7; Sun, 14 Aug 2022 00:50:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EEBB68B178 for ; Sun, 14 Aug 2022 00:50:37 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oMz1h-00ANWO-58 for ffmpeg-devel@ffmpeg.org; Sat, 13 Aug 2022 23:50:37 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Mz14oAfcn8s8UMz1hoTSHD; Sat, 13 Aug 2022 23:50:37 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id Mz1hoPP6j8eSWMz1hoheeo; Sat, 13 Aug 2022 23:50:37 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62f81cad a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=fIyGdquHkijc31oSIpYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 13 Aug 2022 23:50:33 +0200 Message-Id: <20220813215035.12996-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220813215035.12996-1-michael@niedermayer.cc> References: <20220813215035.12996-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCUCXkZkzbZ+YvyIktfCLTKhPyak9dFVaBPzbrG5oCaHMwwSrXweOT7PtoDg+2NRDXttafJ7J3mEQCxcg+IsNnoPXPtGsf8mtbDq+by1siKwRLSdHORU VmR2EzlrO8E6BDVQ50vGGcsBI0LB8NdI6NbB1JOWolcsZ1ckx+zP6GqJjyuVdJVUJ8Bu8oRWGGZsew== Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/mjpegdec: bayer and rct are incompatible X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: ESkpwkNhkVM9 Fixes: out of array read Fixes: 49434/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5208501080686592 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 5f058d026f..65c3c402a2 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1092,6 +1092,10 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p return AVERROR_INVALIDDATA; if (s->v_max != 1 || s->h_max != 1 || !s->lossless) return AVERROR_INVALIDDATA; + if (s->bayer) { + if (s->rct || s->pegasus_rct) + return AVERROR_INVALIDDATA; + } s->restart_count = s->restart_interval; @@ -1942,6 +1946,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) } len -= 9; + if (s->bayer) + goto out; if (s->got_picture) if (rgb != s->rgb || pegasus_rct != s->pegasus_rct) { av_log(s->avctx, AV_LOG_WARNING, "Mismatching LJIF tag\n");