From patchwork Fri Feb 4 00:58:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34115 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2973484iov; Thu, 3 Feb 2022 16:59:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJxD0duvBHt8lB4EfniNZTF+F3gVnxc+dy5fTb6xa50Xa2xFOX0Q415UOAiZpt/avU58Fc4b X-Received: by 2002:a17:907:3eaa:: with SMTP id hs42mr385582ejc.741.1643936364274; Thu, 03 Feb 2022 16:59:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643936364; cv=none; d=google.com; s=arc-20160816; b=O4kJDUhokqhDxU8QTan1Vz/ObSskm+jiSzunruhRbpu1HulU9fwPjjRdFBp8tb4Ndl DtMy0MONA7PPwEoSG1KLLrP+c9e1I3Zv8A278GwWOk5EG7vKskkx+zP/bblqBTlhaRx7 QwERiEsdgC/imYG4LiISkfZpjMeePykrdXpJN/dPxt66jJzz0d4gZFFy9FPK1gCcbPSJ qOvXEj5QfrHnCs/d4GRgLts2J7gCh0qOJhJD9NZ7oKO6YrJ9nPnCunZG+HHcIsPeaRTR B/SPDdV5DyRYfznbbwJ6WEteekqXRgN6Fz6eYZhlXFAlH3G2Z6JDrQpSnYdSpTFRE/qS ElLA== 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=BBfXdiv8FFeTPA9ZqD3EsSXze2Y/UqSwINp/NAPSvJ4=; b=rCya/JIgw4t49G9ao6tgQ0C/EKuX1zkkgG1cTzn7wciVDXBmRHVvVUdPvdpmkrobLU M8JPEZUZtZEPHvmInlYVHNUBEb+ZjfCNh2wn9WDAcIke+z1CDCim8p4BUG+enXrzfmsX 5QzV7/w7Fyjh3TWl2DwhyQzI/qGKMZQmF2a46xGBq/bnb1yb1L0KMk5ubMms4uAUv08i JnRpOgkwFptA/HJh9w5uaoGp5KCT/poYgKy+PlZOiKSpvKc3/RR9BP9DgD0Ee2K6EXAA eYZ8G/ZbE9nmXnKT4Viyyk3VXOhAtPVWeOfPIzULc1rqVFBrpxSelCoafZLztkn/5iCD EzsA== 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 hp33si318766ejc.663.2022.02.03.16.59.22; Thu, 03 Feb 2022 16:59:24 -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 D426668AB7C; Fri, 4 Feb 2022 02:59:18 +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 4292D68A7BB for ; Fri, 4 Feb 2022 02:59:12 +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 1nFmwR-003z4T-0h for ffmpeg-devel@ffmpeg.org; Fri, 04 Feb 2022 01:59:11 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id FmvTniOcESgGFFmvTnmRwH; Fri, 04 Feb 2022 01:58:11 +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=1qGDCK9oyWeIli-JxKgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 4 Feb 2022 01:58:10 +0100 Message-Id: <20220204005811.5459-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfGaO3Bu1g5qsh3Q+PRliYcfDjPwx+RnpIYpNK2YOUaa9aEhnYGXefGdpSf0WDq3p0E76KMdj3czJuXOaAD1Q1oCkpmWAi+YHCy3VKbICX3pY6QrPtrxv mzfpwq0VRGLV0+IBYbKTD+YwyCze8hmvJBWFgL+ba5sgS1eQ4P+EvIzH Subject: [FFmpeg-devel] [PATCH 1/2] avformat/matroskadec: Fix infinite loop with bz decompression 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: VHqlMZK2GCZU Fixes: Infinite loop Fixes: 43932/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-6175167573786624 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d165f6ab90..5a9acfb247 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1742,7 +1742,7 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, case MATROSKA_TRACK_ENCODING_COMP_BZLIB: { bz_stream bzstream = { 0 }; - if (BZ2_bzDecompressInit(&bzstream, 0, 0) != BZ_OK) + if (!pkt_size || BZ2_bzDecompressInit(&bzstream, 0, 0) != BZ_OK) return -1; bzstream.next_in = data; bzstream.avail_in = isize; From patchwork Fri Feb 4 00:58:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34116 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2973545iov; Thu, 3 Feb 2022 16:59:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJweWhycaUuJ9R8Up7dkJclri0XQ6rkDQMgCoMUvAz2ts9l//kSHgYmkWm7h8g2GqZRROPS3 X-Received: by 2002:a17:906:2287:: with SMTP id p7mr426939eja.239.1643936372348; Thu, 03 Feb 2022 16:59:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643936372; cv=none; d=google.com; s=arc-20160816; b=TAM6NlhgNiP4bohjBwrseZ38rYh8YxqepukXjZcHxY/zhJgwZdHLcbIBuYckozngcB VsYidfc4M9Q5aOIef2FWwSxazAPDBD4KDgqOyrbfNRAcNDDWFHY8DNAuy9t5duHulOfe T4Ko8DUNpYD2X7iSGTEF6QLl2vPuXAZeRV9tkCtjssH8Ez4EzgxeWYs5ECACg8cUgLQM 47+fSew+N1KNKG/TWpkX6mgUtMobzrgmJk2IicBPlghF2zUxcMK5PZL4lh2qqHIGs6Ym BhOsGbVZiXVAwKoBd3Uqz1CzVot/HunPm3UE6MDi0/8fiatK1btvngYQRIj819STX/oU WryQ== 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=UNODZPkIH54YxwI3QqMeQ50RJ0PXtayjdt5hQjos4JE=; b=FnPvSyiyyT9bRniCFc0+9/jdlqoiXi161oyvpHpjJ8/6QXPXpzIu4pleFQ/KTTt+0M lmoY/xBLtHvQfL5R1LVTWdlJw0kbjmBAIxBWYjlXErWS+RmuQ8LoXF4h2DrXR1qpTe1I YbodgOz0HpqGp6WyAQSrvcqJYnyRkX5ez3cNI4xq6ERdFcUv+NDBvY1eWLZYsoA6Vm4f paCv2pd5Pw68jEBRM3tANSM/YYhFnGWSTK35aIw3nLFm19xslwQFF5L+O4if/mmQvwy5 LO+GuBGKrm/K2Y0QpwLbrmW1HwqT6WdfpUKbA/I+ObFq7Si1yKTj/SEEV0uZ8IjhskkU NWFw== 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 gs13si322476ejc.747.2022.02.03.16.59.31; Thu, 03 Feb 2022 16:59:32 -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 D4BF568B221; Fri, 4 Feb 2022 02:59:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43EDE68AB7C for ; Fri, 4 Feb 2022 02:59:12 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nFmwR-00FhlW-0g for ffmpeg-devel@ffmpeg.org; Fri, 04 Feb 2022 01:59:11 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id FmvTniOe6SgGFFmvTnmRwb; Fri, 04 Feb 2022 01:58:11 +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=uKKnxcNrydJQBpSpOb8A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 4 Feb 2022 01:58:11 +0100 Message-Id: <20220204005811.5459-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220204005811.5459-1-michael@niedermayer.cc> References: <20220204005811.5459-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGaO3Bu1g5qsh3Q+PRliYcfDjPwx+RnpIYpNK2YOUaa9aEhnYGXefGdpSf0WDq3p0E76KMdj3czJuXOaAD1Q1oCkpmWAi+YHCy3VKbICX3pY6QrPtrxv mzfpwq0VRGLV0+IBYbKTD+YwyCze8hmvJBWFgL+ba5sgS1eQ4P+EvIzH Subject: [FFmpeg-devel] [PATCH 2/2] avformat/utils: Fix invalid NULL pointer operation in ff_parse_key_value() 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: 08cUW73wvUNL Fixes: pointer index expression with base 0x000000000000 overflowed to 0xffffffffffffffff Fixes: 44012/clusterfuzz-testcase-minimized-ffmpeg_dem_HLS_fuzzer-5670607746891776 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 940703e87d..cee86ae87b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1244,7 +1244,7 @@ void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf, key_len = ptr - key; callback_get_buf(context, key, key_len, &dest, &dest_len); - dest_end = dest + dest_len - 1; + dest_end = dest ? dest + dest_len - 1 : NULL; if (*ptr == '\"') { ptr++;