From patchwork Mon Mar 21 20:19:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34883 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1960747nkc; Mon, 21 Mar 2022 13:21:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWJe5WZnrAa0diB9fcYuJsYwjnVibg3V+Z3fZAzEAzmYhJj+a6CP78XMa/2PzzHmqRjGKR X-Received: by 2002:a17:906:9f0f:b0:6e0:3010:8a8f with SMTP id fy15-20020a1709069f0f00b006e030108a8fmr3202982ejc.225.1647894091018; Mon, 21 Mar 2022 13:21:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647894091; cv=none; d=google.com; s=arc-20160816; b=xD/oHnAfd99RQLqeisGIw5Mi0ecvMu8CUmyKi8X8wqcXFSRW3+ygbMBYFO27DETT6P vEA3Obyvq8RV/o/YDu+Q9seSIbifUmqA09g8TvvKeg1cmiQ4ntKJDy73j0ncKSako7UK NCU41+QfGkIhYjA7+zf+eydFPnENjKzOXiV9cCFXpR4cCCD/QSQIoUcuEkJ5cEFQzFez z2Mcc9i84EvjYcPXlhSDQns+qBdSBO9Qu23QI02LcNfgk9bbMlGu/JINsG6gLXsJ/xkw BQlozh8aCLsF0usv8PAgKImg80DHoC7TFDnpgp9JbYN0xtwtw1bmpu5S44ppy1X2XQcD hR2g== 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=FQhXyGQgFjGPpnFZr5YdC5jcBpIQrsV2EK/sqCAF+Bg=; b=0HFinBBbXcdmDsEqVYClu/FD0fEYSA4+dBZGgblYfFlVm5D/oaicPQSAytfOtVh/Yr 8OkkU9fL0c1vaUvfDpGr+14n8cZVv0bgVTgdYPTjNCgKiGUVU/Cc32w6ivRGsV4SbMat UlGbcKVS9YXZfneHlE6DnGETyfZPc7OHtCjP9Hf3+hIooCnoOujPO+aX6OSUZBSaiEYC vqR/9W/sF0zpD+A7wg0xmC/viKD3FelhnXCCTNmJeAwZEkxHfut89qxrgIXCvO/IfW7g hxLkKHaQbsgtK3To9Y8Ej2PYZYNa2s8lP2SeamwEe4ibNB5iXHlfnm+WTcuXkOwY+WL0 a9xw== 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 q14-20020a50cc8e000000b004190a5a2987si8844239edi.430.2022.03.21.13.21.30; Mon, 21 Mar 2022 13:21:31 -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 576A568B185; Mon, 21 Mar 2022 22:21:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E93968B0F9 for ; Mon, 21 Mar 2022 22:21:03 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nWOWV-00Ghof-5D for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 21:21:03 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id WOWVnckp3SgGFWOWVnNAao; Mon, 21 Mar 2022 21:21:03 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id WOVInVhDkOPqFWOVInJl7W; Mon, 21 Mar 2022 21:19:48 +0100 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=OcX7sjfY c=1 sm=1 tr=0 ts=6238ddf2 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=hbWDiSJ8O4ovbG1I8Y0A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 21:19:46 +0100 Message-Id: <20220321201946.16919-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220321201946.16919-1-michael@niedermayer.cc> References: <20220321201946.16919-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKH3XT/GAoipflDQbUD5paxHMRtRRiGJPlSG06RdRt3aHfKe8xLXfMLtp+zeIgB4Xv+DcOYplhSjH74kRVH03tqE011dcDwn9Cnumw60FXEFv392o1r/ tufZibxenBswwVdK1v3NJiI4RZ/GLgnr6JSCzCT4ETunA8O7OXVNCeuOJr7dO4adfDjZTap43VLFXg== Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/exr: Avoid signed overflow in displayWindow 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: lXfs7AwOUyjf The inputs are unused except for this computation so wraparound does not give an attacker any extra values as they are already fully controlled Fixes: signed integer overflow: 0 - -2147483648 cannot be represented in type 'int' Fixes: 45820/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5766159019933696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index dd5924245f..f338ff0085 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1833,8 +1833,8 @@ static int decode_header(EXRContext *s, AVFrame *frame) dx = bytestream2_get_le32(gb); dy = bytestream2_get_le32(gb); - s->w = dx - sx + 1; - s->h = dy - sy + 1; + s->w = (unsigned)dx - sx + 1; + s->h = (unsigned)dy - sy + 1; continue; } else if ((var_size = check_header_variable(s, "lineOrder",