From patchwork Fri Jun 30 00:16:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42341 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp2124601pzh; Thu, 29 Jun 2023 17:17:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlH4EOnqLlJ/aPnlzQrphZEDFaN7sVPB3gW5wgaMTiGMuZT2LnvHpZSnKMPTDb1zq3VnHHj5 X-Received: by 2002:a05:6402:746:b0:51d:ea4d:3370 with SMTP id p6-20020a056402074600b0051dea4d3370mr1426848edy.21.1688084228110; Thu, 29 Jun 2023 17:17:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688084228; cv=none; d=google.com; s=arc-20160816; b=LbjMH1ic+HsBnh6TF3dm8dVmyxkoMDqsANvhhAsl7jXH4aQ2imaqBsijamsBLvxXNN Vp3/IavcoreLmHh4DN5rVqrvRRJMWsKei7Avv6N16kmQn5awT+VbG8B0NTC6lVmRSp1a W5YtgXG/qU9PnsyvhO5B2BbzjEpDuAlCRFgZIlhSUXVzqqaSmjseW11yLyNTgrhynO/z Lhi6V41+x8aoJmk6CnRBYp3qpKU91yAScu+zU2UoIwDc4UNMIkw9OP0riUOdNBV67fae SLEOqLIkiYqqvqwZvxoOYaGyyS0WJ2oovIOQ1/nTKodEQQ6vZ/8M+wRsQpLowNVxC9ed u1mw== 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=PBqfp3DL40eQVCWlRJx5B19ljJRZOWycMbdwbNpq0KQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=olS7ouC81e/5CfU0zOSVc7XBxjRNHN0AsAD6ex5cN+px7NA1DscvSjQaXKw//+l7KY V0PS+54aj+fpRMIKDC01Pdb5zun4C7XRF1k2JPfXBImGSD12FWAZYSIgkBIhR2jmQNk7 8pgDoBeHj8R8Damj4GLQzFdqq7pPVtKEk9sM+w59U9zvzdvCPWK7grZ/JUfcphnI9sq6 OYUAy1oydYRwiDiW4BSKFm1fnDj/obWZmt/rWhyEc1juqBh7qHeA7Vb/LX8IkHUTiXsI ZfuZYdKLUrfpU2TVzcjwtSrZ0Rhm/Xi6Y375AJnzl3BuG+HeMGBVVPiGNMRz5PSyhIyY lxYg== 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 c11-20020aa7df0b000000b0051d885b835dsi6449376edy.442.2023.06.29.17.17.07; Thu, 29 Jun 2023 17:17:08 -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; 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 3CA3968C2EE; Fri, 30 Jun 2023 03:17:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-01-1.mymagenta.at (mail-01-1.mymagenta.at [80.109.253.246]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C329868C1A6 for ; Fri, 30 Jun 2023 03:16:57 +0300 (EEST) Received: from [192.168.232.136] (helo=ren-mail-psmtp-mg02.) by mail-01.mymagenta.at with esmtp (Exim 4.93) (envelope-from ) id 1qF1ol-0080PI-U9 for ffmpeg-devel@ffmpeg.org; Fri, 30 Jun 2023 02:16:55 +0200 Received: from localhost ([84.115.40.24]) by ren-mail-psmtp-mg02. with ESMTP id F1onqLNqAbZLDF1onqymdJ; Fri, 30 Jun 2023 02:16:58 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 84.115.40.24 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=649e1efa a=4thelYDX6rwh+ygQwvsI+Q==:117 a=4thelYDX6rwh+ygQwvsI+Q==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=xwJ5XiyUqOB4bl9eISIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 30 Jun 2023 02:16:54 +0200 Message-Id: <20230630001655.10242-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4xfIRLHMHZgknhsZr8zMu1yIIqWjpv8hNjJJOVG0qrFSgbnQAMaT/j0fERrf/g60GcrPdniWLy4dsAaB4RGVcpOEGMBBNtgPn6n/n7H5rFhhaVwG1Jgyah r+ds7m83vZ47X3LSZEcKlkboG+F8uwmln+tXue39VADigADzfWLpKIr+w0famOmLpOK7hypvMLed4w== Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/rka: Fix integer overflow in decode_filter() 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: e1gmFqg3/YYH Fixes: signed integer overflow: 2147443649 + 65535 cannot be represented in type 'int' Fixes: 60054/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RKA_fuzzer-5095674572832768 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 d56f4faee4..7646d776be 100644 --- a/libavcodec/rka.c +++ b/libavcodec/rka.c @@ -745,7 +745,7 @@ static int decode_filter(RKAContext *s, ChContext *ctx, ACoder *ac, int off, uns } ctx->buf1[off] = sum - ctx->buf0[off + -1]; ctx->buf0[off] = sum; - m += FFABS(ctx->buf1[off]); + m += (unsigned)FFABS(ctx->buf1[off]); } } if (ctx->cmode2 != 0) { From patchwork Fri Jun 30 00:16:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42342 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp2124677pzh; Thu, 29 Jun 2023 17:17:17 -0700 (PDT) X-Google-Smtp-Source: APBJJlG10sVEPwnu/pc3n13XLRfboXTGmtCGLux0L8kGcDvUsNjaJ0BoMnQBQw74IoIKxYfx+rWS X-Received: by 2002:aa7:d0da:0:b0:51d:7ff0:842a with SMTP id u26-20020aa7d0da000000b0051d7ff0842amr425190edo.28.1688084237574; Thu, 29 Jun 2023 17:17:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688084237; cv=none; d=google.com; s=arc-20160816; b=iaU5PahSVtwO5kNrLLXuCAig3Q7vLCAD1lWFnWXCyWd+HvHBwhg81pHePkjVXQ5BOa uT6XTSvKhT+gw8zEWCusTYb9YQzGB0ae9xAeEZK7GCfYGKJQY5UHDnjdEJDgdkJ0J2jL keY/2TRZGsLj7mptszJ5WEoYslzgIdEQtDPwCLH/ftpMmFBErUTBiibvBa5ITmvG7TL8 v6Z8tziWXT40SvqPMajYTMDAUo9qeZ/XBRTXsyhFMBBLui51zIqtwtKYroi/7lYPJXfM wb5sc+LWaRk0UeLAcn52nqOObHjBZJU1h2t4laMTObDsM3ocFg8EKzVKDBn/84d6l0FU UiGw== 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=OQrD34uThz/+i8/srDvR6VJuKHAv7v0+Tt4mOAP8SdQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Bw1jbR6peweihNGsgQydP7kWG+DyUdb4gD+d8cnts07vuDIlcEvGljO/X2fnB2e/ci YnufltFzABZMntW9CQD883BxmtV303LGbABpWrWJ7KEBde8O+K7U0IHsGAiahJSdBrln pOsY/vklU/+z0hThxCtqWnDFL6zZ/0GgSC0OSqf1FhhakbuKd6M4A18JGtRm7vEQLPeP UbV/tjY0u7WTX4AV6HP9LQuIOBl8Wc7OnJBb+t3LQx5E/h9IWl99rMwwelYgGYfulJ7T 8VaIzy/hcZxUrou835eCuXo7rgfCEmzpGlId+6LNOdb0syGK/NSii1obx+fovqA+oHcd BwUA== 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 p14-20020a05640243ce00b0051dd4c5b0c0si1947401edc.536.2023.06.29.17.17.17; Thu, 29 Jun 2023 17:17:17 -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; 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 4C0BF68C2E0; Fri, 30 Jun 2023 03:17:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-01-1.mymagenta.at (mail-01-1.mymagenta.at [80.109.253.246]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1C2C687F3A for ; Fri, 30 Jun 2023 03:16:57 +0300 (EEST) Received: from [192.168.232.136] (helo=ren-mail-psmtp-mg02.) by mail-01.mymagenta.at with esmtp (Exim 4.93) (envelope-from ) id 1qF1om-0080ad-9G for ffmpeg-devel@ffmpeg.org; Fri, 30 Jun 2023 02:16:56 +0200 Received: from localhost ([84.115.40.24]) by ren-mail-psmtp-mg02. with ESMTP id F1ooqLNqTbZLDF1ooqymdK; Fri, 30 Jun 2023 02:16:58 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 84.115.40.24 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=649e1efa a=4thelYDX6rwh+ygQwvsI+Q==:117 a=4thelYDX6rwh+ygQwvsI+Q==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=35311Wvmk_Gn3BQPaA4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 30 Jun 2023 02:16:55 +0200 Message-Id: <20230630001655.10242-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230630001655.10242-1-michael@niedermayer.cc> References: <20230630001655.10242-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4xfIRLHMHZgknhsZr8zMu1yIIqWjpv8hNjJJOVG0qrFSgbnQAMaT/j0fERrf/g60GcrPdniWLy4dsAaB4RGVcpOEGMBBNtgPn6n/n7H5rFhhaVwG1Jgyah r+ds7m83vZ47X3LSZEcKlkboG+F8uwmln+tXue39VADigADzfWLpKIr+w0famOmLpOK7hypvMLed4w== Subject: [FFmpeg-devel] [PATCH 2/2] avformat/id3v2: Free buffer in decode_str() 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: 7nYUsXHtD9Hj Fixes: memleak Fixes: 60058/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-5665259244093440 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/id3v2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 38c86a8e79..69193933e0 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -309,8 +309,10 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding, avio_w8(dynbuf, 0); dynsize = avio_close_dyn_buf(dynbuf, dst); - if (dynsize <= 0) + if (dynsize <= 0) { + av_freep(dst); return AVERROR(ENOMEM); + } *maxread = left; return 0;