From patchwork Tue May 4 21:05:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27589 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp748136iob; Tue, 4 May 2021 14:11:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyq2nIGmm23uWGyrQUOhJd2aVJ+CeNQeR2hjsBaoX/Bv7labCGDvta15zEGye7E7x9xo9B8 X-Received: by 2002:a50:9f8a:: with SMTP id c10mr2993369edf.65.1620162709829; Tue, 04 May 2021 14:11:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620162709; cv=none; d=google.com; s=arc-20160816; b=o5RvmSQ3z+TvQnsZT1yLRI0/puJfTGFpbqxPeHiiphqaZAJ0XgbY1B7PVI6Thmgo7n +SOWle9pMvD9HdrjrGb2bK0OG0yA9x5d6y/JQGRLJcSuBCR2/W30OhCD+zYownVDm9G7 WA215gXCQIqT5IQlH3wsyS/YM2Cq1ru+kvDam0h6WHXZL4vs9M/MAwx+fQ5yXz+5ndvt Hgt69CCAVqPZWD+BZNtKlja1Qf5SCAfUn5IR80QwbEYVLQ0PHSPNRGOchVSj4CCy9z5s AY0S5rc0xXZqcfSXOubRBfUTwq42OpDZI9ejWy3ITUxdn1Pju56Tp4UYY9YFqTP1dZnX rvUQ== 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=baNBRBL4FeU2FHKaCDtbejJ5O46ascLOq/fmBDdOcIM=; b=j9EJj5Zni8aM5sS5g4TIgdF/JQbkGdv3QI3RCnRDJat+TeBirxs9Iqk1p8hl7L31gp NHguTxE+C9xye+VGm02tWq0qOljiBluNxUKjUBs2M1CqWntV9sqinXbW7N8CH8p18UOd mDGZ0Rx9aMWsgxF84VUsLPiCMa8LGSLz0aV/d7Nhmz22GMd3NBEvUCDkkOSrC1paxVS/ 6lAhx8aEnO9uFa54CSLKWm2OuOfF1UNS/s+gIhbPMx8DCxtjJfHabJ7lqlbvsgIsVAB5 Bqg49g6KzwtoZmMirzc5F7vZv8M2k+TZe+cikVCV2wArS8DgqdEfqZuLbHaYqWAPPRYg M+Zw== 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 b10si3544859ejd.716.2021.05.04.14.11.35; Tue, 04 May 2021 14:11:49 -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 9E0B3680C3F; Wed, 5 May 2021 00:11:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E37B68069C for ; Wed, 5 May 2021 00:11:25 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1le2F2-001Yoz-07 for ffmpeg-devel@ffmpeg.org; Tue, 04 May 2021 23:06:04 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id e2E4lfjDVljeHe2E4lW7WH; Tue, 04 May 2021 23:05:04 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=Enj_JAl4A3Mtry2jw10A:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 4 May 2021 23:05:02 +0200 Message-Id: <20210504210504.13396-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfLWmxNpjl5hO2xseVxI9JtvoG3LbjHFqFqZYJUV+yo889p82iO/lm4YyDCwtebAT8k35Qz11w1ONjScc98QE7aUMj1WBXev6hpMahbE3w6/tKQuqwRis 7f73ZwBIN72qFCb0Iynop9zt/ABZzm8j0FhXmS9Zp8ALN6p5aYI2N4gH Subject: [FFmpeg-devel] [PATCH 1/3] avutil/tx: avoid negative left shifts 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: lkQHGzyOO0xW Fixes: left shift of negative value -1 Fixes: 33736/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SIREN_fuzzer-6657785795313664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavutil/tx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/tx.c b/libavutil/tx.c index 8da04e99ca..25adb6b37e 100644 --- a/libavutil/tx.c +++ b/libavutil/tx.c @@ -97,9 +97,9 @@ static inline int split_radix_permutation(int i, int m, int inverse) if (m <= 1) return i & 1; if (!(i & m)) - return (split_radix_permutation(i, m, inverse) << 1); + return split_radix_permutation(i, m, inverse) * 2; m >>= 1; - return (split_radix_permutation(i, m, inverse) << 2) + 1 - 2*(!(i & m) ^ inverse); + return split_radix_permutation(i, m, inverse) * 4 + 1 - 2*(!(i & m) ^ inverse); } int ff_tx_gen_ptwo_revtab(AVTXContext *s, int invert_lookup)