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 7A4454374B for ; Mon, 27 Jun 2022 05:57:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 369D568B7F5; Mon, 27 Jun 2022 08:57:18 +0300 (EEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069093.outbound.protection.outlook.com [40.92.69.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A44D968B713 for ; Mon, 27 Jun 2022 08:57:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gEJ5kf2NpIcFtM77+jqIdCG76L84x57UGZJP3GWxsJn1M4adjlexWmmzHMM3cOM8rNzYwekub/7KCqEHW9FSLmx1oz+U6vz2/i9kyqWFhVArPds498p0DWJGIeo6xFo/fGCV6CsDBvOnX98rsc1gOigQHLRAcjLaRb/1k4TDPTVA1I4gvIPOs7pqcVi7kZ7BFx9B+tTTIkXHLKAI80oWR+FYh+5rHEEOTM5G/02Wf2iGJuG3V38GnycM70X2h11BfY/TMByTqPgpeChRp6q3g808Ud801AbNl8hUVDsjKUtnoRZH/xLw9pAW0KYLLnrMH0Ke2OnI8K34VIE7h0n7gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1+NXcv22+AJcoaHPEnp17Hj8Ogb8IsNalYtK/wDn3GY=; b=ScDtDCvw3rm+pj9B4LlYmnMHfVSOVn7BW+jNO8Jrp557V2/cNrfr9wGWxP3W2Ip3ZikkIES6ZaBi4fij20EVlbfC5CcuXm/g8prmRGcQmvHJ8sAb3+tqx2ku9jOLpN/PIfOclyqP8kur6xCMyAOcs0abwwiSNYWuYz60Hi/ouq/YOdNfAKZ0I9xvOdGaMvQXMFcgUlj1HldxeVJ91MYYqTgQXhJr8BIOYMC/jkKRpSxZQpXuGQwArII389a05QtNLtHeHP2Vcneul86WflBNsJhM63hOCP0nxq6hjfqYp5x+X8tEsy81Yx/vjIbSi5Isdnu8Adm8A0K9/PyScEPRIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1+NXcv22+AJcoaHPEnp17Hj8Ogb8IsNalYtK/wDn3GY=; b=p+asgZMDMx2+qqadYiPHkyoLJR8AbNla7NJPe8sX6nNT/by8XiRBfdrjkwkpSFDnh6e619yJZkPBIzDHfxqhzEbQa9+Oot0yBtZSnxD/DJzje7elEKAuzRgwYIrTLvabfGKYVzoXULl4bm7f+HPLMylaK+58NhtYP8f1V70rRyj/+Cd69WTfsyZU3KcNn1TnBNZDvQKhf91sY+/kvYIzTXQ0ouUbp7PgI3PEKcf49iIJJ+lqTYJnQv4vxdElCu5HE1LmkhYBv43izUpjymtcc+yec76JaN3TNArfh+23T9e7nzptcE11cvaCT0OoOmN3y7HxcRkNEHHw/8I5lrrzZg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB5939.eurprd01.prod.exchangelabs.com (2603:10a6:208:15e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Mon, 27 Jun 2022 05:57:09 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5373.018; Mon, 27 Jun 2022 05:57:08 +0000 Message-ID: Date: Mon, 27 Jun 2022 07:57:06 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220626135146.13096-1-michael@niedermayer.cc> From: Andreas Rheinhardt In-Reply-To: <20220626135146.13096-1-michael@niedermayer.cc> X-TMN: [eN/jwp0vazexUaqfvqOhrXPPu/ldG3S4] X-ClientProxiedBy: ZR0P278CA0141.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::20) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d1c70015-4264-4b8d-f698-08da5801deeb X-MS-TrafficTypeDiagnostic: AM0PR01MB5939:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dELA8qVBUGQFztdE+GnH0AfM6y7oqLpXKz3cW4u+3w11WcBpZHzYOjfoH26vu0ZZS3pduvGRIASKSQ5sCKvMyeiHMxr3QvvTj7qa/yvdihyMUo5KDJjUBM7qE94aHKUEcvDwdaT3jwAwvdlf2Ef2SboQlNS+D03S8AYeP29PngRJOniHmO5P9yqrTm6/Q06Km49zitVRBn13dpXHTIOe+LnziWCRCb5yf5+DYk5zcZPcCE8QK9lwJWyYeyCM/C0pVXZlBMx+2so/vI4kwtZBfGHdroJ4za+8OF1959qo0k8U8SxBJktk7zHKL5BUQ9KVcyea8Y4b6AMxlhR7X5XsUOxvgcHi32sf6avuKuNEUSjBKCIqlsrDAiExchRf0Mqh5V4m7RF5wdsju90sJ5uKA2saE8RMcosSDrZ+6pVXtukOrnS4R8d9bf8qh19pMYNpnFMa0ycyaaOyRuzq/oQYwQxs5XiX7nJjsL1MHlLoLDtHyI5JCdia8VPiQnFzNBYcY9r+o/7iRJXO9X/+iUAw/9MEw2sKJQ6m7JOObXYnc7yLLghqyYKOmf7TTGNpnRWUHVI/m7z/d+0DLya2XAaqfdEQQM6k6b/wqmi5LyhsCYK+fgo6pR6WN92NlcnaCg1YszCc79JPVWEAJxeSn9F1REEKRKwn2O4rk48lLPifUnOEiNNO2DMh4XlZjsiWH23Q X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RVJ2K2xqQllZNWd4V3hpS2tHTWROSHRvU2hYUzJPazNaUGg5VG13R0s0S0tP?= =?utf-8?B?b2JJMi9EUDJnY1BHSDRUQVVjY3V4VW04NE9kZEJsb1dRMmphazFkMmhnTktL?= =?utf-8?B?REtHa3R3WlZ2bUJaMHgwOXZxSW52YlA1dFpSN3BPd3JuVHVaWnMrV1o2ZmZW?= =?utf-8?B?NjdhTFVpOER4MFZwTFdrZG9RR2dvZzZqQWJHRzMzS09nd05haEdPdi91OEp3?= =?utf-8?B?YkROUkFsbnRGME1BU1pqNFVZaThOdC9ubnpNMmhEeDdVQXVQdXRuMmV6QzJZ?= =?utf-8?B?MWZpL2J1RFdBWVVsTkVVMjZ2MUlzcTBHdi9abWtwZ3JJeE5aVngwL3pHQmJM?= =?utf-8?B?OXNEajZ2MmxvKzg5Y0ZKOVVHaFJhL2dvQU1mVU8rTWR5bGpXZk4vc1dwR0Mz?= =?utf-8?B?ZlZZaFJwMldELzNLcDFTOWNIclVIUzBQdE1CT1I4SXlJV0F1U3BHOW1BMkZk?= =?utf-8?B?SWRKQnhOQ2hmYm1wai9pOTRzQStOQ3VqaEljUVV1OFJxOGpVWmhsZHVLcm9l?= =?utf-8?B?QzlaOWRBZWp4QVAxNWRVbVJUN0U0NVNuTm9XLzZPRTN1dk1TL1VLUU9RUVBT?= =?utf-8?B?SFNDK2tRQWh5U3hRZ1c4MXZsbHdDYU1tV0FFUnk0Q0lPSmdoclRsdUV0RmNS?= =?utf-8?B?KytydzRLSzlQTHNKVG15UFptT1R1bkk5U0loYTBkVVplbnpaTnBiQ1BzcnhG?= =?utf-8?B?dFppbE5nalR3aGJZcHpYaFNodlhMSVVTb3lTUFMyTzYzZkNqTUVLS3hKNHp5?= =?utf-8?B?NGlDQzJwNWx5WHRGR0t6dE9TNlZadFpTQWQ0S1FkUGJHdllBMGdwNmRMSEFG?= =?utf-8?B?bVBLK2R5Ny9FNW1HdjlvNlUyLzgzR1lxbWxvY0M5d0pYbjVUM1VmZU54bDBR?= =?utf-8?B?dkdEMnNZUlNWZk5hcWFZMmVSWndzOVJWcVVaa2hsUlVmTXo5SUNERngwTXFl?= =?utf-8?B?aStoL3c3Z1NaRXNiK2pNVVZFZjBUTFFKejkyYXFJWVBOV1lldk9CTngzVFVv?= =?utf-8?B?TXI2MU42V1JTRnk0dm9nMmxGaVJYaGxvR2NpMXVQdXM5TzlsaC9SUVdLMzBw?= =?utf-8?B?Mk9MMGhDQ0k3NVhKSkkzVHBPSnc4NDBLZ2lNTzA5clhkRnVkV3NmMWRJMHhu?= =?utf-8?B?STBJSlhHemltRy9Id2YxYUVNQU51eW80L1pKMU5zbnhjaURSaFBmVnBKbndj?= =?utf-8?B?K29kRitKNitFSVFrcmV6cGFKRm5QdjJUdUxNbmhjVFNlZHRTcEVER0MwRk9h?= =?utf-8?B?SWtva2xCOXptOWRybnkrL0NYRkg3VHZCOE5QUFJFMzhXVnBiYW1LSVd1TWRp?= =?utf-8?B?U2lLUk4xK2lURmU1bFNRUjJNeXhRcUR4cmtncFRTeEZTNVNxNUtEM2haakJ4?= =?utf-8?B?cDQ1RnU4Uk9MYlRqOWxoc1pudjR3b2srZzRjUk5Nd0JsaTlQRWhpcGNjK25P?= =?utf-8?B?QlNqZk9RcGk2L21NeVY3VElpU01vdHpxUmI2RkFrRnZBQ3hZRVZkd2hTZ0Ry?= =?utf-8?B?aHY5SmxxRU91WWhoVm93ZXc1Q0ZLS2JtT2pieGJ4QlhnRkJaZVNUZWtKVEUv?= =?utf-8?B?MFFsZlhMQkFENEp2SjZRL0pUS201cXVSeW1IenBJTGhUUUxFQndPRkJxWDhS?= =?utf-8?B?cFVVYTJ4RHdYdDQxVG5zNXd0UW0zVTlDOWxCekhCV21udUdBb0VqVERwWTZ4?= =?utf-8?B?enlpSWhDQjZ4ZDgwNHNZUzdhaDB2M3FqQVB2UDZmMncvVThrNHAvRzFOSmxQ?= =?utf-8?Q?LDGB4PHy/IdxBt31UA=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1c70015-4264-4b8d-f698-08da5801deeb X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2022 05:57:08.8313 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR01MB5939 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/qpeldsp: copy less for the mc0x cases 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Michael Niedermayer: > Fixes: out of array access > Fixes: 47936/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5745039940124672 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavcodec/qpeldsp.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/libavcodec/qpeldsp.c b/libavcodec/qpeldsp.c > index 2b9146ceb1..5f937f9d9e 100644 > --- a/libavcodec/qpeldsp.c > +++ b/libavcodec/qpeldsp.c > @@ -199,7 +199,7 @@ static void OPNAME ## qpel8_mc01_c(uint8_t *dst, const uint8_t *src, \ > uint8_t full[16 * 9]; \ > uint8_t half[64]; \ > \ > - copy_block9(full, src, 16, stride, 9); \ > + copy_block8(full, src, 16, stride, 9); \ > put ## RND ## mpeg4_qpel8_v_lowpass(half, full, 8, 16); \ > OPNAME ## pixels8_l2_8(dst, full, half, stride, 16, 8, 8); \ > } \ > @@ -209,7 +209,7 @@ static void OPNAME ## qpel8_mc02_c(uint8_t *dst, const uint8_t *src, \ > { \ > uint8_t full[16 * 9]; \ > \ > - copy_block9(full, src, 16, stride, 9); \ > + copy_block8(full, src, 16, stride, 9); \ > OPNAME ## mpeg4_qpel8_v_lowpass(dst, full, stride, 16); \ > } \ > \ > @@ -219,7 +219,7 @@ static void OPNAME ## qpel8_mc03_c(uint8_t *dst, const uint8_t *src, \ > uint8_t full[16 * 9]; \ > uint8_t half[64]; \ > \ > - copy_block9(full, src, 16, stride, 9); \ > + copy_block8(full, src, 16, stride, 9); \ > put ## RND ## mpeg4_qpel8_v_lowpass(half, full, 8, 16); \ > OPNAME ## pixels8_l2_8(dst, full + 16, half, stride, 16, 8, 8); \ > } \ > @@ -459,7 +459,7 @@ static void OPNAME ## qpel16_mc01_c(uint8_t *dst, const uint8_t *src, \ > uint8_t full[24 * 17]; \ > uint8_t half[256]; \ > \ > - copy_block17(full, src, 24, stride, 17); \ > + copy_block16(full, src, 24, stride, 17); \ > put ## RND ## mpeg4_qpel16_v_lowpass(half, full, 16, 24); \ > OPNAME ## pixels16_l2_8(dst, full, half, stride, 24, 16, 16); \ > } \ > @@ -469,7 +469,7 @@ static void OPNAME ## qpel16_mc02_c(uint8_t *dst, const uint8_t *src, \ > { \ > uint8_t full[24 * 17]; \ > \ > - copy_block17(full, src, 24, stride, 17); \ > + copy_block16(full, src, 24, stride, 17); \ > OPNAME ## mpeg4_qpel16_v_lowpass(dst, full, stride, 24); \ > } \ > \ > @@ -479,7 +479,7 @@ static void OPNAME ## qpel16_mc03_c(uint8_t *dst, const uint8_t *src, \ > uint8_t full[24 * 17]; \ > uint8_t half[256]; \ > \ > - copy_block17(full, src, 24, stride, 17); \ > + copy_block16(full, src, 24, stride, 17); \ > put ## RND ## mpeg4_qpel16_v_lowpass(half, full, 16, 24); \ > OPNAME ## pixels16_l2_8(dst, full + 24, half, stride, 24, 16, 16); \ > } \ Are the arch-specific dsp functions affected by this, too? Do you happen to know why copy_block9/17 has been used in this code? (After all, using copy_block8/16 should result in a slight speedup, so I using copy_block9/17 must have been intentional.) - Andreas _______________________________________________ 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".