From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 149AA44A6E for ; Fri, 13 Jan 2023 00:11:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3DF0568BC70; Fri, 13 Jan 2023 02:11:28 +0200 (EET) Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 907C568B429 for ; Fri, 13 Jan 2023 02:11:21 +0200 (EET) Received: by mail-oo1-f46.google.com with SMTP id h3-20020a4aa283000000b004ead187bd6eso5214582ool.5 for ; Thu, 12 Jan 2023 16:11:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=j8JB1YRa+2wL95L9GN9dfZ2Uea5TX/HgfYx10/HWeK8=; b=atXoAeig8yMIDvOleU8IjtZm5YX60sHrCeDo/9Q4/5LZwbywpqCHJV4mjbWnE/HhPT yf7bNluAHrpJUPIdk5KViL86fELMtPmnfPbPZNQW/Pr+VSCvdSP+TonhZDKh0kQ5Tymg J23D/n17TsfT0e6NbOL2IiqmmM1YfYgu7GLm3kIwZeR7p2D8Abt5M+LkHkMnWvnIN6Y9 8iHe0WWc/fFfdclJOfKCp3O7anV4+AbxyK9r5YsX1uqVQ37qU3yD9irONaSIiEASnT4o kS0rY08iPDo6ugyXamuNDY0MLCjvvWSv3/0IBvd9yc0WuhhppRRArSWmuMSkITG1Nrif YnZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=j8JB1YRa+2wL95L9GN9dfZ2Uea5TX/HgfYx10/HWeK8=; b=VU5VDiDwCrZGz7erxR7l0fFbW8swlllYn6xMVYBvX9yMHaamsLCpvg25HWcLwrOpb8 UmNxvFvTMxOptnBmxWdpnGCWEDHwsw4cG67h9xoGoPnswJvXv2AnM0zjlB+NNKArBpaA 67Novul3HKBZX+HVwSGuDUKbVTYENfin6zjP8RFZeTHo0pCQG/3wRKW/NOfCv0s6eNjv waKFI/jjQFUsne+43d6146MBionaUFjemalMzlsWnEn5sGq0OfdAmb1NEu70pL6cJbQ4 5vZ3GRD7QnX8xMks/PBagL8uThex3HT7CXnlndHOl7gRVngVjJ3yrIm1/VH78rgwd/LU dPHg== X-Gm-Message-State: AFqh2kqohueq/QYmtei60RmeawtqKUUN5KCyuYDhahpfh7rinou9/IuA vr+iaI/7yDM5zDNyUKiJqAQHPvyLmbU= X-Google-Smtp-Source: AMrXdXv+uTsepYODzfuOv1whD1ELkSHJ1EpIaClVUFOzuSQfdN1OMKeBpXJYLu1qMnPSSV9ysrGfVQ== X-Received: by 2002:a4a:ac81:0:b0:4a6:5afc:9a51 with SMTP id b1-20020a4aac81000000b004a65afc9a51mr36771095oon.8.1673568679340; Thu, 12 Jan 2023 16:11:19 -0800 (PST) Received: from [192.168.0.14] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id d144-20020a4a5296000000b004f269f9b8f3sm1474491oob.25.2023.01.12.16.11.18 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Jan 2023 16:11:18 -0800 (PST) Message-ID: <8b9a4802-58fe-3009-2002-b3b6cddc4d19@gmail.com> Date: Thu, 12 Jan 2023 21:11:35 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 To: ffmpeg-devel@ffmpeg.org References: <20230113000138.9994-1-michael@niedermayer.cc> <20230113000138.9994-2-michael@niedermayer.cc> Content-Language: en-US From: James Almer In-Reply-To: <20230113000138.9994-2-michael@niedermayer.cc> Subject: Re: [FFmpeg-devel] [PATCH 2/5] avcodec/xpmdec: Check size before allocation to avoid truncation 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 1/12/2023 9:01 PM, Michael Niedermayer wrote: > Fixes:OOM > Fixes:out of array access (no testcase) > Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XPM_fuzzer-6573323838685184 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavcodec/xpmdec.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c > index ff1f51dd32..504cc47d8f 100644 > --- a/libavcodec/xpmdec.c > +++ b/libavcodec/xpmdec.c > @@ -356,6 +356,9 @@ static int xpm_decode_frame(AVCodecContext *avctx, AVFrame *p, > > size *= 4; > > + if (size > SIZE_MAX) > + return AVERROR(ENOMEM); Maybe check for (size > SIZE_MAX / 4) before the multiplication above instead. > + > ptr += mod_strcspn(ptr, ",") + 1; > if (end - ptr < 1) > return AVERROR_INVALIDDATA; _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".