From patchwork Mon Aug 15 17:59:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37290 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1415741pzi; Mon, 15 Aug 2022 10:59:40 -0700 (PDT) X-Google-Smtp-Source: AA6agR6/S/qURKpa/70ku+gDCX5st3IBqVJE2WkUTahIKPh7Gn7nYr+g+tHX9WuZV+SmIeHeqd+l X-Received: by 2002:a05:6402:3583:b0:43d:6943:44a with SMTP id y3-20020a056402358300b0043d6943044amr15230829edc.409.1660586380332; Mon, 15 Aug 2022 10:59:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660586380; cv=none; d=google.com; s=arc-20160816; b=giu0Rj2JF7xWvW9tcAhBUmAWzu4DX5zCQk13B0jQGWjwg7Hih3W9chRngD8ascVQZF Z+K8GyKfJwS/tSLMD65H5RgF8iT2zTXxqEvxClH0gmWfeR9fgyTovGjjhxIl81vT2/y4 PdD6LVlD3nwOdx5gYr8TXiUuS8yL6eiiF2HY61TUz/Qp3mDSEr3yc+J2RFCOo5aNx8BP NpOHNxgJmOJaBaOrtXrut/OE8D1VEkTI0BM7BTe91j2MQACfwh+1BVilTAmam1ZJL1vq tAb6PkewjhCN9gPoPixMuGET+0gjshFxePeE7pLUOBmq/Vjk3QIrGWSWXFeLsO8rwFoO INlg== 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:message-id:date:to:from:delivered-to; bh=s/IGBwQUeDz3q+T1nyJJo5kO2CowWrYGURJ1QgvH91k=; b=B6PWDqq0LSGjhof1rYchwIAXL1cWvDM+MdpV6S/514OT+7s0/HktRJ4UjqfXGG76IU b6h37QhOsmTfIoFDvbnbX3nGRbfknTOks8UYqu6iJizn8qvJlg1BqSYc1WBOP8DNDvOF 0RK5VO9V7bz05jDoC3TWyolUBR25g1JG/pnJWqEpbywOyDXG+PVM/m74J+b43IkccP0N Q+62VSE4LzYAe5j21pO5//Qn8kPCGiVQq0kZ17JUajb4BHZ2XMmlAyGizTj0UyRMqxGx fmYUgvfxiGQgxIEmguf5NG0BuZS0m2CwQGeFwVVasJ0fjrYZOtAO7PsS47r9PIyzXB7M LL3g== 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 l4-20020a170906794400b00711f4c750basi8978965ejo.940.2022.08.15.10.59.39; Mon, 15 Aug 2022 10:59:40 -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 348AC68B956; Mon, 15 Aug 2022 20:59:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37CF868B462 for ; Mon, 15 Aug 2022 20:59:30 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oNeN7-0074A1-3z for ffmpeg-devel@ffmpeg.org; Mon, 15 Aug 2022 19:59:29 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id NeM6ooFBW8s8UNeN6oXvht; Mon, 15 Aug 2022 19:59:28 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id NeN6oZMDj8eSWNeN6ojpsg; Mon, 15 Aug 2022 19:59:28 +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=KKE5sHJo c=1 sm=1 tr=0 ts=62fa8980 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=XJFLZRmqKwOHnJPfURUA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 15 Aug 2022 19:59:24 +0200 Message-Id: <20220815175927.8743-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfAwSYdGCOX8Py6pbTjDTCnfVrAHvRHE9MTcQm4zUUYdqioFW/gRAGUJMpS7gLMo+JMLtvNtftP1UpZI9Q9I6OdIxKQtASfMS1Kb13z1pCtJZFsXi76v+ GyPtAepA+PWldA2s3hHDLKJftRANpi6ZfkUjKl/Lsf2+HRQJPrzqd9hyYeuwwTpA5iLBKiJf9lscwA== Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/mpegaudiodec_template: use unsigned shift in handle_crc() 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: w/yxphsDLGmN Fixes: left shift of 192 by 24 places cannot be represented in type 'int' Fixes: 49577/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP1FLOAT_fuzzer-5205996678545408 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mpegaudiodec_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index a28cac9867..a711154a3c 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -374,7 +374,7 @@ static int handle_crc(MPADecodeContext *s, int sec_len) crc_val = av_crc(crc_tab, crc_val, &buf[6], sec_byte_len); AV_WB32(tmp_buf, - ((buf[6 + sec_byte_len] & (0xFF00 >> sec_rem_bits)) << 24) + + ((buf[6 + sec_byte_len] & (0xFF00U >> sec_rem_bits)) << 24) + ((s->crc << 16) >> sec_rem_bits)); crc_val = av_crc(crc_tab, crc_val, tmp_buf, 3);