From patchwork Fri Mar 12 13:07:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26350 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6B1FB44AEF8 for ; Fri, 12 Mar 2021 15:07:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 387A968AFAF; Fri, 12 Mar 2021 15:07:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F4D668B0FA for ; Fri, 12 Mar 2021 15:07:42 +0200 (EET) Received: by mail-ej1-f54.google.com with SMTP id mm21so53160252ejb.12 for ; Fri, 12 Mar 2021 05:07:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aVNHPkMhqJSr/MDwXKLyXAaQIa+Z02Taw4oyfT5+cCQ=; b=vPZZfJtb2R3GGtuT4uVxQEg8TEngpDGX0c7nkcRf/YUItku0IZeB0mET4MjEP3bwa4 bLCJruaA0shIjXpeMF5/KDbB5y25SdPC/dlN7YzPuch3HljldRQCcRYpecPpUkmxRv0D rfBMj5ZKNitZBWClBS+iV8aXKoTj2kRcMN9t5bMye00Oi99u4xH5fPplqLG5a/M59fA8 IyTMbpL/6cu8Ww1acyghDxVJBtrVVe8ljudcSvBQRNWA9jW91w+kuEju5/+0agEYTdfR OwwZXnPCeqSDZm5noLFONjGP0CJF9Iwq3XGgSf+mPO1uKrV4UleajP+cDYFnpG60lxCf XMZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aVNHPkMhqJSr/MDwXKLyXAaQIa+Z02Taw4oyfT5+cCQ=; b=CzudAsuyt9lQMdiWiUxcmVm0N+zWp0y6shjc+bCcWXUhK0XQHsZXrPYmfrTsge2Beg H/nrM3ZndJdPkT/psLPSa+GV2DDi+veWh7YIxTDQWzgPHinbi+FTZ801tgiU/yfluau5 sOLML8Czx+M5OQJ/H29H63Rwvd7yNEEgcIMMsKkpGmfd+nPWBE8PKcDz9RgWbvGZRCPe i2dz3thGtSzIlqsaISJZDx5qrlEIkTdBbnTdjjQ3i8x1IGoTa4vr8J1mQQ9GzXXSHNIp ks/72MYnwR/jx3HpqM/+ld1H8AJJua06syiiZvqf2wqWALOw5sRyqtIZbM/gSeeFTL6W ancA== X-Gm-Message-State: AOAM532s6jZQbbCoevnVkpQHOLnYRNjD4SZaVbetGjo/SZSoE9iiZTM/ eY4OZ+T6UMr/eYoVRhvwkMEDHrSP18E= X-Google-Smtp-Source: ABdhPJx4wgM/ecq+dCv/prHCY1bffksok73OA2LoFx6Y+cD/1Yh5Ms70E7NdWBdfFhrW/oWRi1danQ== X-Received: by 2002:a17:906:4c85:: with SMTP id q5mr8301530eju.375.1615554461617; Fri, 12 Mar 2021 05:07:41 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id hd37sm2562042ejc.114.2021.03.12.05.07.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 05:07:41 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Mar 2021 14:07:32 +0100 Message-Id: <20210312130733.1980124-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mxfdec: Don't use wrong type of pointer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If one of the two results of a ternary conditional is a pointer to void, the type of the whole conditional operator is a pointer to void, even when the other possible result is not a pointer to void. This loophole in the type system has allowed mxf_read_local_tags to have a pointer of type pointer to MXFMetadataSet that actually points to an MXFContext. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfdec.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index bb00838a3f..d7213bda30 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2889,13 +2889,20 @@ static int mxf_metadataset_init(MXFMetadataSet *ctx, enum MXFMetadataSetType typ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadFunc *read_child, int ctx_size, enum MXFMetadataSetType type) { AVIOContext *pb = mxf->fc->pb; - MXFMetadataSet *ctx = ctx_size ? av_mallocz(ctx_size) : mxf; uint64_t klv_end = avio_tell(pb) + klv->length; + MXFMetadataSet *meta; + void *ctx; - if (!ctx) - return AVERROR(ENOMEM); - if (ctx_size) - mxf_metadataset_init(ctx, type); + if (ctx_size) { + meta = av_mallocz(ctx_size); + if (!meta) + return AVERROR(ENOMEM); + ctx = meta; + mxf_metadataset_init(meta, type); + } else { + meta = NULL; + ctx = mxf; + } while (avio_tell(pb) + 4 < klv_end && !avio_feof(pb)) { int ret; int tag = avio_rb16(pb); @@ -2922,20 +2929,19 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF } } } - if (ctx_size && tag == 0x3C0A) { - avio_read(pb, ctx->uid, 16); + if (meta && tag == 0x3C0A) { + avio_read(pb, meta->uid, 16); } else if ((ret = read_child(ctx, pb, tag, size, uid, -1)) < 0) { - if (ctx_size) - mxf_free_metadataset(&ctx, 1); + if (meta) + mxf_free_metadataset(&meta, 1); return ret; } /* Accept the 64k local set limit being exceeded (Avid). Don't accept * it extending past the end of the KLV though (zzuf5.mxf). */ if (avio_tell(pb) > klv_end) { - if (ctx_size) { - mxf_free_metadataset(&ctx, 1); - } + if (meta) + mxf_free_metadataset(&meta, 1); av_log(mxf->fc, AV_LOG_ERROR, "local tag %#04x extends past end of local set @ %#"PRIx64"\n", @@ -2944,7 +2950,7 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF } else if (avio_tell(pb) <= next) /* only seek forward, else this can loop for a long time */ avio_seek(pb, next, SEEK_SET); } - return ctx_size ? mxf_add_metadata_set(mxf, &ctx) : 0; + return meta ? mxf_add_metadata_set(mxf, &meta) : 0; } /** From patchwork Fri Mar 12 13:07:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26351 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1D204449EDA for ; Fri, 12 Mar 2021 15:13:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA06C68B107; Fri, 12 Mar 2021 15:13:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49F0868AF05 for ; Fri, 12 Mar 2021 15:13:14 +0200 (EET) Received: by mail-lj1-f176.google.com with SMTP id z8so6679412ljm.12 for ; Fri, 12 Mar 2021 05:13:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mfk3s+mW42oe4kIsvF07q1XzcY4e+eEggxIbJF0PUKI=; b=AC5joRtv/DWk6vhgX01+xsxtfMvytWyZt5ljcPPeesEVYAT3+3OnEREkvR3r/jCZXN kcmHx9SyWHIIOVNhlgqdkbSz7YMyzQ2KeanOVcqTkO4nRrNpb40ccP4BME8iOwmo4mm6 G1zDnBRasqvPY+n5AwHaaSW+rNdZAfdLMxFBzmbGztYdTZOLKGDR/VqwuZ3IA28tWxGF 6X0HHmaHILozcHNCcv248+odmEGq/HkxpDicSj1irZiigT2egWPDCJ1JkUDCSoNOHURv 1W10JenrToqDH+Y18NJywyIoB5L9vJWBjGknyuJS1kzJcWc9jAVgG2fb6LM5WE4ABmW4 RZkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mfk3s+mW42oe4kIsvF07q1XzcY4e+eEggxIbJF0PUKI=; b=rcF2jNvWmYMYCxXmK+6C6GGPp/51iwInWEZkSOigFCiWDmo31QlO7swGazRsXMM6Yk LZ2j3wJUC8Cbh+or2uo6kE+ftK9f9JZmF9L47sTDMlz5V2tTPaRgMvmWF0X55b2PtRAG WUKWA6Z6NVtU4RiSDKOjabzxLSGrazFAc5hPkszrl8hU7mWuba82wT7erXY+3qJ0zVgJ OgBY4WexNkJOcJHjdcn6aIFXgYFNVA6yESQtxtcxBzuIx4+PJLoqHdmrwo7PMnI8ZYUe q6AnkSEGzama9hsfVYB3fDoqLipiyt7g4o80RqWoOyYRqk1PnZP/EKBNrKU0nyMkGPRN apxw== X-Gm-Message-State: AOAM530SOxrn+f5s7AnXSG0CePMOMovoC9YUDxx4KVlJFnUJvqczvyu4 MA2VniUhcZqit0XKAKX56iwrFR3KBNs= X-Google-Smtp-Source: ABdhPJwhC1tVmX6cGej7RFQ8n3+DcA9vE/ai/SizpEn5XIX8hwaTmWI9kaL4kMgNu2K2MtZ61tGHrA== X-Received: by 2002:a05:6402:10c8:: with SMTP id p8mr13802215edu.144.1615554483442; Fri, 12 Mar 2021 05:08:03 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id hd37sm2562042ejc.114.2021.03.12.05.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 05:08:03 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Mar 2021 14:07:33 +0100 Message-Id: <20210312130733.1980124-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210312130733.1980124-1-andreas.rheinhardt@gmail.com> References: <20210312130733.1980124-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mxfdec: Fix leak on error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It was introduced in d3d9b1fc8e2dfc8b4d66c9916ab7221062ff4660; Fixes Coverity issue #733800. Signed-off-by: Andreas Rheinhardt --- I have no testcase for this; but hopefully Michael can test it with the testcase that led to d3d9b1fc8e2dfc8b4d66c9916ab7221062ff4660 in the first place? (And I always thought fuzzing samples were small. How does it come that it is close to INT64_MAX?) libavformat/mxfdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index d7213bda30..2e9d7d713a 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2909,8 +2909,11 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF int size = avio_rb16(pb); /* KLV specified by 0x53 */ int64_t next = avio_tell(pb); UID uid = {0}; - if (next < 0 || next > INT64_MAX - size) + if (next < 0 || next > INT64_MAX - size) { + if (meta) + mxf_free_metadataset(&meta, 1); return next < 0 ? next : AVERROR_INVALIDDATA; + } next += size; av_log(mxf->fc, AV_LOG_TRACE, "local tag %#04x size %d\n", tag, size);