From patchwork Fri Jun 14 12:00:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 49910 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp331332vqg; Fri, 14 Jun 2024 05:00:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXpvg2G7aPxSecpE4iPaKU5r1v7nO6w6g4UtOqlivZFaYTWsz5jUe9Gxhy+2kLkylJhxJk+sTUSy2UWrleh5q5CA0NOJVpA1+ZT7w== X-Google-Smtp-Source: AGHT+IFYD01bj423Teu3Dri7pG/WWmHs9Sn5eTm9/Zg/OMNEnmDjSm6W15ZTd5bOrGRCbtnVx3hD X-Received: by 2002:a05:6512:1285:b0:52c:8811:42f7 with SMTP id 2adb3069b0e04-52ca6e67145mr2418841e87.19.1718366428934; Fri, 14 Jun 2024 05:00:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718366428; cv=none; d=google.com; s=arc-20160816; b=NpDB7Fv05bQfrV9IZkWjsmmKx7Z+kcHJ+5nXokDG6Zz97NFcQFPQIpy2abA3mnzG6d Qgjo91aOZyyXox1F+F1WBSjJiHJ5tyoTOSeDG6FwsSMB3idKARe90UKXd2n2hfktoHL2 JBFG9/eH+MsaTIJGZw+gOKWOPACEj7sEKX7++z/cz7oNZ/40hg/31Ik5Mtgsc0KSu6MH qYzIcoWRlpaA0PK+VB4nZFlTNk0H8C60JOSE/ZSvSBCAtmZapw3qHeyGnZGWT7g/VeeR 4myP/9GDgTk3Ic9lKJkkMQuaocpWezGr4mlhlEagoP25t+RU79lQTQkmNTmgM9EwxrBy gkwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=vElgv+VaMI/IA66X06W8/vERx7txxOjkofbMG+e6wpM=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=0miT1L1sNMzQLApQYf1XfTTChIRHimml524qDhg+s90yfqN4WEjhKZHaHEFCBPfRlw WKkBLu4TfBoQBwvhCrOCtEDcTWFG/HQLg/lLlMp89qUA9+75W/vIuNKSgvajWqIWmMJU qvfxjKEIXwFwxeveQXQVw4H5LNo2asumHuw3AVtwvKccAEVx9fBf6yjfd2Y2xt0BmHrk buuQxjjBREYDx8ELwWQnBW/0mSPkwx93mVhdYKl3uYbFU9kxEUQmSAPIRgPNGTOZW+g6 mPtv4lQVdUh9tZcH5vRSTb9GzypbGg2hOP8eGfSf0FfjVqVdzWF3L0bByzid26woPBvg I56g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=Zu034II8; 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 2adb3069b0e04-52ca2872a2dsi960836e87.309.2024.06.14.05.00.28; Fri, 14 Jun 2024 05:00:28 -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; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=Zu034II8; 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 7886E68D412; Fri, 14 Jun 2024 15:00:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A89F68D5AF for ; Fri, 14 Jun 2024 15:00:17 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1718366417; bh=sHEMVMN5Qq6FpJrLRvjh3jFW5kyy6Vkohm9GAN3mBOY=; h=From:To:Cc:Subject:Date:From; b=Zu034II8TI8J1+US5Dma+vWtpYsKh9ZjFtYvYWRf+rJchdHimqbRMflKx5rYSYyB/ gdNZUWvjGxIIcfcGvHSFNMYLmLXDni1jt3pf8qsGUVpY9HlsiTZEDcYbGWfmLViNxc Fevf/0VYpjkaQ6KAcDNF3spzsG1Sv6nBHQHmfjXM= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 1A14541128; Fri, 14 Jun 2024 14:00:17 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jun 2024 14:00:13 +0200 Message-ID: <20240614120014.31038-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/dovi_rpudec: add return code to parse_ext_v* 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qWeaAJiAmUlE From: Niklas Haas --- libavcodec/dovi_rpudec.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c index a477dbd4e3..fc3b0a2b82 100644 --- a/libavcodec/dovi_rpudec.c +++ b/libavcodec/dovi_rpudec.c @@ -127,7 +127,7 @@ static inline unsigned get_variable_bits(GetBitContext *gb, int n) } \ } while (0) -static void parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm) +static int parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm) { switch (dm->level) { case 1: @@ -170,6 +170,8 @@ static void parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm) av_log(s->logctx, AV_LOG_WARNING, "Unknown Dolby Vision DM v1 level: %u\n", dm->level); } + + return 0; } static AVCIExy get_cie_xy(GetBitContext *gb) @@ -181,8 +183,8 @@ static AVCIExy get_cie_xy(GetBitContext *gb) return xy; } -static void parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm, - int ext_block_length) +static int parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm, + int ext_block_length) { switch (dm->level) { case 3: @@ -254,11 +256,13 @@ static void parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm, av_log(s->logctx, AV_LOG_WARNING, "Unknown Dolby Vision DM v2 level: %u\n", dm->level); } + + return 0; } static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver) { - int num_ext_blocks, ext_block_length, start_pos, parsed_bits; + int num_ext_blocks, ext_block_length, start_pos, parsed_bits, ret; num_ext_blocks = get_ue_golomb_31(gb); align_get_bits(gb); @@ -278,10 +282,14 @@ static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver) start_pos = get_bits_count(gb); switch (ver) { - case 1: parse_ext_v1(s, gb, dm); break; - case 2: parse_ext_v2(s, gb, dm, ext_block_length); break; + case 1: ret = parse_ext_v1(s, gb, dm); break; + case 2: ret = parse_ext_v2(s, gb, dm, ext_block_length); break; + default: return AVERROR_BUG; } + if (ret < 0) + return ret; + parsed_bits = get_bits_count(gb) - start_pos; if (parsed_bits > ext_block_length * 8) return AVERROR_INVALIDDATA; From patchwork Fri Jun 14 12:00:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 49911 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp331463vqg; Fri, 14 Jun 2024 05:00:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU1U8wgzTzMMA1skUs4w+KBdvjfkylkxWRbeVIlObDq38KreyegXmZIBXQgS5qSaJu/TrTf9KhBLrB8YFaa6n9cjR+xCZIZp3U73g== X-Google-Smtp-Source: AGHT+IHpm+WhJ6pmuBQpst1IAZ/8aO9tVjSReWpwvpfG0uyZrRacC4NSILSAfYa32UIV5UNvvBIv X-Received: by 2002:a17:906:99cc:b0:a6f:6d7e:f4d3 with SMTP id a640c23a62f3a-a6f6d7ef6e6mr13294866b.34.1718366438408; Fri, 14 Jun 2024 05:00:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718366438; cv=none; d=google.com; s=arc-20160816; b=F1ymRM2s/LzjMM34FglDsUeCLcIYH5eaHa80pLyn8F8/D/bQZcod7lMzP6/8A4lkpK tC+HtAr4271xn5PO9Sq2BsdDYWkCeDwZ2sNBFHM7T+cyQJLTroiSFCATI0o8uoAD6K15 DxKO9/dGi9hkbGMPHFftZxoB6+qjft8zNHclRZ+Dzcqf2bZPR0UpdhAiIEJSgpZO70ke fPqJZdfLx9e+Hx85YdCuUDkLsyuXpkdWIZUGC//9SMDv0QGuhX47tkXQCyM71sfBItls YxrDcs4T9Xs/pCFE2kEAp3GIiPTxGFFQF/1E0eBf/uN7AjgJmf+DtiNT53Y/3AIRQ/Ph WlWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=Vka+4yCbVXyacBWCKEYBSDXnHxnyesDwKvp6agSQ4T8=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=eRd+LpIHSaMZamncWSDsUzge/5rA2eVyAR5J/1ouenD97sD5Ubh6E0ZBRgceM0e1GQ LpLnumZjhsxu08waeZwxfQ9LVgS5pBQ4RcmZg3N3imyCFl/U3Of2z+xmiBAW454sS6L7 1xTLO5tNQqzP1wNB/jqyEn/2079aJJ41OslHyDsSlk68YWTIrK+yMdySJBZEzsLqEGJE hUwBMBl5QJtPYLDjxl5dvi6KMF4L9tj+NGmCsrUovSshliXMcgvrB7iI1aXUXbMIvQCD NLIzq5140yIElwpWb4UF5AJx/M0v8PA/oxIYYQo2DyJjrwZZzZFWXsGm3bfJ8i33ETvf y8dw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=GFmbAPX8; 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 a640c23a62f3a-a6f56d214ccsi165729266b.184.2024.06.14.05.00.38; Fri, 14 Jun 2024 05:00:38 -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; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=GFmbAPX8; 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 8752A68D684; Fri, 14 Jun 2024 15:00:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9222A68D5AF for ; Fri, 14 Jun 2024 15:00:17 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1718366417; bh=vTSH8oaQRxgd2/gA6yvk4Jo6s/464K/4REVMWHByzh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GFmbAPX85dUBPdBiuqUxf0Z6FikzH+wRTv7OSYL/J0d5mIxZb+UuvCgV7Enebg3Qz F+k58+iUqkxIKYwITXc3Xy0nHbJa7UCJCE4uQIBRGcw6COrLnz5L6N2qBaWTMewzFp 3Fz4RoaawJgN/GEJKEN2zmNT80j2PCRiK+osloJE= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 50AD2418F4; Fri, 14 Jun 2024 14:00:17 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jun 2024 14:00:14 +0200 Message-ID: <20240614120014.31038-2-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240614120014.31038-1-ffmpeg@haasn.xyz> References: <20240614120014.31038-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/dovi_rpudec: validate L2.ms_weight 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GkxpszWID6bA From: Niklas Haas This is specified to be in the range -1 to 4095, apparently the only extension level with such a restriction. --- libavcodec/dovi_rpudec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c index fc3b0a2b82..306efbb31f 100644 --- a/libavcodec/dovi_rpudec.c +++ b/libavcodec/dovi_rpudec.c @@ -143,6 +143,7 @@ static int parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm) dm->l2.trim_chroma_weight = get_bits(gb, 12); dm->l2.trim_saturation_gain = get_bits(gb, 12); dm->l2.ms_weight = get_sbits(gb, 13); + VALIDATE(dm->l2.ms_weight, -1, 4095); break; case 4: dm->l4.anchor_pq = get_bits(gb, 12); @@ -172,6 +173,9 @@ static int parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm) } return 0; + +fail: + return AVERROR_INVALIDDATA; } static AVCIExy get_cie_xy(GetBitContext *gb)