From patchwork Mon Feb 20 19:29:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40455 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp2166655pzk; Mon, 20 Feb 2023 11:30:19 -0800 (PST) X-Google-Smtp-Source: AK7set9YShEBIC8G4dDcSQsrMLusYw7oVPtEM9ipM3Hyr8LXRq0cAZyjlaKkQSpFFJZ4swtOUMda X-Received: by 2002:aa7:de98:0:b0:4ab:eac:30f2 with SMTP id j24-20020aa7de98000000b004ab0eac30f2mr1416210edv.18.1676921419518; Mon, 20 Feb 2023 11:30:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676921419; cv=none; d=google.com; s=arc-20160816; b=c12ccHZzNWpICu1q2R3GkFWv24k22yZxEB35rwbIayc+T9dVpdPN0NZnrpaDCdRaWa HoOZgqS2HCPmQZCeiP8Je8gRsP/T1KOnbZOI4Sqgu5b/4rpSJoKEU0pwObflphbSE2Xq +TcL8Jsnrh32XKJ01EIa7yCyGENTQzWSw2jgGgDOdP+9vgsX5bagnOfBCoPwqqGExCCS qOF0aNKD/lOVor+kEUXyj531LihQZzy4j1cAQE4OTJtc7TRsULHxNTdX6Z7EZUsZI8w1 gzWqMxVgbsG90pK7nr6i+A0EdrtFsBd5C2lTVCmAakBygvVJYHdHuvdfSTJaI4QwNcqr HU/g== 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=+yNuGF/qawtwI/h0gNS3Y3Sn4VbkRYCICtcKgsvnNEA=; b=xgMCWCs84FURXJh+mxOkumVsKRT4lpXkYN3gMD0uLI2zG7uoXqE3ugNd+1veLq4Aqx 5tQ0cCQTj4+apJVk5887gse7skwWXjLftTsWXBnNAJx7JFlgbkMt7nD4zZu6d6QXxYU1 9J8eamByGw//8yftZ+AP9QNGvSislrD4pnlHE82+STFjB0bdYcPAV1o7/EMuwsEOMMzB Si87t1bO04xYSkYrllSSCAh46SmRyLC06+PUKukEfu46nDwWiGnQoYGY7zhbsv+ltRtl r9Uh+ZGdBmU8H1XFvy2KuMPQ/vDWitCjks6PFJA1nTE+01pE1nuHbipLUOeC97WCoKxA MKHA== 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 n4-20020aa7c444000000b004ada4edd8fcsi12578881edr.63.2023.02.20.11.30.19; Mon, 20 Feb 2023 11:30:19 -0800 (PST) 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 DF8E468C0A8; Mon, 20 Feb 2023 21:29:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEE0868C09C for ; Mon, 20 Feb 2023 21:29:40 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id AE7431C0002 for ; Mon, 20 Feb 2023 19:29:39 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 20 Feb 2023 20:29:28 +0100 Message-Id: <20230220192929.4493-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230220192929.4493-1-michael@niedermayer.cc> References: <20230220192929.4493-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/rka: avoid negative value shift 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: Y5zHSgoTSoE5 Fixes: left shift of negative value -81 Fixes: 56061/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RKA_fuzzer-4649758062149632 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/rka.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/rka.c b/libavcodec/rka.c index 7452acf27f..1eb2289e58 100644 --- a/libavcodec/rka.c +++ b/libavcodec/rka.c @@ -737,7 +737,7 @@ static int decode_filter(RKAContext *s, ChContext *ctx, ACoder *ac, int off, uns } ctx->buf0[off] = ctx->buf1[off] + ctx->buf0[off + -1]; } else { - val <<= ctx->cmode; + val *= 1 << ctx->cmode; sum += ctx->buf0[off + -1] + val; switch (s->bps) { case 16: sum = av_clip_int16(sum); break;