From patchwork Tue Jun 18 13:48:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49996 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2569754vqg; Tue, 18 Jun 2024 06:49:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUBa2WlnbD5rNI0k8RLWDkfPV2TASBExUkSk3i8x9tfJ9wzm7WDmJVM9ixyFW5JZKjxYuAGb1bMsrigXv4YXNbsna5LQOn6nCskvg== X-Google-Smtp-Source: AGHT+IEoSAjoLTBb1WmqU/7r0xcun4k5hUqjTJUZKdrDzoCmqoe5Xfmm9um61+m2GP9HbSl+WOqS X-Received: by 2002:a17:906:35da:b0:a6e:f6bd:edd9 with SMTP id a640c23a62f3a-a6f60dc51ddmr797768966b.59.1718718570018; Tue, 18 Jun 2024 06:49:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718718570; cv=none; d=google.com; s=arc-20160816; b=WnTwonPvDNAuTkp8iO4e7E5patT6Bh0KnbQybaCVXn3eSlBPVaF2K10AZQjh3Lze2r qPdPvngyX65/H+izNpkJNqHc0nBWjHT623/swJE+ZsaTZSpGLS9fcnDQyPkV0VbAn2q2 tDoAkPzfNEs/SeTy+SaHLhq9s6DjhYjAQe0sd/K5H4DfptEYh+t5XkzuwDCTVryLgC+8 xqeQYXs07UUE361DVBLUAL5Z6XIhbUCqec7qsxSOf70SLlopF+ncREps/iOYqzDD4v5w Jbi8nqDSS4X/BTVdAVzbxX3BzBu4odIQbK8tzZTn3uCn+aMgb/wXpWabNPNrSrq8oy64 EtnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=foiwmHhhOVVBUD5hRUjmKzEkNG0h7ozl8y//0Dzrhmg=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=P8uwV+TqJL9sd6cYJC+UELIfaFokisdu416vsPpEol0XH1gnwBypmvnflBNOg7Tkby LWHZiC0aRwcMy6wl/X+IIDOKqBjQuAckXMFNivCKm/qfQe/f7mI2/RJrKGJBeJ4ofSCR p09XYWgj67I2HtVONrUJNVNFK/dU1uLS5YlVJl1nfPeA2+IysNp7ijrWcirWVxBzzeZN NownwQeugVV/dfRwE2FOvkRYS+R7L8LfYGKG1M5V8E8MfkWjNNq6Aoyfhi5nd35bIZj3 EwfDklNfwVIfZcGaXlNxue2NV2RknxGGUFazoed5kGVSZcbgR2852Y/lf0ncRSaqG5YL ssXQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="S/Ci9lvh"; 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 a640c23a62f3a-a6f56df7496si524862166b.528.2024.06.18.06.49.28; Tue, 18 Jun 2024 06:49:30 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="S/Ci9lvh"; 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 5BF3C68D7C5; Tue, 18 Jun 2024 16:48:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 620E868D7CF for ; Tue, 18 Jun 2024 16:48:33 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id AF0901BF20B for ; Tue, 18 Jun 2024 13:48:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718718512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HN9q2Xui9vPvLA49HQKIJI0zR0DQ5JwqRRKQhaXVNL0=; b=S/Ci9lvhcXFwG/qEN0BkirGq3svVhM+Ob0M31i6r24TOlNTXDRFNvsOQsbZSs+brHdIBDB jF1fpf8CK3DRytusjxMo31XDLEtkvslHM69qhzpHzrgK509a2zGwCwKDGrxlBIghqd5ERQ aQbbC/UmjdrcXvPw7BJK5zDBi155JnLBxTLHu9KAeM7jGvUakMbnAfdWP4tJ78C4b8hNuX 2Ss1vdND8ZmKpxNisGH3joS+xYjx/WVY3NOW+jluaZXpYMCam0BqieQnT6sQDEjO6wrbfS J//AUt8PWKv32guW71QRV9l3od0H/PWEbCjrDSTtp1CqliILEvBXMwVGhsSt8w== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 18 Jun 2024 15:48:25 +0200 Message-ID: <20240618134826.2189719-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240618134826.2189719-1-michael@niedermayer.cc> References: <20240618134826.2189719-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/vc2enc: Fix overflows with storing large values 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IAhAJt2CiQmf Fixes: left shift of 1431634944 by 2 places cannot be represented in type 'int' Fixes: left shift of 1073741824 by 1 places cannot be represented in type 'int' Fixes: 69061/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC2_fuzzer-6325700826038272 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vc2enc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 4ea836d9c9a..7fa6ddc4ca0 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -189,7 +189,9 @@ typedef struct VC2EncContext { static av_always_inline void put_vc2_ue_uint(PutBitContext *pb, uint32_t val) { int i; - int pbits = 0, bits = 0, topbit = 1, maxval = 1; + int bits = 0; + unsigned topbit = 1, maxval = 1; + uint64_t pbits = 0; if (!val++) { put_bits(pb, 1, 1); @@ -206,12 +208,13 @@ static av_always_inline void put_vc2_ue_uint(PutBitContext *pb, uint32_t val) for (i = 0; i < bits; i++) { topbit >>= 1; + av_assert2(pbits <= UINT64_MAX>>3); pbits <<= 2; if (val & topbit) pbits |= 0x1; } - put_bits(pb, bits*2 + 1, (pbits << 1) | 1); + put_bits64(pb, bits*2 + 1, (pbits << 1) | 1); } static av_always_inline int count_vc2_ue_uint(uint32_t val)