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 317C647A93 for ; Fri, 29 Sep 2023 23:41:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 25B2468CCA0; Sat, 30 Sep 2023 02:41:29 +0300 (EEST) Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3A7668CC5A for ; Sat, 30 Sep 2023 02:41:22 +0300 (EEST) Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-1e0ee4e777bso1957388fac.3 for ; Fri, 29 Sep 2023 16:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696030881; x=1696635681; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=GY8unQQkaNNj9xHj1Lp+D9wC4YYrP8iPk+ASPys0r9w=; b=gLFKgyZNdhZxDi48wNYe2vtnJ20C5AXg26xLfWQT5waiAqRSYJ2tVOvuCR6AhI7oAc RZXc3Y/tPK1RBhgVMCzgj1Ku07pvxN322D/xzccMUdzYXEeqLyfrUnJkV/S2HhZGLY8w wI65LAgrQ0rNnbJnRx3XdI2aBZ5n8FbJ26lvt0dEe+2jGeP2RX+/cJyFGwygXGg1lWGl uPO2oNNhhUQvbd6ETV8uO7bV6C/XaoFfLPgAxEoUfwbv/UHgEkmw1N+V0OOOR9JkGXqx GPDeKGR143CSvsqWYbMi7iDHbwipBjPI/Qyrh9de6YhuTnvxmP0RQaB7sbYNhQZZvkCK 2vNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696030881; x=1696635681; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GY8unQQkaNNj9xHj1Lp+D9wC4YYrP8iPk+ASPys0r9w=; b=fUQzcuVcHc2oMbyoSFAZibXJuDaNQGuOr7/AkJOI6Jmvz6fhfxskmL4Ic8ZMtAeFdd ehixw60PL2RX4BafpcCukPUPfpFjY/CVQbEjwS6sELg5SqvxwGAW/Sn77q3DJkWHNJmF jfVmm7kCxWUNgnGgISDoz6v+azBxDyg5Ef6iQXf9bfYbzm4yZDZvmFtd3INnotUIQuNE U7MagqkJa8xnDN6PdSEXNzkwPGjrq8Q4qM0mf61pQwmI3kQncPy/izpIi9AomkKrcyw8 b3zU3ok3JOfXsa9uyL7oE7P9/mhBVRWT7tUb9+2donb0Xg79ROvXouz2JUFYFqBBAf3t q8GQ== X-Gm-Message-State: AOJu0YxnpYNZ88CP2oIQ26LrWIOCL2/Yi132vJqnFEp6gnvQ/hv068Rj p2zI7Tm5u4YFsHXgILX2G5wUrTcI+H4= X-Google-Smtp-Source: AGHT+IGFyLlQ+Hc8feceIbMG0/B8KPk7BkviJIk1l7xYJ+9Ne4AtvHAbdDqH36r9B0lZ0lPBfk4JVA== X-Received: by 2002:a05:6870:41d0:b0:1d0:f5bd:6d2 with SMTP id z16-20020a05687041d000b001d0f5bd06d2mr6694874oac.38.1696030880482; Fri, 29 Sep 2023 16:41:20 -0700 (PDT) Received: from [192.168.0.10] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id a9-20020a056a000c8900b0064f76992905sm12857204pfv.202.2023.09.29.16.41.19 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 29 Sep 2023 16:41:20 -0700 (PDT) Message-ID: Date: Fri, 29 Sep 2023 20:41:23 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230929232001.23197-1-michael@niedermayer.cc> <20230929232001.23197-4-michael@niedermayer.cc> From: James Almer Autocrypt: addr=jamrial@gmail.com; keydata= xsBNBFjZtqABCADLW+vdEoZaJZDsIO6geYFTOcn1unsEHefj9zn+3oTHlDFFzO47mzHsSfbK 9JE2xpOJEVnC8FAF5Sayi/pVwV+mtQUV3n5dgVeVBYF9GUQwOGFCpK8X54RRqhkgknbunOEE 0CtgAJgmpFmmmHgq02GvEspx1h/rh4apqwQR6QX4Favb+x9+i9ytVpwVcBX94vo2toyP7h/K BWfadQmb8ltgE1kshfg+SQs/H5bTV5Z1DuEASf02ZL/1qYB/sdTgWPLv9XMUHHsRFmMY8TMx wJSkP+Af3AiYQPJYz1B1D4tt98T/NoiVdin10zATakPjV8hXaobuRmxgakkUASXudydDABEB AAHNH0phbWVzIEFsbWVyIDxqYW1yaWFsQGdtYWlsLmNvbT7CwJIEEwEIADwCGwMGCwkIBwMC BhUIAgkKCwQWAgMBAh4BAheAFiEEd1EujP2UoWlX5pp6FGMBrXN2WeAFAmJoLUUCGQEACgkQ FGMBrXN2WeAFVQf9GtGhniRs1PzNUOgJktCnv6j4BbLieaIPYPEFXKDHOgjqQE2zVMYXnoXl Jam928ii902a8OY06r9ywn/R8ApD1/3NY/v64O71CY9scz5XyH2au8wIZ6HwFy3/f7sqjdGD uctY8Qs7rjT7NkoC5lmgMu2v2k03dGtM9AAf5AK5gU+H0EUw7vmKKiXzUqt5kvBuf4CEwXvH AQT1SMJ52rIlDWB7FQFyZeUbOAK2IgY/KNedfK6nsgd/eQVnlofPd2XoddE7kP6iys7jJefw DD3g3rZyDTq7in5dyk5glaNpWZpbHGBs+9SCYLnfQ8XvWqPFOD+gj0plamKANgOvavKTxM7A TQRY2bagAQgA69YtILj8kYxmqPr/M8+MXT7wVoOWVW9lvSmPquCELaDy/NIS7D06VC5EuE/6 JlJXZMTn37NLlyWhzwOgXuXw5w2tyoQQBuvqGiXJijuXwXH7HKdzrc6rpYtAqt5w05hzNrFS KrS0izG64VpWrfproy3BsL+8TBm9brLhhNPynVRqVukbbGzlATTzNQGZ14TTi2/dL6DkMQnM qn4jX9UEe4GdGQBP50bUJSSmeiIkyNLWA+znuN2PZEz930ZwNrF9GtDVw7mzcmpCZ7spldE2 tutbpy9D1bIqxyqBrYDSezyzL2adR1qgHyOTMCHg2AYNkrIQHrSyJxKTpZ1/hqOp8wARAQAB wsBfBBgBAgAJBQJY2bagAhsMAAoJEBRjAa1zdlnghekH/0Yb0iYJ74oID2f/Fj+AJKS2ekQF P2xOr8lpGzgp/+yWUvPtqbX0A33anBJdYwxaAC0NataX3tfZ+oJkzXqfmqhIHMPYHdZesJA2 Bk9hU/33mDl5s5U66/z0uelWzwKVHoQ2O6or4+qF3HJFSJLCe9uvWJ3zXf9F342Ftj73sfx+ 3xkw/IXsN1RqbYqDlzpoEQ99SIEfY/8Jjwnd3sIPfqkuyeaYfe6GJDqKawdCEP1oRRlbXEAp TJgYz8r3nPhGv9cdHNDCk44ISbsqVuxIEnLqi4fTPZaGupiQhT+srl268TTAp2TQW7+6Ce/b NPQorMquzS/LZoyALpmsYi/miMc= In-Reply-To: <20230929232001.23197-4-michael@niedermayer.cc> Subject: Re: [FFmpeg-devel] [PATCH 4/6] avformat/cafdec: saturate start + size into 64bit 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 9/29/2023 8:19 PM, Michael Niedermayer wrote: > Fixes: signed integer overflow: 64 + 9223372036854775803 cannot be represented in type 'long long' > Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6536881135550464 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavformat/cafdec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c > index e92e3279fc6..0e50a3cfe68 100644 > --- a/libavformat/cafdec.c > +++ b/libavformat/cafdec.c > @@ -435,7 +435,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) > > /* don't read past end of data chunk */ > if (caf->data_size > 0) { > - left = (caf->data_start + caf->data_size) - avio_tell(pb); > + left = av_sat_add64(caf->data_start, caf->data_size) - avio_tell(pb); avio_tell(pb) here is guaranteed to be bigger than caf->data_start, which is the offset where the DATA chunk starts, so the result of this calculation will be <= INT64_MAX even if you don't saturate it and instead cast it to uint64_t. Nonetheless, if the DATA chunk ends at an offset that would not fit in an int64_t, then we can't parse it to begin with due to AVIOContext API limitations. Maybe we should just abort in read_header() if data_start + data_size > INT64_MAX, instead of pretending we can parse the file, invalid or not, by saturating values. > if (!left) > return AVERROR_EOF; > if (left < 0) _______________________________________________ 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".