From patchwork Wed Jan 11 20:42:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39973 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5037780pzb; Wed, 11 Jan 2023 12:42:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXvEUDGYmbzDI2F3KDO1CMFYvVzwod/FEDJbSmp6AGfJrA8+N2nGb4Hnpj00bjUv/riJh3cP X-Received: by 2002:a05:6402:c8d:b0:499:bec8:3a78 with SMTP id cm13-20020a0564020c8d00b00499bec83a78mr8066724edb.41.1673469755743; Wed, 11 Jan 2023 12:42:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673469755; cv=none; d=google.com; s=arc-20160816; b=BYGWwujDMzRX/E39tIRxfHZ/qpATnLTMvYDuNJZattkSChj1QTKpxOpS2m5POVvLOg mp/689U5ELmWGAEdOFAxL7qzpqSawLNAx+qT/5xuS4OO3nt9+jFv7pB/kerm62e3z3xO 3ya+Earrx90kfnTAVIHtdy9oQU9MI3jnaFpDHLQ1MrI1yq9K9ZbZa/gKl8wamulVzoMD ldvzuuOd5Rk10MVnq05/lNR3YHXKv7BGD1GtwfYoaAc50nHk6Vz3weRrNGiyoTKnOCH6 CZKifqf9cuGDgWTYOsb9YKdHM0AiGTmQIkv190UeAU0rSieuUXWH83Fe57lzN8CGqdIC 55YQ== 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=ae3b7WdTyJqcDUm9Cm4m5NKWGoKlGKLGF5BzVkLcL/o=; b=OkzFAKj6Nk+9qlK3q40IUEkkJVw1aANbMRDIQiEhtKbMXpNhTgiZOo6y89kSIgQPKV 9uUt+YuXdpHA/6rntEhhRS2hqwSDObZThsGtMtAQ3iAYQFFjB2U13+w+hSbAp1KQ561p BBHLjKPYYI+OhkPq0z2f2H9QjWewQR4ZwJ3vGtKc365+iMQKSGYlo+bpy5m8Zp6//aum +mEEKmwwYMV4G6jJbAI5VTNOu4JZmi3op0nVhZ+rL3hWtrN1CWMWPmeTUQDNiv08uhJ2 MbfWIgWmqjazL7dFuveLYt/igwPeQuq0I1aFpqYAByEPzuCeP5mxRDLZUZALpqY5rxnG Pb6Q== 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 eb6-20020a0564020d0600b0046dbf1fd79csi19168121edb.612.2023.01.11.12.42.35; Wed, 11 Jan 2023 12:42:35 -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 51BF168A2BD; Wed, 11 Jan 2023 22:42:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA78168A2BD for ; Wed, 11 Jan 2023 22:42:24 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id A1900100006 for ; Wed, 11 Jan 2023 20:42:23 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Jan 2023 21:42:16 +0100 Message-Id: <20230111204221.22550-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/utils: allocate a line more for VC1 and WMV3 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: 3Fs4yDe2iUvj Fixes: out of array read on 32bit Fixes: 54857/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC1_fuzzer-5840588224462848 The chroma MC code reads over the currently allocated frame. Alternative fixes would be allocating a few bytes more at the end instead of a whole line extra or to adjust the threshold where the edge emu code is activated Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2b63a498b9..1aa0a05a31 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -321,6 +321,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, *width = FFALIGN(*width, w_align); *height = FFALIGN(*height, h_align); if (s->codec_id == AV_CODEC_ID_H264 || s->lowres || + s->codec_id == AV_CODEC_ID_VC1 || s->codec_id == AV_CODEC_ID_WMV3 || s->codec_id == AV_CODEC_ID_VP5 || s->codec_id == AV_CODEC_ID_VP6 || s->codec_id == AV_CODEC_ID_VP6F || s->codec_id == AV_CODEC_ID_VP6A ) { From patchwork Wed Jan 11 20:42:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39974 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5037857pzb; Wed, 11 Jan 2023 12:42:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXsoVDdLJM0QjD0Wk68Gi5iC2qbqHkhU3prWXg3OsnAmtacJelm+YAYdLl5BFmom11bJ/FxT X-Received: by 2002:a17:906:a18c:b0:7c1:5467:39b1 with SMTP id s12-20020a170906a18c00b007c1546739b1mr65115004ejy.72.1673469765725; Wed, 11 Jan 2023 12:42:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673469765; cv=none; d=google.com; s=arc-20160816; b=ylxtQSvXeGY7UFh/D8OYtXyimqDBvVmEpC5GlIH9x7m76KH4nMtSTe2Ft9sFTcbNbe CTSQJf2MiIrtcqKC7uqJlnLv1LWT0FaO49TByt413FWh1BuY8NlvcoEizf3nDm15MnPi lT3bMhjxnGbYzIOfqez8nUb2uED/4GGzQ4fNJXFYL6D+1lQy4+V8y8mHqYbEYkkpObTr VyAp0qxz93wdU2Dxvt3smMbsVcze7lhunHWa0HubOIMRYfTj3PVJ/sNauM1vP/SyYyR1 W4WujvsbtZ8ak6Lp+WBC+6+lDMHlm9otfaQovNJC4Q74ZpFm5Nvcpl/A5hesYve6hEYG U5CA== 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=0SE77B20g4J+rNfieg5Tmw5z4G5WRsBq1bPrleQuNLQ=; b=oxGaiwYa22aKW0r6ewofhGz1dUn7KJzJLp6hWZL+4HSS20h8xCNnipANLPQGXGSFsi d3QmEprlvGcHH4UObI+JKZn7m1DuSn5p1Z7zHYGdzWVXV6T7vfHTAk3Uli7CcwnWNqol b7Ej3FfrpDc5MGWER7qv2QT4eWVOuadafCWofK0ARq8j3gkHVptpvzCDsIE289ug4Yzq IMRO1Wvn4LSdUu/hBjoDQcHNsU1kuzeTO2TurG+LcP5k8ZuspF9r2Pw+cOkmsHMI7YS9 pbJAKaoWTMgqqcKYzdRpyqeMSh6pPfaiZSEoE4zKYP2XYMlaj7fYxl4OUMpdVD7Fg20W s4Ww== 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 xf5-20020a17090731c500b0084d4cd2dcc6si8331988ejb.598.2023.01.11.12.42.45; Wed, 11 Jan 2023 12:42:45 -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 6E32268BD5B; Wed, 11 Jan 2023 22:42:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21FB968BCE7 for ; Wed, 11 Jan 2023 22:42:28 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 1F574FF809 for ; Wed, 11 Jan 2023 20:42:26 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Jan 2023 21:42:17 +0100 Message-Id: <20230111204221.22550-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230111204221.22550-1-michael@niedermayer.cc> References: <20230111204221.22550-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/utils: Ensure linesize for SVQ3 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: LAQ7nUia0ILQ Fixes: Assertion block_w * sizeof(uint8_t) <= ((buf_linesize) >= 0 ? (buf_linesize) : (-(buf_linesize)) Fixes: 54861/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SVQ3_fuzzer-5352418248622080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 1aa0a05a31..30dea8a813 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -335,6 +335,9 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, // the next rounded up width is 32 *width = FFMAX(*width, 32); } + if (s->codec_id == AV_CODEC_ID_SVQ3) { + *width = FFMAX(*width, 32); + } for (i = 0; i < 4; i++) linesize_align[i] = STRIDE_ALIGN; From patchwork Wed Jan 11 20:42:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39975 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5037961pzb; Wed, 11 Jan 2023 12:42:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXsRT1p4q4bMo02wT4EzrbqNcMuETay+whQEgPhja7ZsjCkCuTDV/LuSMLmD/pfwhg4UDRiP X-Received: by 2002:a05:6402:381b:b0:497:233d:3ef4 with SMTP id es27-20020a056402381b00b00497233d3ef4mr22871205edb.22.1673469776448; Wed, 11 Jan 2023 12:42:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673469776; cv=none; d=google.com; s=arc-20160816; b=XfcGV+4AdCnz0N+FDVmapfNhMJXCZky65z87xXDDXMlKGRl4z2a5zjdYcXeLtVLPe3 CaowNaC+KsWEzID2xUbs29VtiK6GSEumYUNXM3lPMQRMTC821Uw6lr/X0Xjquy2LQ+wG u4Yv4uRQDE34ckWmlQg064wI+2SAFmhR0a/yOX1cGOr+RQXO6OVxcudLorsT0wIRpXZy Ak6tsEfx4qIV4UoJJyYwwzLU0v2l1/6Jauaja+jkLKi83apLlkRXE866R3wetYkfrUFK vcHYRWZI7xuDS6yR+uxV/NJte2AW9oTyNZqUOP/ht1sa5xZv8ff1sY6PrFQ7fbdVbq1A Xv6A== 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=sr0XK4NPLh6TZGtP+ai+8sAc4Bmbn50/drZI0E07eIA=; b=jGraKP3ulwbgYphSJPRy+o3bQMIrc54QSNywrShEbm+zg6pQY1NP0faDYVnTmCKvRk 9t8StNhHLfApB4p7IVhfPXepm2GZRCBfURXIPWHI9IyUhowci5q1jYpQ6oTlQWh5Yp0k xDpDQI5mGtzGSCuCAPSqZ2Od+lEMelTNnQXkSwWW82msyS2FigkUVmgZ5EeN4x2Y61+x 4faLeBQ6cMVsI2D6562ThqX8XNxR4KTGYCx7QEgtpMp+GIIGVCYpyhZPAcGZmUeIvR1F LqqWj2BGxM1wEFTrrCsXfW3XyrvXB48DlGiLYfmNyFvuqEkvOnxcGH+ZZNFOy27IFMbq i3oQ== 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 b8-20020a056402350800b0048589250850si17548431edd.11.2023.01.11.12.42.53; Wed, 11 Jan 2023 12:42:56 -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 76C7768BD5D; Wed, 11 Jan 2023 22:42:38 +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 B5E5668BD23 for ; Wed, 11 Jan 2023 22:42:31 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 8487E1C0002 for ; Wed, 11 Jan 2023 20:42:30 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Jan 2023 21:42:18 +0100 Message-Id: <20230111204221.22550-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230111204221.22550-1-michael@niedermayer.cc> References: <20230111204221.22550-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/bink: Fix off by 1 error in ref end 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: dlBI2EEuuZRX Fixes: out of array access Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-6657932926517248 Alterantivly to this it is possibly to allocate a bigger array Note: oss-fuzz assigned this issue to a unrelated theora bug so the bug number matches that Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index e3971e557a..a3140114f0 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -870,7 +870,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, binkb_init_bundles(c); ref_start = frame->data[plane_idx]; - ref_end = frame->data[plane_idx] + (bh * frame->linesize[plane_idx] + bw) * 8; + ref_end = frame->data[plane_idx] + (bh * frame->linesize[plane_idx] + bw - 1) * 8; for (i = 0; i < 64; i++) coordmap[i] = (i & 7) + (i >> 3) * stride; From patchwork Wed Jan 11 20:42:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39976 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5038009pzb; Wed, 11 Jan 2023 12:43:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXuOL1/6/IV3f7gFi5wVpq5zB6VvvJ3GEXwHQ4paUohAFKjHkkekU+R1q8Wfl5UKs9ZjibVq X-Received: by 2002:a17:907:b601:b0:838:9c66:cd30 with SMTP id vl1-20020a170907b60100b008389c66cd30mr65712304ejc.13.1673469782457; Wed, 11 Jan 2023 12:43:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673469782; cv=none; d=google.com; s=arc-20160816; b=ufkkPzjpKyLQ4v3J8zkE3qWmZnPvmvw6ZL0vUTJ/X5vEFmCLw5JoFI1OTyAQCuNhY3 GfgIWCcyzZgDVdV1KEoyfPRaW23neAUFeP/XZXi3Q0EzHGeap3pbxdpcUrvs6S251VqC IrweUE4ksW1rI53SGtQV2bOuEaWrq9PA35Z7awFyc7mTYWjeRcWcPs+F8zPy9bdUuQ5h tCBhzUjCxZzGmR0YatxxpAkrWya1WqQ/j2bbqKqKNZEPy4jgQKK0SgSRgIhYxSq3YPb0 efV2U6U9ZqGAHnTlK/A/EyOyNZaVW++ItUB4ncSuo5PaZbIehCETokKuLuF+sVwXzl7/ fJ1w== 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=TiYKuzq+oHjMgGWO+TXgsCbnB3QmtTJWKcfPH003rcM=; b=G/qK520unDcf4pq3fC6aUPmygNeg63hi28yPOAUV7L2VO9gr0RltaPrCq6AsHSrHr6 VJtN5siOQXaJao86ycBtnEsYXso4meQ42rauKKJonYt25/BMHN/54zuKLzWazsGRN3QR 1reyfBes+Pzsq368Rm41jY0aiEVekJFY9eivf4VNABva3u14Y/ZsEar4dP3dDykOArdt S4yDSUVFKeOUCffb08z9QPQcPXmso+9WLfbrbBJlymK6vqjxeGAzhpDFA3g29n3RQakx iclSL3pXKE0wjYnqLFn4Q1p7zvtQaQ11QhT/XKPfqCD5vgXJSUkEChJnHyfD9OHBPkxa PwIg== 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 dr5-20020a170907720500b008327270a7ffsi16274531ejc.663.2023.01.11.12.43.01; Wed, 11 Jan 2023 12:43:02 -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 87FF168BD72; Wed, 11 Jan 2023 22:42:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89AC368BD5E for ; Wed, 11 Jan 2023 22:42:34 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 88554240005 for ; Wed, 11 Jan 2023 20:42:33 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Jan 2023 21:42:19 +0100 Message-Id: <20230111204221.22550-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230111204221.22550-1-michael@niedermayer.cc> References: <20230111204221.22550-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/bink: Avoid undefined out of array end pointers in binkb_decode_plane() 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: ehk1dOcQMd3f Signed-off-by: Michael Niedermayer --- libavcodec/bink.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index a3140114f0..15fc9d29ed 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -870,7 +870,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, binkb_init_bundles(c); ref_start = frame->data[plane_idx]; - ref_end = frame->data[plane_idx] + (bh * frame->linesize[plane_idx] + bw - 1) * 8; + ref_end = frame->data[plane_idx] + ((bh - 1) * frame->linesize[plane_idx] + bw - 1) * 8; for (i = 0; i < 64; i++) coordmap[i] = (i & 7) + (i >> 3) * stride; @@ -926,7 +926,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, xoff = binkb_get_value(c, BINKB_SRC_X_OFF); yoff = binkb_get_value(c, BINKB_SRC_Y_OFF) + ybias; ref = dst + xoff + yoff * stride; - if (ref < ref_start || ref + 8*stride > ref_end) { + if (ref < ref_start || ref > ref_end) { av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); } else if (ref + 8*stride < dst || ref >= dst + 8*stride) { c->put_pixels_tab(dst, ref, stride, 8); @@ -942,7 +942,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, xoff = binkb_get_value(c, BINKB_SRC_X_OFF); yoff = binkb_get_value(c, BINKB_SRC_Y_OFF) + ybias; ref = dst + xoff + yoff * stride; - if (ref < ref_start || ref + 8 * stride > ref_end) { + if (ref < ref_start || ref > ref_end) { av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); } else if (ref + 8*stride < dst || ref >= dst + 8*stride) { c->put_pixels_tab(dst, ref, stride, 8); @@ -974,7 +974,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, xoff = binkb_get_value(c, BINKB_SRC_X_OFF); yoff = binkb_get_value(c, BINKB_SRC_Y_OFF) + ybias; ref = dst + xoff + yoff * stride; - if (ref < ref_start || ref + 8 * stride > ref_end) { + if (ref < ref_start || ref > ref_end) { av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); } else if (ref + 8*stride < dst || ref >= dst + 8*stride) { c->put_pixels_tab(dst, ref, stride, 8); From patchwork Wed Jan 11 20:42:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39977 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5038064pzb; Wed, 11 Jan 2023 12:43:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXsSR3yX8V+5lTKXbZvth9FIyg1VgEK0iinGW7RLsiKaULJSxzk2Ygfze8nuv7slSxAEbYlF X-Received: by 2002:a05:6402:548f:b0:49b:57f6:d9a with SMTP id fg15-20020a056402548f00b0049b57f60d9amr563287edb.21.1673469789864; Wed, 11 Jan 2023 12:43:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673469789; cv=none; d=google.com; s=arc-20160816; b=UShnpxvxIc1KS1pqDOwQ+EP9fM13wwSX3ZlVr3SgQ/xILAE41TTKebEYwLL1NFQTih Iwb+AXztvohYDTgUhEbFLGLdgE7Xecn6HGReF3PPdXqt6lOnSXuEx1bE2BAS4kXglaoI jXjyC4DyfCxSXIMYIR3Sw3Xo2JF08WxB65LzCpBqqClBkOdAV+uNrkHwwrRtYNMMmw0D kocPs0nRxIag+KB5Bbk3mXnjmoQan1o08caGsC092QxHAoSgQj8967CI4O8Bfh6ZPIc9 HHXTmMJy6U/QUdHrknTHV+LjivMSO0pBm8cDeURCi4js9QZ9bjQHarAx2mAhh+fWaXdB CnIg== 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=LEZLrIog9ds677bbQOOh5f+Oxigg+sGyFEw8ZSgGE1I=; b=PRwPvg9Ph1aDqmf+PtFPp7lQc7TxKydi7MfZ8hecLNJs6OYDzjs/9p7MarPAtwyISJ RKSWAj40YKhYq3RZ6vZqKkfLNFW9IUZsKYxno5xrLDJm5v7hxUzR8QsPoqo3anU4HlMx qrTaIrt2OXHYdpkNRKZhDhGewdiUNJCmbHN2DTkGDPCI7Htp6ZJJmgM3XTbzYXuc4tpi Mkk98pk+uq1wNTs+JSRtlOmzSWgLUKXcWFGZGbuNf6ejc8X548zgYnSRP3BRw7NyZccl avRQFaE2nZ4ZPIcezvSXOE2ALcHBayDZ35GhuoVYGt9nscNeS2+hH3zAqvDd8aTiZ3Am lb8Q== 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 p11-20020a056402500b00b004948ab74664si15317299eda.106.2023.01.11.12.43.09; Wed, 11 Jan 2023 12:43:09 -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 9417768BD60; Wed, 11 Jan 2023 22:42:43 +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 63D8C68BD6E for ; Wed, 11 Jan 2023 22:42:36 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 99CA11C0005 for ; Wed, 11 Jan 2023 20:42:35 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Jan 2023 21:42:20 +0100 Message-Id: <20230111204221.22550-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230111204221.22550-1-michael@niedermayer.cc> References: <20230111204221.22550-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/bonk: Avoid undefined overflow in quant 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: 1pnQQ5JgNsy0 Fixes: signed integer overflow: -2889074 * 2048 cannot be represented in type 'int' Fixes: 51363/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-5660734784143360 Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-6617680050520064 Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-6743951854141440 No check is done for the overflow as this was rejected in last review, see the ML Note: the 2nd and 3rd testcase was assigned by ossfuzz to a unrelated theora issue (48567) Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 5d736b1563..9e176d5477 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -356,7 +356,7 @@ static int bonk_decode(AVCodecContext *avctx, AVFrame *frame, sample++; } - sample[0] = predictor_calc_error(s->k, state, s->n_taps, s->input_samples[i] * quant); + sample[0] = predictor_calc_error(s->k, state, s->n_taps, s->input_samples[i] * (unsigned)quant); sample++; } From patchwork Wed Jan 11 20:42:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39978 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5038148pzb; Wed, 11 Jan 2023 12:43:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXvMEt7g37BoTfifHPRpXB1W/JWJi8A6TPdMgMf+FfFbAdYboefLRjxOu9Af2RjoqUnjz9r4 X-Received: by 2002:a17:907:c48d:b0:7c0:fe60:be12 with SMTP id tp13-20020a170907c48d00b007c0fe60be12mr58621505ejc.25.1673469797795; Wed, 11 Jan 2023 12:43:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673469797; cv=none; d=google.com; s=arc-20160816; b=EH3hrufsoUIaNpqW4vJl7+q57bZUvv7VxpYo8ceivHtUvuCczzqHSxEacPcBTmifja V+8LcbIWZiCodruwJujjVvadOvuhkrlWljKTc8GIwCYEWqZmHErkICog06E+MO9RvGBb yv/C9Eqi/+onHkpaRJMDwewyMxhVCss8vO/BSakmXo0kXJPkVAoGV1JS5vE6NSrvUzG2 yeiWg/PrTJBlFme3ykwATHZIDnhdfpi3Mprhon7GWy5mmEgTfHphlXpCfi1/Coxhwrkg 6vP8oY1xuLIWYPWli6tM6+y3OGWsTSTkT+lqzJh8vaUL/r2bl1r22ou6+z+husbv5D89 bNXQ== 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=1I9Q3Ia6lcytOl1WZC9K3F4NpfpXNm+sLTXBEDpNH4Y=; b=AAoOxnCCot2I0wWspE6dutlI4t1DZQS08aSBiFVfJfmZ3bj9S9pfZ9lMwodl6+1Wnz sQOE6fk0JhSMy7u0AznGNWkk7+lDhScf3NpWGTOcA8/M31qIFSgUFTngjZsKJOOIBIjR v2RvJYhgu95rkmNwpPkwMG8cpaucUDlmZzTyv3BSjn3xf9BbX+0ypNXAl6Z5X82j+jW1 WxRk6PXFVoAItpCN7TcSL9UWE7N1PE1WIoeHCBz8z+bOKaos7oNPJmItWdhl+o+YEb0q RFwMCST6jVU1YOow0tKuLTMHnMqn0jycgcZoARH43rHQ4k1iDojBo2yhwHe/fQlXOxto Ikpg== 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 js22-20020a17090797d600b00860c51f7df4si2047334ejc.769.2023.01.11.12.43.17; Wed, 11 Jan 2023 12:43:17 -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 AE20168BD7E; Wed, 11 Jan 2023 22:42:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1993B68BD67 for ; Wed, 11 Jan 2023 22:42:39 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 00D94C0002 for ; Wed, 11 Jan 2023 20:42:37 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Jan 2023 21:42:21 +0100 Message-Id: <20230111204221.22550-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230111204221.22550-1-michael@niedermayer.cc> References: <20230111204221.22550-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/bonk: Check ntaps against buffer size 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: /VomYmOE4brv Fixes: out of array read Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-6739246658748416 Note: This issue was assigned to a unrelated theora bug Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 9e176d5477..061cc69a58 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -101,6 +101,10 @@ static av_cold int bonk_init(AVCodecContext *avctx) s->samples_per_packet = AV_RL16(avctx->extradata + 15); if (!s->samples_per_packet) return AVERROR(EINVAL); + + if (s->down_sampling * s->samples_per_packet < s->n_taps) + return AVERROR_INVALIDDATA; + s->max_framesize = s->samples_per_packet * avctx->ch_layout.nb_channels * s->down_sampling * 16LL; if (s->max_framesize > (INT32_MAX - AV_INPUT_BUFFER_PADDING_SIZE) / 8) return AVERROR_INVALIDDATA;