From patchwork Fri Oct 21 18:59:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38874 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp927248pzb; Fri, 21 Oct 2022 12:00:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Wgm0gFUr3MU2r7OCnYLirwewcYNmXTKG/V6/mg/CctUwK0vHodM+cmN9sntwouoPb31PS X-Received: by 2002:a17:906:4fce:b0:78d:9fcb:50c7 with SMTP id i14-20020a1709064fce00b0078d9fcb50c7mr17139480ejw.63.1666378854067; Fri, 21 Oct 2022 12:00:54 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb13-20020a170907160d00b0078b0865d468si20296166ejc.549.2022.10.21.12.00.52; Fri, 21 Oct 2022 12:00:54 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="s+/rrWCa"; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A9AF68BEE3; Fri, 21 Oct 2022 22:00:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074078.outbound.protection.outlook.com [40.92.74.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14EF168B8C1 for ; Fri, 21 Oct 2022 22:00:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ncSUvwEl3C9R1/ck9idUFqqyv28riAkFASbzkZCUG5Z6slDe3Zmj776MH9LFskbmmh6cYORC7Ma8z5Dqsbt0u8pC1Zam/VyB+3l1nNsOKXEIPHLcKHV4He9FOgju0fC7OtNZdjRTlYWu2IenwGE3NguRncTjbeRBfuQLS001qlXN/99SYfY86vg2ERromldqgOvHIYsTR187KMF8oE9yAQelObeoTb9NBIClDKsHlqULfHQDvzLBa0vRmLSssyzIzuMxY1YVmJmTgVySsNce7AA9/UGCJMoaRblfrUsymO2U2Vi+DeMZRNwCAe4BDo4an7tg5KPCihBYxMBQDeaFyQ== 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=MKmW6USXQXmEz9R+DqCRFzADWjDiJolXAXb0bnyAFbI=; b=jDQgPsChsULAk1CAtkoIMuHZQHN9qXRi980g5CCLA9xgD35xJvkgL0BoWl2sqUHM4y2/Vk2V34L8XjqPffgP8EUIuZcsIGikDfVtxXEKOJfijFwgEGiF9xVexmbZ4WSecz76TAUxt7X9nzz1Es9RcH04zTYkOYiTpZo8MbW6Klt4NDqGJ4sSD2jFJeGbjyOXwSdKDkpajB9/7uOXLOs5mpXE2bQZvSM7kQ4C8dBpvG0uVDwXP7E+O4dtS4CWQxSC3RSQV+tKeelxd0p2zgv3e4LrVpAvFtYjErQHA0RTvXmBFXbRHE7n6knRZUeqXkcEN+fHH6KwOk2+R+POO2PsQw== 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=MKmW6USXQXmEz9R+DqCRFzADWjDiJolXAXb0bnyAFbI=; b=s+/rrWCaH+kAfma58j0zmlcOPYRoy9A+vTDINBTP+uh2BSmGhfOugtwfBQPTtNJmY/5jkPJmiYZAXjN4DMM65vHk4q3Qd0PsldpmsXNvmjIrC8e1qRE4BrRPFdNB8GMUdG9+6u/4VYcz/oUQfspcRfsOl05WrNQxF5AReAwoI9XP7DhCZyRAzzYpZYdDB6B8bYF6X01/2XJvGyX/LTtWfYCjsth0XcfpiYLcDn1bIYvFww29NGQg9FdT5o9rUBWD1FbpPYUBHCqb0GTXmCCI2x4Cu8U3mrh4cCTAqoTaOTExyar7oe336wXacnzvwWjgq8Z+JKOgppe3ZVM2LZ2hGw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0491.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:291::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Fri, 21 Oct 2022 19:00:28 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Fri, 21 Oct 2022 19:00:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Oct 2022 20:59:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [UC9aAMij874Gvq8hCvPnpaWahJHoMPiTuzMAZd9tes8=] X-ClientProxiedBy: FR0P281CA0047.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221021185939.3096155-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0491:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c2533ff-8313-4b96-71b4-08dab39684f5 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmoyh0/rGpTlCzjnzrUxdxR91Hl9wChFmIOgZstH3eQ7/Mse54Hrj57ecOFHqFE+cG0rqzmlu1ubcTKCXxqQiR9lxr+3mczSE9yqUduiqshUluSY5pgeiPloMdXR6Yf39muLhqlUlxaArizpABfLUZa5IRBh/NKN+92PFCnYVhlJIAebHVJfo6BKr6yJi3YKR+a0fQtQH03e2P9Y1xTXGcBG3/qKAJYQrpVe+I59LjXC5+5l1jRQscAiL4MGAcLoZzN7TZC5RAyO7fgWKI38BqU6TGydxp7Rm3JksAnJU/4LnP9DQ3EsG/MTeANxPt97EvVWTfDZbjVsdIjD6aPOLZ4vokY23aXsy/nyQPxa/DBkgDsoarvkkDdeRWm+9MiztpNhXFBSAST/TXUoRCAVTcX7g7XQUmiXOz8C8JI5L1ngapQfoWiYwlsYYtD8OmxaI0mzcUDlZG1IQTw9d/I5FjUw286PGKOyl5CBTcBX3Hh3XIC6Klms1qL0Kq3LJuppiZsLxsg5S1vNvFGwxc0CMCXnBQaJ3nEFQM3mPCz/ZSLMhk/anNiJtk2dPIJnLSeHCxvvWz446y7paiyLKsvsEVT3yVHlVcZi4HNyR8O7XsFBNG6eT+sYUU95sbFTgorppRprgAiTJXgo7J9ib31IUI9weICklShunklyDE9fuaMPVj2ZkFDGXAyExwwsBsJJoqwj7L3hNpHgw/qwn6sqbsUBhReIAtNOnXHbMJO4o1LfG3156LMYPBDX4fUeAstVvWY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C6gXMhYdrD9prIgYKhNrdcT9FTzdK3vn/KVBfV7oojKHUEFUvTQ82jxLiaysCeuu6NGFHvPWV6qAs0SX2VuPHREjqwCvwlAHsxFxjzbQLd8wd09meEoC/ojDZ09ljT02TZyGRjlB1EA5EVFmvMkWftalINcvKrUiIUlhntclx9TjQ5dohSvcQNqxNcHGEovaqmU1gOtr9dsf2r5Z2EjjoyYbFWx86Y+ZUb6/8m7/s96NSYLqUy2/YtfR0cKkW4F7T7TUxCq/U+7py9oVb6M8vPKpMEu2DImgw/G238UcByUf2CE1lePRUPid4IJejN/zZMSaqbka47cUqBpY12uS2qVABpUiJbJIDKRnaEIgkV/04E7YuGqMsYOI2jrKidBa3C+/e0Lf2gC5YRrsCSYaxAlQnXUkJAhZyOGnD+y7edFommp8CNbK2IGbd9miHkm3lpKNRHcUhIX6eer4uUZcsWyuVsHiSHPwMdYZmKTywCgJljdPsxp2hQrZGlrwqMqiRalvq+gdyh9cIFKH+gmjcLdGyKR5wuik4kCUpjXkFcLND2Zaj4lfoq0vWG2/a2nAEgnEcJOWi95E4PhkiRB/FE6ioaSQQqutilXFeVXaEJAuukUmb/ozdTVER18d+Nhurdavjy9rxhqLmfbZsHAKpbIrPGuBVZj2s6famGWKowYyEEg+Rew75vt18Mw7u5O/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8hDUGcMDRSiH+LMRd4ie9ABuCJnn8dAzqYVVsDpH64AJB9VkRrdZUa9z6VYfkyQF/crBOIhNS8IMejYUueGLuirLe+hCb1CEUGlpW5PMDPYAGInQMtv2jg36RXxAB2Ym1QJV8BJaEucJ4FiINrXpBgNIYXdp3LgnpIyHWZfzj4T5mw4XgHgyNktQCzeTkma6Pd3LKdGONJSlwPvsZFl7HfZf4z/9++8wzxiZQTGTVTJHm6Slougz1+mHAcifbtUQkqi/BWoXkEXhGGHLTwQpkUgPt9F0FWVmCcklsyycmZYO+V0EAprjX899GWjh0M60LSXj/jbWreso1FDd7JTnpzhIkf5nDGG1gxPJg/+791Hj5FrPwXoJw8PN09EaWjKRo/X4E3M1ZviAQb3ekrl7Nc6wE0wLeTazrGrVO+kYjm5uSb8gSVbmhl/bq+tBc39EfsRrhKIZv7J8/2GLw9b/DWUEUlZXcwvNZw/eU7/XNxmya4RPb9Cgl/KgYCcVf9yDvIZJLk0S5NYguPv00eznsCOkTuO3+cB0UWJFPQSlGTnOPZ4DJCrYQJIeWTGbmRRcgyssN95I9zsE7Z3S86hL8RNquh9ua9cLZsLdSjunFIKZd3FBNMvtHFHEOJ02VhvCZXET1RaPSwYD1Fg95CbdiL7i8ZzlgzJRJqNTz6dNK/kTPMGFO3Iy/FMuQHYgYGKbcddEM+gQk6Zw9thV2Cbhe4TEndZVSkfh/QIylaJZYwlbJ/2JuMfE3urSv+HxlgsZgQv+X/VpzN/Ktw/I8hD7xdcVCvIW1P6Oac99a2hhIJlljlee2j+i3thdPphx5LyMgIAhaFn1FuIY+yjvB4DHLsMdqEzwsYimEFlKvj4ZEW59OyzEiV3OW8lQMjXGiqcq+8qLowhGD61O9rAA7/stY9EsWPB1Cd9mx2gUC3NN5ArpOc0jumBFlm6MvIvbjBm8veADLiyunlko8N3phG2UehJWi2rJJWekO77KFfv7loCksgHEwfnbYCPehtaf1qbAkIzTA6AzMRmfSgay8wsnx8S/t6IJmnM5P7Tw7LfZdS5gqgW6WEnZWKOhYdaS43u5FO8xxbmQO3D6pfgSppWkE3T4rGFht1Bk8pOg0eOP3n+YSiHoDHNE0+08L6EwRVU/StnMpgzo3VsnWAydOsrQI+3mhucydXKMM7znr/BPi/jFVdDuJ/18H+7jHqePUYxHutXgMJvpu0F0pF1dP2HZKKW586gFczTOQUzVFPqaIkv5WKdC8ugDZcUwZWvkJAQdslulsUNatVYc1TyTyihBWYnOkfFpwP2eOjeZ8m8uY625PUyuUx0AISgrRbTPa627 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c2533ff-8313-4b96-71b4-08dab39684f5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 19:00:28.5375 (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: PRAP250MB0491 Subject: [FFmpeg-devel] [PATCH 5/7] avutil/aes: Don't use out-of-bounds index 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3l5DInnueeAY Up until now, av_aes_init() uses a->round_key[0].u8 + t as dst of memcpy where it is intended for t to be greater than 16 (u8 is an uint8_t[16]); given that round_key itself is an array, it is actually intended for dst to be in a latter round_key member. To do this properly, just cast a->round_key to unsigned char*. This fixes the srtp, aes, aes_ctr, mov-3elist-encrypted, mov-frag-encrypted and mov-tenc-only-encrypted FATE-tests with (Clang-)UBSan. Signed-off-by: Andreas Rheinhardt --- libavutil/aes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/aes.c b/libavutil/aes.c index 8b78daa782..2f08fb4164 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -253,7 +253,7 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt) tk[j][i] ^= sbox[tk[j - 1][i]]; } - memcpy(a->round_key[0].u8 + t, tk, KC * 4); + memcpy((unsigned char*)a->round_key + t, tk, KC * 4); } if (decrypt) {