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 5493647895 for ; Tue, 26 Dec 2023 16:56:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F12468CC25; Tue, 26 Dec 2023 18:56:12 +0200 (EET) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D3686803CA for ; Tue, 26 Dec 2023 18:56:05 +0200 (EET) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-6d9aef87d44so341808b3a.0 for ; Tue, 26 Dec 2023 08:56:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703609763; x=1704214563; 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=eZnxARxK7wiW6CDpJIwamr08biBY/xTBVVn/ptZm+7c=; b=HwWgxpQiFAlH8cG4pJ/qOdVwGDhYptJLfxLyOocyHtg7YRceGCSDQLvusXbegRkVW1 D2c1bBZPfjNuFWzgbPEXJUBTRZI1/wMhwJlthuJEeDT7543puY2S/8l6G7fu5vDnEFfu q91yIFmWeLP3sSO+efqoFwjj64joAtH1SCSdpfXFjs49IDD2XaZyIw0LzT5RhBo3+biN H0dAuBmm4d/w66TTXe3pZU9lvWigY/YRY2jSZXldEGn25HvVgKdBcHBMsxkJO7GfBgGc wxCd+qWYDEM9OMXag/ST6xR4MmoFkbMr7j9dtx5B51VXAv43ltuNLfbU/N38cKiKk01O I4aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703609763; x=1704214563; 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=eZnxARxK7wiW6CDpJIwamr08biBY/xTBVVn/ptZm+7c=; b=NuePH0hMPXbaCEtzJZbq9HK5UGiOwTrZV7W5s5SwxyzQyXksJhUKxhrbdqtrKd8rzO ARTj9RABInujZS7xyeos6Tl+drH+6A1x6I7jWW+6XJJAj6Zcr/u2/USV0n70V7gXS2Mr 8imyo4SAeQhmZeP5rIZZNVEZ/h6E8RthyTMM9cfjgM3NpP4TcuCIcyoYNYc+TSpqYWzZ Er6Yz2S6iUHXn27VdnOBvauj/EEc5WuJCi0qpvbf+QyDvRuapCRrh37roHmjja/FTAem OKacctwKbQb4OULIJCYWQ9X9GoyTuXT6+lYUK6TCYmBrJpJIAmgBrYD9Avxvw0cSqbBU RLeg== X-Gm-Message-State: AOJu0YzME5zGK2Eo03KXcLPA13r+labP2Yzu8lzdiMMbii7KKu3toaIv Dtz7VFyVGCP8EIZlT2R42F9nNxNgFho= X-Google-Smtp-Source: AGHT+IHRIPkis/CcN4Uwlcf1DkQLR3s/pVDoPXKgwb3xUYV8zP9/gNBO9fY+CbSxTUxrsNGxBYu7MQ== X-Received: by 2002:a17:902:680b:b0:1d4:6804:aa1b with SMTP id h11-20020a170902680b00b001d46804aa1bmr643443plk.113.1703609762654; Tue, 26 Dec 2023 08:56:02 -0800 (PST) Received: from [192.168.0.13] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id a17-20020a170902ee9100b001d0c418174fsm10219156pld.117.2023.12.26.08.56.01 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Dec 2023 08:56:02 -0800 (PST) Message-ID: Date: Tue, 26 Dec 2023 13:56:31 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20231226163731.4147-1-michael@niedermayer.cc> <20231226163731.4147-2-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: <20231226163731.4147-2-michael@niedermayer.cc> Subject: Re: [FFmpeg-devel] [PATCH 2/3] avcodec/osq: avoid several signed integer overflows 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 12/26/2023 1:37 PM, Michael Niedermayer wrote: > Fixes: signed integer overflow: 178459578 + 2009763270 cannot be represented in type 'int' > Fixes: 62285/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_OSQ_fuzzer-5013423686287360 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavcodec/osq.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/libavcodec/osq.c b/libavcodec/osq.c > index abe15c97f18..f2771c46eb5 100644 > --- a/libavcodec/osq.c > +++ b/libavcodec/osq.c > @@ -222,8 +222,8 @@ static int osq_channel_parameters(AVCodecContext *avctx, int ch) > #define C (-3) > #define D (-4) > #define E (-5) > -#define P2 ((dst[A] + dst[A]) - dst[B]) > -#define P3 ((dst[A] - dst[B]) * 3 + dst[C]) > +#define P2 (((unsigned)dst[A] + dst[A]) - dst[B]) > +#define P3 (((unsigned)dst[A] - dst[B]) * 3 + dst[C]) > > static int do_decode(AVCodecContext *avctx, AVFrame *frame, int decorrelate, int downsample) > { > @@ -273,10 +273,10 @@ static int do_decode(AVCodecContext *avctx, AVFrame *frame, int decorrelate, int > case 0: > break; > case 1: > - dst[n] += dst[A]; > + dst[n] += (unsigned)dst[A]; > break; > case 2: > - dst[n] += dst[A] + p; > + dst[n] += (unsigned)dst[A] + p; > break; > case 3: > dst[n] += P2; > @@ -291,28 +291,28 @@ static int do_decode(AVCodecContext *avctx, AVFrame *frame, int decorrelate, int > dst[n] += P3 + p; > break; > case 7: > - dst[n] += (P2 + P3) / 2 + p; > + dst[n] += (int)(P2 + P3) / 2 + (unsigned)p; Would 2U work for this? It's shorted and more readable that casts everywhere. Same for most cases below. > break; > case 8: > - dst[n] += (P2 + P3) / 2; > + dst[n] += (int)(P2 + P3) / 2; > break; > case 9: > - dst[n] += (P2 * 2 + P3) / 3 + p; > + dst[n] += (int)(P2 * 2 + P3) / 3 + (unsigned)p; > break; > case 10: > - dst[n] += (P2 + P3 * 2) / 3 + p; > + dst[n] += (int)(P2 + P3 * 2) / 3 + (unsigned)p; > break; > case 11: > - dst[n] += (dst[A] + dst[B]) / 2; > + dst[n] += (int)((unsigned)dst[A] + dst[B]) / 2; > break; > case 12: > - dst[n] += dst[B]; > + dst[n] += (unsigned)dst[B]; > break; > case 13: > - dst[n] += (dst[D] + dst[B]) / 2; > + dst[n] += (int)(unsigned)(dst[D] + dst[B]) / 2; > break; > case 14: > - dst[n] += (P2 + dst[A]) / 2 + p; > + dst[n] += (int)((unsigned)P2 + dst[A]) / 2 + (unsigned)p; > break; > default: > 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".