From patchwork Sun Sep 18 21:57:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38038 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp886253pzh; Sun, 18 Sep 2022 14:58:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4WnoSlU8kX+7LVgEZC1u76uDmbtwK8cEc/68SlESMgkc7vEoGUBR9WXUYKn1238kQ87VeI X-Received: by 2002:aa7:c6c4:0:b0:44e:dfc0:224e with SMTP id b4-20020aa7c6c4000000b0044edfc0224emr13026688eds.115.1663538293732; Sun, 18 Sep 2022 14:58:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663538293; cv=none; d=google.com; s=arc-20160816; b=KgOqveqzS4NPRZNHgePeP4C835gJx+J+uQlccdXU+7sAd+y4jzwROlL+kd45RjZOpR xoMoyMYfL+pKF2cWQYvhOflqqigQs3xoI1lbTpttxNA6tr7MJQgBpfLgh/UbRqCfMUV+ KeGWLPgBOfmpP1oJ6Iz54QRmzO1qlNmgWPKZamPPDTvYyk1qF+1AJ7BPoTdAuzaMsIe2 2YzXwzY6FoFlrN8mwW1lCgXrTOphxednakqOMZNVLlOUXVjS1dvsRW8WuuLfjFdn0S3n d3iZzjycP5VIFrUSMYfyCQwItdWDCejJubl1TlLvuigUZkPdDPXlXwPytSMbDTITXGSU nR6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=9MiJz+SSG4gsDgzOIHTCh8SY9SuiahCEy3NEZkU3s/k=; b=YsAgYRuCnF0g6geCIi/+i65mmIIK9n6UZOjU+V0XnEEZxSIe0BzOnVMKLlg+QWpcYV wjK56flMKyIBKlxnOOSC+57fKrpaRy5fn5293GQcRR979tZpHFZlxuCvDTNO8vYPx32M yxxojlgGsqxMyZLqLlOl7Stg5GeD2O2Db5T/Cs27InPyRqdWwNOU7YlSdYwvcnDx+zQ2 Cv21sXdOOZfKjO6IwUTdkh0oeQrZXcUFKEBuGjq2T2oJjIt/+akRimvwk5/CYhexk2VJ 36EsqEvK0Lk6qFTNETwZIDGXNL4kDRfbWZ/GDH+yL/w14DfPyoV1efQb6sx1h1JzMW4o P5Jw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dd18-20020a170906c83200b0077081057215si20057293ejb.956.2022.09.18.14.58.13; Sun, 18 Sep 2022 14:58:13 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A52D968B747; Mon, 19 Sep 2022 00:58:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B9CE68B747 for ; Mon, 19 Sep 2022 00:58:05 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oa2If-00F0Id-27 for ffmpeg-devel@ffmpeg.org; Sun, 18 Sep 2022 23:58:05 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id a2IforEOd8s8Ua2IfoHb9H; Sun, 18 Sep 2022 23:58:05 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id a2Hho5pLXbZLDa2HhoJaQT; Sun, 18 Sep 2022 23:57:05 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=63279431 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=B5ecJTVlEDOtsynCxIIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Sep 2022 23:57:04 +0200 Message-Id: <20220918215704.13793-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220918215704.13793-1-michael@niedermayer.cc> References: <20220918215704.13793-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfP1ySR9ebVqyPduhmBtfMOvEVV+VtLSJ9Q84eIzXq/Tz/90yZ8GojVhlQDv2p1X2rsiJojT6yMG3LuyEOQW5POpAVf/G7/58KVWBwb0KEuFugIUCF66J RNDuROnTiwbDtw3eIKHVHWYj9g2bemjnVTxvCuwTEAHmDoJtatrvr/34trRxVGD3J2RHAiBHghGpKQ== Subject: [FFmpeg-devel] [PATCH 2/2] avutil/aes: Silence fuzzer about accessing round_key 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rWaobQFzu2ph Fixes: index 32 out of bounds for type 'uint8_t [16]' Fixes: 51253/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5968304170205184 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavutil/aes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/aes.c b/libavutil/aes.c index 029d738f870..8f3e04e7c6d 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -251,7 +251,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((uint8_t*)a->round_key[0].u8 + t, tk, KC * 4); } if (decrypt) {