From patchwork Sat Jun 18 20:03:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36325 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp825081pzb; Sat, 18 Jun 2022 13:03:27 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sUENBd6BatAUBob7bZWA3usKtlY+gExu2TGg0BFLYAUlZmjGU81v60QfWLiWNvikVtefxz X-Received: by 2002:a05:6402:201:b0:431:665f:11f1 with SMTP id t1-20020a056402020100b00431665f11f1mr20333333edv.378.1655582606883; Sat, 18 Jun 2022 13:03:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655582606; cv=none; d=google.com; s=arc-20160816; b=FLqDL+1mdcGs7f6D5avq4XI1m/fSgAeTcQSan0JmOjGIryHLsEpTVTkVomkVlT9Ytq RWAbsTE+2ofTQkZ27MdGODleQS2OqfdpYiL7cIIOTqj6qIqs7PXFzdQW1iEzvclcMmsb m4UCHrfhhpscgSGiILOIFrTNw1JX53XUUYSOrfegV9B2vIQScWVxBJyQ99AEIvjXD8ZO C+gBfBkcz+f1fu+HJLOjBFhUd1S4CyGbvPn2JhDjcDT+4f9TDCVVk7yqMxnEampbLCeM VCt1biCfjPI6j0rorRErDEnztx56Ksd52prauyxtNiOPSV/f1zhkZm0jAIrD3a4C2wjn QGGA== 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=qFZxkm32VdTqpggHGoZRO3qkjDB/y3fBPUjYVoKrRIY=; b=If5nkJ/xVEJR+wHPdFbbUip8f91L1ykqtqRQ6JTZKut4JEcX3oZO8dxBhubHVsio37 Fp7DtyCNlTlz9JadsybcawlStovb1EVSYqnSbXXkLwq03kzITiZ3LR+ZoxOOchg195dc w9EjMpd7fJih2vXffCrCiTRP/Fwvv7BPI3XBTouh58XWIJD7hh7/MYUvoKxO9KcVp67+ Zzn8wGq93QxLdep0+IUTK9Ud719tWPRXbPxslv7nz2rxflH3rDLwToi1yIuDhJPWNUNu KEDFPWtPKs8V2PuZFEDUMQI24x5u8+N7/2SLVcg51eqV2mA5Xsooyrk295RmMiQ0b5uB oyYw== 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 v13-20020a50f08d000000b0042dcbb47403si4521135edl.116.2022.06.18.13.03.25; Sat, 18 Jun 2022 13:03:26 -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 1136A68B4E4; Sat, 18 Jun 2022 23:03:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1080268B415 for ; Sat, 18 Jun 2022 23:03:05 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o2eeu-0000EI-5D for ffmpeg-devel@ffmpeg.org; Sat, 18 Jun 2022 22:03:04 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 2eeXoZnMP8s8U2eetolqvG; Sat, 18 Jun 2022 22:03:03 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 2eetongLk8eSW2eetoUOzJ; Sat, 18 Jun 2022 22:03:03 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62ae2f77 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=e7X-CqB84J0Fa-SPJ20A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 Jun 2022 22:03:00 +0200 Message-Id: <20220618200303.17054-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfNCC2MwsRurECCjzTRhZ1Lw+8vUlVZ3RRvEuU0pdBzIibrivJwXzeG5yyrlQOaaJWU2wzbP02dWvUjApVgQ57HAtzDC+z5T9feYblBXg2jcbpF+CELQm ZScgefdLaG+vXh4COkpGDiADfWrQ1dzHa96IAjt1V+RQuy0fcPaDhctUgDld5iOov1V2Zxjec3wRpw== Subject: [FFmpeg-devel] [PATCH 1/4] avformat/mov: Avoid cloning encryption info if its unchanged 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: PB5V8Ys6rnmG Fixes: OOM Fixes: 45834/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5419540462305280 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3ec0ea2361..c93e13c8cd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6187,9 +6187,12 @@ static int mov_read_sample_encryption_info(MOVContext *c, AVIOContext *pb, MOVSt return AVERROR_INVALIDDATA; } - *sample = av_encryption_info_clone(sc->cenc.default_encrypted_sample); - if (!*sample) - return AVERROR(ENOMEM); + if (sc->cenc.per_sample_iv_size || use_subsamples) { + *sample = av_encryption_info_clone(sc->cenc.default_encrypted_sample); + if (!*sample) + return AVERROR(ENOMEM); + } else + *sample = NULL; if (sc->cenc.per_sample_iv_size != 0) { if ((ret = ffio_read_size(pb, (*sample)->iv, sc->cenc.per_sample_iv_size)) < 0) { @@ -7120,6 +7123,8 @@ static int cenc_filter(MOVContext *mov, AVStream* st, MOVStreamContext *sc, AVPa } else if (encrypted_index >= 0 && encrypted_index < encryption_index->nb_encrypted_samples) { // Per-sample setting override. encrypted_sample = encryption_index->encrypted_samples[encrypted_index]; + if (!encrypted_sample) + encrypted_sample = sc->cenc.default_encrypted_sample; } else { av_log(mov->fc, AV_LOG_ERROR, "Incorrect number of samples in encryption info\n"); return AVERROR_INVALIDDATA;