From patchwork Mon Jan 17 22:32:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 33645 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3188501iog; Mon, 17 Jan 2022 14:39:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJzmiWYEPSajuVGtGQoR8PR2bzqbUDXrx69PWDJjdkNFp9Rm75eykEsp/MfJmmY9gxaEWQkL X-Received: by 2002:a17:907:7206:: with SMTP id dr6mr1300420ejc.146.1642459147691; Mon, 17 Jan 2022 14:39:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642459147; cv=none; d=google.com; s=arc-20160816; b=ZZ+B2M6Y0QlhgXTwcrOYv12+bZOp/yDEThUx/ZvVyFqJ2NrPo6NzLsNLOpe5oDacUk jA5xo990wX1dsVwFqxzU8WI1mvI+JMAh6kBOkdnjLF0/0qPpDZ1sFw7/oIq8ctKnG7xO eJ0drf/UPI3KfNqSEdfk9X6qUCUy/djczxY96XMm8ODM5sDTy7cs/oQjC8hDpBxacf5Y 29TUqF3BKZocJyhpf61EPxnXz8eh8kvYgtfK23v9wgrbyw5iOI7nreH8wYLc3alLvfyb xT4Q4C+5T/0uBgdj9tHN4eJzpYuj6EEy1tfUuazF0sks2x6Z/2WcnBJek8hGTfZCTa60 89jA== 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=82sTYwqA83EZlAB2n5a7O62ZCPvVc0LVQOpuK1ZuiHg=; b=NBnlyAgFGor2IsUEB71zOgAtZEKxlY7K1pctLnLm729UjKqWp8UD/a79O5w0XTqLuF YHQ+bhcWatoUB9bDFHLdbTQLAQ0K5xRiqsdnE9DbiYfaz+wfWNUeCDaeC+92p4rzm0IH Z91GUpomDIL9WyzCDfEekxb6IVVVHHFeoG/PSIDkNCnz6i3n3rHoNqVnbTPh88zuDPG5 JJaflmSrqsxiwlfGCF2yjqk0fBbAhzG9p2Fn6zl0Wr4YtJ+IKchr0PoVp5wsmv+q0B1r 9x2yuZUdfi4ZAPAIV6t/96nFuZHxbk8HBAmNZx4JS6gwy9BN/CoVbc5TvNSdkJQ/iiRo 6+UQ== 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 z94si7723624ede.595.2022.01.17.14.39.07; Mon, 17 Jan 2022 14:39:07 -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 C36BE68B09B; Tue, 18 Jan 2022 00:39:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30DE268AF85 for ; Tue, 18 Jan 2022 00:38:57 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1n9aZN-009xmX-07 for ffmpeg-devel@ffmpeg.org; Mon, 17 Jan 2022 23:33:45 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 9aYPnN1itSgGF9aYPnysXg; Mon, 17 Jan 2022 23:32:45 +0100 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=f8Q2+96M 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=NEAV23lmAAAA:8 a=DLn-BtLLC9PIly0UTJ4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Jan 2022 23:32:44 +0100 Message-Id: <20220117223245.31928-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfPSdywsjXAsWKU9IN9Y9z95Ey51xkwTXrqZfwJHKQ3n+/lAKFS+1mAeDoc1QvrCL+d9+TyJ13qxtBbSUnqcekQthOiQzlrJnKf5N99xt1iWAA6T/IoVh EivZmAOsf0Mr7IMZE7UmlStGliSvWV5mUInVlv0RXU4zsoMYFiJu0BVt Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/cfhd: Avoid signed integer overflow in coeff 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: fdFKIiA21LJA Fixes: signed integer overflow: 15244032 * 256 cannot be represented in type 'int' Fixes: 43504/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_fuzzer-4865014842916864 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cfhd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index 008a6360b6..ac7826250f 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -838,7 +838,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, const uint16_t q = s->quantisation; for (i = 0; i < run; i++) { - *coeff_data |= coeff * 256; + *coeff_data |= coeff * 256U; *coeff_data++ *= q; } } else { @@ -869,7 +869,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, const uint16_t q = s->quantisation; for (i = 0; i < run; i++) { - *coeff_data |= coeff * 256; + *coeff_data |= coeff * 256U; *coeff_data++ *= q; } } else {