From patchwork Fri Jan 13 00:01:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39990 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bb05:b0:b6:a58c:cef with SMTP id fc5csp62516pzb; Thu, 12 Jan 2023 16:02:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXsnYnw5PLAbT8DGUGyzxEb/0Mss+Ox7SJBh4OB8+f9d9cnals1TV0iGqIbczKzQ92Q+1fup X-Received: by 2002:a17:907:d1a:b0:83d:61f8:3c with SMTP id gn26-20020a1709070d1a00b0083d61f8003cmr1669286ejc.3.1673568121175; Thu, 12 Jan 2023 16:02:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673568121; cv=none; d=google.com; s=arc-20160816; b=ui6o3Fh069fionKzr0/onLRNc1bLIZXRRDcA9jX0PLKM8VilabnISMaUqJclYvJ0g2 ixHTS6NL0xjNGDLfvVH2qR1PGzb9R69tzIyq8AOI45s48NTpWYrzQycV6jM29siimRKE ANUU01AvwB8gqJrbZeeUgDmXovVKncKJPiwzCCJsvyRQPJhE9yIOkeZkaUMeGzNQVZOP nxbpaHcmjAm0OZHhwyXD1mZ95vabgF7MZXjZnyuQbh8N6j8D0xSaVPvVxbga1wgeK1h3 5tx5trvGQ6haDvnnvwd/jL3OnGGAi2Q9rUcYC6uQnjOKvUQDjsYO6qk/QSgkAT7/JZPV GveA== 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=myT0vVT2Qt/sIegxnf++qcNOvbEohtqMK7pY2IrC8sc=; b=NTPTGhQ9VyTDGTxiaRWTgbmNZXflA7bWBgbBl+1Wm+iep03Hel6/WewVrCMxwUrtjI l5rsVFYlo0Sj1zzb9mlTn3iuq7E2Ca2o+q7MUjacu72Iih8keTqOd+do0UIi21TaCOif sL4y1cUHKhdidZimKLLA7c+15kYj0kZ2CzTRcT6G0oXNAOVMrAQJO6I5SwGtlCxg27VC P/d23HI69jzVaVfqFiuDDNaM3FotP9y6L1Dhu9JyFCrmxtqUrgtEjy/HcG8gCXgcEIHE 9/f1ofAWfev3tpQMzBcabazTcp2Nqv7w1jjkQlCRpYFlr9ReDfnXgLb7B/dDEPQocyhv V3mg== 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 wg10-20020a17090705ca00b007c4f75345e2si21134695ejb.431.2023.01.12.16.01.51; Thu, 12 Jan 2023 16:02:01 -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 4AB30687F61; Fri, 13 Jan 2023 02:01:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F9C2687F61 for ; Fri, 13 Jan 2023 02:01:39 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 3CA5920005 for ; Fri, 13 Jan 2023 00:01:38 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 13 Jan 2023 01:01:34 +0100 Message-Id: <20230113000138.9994-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/wbmpdec: use remaining size not whole 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: Ul5haswXO9J0 Fixes: out of array access Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WBMP_fuzzer-6652634692190208 Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WBMP_fuzzer-6653703453278208 Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WBMP_fuzzer-6668020758216704 Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WBMP_fuzzer-6684749875249152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wbmpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wbmpdec.c b/libavcodec/wbmpdec.c index 9638b55b94..8b105bc135 100644 --- a/libavcodec/wbmpdec.c +++ b/libavcodec/wbmpdec.c @@ -72,7 +72,7 @@ static int wbmp_decode_frame(AVCodecContext *avctx, AVFrame *p, if (p->linesize[0] == (width + 7) / 8) bytestream2_get_buffer(&gb, p->data[0], height * ((width + 7) / 8)); else - readbits(p->data[0], width, height, p->linesize[0], gb.buffer, gb.buffer_end - gb.buffer_start); + readbits(p->data[0], width, height, p->linesize[0], gb.buffer, gb.buffer_end - gb.buffer); p->key_frame = 1; p->pict_type = AV_PICTURE_TYPE_I; From patchwork Fri Jan 13 00:01:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39991 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bb05:b0:b6:a58c:cef with SMTP id fc5csp62600pzb; Thu, 12 Jan 2023 16:02:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXvUiZV/f0Lef/qTsJBiAdllNn1eoCHkE2/FW5PF2LQnasmz2/RKT5o2bFnnV7zbnO9xDE46 X-Received: by 2002:a17:907:8a24:b0:846:95f9:5b4d with SMTP id sc36-20020a1709078a2400b0084695f95b4dmr87613471ejc.42.1673568129788; Thu, 12 Jan 2023 16:02:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673568129; cv=none; d=google.com; s=arc-20160816; b=Jyn8K04eIdYBjvqAfyYwEBlOXjcpzD4rd+wudPXemXGvoDL5yFpbTl6v/Ne70r9IZQ 3szsOXOzRrmEXLlKJaQA3RglhigI37gmjOLrtvf/UyRjtnBhTlEJppFecGGowcP9ky+k AI0SqfjU5JBMlc1Y6HRTsQ3dn8ZOSiLOWTgGr4KpZ0ON+9bExtm6yQ2ywCEATvY+p2qc HzVfQoLAeL+Sz4Pdl1MDC9AXcxYRIU9cE3/5LcW0rBdJ3r+NUICEFw2GfZ5RjHw7TuLz S3lOTVfce82fyomuJ4scMmyeLIlPgMzoL7bQeIViMFt9Z1KyoPor8yoS41hpwjDm1ey/ 8UHA== 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=lPa3SzdCgdGbEB2jIlKKiWK34xY5fRagseoJn3cXru8=; b=ECUaSqa5LimEouLpppldZTd25/S2Ds/nBv/9penoNbbIXlDulUMEvFXOUPwYhFDGLa DH5Fl6p5/VqiBa/kHwELuwFOLTfJySRliz2NGHcGHCJoWnccjTjMuQlihnoPnyQqTHaq ROU8AhG+ZpR9UwCI8LbHuCiVYmnHDBXX8OWdD0ABnrmsQq+fa2WFDyYAjhozdtr56twp 2yU6jphQdR47Yev+Big6ANLfmzWBmGRfT+5J4tgDY7rnYYhlx3C5lprosmmRY+FxCngq ydG7vkPb5Z2A4otfDesYmghnlcagew0HFeVIV6dClFnLjQ24KEp4SrMNvK/7QHP96OWa QdgQ== 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 mp14-20020a1709071b0e00b0084d452da656si15258850ejc.577.2023.01.12.16.02.03; Thu, 12 Jan 2023 16:02: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 6AEF768BC88; Fri, 13 Jan 2023 02:01:48 +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 1A6F4687F61 for ; Fri, 13 Jan 2023 02:01:41 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 60A11240004 for ; Fri, 13 Jan 2023 00:01:40 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 13 Jan 2023 01:01:35 +0100 Message-Id: <20230113000138.9994-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230113000138.9994-1-michael@niedermayer.cc> References: <20230113000138.9994-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/xpmdec: Check size before allocation to avoid truncation 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: C7nr31+j7Lby Fixes:OOM Fixes:out of array access (no testcase) Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XPM_fuzzer-6573323838685184 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/xpmdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c index ff1f51dd32..504cc47d8f 100644 --- a/libavcodec/xpmdec.c +++ b/libavcodec/xpmdec.c @@ -356,6 +356,9 @@ static int xpm_decode_frame(AVCodecContext *avctx, AVFrame *p, size *= 4; + if (size > SIZE_MAX) + return AVERROR(ENOMEM); + ptr += mod_strcspn(ptr, ",") + 1; if (end - ptr < 1) return AVERROR_INVALIDDATA; From patchwork Fri Jan 13 00:01:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39992 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bb05:b0:b6:a58c:cef with SMTP id fc5csp62748pzb; Thu, 12 Jan 2023 16:02:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXv6yN8xPJPi+w1OGDGJKJFCnnaOGqQ1b2jAZwCI79grPc6roXoyY/IXBCp+G/A+ygUxCMh5 X-Received: by 2002:a05:6402:2b87:b0:482:4ffd:3e80 with SMTP id fj7-20020a0564022b8700b004824ffd3e80mr57822276edb.12.1673568143149; Thu, 12 Jan 2023 16:02:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673568143; cv=none; d=google.com; s=arc-20160816; b=u9zD+TGI1WXqazyPSyzZv+NV+bQZJ3TPyXRi3SBMtlyfqJFQMePKYH5ZERrQH9/b3C iRe/1zDQCXbVJJnNjniiR8FKcwBdKMqda61uso5dWH2Im30ktG5Uaf6s5BHVfQSxMYNw nWEXW4KoVasAQNF0CupA6eAjupzMGMmzFdH5ePMb0+Pb9gkNlkpURmvPro/fl1Sr85MP +pqoYq9MMTYGps+fiWJHonQrAY74KKO7pUW4T57v+2sYpp1tbAlGZumVexkODmDZrY7R l+PASIvMpGUlyzo7VhcEVTMvUXmd3c/lKrT6HjgeLph2/JtKBQazc3fR7Vqphp3AyAn5 Ptvw== 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=XB9IYhGqjhdBu81KVPFffNQ6f9eGcTUrtCBhqB0ZffI=; b=qgkCDh6KhD2xSV8szJHvtK3MUSkqN5UoSMcTsVCaIAQNkMzUK1kD8iCJJAp1lxbvHL cPTdi8usgCiDlVVJ/D3mVDbE54M5SopAYYmSiqj84I8udTFhkI/c9xMR4AOxEnygCv+G D74bhqJ0OQ/vIj3sMdVxNxkeNzuzBOMFEo5nBi9Ot7oDG6QfO835uewjZc+v7vjgTOHr euM3PnSgCulbHrAg3kB+5mZFYox0+qgpunnydYrU5yaYIN2NIkwgKq1P+xLMfohkKvhF Yaty+5HKISrhDncaS9o/bW9rXe8EgAtWh9y7JOEvMl5jVGLYwPsDgoosI48z4ADS1QRl I3zQ== 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 cs10-20020a0564020c4a00b00499cf6bd2fasi8222435edb.66.2023.01.12.16.02.14; Thu, 12 Jan 2023 16:02:23 -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 75B9C68BC9D; Fri, 13 Jan 2023 02:01:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA789687F61 for ; Fri, 13 Jan 2023 02:01:41 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 3BE8E20008 for ; Fri, 13 Jan 2023 00:01:41 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 13 Jan 2023 01:01:36 +0100 Message-Id: <20230113000138.9994-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230113000138.9994-1-michael@niedermayer.cc> References: <20230113000138.9994-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/012v: Order operations for odd size handling 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: gIvjUfllKMk3 Fixes: out of array access Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ZERO12V_fuzzer-6714182078955520.fuzz Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ZERO12V_fuzzer-6698145212137472.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/012v.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/012v.c b/libavcodec/012v.c index 2d89a86b98..f0197cd8f9 100644 --- a/libavcodec/012v.c +++ b/libavcodec/012v.c @@ -131,8 +131,8 @@ static int zero12v_decode_frame(AVCodecContext *avctx, AVFrame *pic, u = x/2 + (uint16_t *)(pic->data[1] + line * pic->linesize[1]); v = x/2 + (uint16_t *)(pic->data[2] + line * pic->linesize[2]); memcpy(y, y_temp, sizeof(*y) * (width - x)); - memcpy(u, u_temp, sizeof(*u) * (width - x + 1) / 2); - memcpy(v, v_temp, sizeof(*v) * (width - x + 1) / 2); + memcpy(u, u_temp, sizeof(*u) * ((width - x + 1) / 2)); + memcpy(v, v_temp, sizeof(*v) * ((width - x + 1) / 2)); } line_end += stride; From patchwork Fri Jan 13 00:01:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39993 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bb05:b0:b6:a58c:cef with SMTP id fc5csp62860pzb; Thu, 12 Jan 2023 16:02:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXvfrC+M+XEiulJAUv6fckk9CvmxMvzFJEBO7RYFnboCER4A/tOlyfXE6N431x/jQiO0mFfm X-Received: by 2002:a05:6402:610:b0:499:bffb:7e58 with SMTP id n16-20020a056402061000b00499bffb7e58mr13190079edv.20.1673568151874; Thu, 12 Jan 2023 16:02:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673568151; cv=none; d=google.com; s=arc-20160816; b=BlEhr4gkDpCXaQ4tJbqNeMOqa9wCSThpbQUiLaE4uMT7fTw42Qy+hNchHvMGlQ9LiF fo0o/DYi0KFAjCvGD+fycXrDCdR02ZVmCiZaWIrpSQLpOfnLbMKueKZQWoSxweU9Esfq Jauo5ds7Uh3cWG9jc5+hmPdHzlsMTcYSklzIibC24aDPS0c5miagpsZ8t2tw5e5DbbS0 HuFbGvMXxscb6nHQK5LhErYtG7NVrCK9dvMlsC0y8v6G5OPgQN6/js8FeoHP7b4XQm2J mhYh0AB/xUSzW1bQPcIHw9Zps9mQbnZQmjaU4dmZ/zZj9XB4zzpziYfuapMPfn5UP1Fg iJUQ== 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=eRmXjt9df+aqhfcZmJeYDnUo5S8ievUAW4BdlexeMzE=; b=WnlACNgFVFNLS5OaGAat4pEOtvYZoITjQ/o0bLkXALaLAP+5k7wMg9rbFR5+KCZVap tfT0FGx4D/A2dvLV2jUnyXvXOVUp55v2KrsrXqFu/EVY1mrDLnEZLjz3p2vMcf5vsB1y YAo1sumNbDafkYOONY+ZOaOwvre/QDIOKTpzGsP2yp1Lee0dbf8nTLZxNSSFc/asa+3q IGb1kZ5PSwt8LjJ4mXUx6ozW5VMvdX6D7SyIG8aLTPPlQGi8WJtUJUuvNkwqy/YAodTr W/ZRG2vWnXslmo5nKs7sabLy7JR7d4Nn5cRce0nuXCZY2+AALBcuUUhNGhkxpCL5HYSa dB7g== 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 l21-20020a056402345500b00499c02e381esi9234032edc.157.2023.01.12.16.02.26; Thu, 12 Jan 2023 16:02:31 -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 96A5468B6F0; Fri, 13 Jan 2023 02:01:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6406D68BC82 for ; Fri, 13 Jan 2023 02:01:43 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 597D9240003 for ; Fri, 13 Jan 2023 00:01:41 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 13 Jan 2023 01:01:37 +0100 Message-Id: <20230113000138.9994-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230113000138.9994-1-michael@niedermayer.cc> References: <20230113000138.9994-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/motionpixels: Mask pixels to valid 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: v0m0ypKGQhzU Fixes: out of array access Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOTIONPIXELS_fuzzer-6724203352555520 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/motionpixels.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c index 4141c5a495..a947ca05de 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -185,7 +185,7 @@ static YuvPixel mp_get_yuv_from_rgb(MotionPixelsContext *mp, int x, int y) int color; color = *(uint16_t *)&mp->frame->data[0][y * mp->frame->linesize[0] + x * 2]; - return mp_rgb_yuv_table[color]; + return mp_rgb_yuv_table[color & 0x7FFF]; } static void mp_set_rgb_from_yuv(MotionPixelsContext *mp, int x, int y, const YuvPixel *p) From patchwork Fri Jan 13 00:01:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39994 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bb05:b0:b6:a58c:cef with SMTP id fc5csp63033pzb; Thu, 12 Jan 2023 16:02:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXsuRdK4dEltwgOC0tAVo8hgxangCcErbN2LXyus3r0D85+fuBh4za81aYtMNcnhOI2d5Lkc X-Received: by 2002:a17:907:674e:b0:78d:f455:b5d4 with SMTP id qm14-20020a170907674e00b0078df455b5d4mr5255872ejc.20.1673568164367; Thu, 12 Jan 2023 16:02:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673568164; cv=none; d=google.com; s=arc-20160816; b=cCEWNuKeXv1Ak+zxHN8ij2r7X28mTI+gS48eGY0SNrR8MXWdsyiQQFh9x2jVeY6wMU SqmJh7ocblMleuYOnnnN2f0qlzvd8VIEFSGPnzO00O3FIwrABcyHWFQz5bl0VZkFA7rK m4HC+vrdiUTRe6m9fK7faX12JqOPsAH3x+rg1RvAes8uV4kLimyYUIbNRHFa8SS3JXZC zLtxKgtY/FE/pDPbbrdwHvKpQHsD/4vEhxg/ci21BX31XALdZyllIF23OcdtIvmZ4giY P+xuorwoRu+dFnrJQkANF2xUQFpA17GTNfzTquospvUkCq4jOLg/CHnTmVEOXmXml/p9 lIPQ== 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=+sndmA8bL2FsV6jLJDW/Hy0N2DFNgHovFz+6UmAsUPY=; b=EMzADMAwEJHug+E3FvxBrTny66CICiPeZEGhngk50W7ef3NTcB0nG5gV2MRxVqOik4 ybJEzDlrXLi3TPfgLwIqF5Z2fvXKdkm9NWkF9vruWHx1PO+13theydXgCq0JEb49joDC Y0stOB1MULgiwyr1T0nmaJ84VbcyqfF9uxQmR3yKBP3DUNeGIyXtu695jIjxZrZsBq6f RxPza/x5TMq9sMIPbD5zp1YYAFj8DP76vjj5gGVOJwUUEkiNH+64CzkE3+x3gNiiA+N2 X7JWnJA4dl5DTZX7+8oR2x8elQC/qR/5hU1ti8T8i6wuOdXtidmFYKimNnUUgWQefTB3 RHfg== 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 xj1-20020a170906db0100b007add5af39f6si16899046ejb.929.2023.01.12.16.02.36; Thu, 12 Jan 2023 16:02:44 -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 A48B868BCC0; Fri, 13 Jan 2023 02:01:51 +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 461F868BC94 for ; Fri, 13 Jan 2023 02:01:44 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 612E71C0004 for ; Fri, 13 Jan 2023 00:01:43 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 13 Jan 2023 01:01:38 +0100 Message-Id: <20230113000138.9994-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230113000138.9994-1-michael@niedermayer.cc> References: <20230113000138.9994-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/sonic: avoid integer overflow on quantization parameter 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: n/Ivnln5sijH Fixes: signed integer overflow: -1094995529 * 16 cannot be represented in type 'int' Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SONIC_fuzzer-6681622236233728 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/sonic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index 77bdb418a7..95ac2b1a96 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -1013,7 +1013,7 @@ static int sonic_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (s->lossless) quant = 1; else - quant = get_symbol(&c, state, 0) * SAMPLE_FACTOR; + quant = get_symbol(&c, state, 0) * (unsigned)SAMPLE_FACTOR; // av_log(NULL, AV_LOG_INFO, "quant: %d\n", quant);